[Pkg-samba-maint] r1746 - in trunk/samba/debian: . patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-03-09 08:43:25 +0000 (Sun, 09 Mar 2008)
New Revision: 1746

Removed:
   trunk/samba/debian/patches/make-distclean.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
make-distclean.patch was applied upstream


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-03-09 08:40:34 UTC (rev 1745)
+++ trunk/samba/debian/changelog	2008-03-09 08:43:25 UTC (rev 1746)
@@ -3,6 +3,8 @@
   * New upstream release. This fixes the following Debian bugs:
     - Prevent nmbd from shutting down when no network
       interfaces can be located. Closes: #433449
+  * Debian patches dropped as applied upstream:
+    - make-distclean.patch
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 09 Mar 2008 08:57:28 +0100
 

Deleted: trunk/samba/debian/patches/make-distclean.patch
===================================================================
--- trunk/samba/debian/patches/make-distclean.patch	2008-03-09 08:40:34 UTC (rev 1745)
+++ trunk/samba/debian/patches/make-distclean.patch	2008-03-09 08:43:25 UTC (rev 1746)
@@ -1,28 +0,0 @@
-Goal: add some missing files to the distclean target in source/Makefile.in
-
-Fixes: #276203 (mostly)
-
-Status wrt upstream: Forwarded upstream, will be in 3.0.26
-
-Note: 
-
-Index: samba-3.0.25c/source/Makefile.in
-===================================================================
---- samba-3.0.25c.orig/source/Makefile.in	2007-08-26 13:08:59.419847863 +0200
-+++ samba-3.0.25c/source/Makefile.in	2007-08-26 13:09:01.919725881 +0200
-@@ -1688,6 +1688,7 @@
- 
- python_clean:
- 	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
-+	@-rm -rf build/
- 
- # revert to the previously installed version
- revert:
-@@ -1876,6 +1877,7 @@
- 
- distclean: realclean
- 	-rm -f include/stamp-h
-+	-rm -f smbadduser
- 	-rm -f include/config.h Makefile
- 	-rm -f config.status config.cache so_locations
- 	-rm -rf .deps TAGS

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2008-03-09 08:40:34 UTC (rev 1745)
+++ trunk/samba/debian/patches/series	2008-03-09 08:43:25 UTC (rev 1746)
@@ -3,7 +3,6 @@
 fhs-filespaths.patch
 fhs-assignpaths.patch
 installswat.sh.patch
-make-distclean.patch
 non-linux-ports.patch
 pam-examples.patch
 README_nosmbldap-tools.patch