[Pkg-samba-maint] r2145 - trunk/samba/debian/patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-08-27 07:21:00 +0000 (Wed, 27 Aug 2008)
New Revision: 2145

Modified:
   trunk/samba/debian/patches/shrink-dead-code.patch
Log:
this patch had to be adjusted for 3.2.2 anyway, so make sure it applies cleanly

Modified: trunk/samba/debian/patches/shrink-dead-code.patch
===================================================================
--- trunk/samba/debian/patches/shrink-dead-code.patch	2008-08-25 15:45:33 UTC (rev 2144)
+++ trunk/samba/debian/patches/shrink-dead-code.patch	2008-08-27 07:21:00 UTC (rev 2145)
@@ -2,7 +2,7 @@
 ===================================================================
 --- samba.deb.orig/source/Makefile.in
 +++ samba.deb/source/Makefile.in
-@@ -1332,37 +1332,47 @@
+@@ -1261,37 +1261,47 @@
  
  bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
  	@echo Linking $@
@@ -55,7 +55,7 @@
  
  bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
  	@echo Linking $@
-@@ -1373,220 +1383,295 @@
+@@ -1302,220 +1312,295 @@
  
  bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@
@@ -388,9 +388,9 @@
  		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
 +	@rm -f $@.a
  
- MKSYMS_SH = $(srcdir)/script/mksyms.sh
  
-@@ -1764,16 +1849,20 @@
+ #####################################################################
+@@ -2096,16 +2181,20 @@
  
  bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo "Linking $@"
@@ -413,7 +413,7 @@
  
  @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
  	@echo "Linking $@"
-@@ -2020,9 +2109,11 @@
+@@ -2352,9 +2441,11 @@
  
  bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
  	@echo Linking $@
@@ -426,7 +426,7 @@
  
  bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
  	$(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
-@@ -2040,23 +2131,31 @@
+@@ -2372,23 +2463,31 @@
  
  bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
  	@echo Linking $@