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

[vorlon at alioth.debian.org]

tags 519911 pending
thanks

Author: vorlon
Date: 2009-03-16 08:19:13 +0000 (Mon, 16 Mar 2009)
New Revision: 2660

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
   trunk/samba/debian/rules
Log:
libcap2-dev is only available on Linux, so make this build-dependency
conditional.  Closes: #519911.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-03-15 22:00:23 UTC (rev 2659)
+++ trunk/samba/debian/changelog	2009-03-16 08:19:13 UTC (rev 2660)
@@ -1,3 +1,10 @@
+samba (2:3.3.2-2) UNRELEASED; urgency=low
+
+  * libcap2-dev is only available on Linux, so make this build-dependency
+    conditional.  Closes: #519911.
+
+ -- Steve Langasek <vorlon at debian.org>  Mon, 16 Mar 2009 01:16:47 -0700
+
 samba (2:3.3.2-1) unstable; urgency=low
 
   [ Christian Perrier ]

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2009-03-15 22:00:23 UTC (rev 2659)
+++ trunk/samba/debian/control	2009-03-16 08:19:13 UTC (rev 2660)
@@ -3,7 +3,14 @@
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Jelmer Vernooij <jelmer at debian.org>
-Build-Depends: debhelper, libpam0g-dev, libreadline5-dev, libcups2-dev | libcupsys2-dev, libacl1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev, libtalloc-dev (>= 1.2.0~git20080616), libcap2-dev, libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], ctdb
+Build-Depends: debhelper, libpam0g-dev, libreadline5-dev,
+	libcups2-dev | libcupsys2-dev,
+	libacl1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev,
+	libtalloc-dev (>= 1.2.0~git20080616),
+	libcap2-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+	libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+	ctdb
 Build-Conflicts: libfam-dev
 Standards-Version: 3.8.1
 Homepage: http://www.samba.org

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2009-03-15 22:00:23 UTC (rev 2659)
+++ trunk/samba/debian/rules	2009-03-16 08:19:13 UTC (rev 2660)
@@ -273,6 +273,7 @@
 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 patch unpatch update-archs