[Pkg-gnutls-commits] r1418 - in /packages/p11-kit/trunk/debian: changelog compat control rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Mar  3 18:00:09 2012
New Revision: 1418

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1418
Log:
Use debhelper v9 compat to get dpkg-buildflags. Drop --libdir argument to
./configure, bump b-d.

Modified:
    packages/p11-kit/trunk/debian/changelog
    packages/p11-kit/trunk/debian/compat
    packages/p11-kit/trunk/debian/control
    packages/p11-kit/trunk/debian/rules

Modified: packages/p11-kit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/changelog?rev=1418&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/changelog (original)
+++ packages/p11-kit/trunk/debian/changelog Sat Mar  3 18:00:09 2012
@@ -4,6 +4,8 @@
     p11_kit_initialize_module and p11_kit_load_initialize_module.
     (Due to upstream change "Remove automatic reinitialization of PKCS#11
     after fork")
+  * Use debhelper v9 compat to get dpkg-buildflags. Drop --libdir argument to
+    ./configure, bump b-d.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 03 Mar 2012 18:42:52 +0100
 

Modified: packages/p11-kit/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/compat?rev=1418&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/compat (original)
+++ packages/p11-kit/trunk/debian/compat Sat Mar  3 18:00:09 2012
@@ -1,1 +1,1 @@
-8
+9

Modified: packages/p11-kit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/control?rev=1418&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/control (original)
+++ packages/p11-kit/trunk/debian/control Sat Mar  3 18:00:09 2012
@@ -2,7 +2,7 @@
 Priority: extra
 Maintainer: Debian GnuTLS Maintainers <pkg-gnutls-maint at lists.alioth.debian.org>
 Uploaders: Andreas Metzler <ametzler at debian.org>
-Build-Depends: debhelper (>= 8.1.3), autotools-dev
+Build-Depends: debhelper (>= 9), autotools-dev
 Standards-Version: 3.9.3
 Section: libs
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/p11-kit/trunk

Modified: packages/p11-kit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/rules?rev=1418&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/rules (original)
+++ packages/p11-kit/trunk/debian/rules Sat Mar  3 18:00:09 2012
@@ -1,22 +1,14 @@
 #!/usr/bin/make -f
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-## ifeq (,$(filter $(DEB_BUILD_ARCH_OS),linux))
-## 	CPPFLAGS += -D_GNU_SOURCE
-## 	export CPPFLAGS
-## endif
-
+CPPFLAGS += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
 export CPPFLAGS
-CPPFLAGS += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-		--disable-silent-rules \
-		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure --verbose -- \
+		--disable-silent-rules
 
 %:
 	dh $@