[Pkg-samba-maint] r1005 - trunk

[Peter Eisentraut]

Author: petere
Date: 2006-01-31 22:36:32 +0000 (Tue, 31 Jan 2006)
New Revision: 1005

Removed:
   trunk/winbind.links
Modified:
   trunk/changelog
   trunk/rules
   trunk/winbind.files
   trunk/winbind.lintian
Log:
Remove the symlinks and install as libnss_*.so.2.


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-01-31 00:15:36 UTC (rev 1004)
+++ trunk/changelog	2006-01-31 22:36:32 UTC (rev 1005)
@@ -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
-  * Ship symlinks to libnss_win{bind,s}.so in the package. Closes: #333290
+  * Fix sonames of libnss_win{bind,s}.so. Closes: #333290
   * Remove autoconf build dependency.
   * Remove remnants of old patch system.
 
- -- Peter Eisentraut <petere at debian.org>  Tue, 31 Jan 2006 00:56:29 +0100
+ -- Peter Eisentraut <petere at debian.org>  Tue, 31 Jan 2006 22:28:33 +0100
 
 samba (3.0.21a-4) unstable; urgency=low
 

Modified: trunk/rules
===================================================================
--- trunk/rules	2006-01-31 00:15:36 UTC (rev 1004)
+++ trunk/rules	2006-01-31 22:36:32 UTC (rev 1005)
@@ -160,13 +160,13 @@
 
 	# Install winbind stuff not installed by 'make install'
 	install -m 0644 source/nsswitch/libnss_winbind.so \
-		$(DESTDIR)/lib/libnss_winbind.so
+		$(DESTDIR)/lib/libnss_winbind.so.2
 	install -m 0644 source/nsswitch/pam_winbind.so \
 		$(DESTDIR)/lib/security/
 
 	# Install libnss_wins.so, which is not installed by 'make install' either.
 	install -m 0644 source/nsswitch/libnss_wins.so \
-		$(DESTDIR)/lib/libnss_wins.so
+		$(DESTDIR)/lib/libnss_wins.so.2
 
 	# pam_smbpass.so isn't being installed by 'make install'.
 	#	We'll move it here to $(DESTDIR)/lib/security/ and then

Modified: trunk/winbind.files
===================================================================
--- trunk/winbind.files	2006-01-31 00:15:36 UTC (rev 1004)
+++ trunk/winbind.files	2006-01-31 22:36:32 UTC (rev 1005)
@@ -6,5 +6,5 @@
 usr/share/man/man7/pam_winbind.7
 usr/share/man/man8/winbindd.8
 lib/security/pam_winbind.so
-lib/libnss_winbind.so
-lib/libnss_wins.so
+lib/libnss_winbind.so.2
+lib/libnss_wins.so.2

Deleted: trunk/winbind.links
===================================================================
--- trunk/winbind.links	2006-01-31 00:15:36 UTC (rev 1004)
+++ trunk/winbind.links	2006-01-31 22:36:32 UTC (rev 1005)
@@ -1,2 +0,0 @@
-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-31 00:15:36 UTC (rev 1004)
+++ trunk/winbind.lintian	2006-01-31 22:36:32 UTC (rev 1005)
@@ -1,4 +1,5 @@
-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
+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: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2