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

[bubulle at alioth.debian.org]

tags 563372 pending
thanks

Author: bubulle
Date: 2011-02-12 17:25:31 +0000 (Sat, 12 Feb 2011)
New Revision: 3671

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
   trunk/samba/debian/rules
Log:
Use architecture wildcard "linux-any" in build dependencies
Closes: #563372

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-02-05 16:53:44 UTC (rev 3670)
+++ trunk/samba/debian/changelog	2011-02-12 17:25:31 UTC (rev 3671)
@@ -4,6 +4,8 @@
   * Only try parsing dhcpd.conf is it's not empty,
     in dhclient-enter-hooks.d/samba
     (partial fix for #594088) 
+  * Use architecture wildcard "linux-any" in build dependencies
+    Closes: #563372
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 05 Feb 2011 13:50:22 +0100
 

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2011-02-05 16:53:44 UTC (rev 3670)
+++ trunk/samba/debian/control	2011-02-12 17:25:31 UTC (rev 3671)
@@ -5,12 +5,12 @@
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>
 Build-Depends: debhelper (>= 6.0.7~), libpam0g-dev, libreadline-dev,
 	libcups2-dev | libcupsys2-dev,
-	libacl1-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+	libacl1-dev [linux-any]
 	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
 	libtalloc-dev (>= 2.0.1-1~bpo50+1),
-	libcap2-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	libkeyutils-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	ctdb (>= 1.0.103) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+	libcap2-dev [linux-any],
+	libkeyutils-dev [linux-any],
+	ctdb (>= 1.0.103) [linux-any],
 	pkg-config
 Build-Conflicts: libfam-dev
 Standards-Version: 3.9.0

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2011-02-05 16:53:44 UTC (rev 3670)
+++ trunk/samba/debian/rules	2011-02-12 17:25:31 UTC (rev 3671)
@@ -247,10 +247,4 @@
 
 binary: binary-indep binary-arch
 
-update-archs:
-	sed -i -e "s/libacl1-dev\( ([^)]\+)\)* \[[^]]\+\]/libacl1-dev\1 [`type-handling any linux-gnu`]/g" \
-	       -e "s/libkeyutils-dev\( ([^)]\+)\)* \[[^]]\+\]/libkeyutils-dev\1 [`type-handling any linux-gnu`]/g" \
-	       -e "s/libcap2-dev\( ([^)]\+)\)* \[[^]]\+\]/libcap2-dev\1 [`type-handling any linux-gnu`]/g" \
-		debian/control
-
-.PHONY: build clean binary-indep binary-arch binary install configure update-archs
+.PHONY: build clean binary-indep binary-arch binary install configure