[Pkg-samba-maint] r1004 - in trunk: . patches

[Peter Eisentraut]

Author: petere
Date: 2006-01-31 00:15:36 +0000 (Tue, 31 Jan 2006)
New Revision: 1004

Added:
   trunk/winbind.links
Modified:
   trunk/changelog
   trunk/patches/libnss-soname.patch
   trunk/winbind.lintian
Log:
Put the sonames back into the libnss modules but append a ".2".  Install
as ".so" and make ".so.2" a symlink, shipped in the package.

This makes everything more consistent with the rest of the world, being
other libnss modules, other distributions, and the upstream documentation.
It also avoids the weird lintian error.


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-01-28 08:11:54 UTC (rev 1003)
+++ trunk/changelog	2006-01-31 00:15:36 UTC (rev 1004)
@@ -8,11 +8,11 @@
   * Fix lintian overrides and install them into the right packages.
   * Remove swat inetd registration in remove, not purge. Closes: #313214
   * Add findsmb script. Closes: #231806
-  * Remove sonames from libnss_win{bind,s}.so. Closes: #333290
+  * Ship symlinks to libnss_win{bind,s}.so in the package. Closes: #333290
   * Remove autoconf build dependency.
   * Remove remnants of old patch system.
 
- -- Peter Eisentraut <petere at debian.org>  Sat, 28 Jan 2006 09:04:59 +0100
+ -- Peter Eisentraut <petere at debian.org>  Tue, 31 Jan 2006 00:56:29 +0100
 
 samba (3.0.21a-4) unstable; urgency=low
 

Modified: trunk/patches/libnss-soname.patch
===================================================================
--- trunk/patches/libnss-soname.patch	2006-01-28 08:11:54 UTC (rev 1003)
+++ trunk/patches/libnss-soname.patch	2006-01-31 00:15:36 UTC (rev 1004)
@@ -1,20 +1,20 @@
 Index: samba-3.0.21a/source/Makefile.in
 ===================================================================
---- samba-3.0.21a.orig/source/Makefile.in	2006-01-23 01:08:53.000000000 +0100
-+++ samba-3.0.21a/source/Makefile.in	2006-01-23 01:50:26.000000000 +0100
-@@ -1180,13 +1180,12 @@
+--- samba-3.0.21a.orig/source/Makefile.in	2006-01-25 18:19:25.000000000 +0100
++++ samba-3.0.21a/source/Makefile.in	2006-01-31 00:33:27.000000000 +0100
+@@ -1180,13 +1180,13 @@
  @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
  	@echo "Linking $@"
  	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
 -		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
-+		@WINBIND_NSS_EXTRA_LIBS@
++		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`.2
  
  @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
  	@echo "Linking $@"
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
--		$(LDAP_LIBS) $(KRB5LIBS) -lc \
+ 		$(LDAP_LIBS) $(KRB5LIBS) -lc \
 -		@SONAMEFLAG@`basename $@`
-+		$(LDAP_LIBS) $(KRB5LIBS) -lc
++		@SONAMEFLAG@`basename $@`.2
  
  nsswitch/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
  	@echo "Linking $@"

Added: trunk/winbind.links
===================================================================
--- trunk/winbind.links	2006-01-28 08:11:54 UTC (rev 1003)
+++ trunk/winbind.links	2006-01-31 00:15:36 UTC (rev 1004)
@@ -0,0 +1,2 @@
+lib/libnss_winbind.so  lib/libnss_winbind.so.2
+lib/libnss_wins.so  lib/libnss_wins.so.2

Modified: trunk/winbind.lintian
===================================================================
--- trunk/winbind.lintian	2006-01-28 08:11:54 UTC (rev 1003)
+++ trunk/winbind.lintian	2006-01-31 00:15:36 UTC (rev 1004)
@@ -1,6 +1,4 @@
-winbind: ldconfig-symlink-missing-for-shlib lib/libnss_winbind.so lib/libnss_winbind.so.2 libnss_winbind.so
-winbind: ldconfig-symlink-missing-for-shlib lib/libnss_wins.so lib/libnss_wins.so.2 libnss_wins.so
-winbind: no-shlibs-control-file lib/libnss_winbind.so.2
-winbind: no-shlibs-control-file lib/libnss_wins.so.2
-winbind: postinst-must-call-ldconfig lib/libnss_wins.so.2
-winbind: postrm-should-call-ldconfig lib/libnss_wins.so.2
+winbind: no-shlibs-control-file lib/libnss_winbind.so
+winbind: no-shlibs-control-file lib/libnss_wins.so
+winbind: postinst-must-call-ldconfig lib/libnss_wins.so
+winbind: postrm-should-call-ldconfig lib/libnss_wins.so