[Pkg-samba-maint] r3910 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-09-26 19:39:40 +0000 (Mon, 26 Sep 2011)
New Revision: 3910

Modified:
   trunk/samba/debian/control
   trunk/samba/debian/rules
Log:
don't use dh_makkeshlibs on winbind since that will actually *create* a shlibs
file we don't want; instead just declare Pre-Depends: multiarch-support
manually

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2011-09-26 19:38:48 UTC (rev 3909)
+++ trunk/samba/debian/control	2011-09-26 19:39:40 UTC (rev 3910)
@@ -180,7 +180,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}, libwbclient0 (= ${binary:Version}), samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser, libpam-runtime (>= 1.0.1-6), libpam0g (>= 1.1.3-2~)
 Replaces: samba (<= 2.2.3-2)
 Description: Samba nameservice integration server

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2011-09-26 19:38:48 UTC (rev 3909)
+++ trunk/samba/debian/rules	2011-09-26 19:39:40 UTC (rev 3910)
@@ -146,4 +146,3 @@
 override_dh_makeshlibs:
 	dh_makeshlibs -plibsmbclient -V'libsmbclient (>= 2:3.2.0)'
 	dh_makeshlibs -plibwbclient0 -V'libwbclient0 (>= 2:3.5.0~pre2)'
-	dh_makeshlibs -pwinbind