[Pkg-openldap-devel] r1387 - openldap/trunk/debian

[vorlon at alioth.debian.org]

tags 644427 pending
thanks

Author: vorlon
Date: 2011-10-08 22:50:52 +0000 (Sat, 08 Oct 2011)
New Revision: 1387

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
   openldap/trunk/debian/rules
Log:
use DEB_CFLAGS_MAINT_APPEND with appropriate versioned dependency on
debhelper and dpkg-dev, so we can pick up dpkg-buildflags for our
policy-mandated flags - as well as our security-enhancing ones!
Closes: #644427.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-10-08 19:57:29 UTC (rev 1386)
+++ openldap/trunk/debian/changelog	2011-10-08 22:50:52 UTC (rev 1387)
@@ -7,6 +7,10 @@
   * debian/patches/no-AM_INIT_AUTOMAKE: don't use AM_INIT_AUTOMAKE macro
     when we aren't using automake.
   * Convert debian/rules to dh(1).
+  * use DEB_CFLAGS_MAINT_APPEND with appropriate versioned dependency on
+    debhelper and dpkg-dev, so we can pick up dpkg-buildflags for our
+    policy-mandated flags - as well as our security-enhancing ones!
+    Closes: #644427.
 
  -- Steve Langasek <vorlon at debian.org>  Sun, 21 Aug 2011 11:25:07 -0700
 

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2011-10-08 19:57:29 UTC (rev 1386)
+++ openldap/trunk/debian/control	2011-10-08 22:50:52 UTC (rev 1387)
@@ -8,7 +8,9 @@
  Torsten Landschoff <torsten at debian.org>,
  Matthijs Möhlmann <matthijs at cacholong.nl>,
  Russ Allbery <rra at debian.org>
-Build-Depends: debhelper (>= 8.1.3), libdb5.1-dev, libgcrypt-dev,
+Build-Depends: debhelper (>= 8.9.0~),
+	dpkg-dev (>= 1.16.1),
+	libdb5.1-dev, libgcrypt-dev,
  libgnutls-dev (>= 1.7), unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
  libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40),

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2011-10-08 19:57:29 UTC (rev 1386)
+++ openldap/trunk/debian/rules	2011-10-08 22:50:52 UTC (rev 1387)
@@ -1,19 +1,11 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE = 1
-
 # Set this variable if you're building packages outside of Debian and don't
 # want the checks for DFSG-freeness.
 #DFSG_NONFREE = 1
 
-CFLAGS = -Wall -g -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+export DEB_CFLAGS_MAINT_APPEND := -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CONFIG		= $(shell grep -v "^\#" debian/configure.options)
@@ -74,7 +66,7 @@
 
 	cp -f /usr/share/misc/config.* contrib/ldapc++/
 
-	dh_auto_configure -- CFLAGS="$(CFLAGS)" $(CONFIG)
+	dh_auto_configure -- $(CONFIG)
 	perl debian/check_config
 	$(MAKE) -C $(builddir) depend
 
@@ -129,6 +121,12 @@
 	dh_strip -plibldap-2.4-2 --dbg-package=libldap-2.4-2-dbg
 	dh_strip -pslapd --dbg-package=slapd-dbg
 	dh_strip -Nlibldap-2.4-2 -Nslapd
+	# hardlink these so not confined by apparmor; do this here and not
+	# in dh_link so that dh_strip doesn't get confused and put the wrong
+	# binary in the debug package.
+	for f in slapacl slapadd slapauth slapcat slapdn slapindex slappasswd slaptest slapschema ; do \
+	    ln -f $(slapddir)/slapd $(slapddir)/$$f ; \
+	done
 
 override_dh_link:
 	for pkg in libldap2-dev libldap-2.4-2; do \
@@ -136,11 +134,6 @@
 	done
 	dh_link
 
-	# hardlink these so not confined by apparmor
-	for f in slapacl slapadd slapauth slapcat slapdn slapindex slappasswd slaptest slapschema ; do \
-	    ln -f $(slapddir)/slapd $(slapddir)/$$f ; \
-	done
-
 override_dh_makeshlibs:
 	# ideally we would do this and not have any libldap-2.4.so.2 links
 	# at all, but that requires adjusting the build scripts first to