[Pkg-samba-maint] r3961 - trunk/ctdb/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-11-06 13:20:08 +0000 (Sun, 06 Nov 2011)
New Revision: 3961

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/compat
   trunk/ctdb/debian/control
   trunk/ctdb/debian/libctdb-dev.install
   trunk/ctdb/debian/rules
Log:
d/rules: enhancements
    - converted to dh (% target and dh_auto_*)
    - moved to compat level 9
    - dh9 enabled hardening build flags
    - dh9 enabled multiarch
    - added hardening=+bindnow


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-11-06 13:00:42 UTC (rev 3960)
+++ trunk/ctdb/debian/changelog	2011-11-06 13:20:08 UTC (rev 3961)
@@ -4,7 +4,12 @@
     - removed 92-apache-service-enable.diff: integrated 
     - removed 99-fix-broken-readdir-test.diff: integrated
   * Don't use /use/lib64 on ppc64 (Closes: #644907)
-  * d/rules: converted to dh7 
+  * d/rules:
+    - converted to dh (% target and dh_auto_*)
+    - moved to compat level 9
+    - dh9 enabled hardening build flags
+    - dh9 enabled multiarch
+    - added hardening=+bindnow
 
  -- Mathieu Parent <sathieu at debian.org>  Wed, 21 Sep 2011 22:07:40 +0200
 

Modified: trunk/ctdb/debian/compat
===================================================================
--- trunk/ctdb/debian/compat	2011-11-06 13:00:42 UTC (rev 3960)
+++ trunk/ctdb/debian/compat	2011-11-06 13:20:08 UTC (rev 3961)
@@ -1 +1 @@
-7
+9

Modified: trunk/ctdb/debian/control
===================================================================
--- trunk/ctdb/debian/control	2011-11-06 13:00:42 UTC (rev 3960)
+++ trunk/ctdb/debian/control	2011-11-06 13:20:08 UTC (rev 3961)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Mathieu Parent <sathieu at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libpopt-dev, libpcap-dev [hurd-i386]
+Build-Depends: debhelper (>= 8.9.4~), libpopt-dev, libpcap-dev [hurd-i386]
 Homepage: http://ctdb.samba.org/
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/ctdb/

Modified: trunk/ctdb/debian/libctdb-dev.install
===================================================================
--- trunk/ctdb/debian/libctdb-dev.install	2011-11-06 13:00:42 UTC (rev 3960)
+++ trunk/ctdb/debian/libctdb-dev.install	2011-11-06 13:20:08 UTC (rev 3961)
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/pkgconfig/*

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2011-11-06 13:00:42 UTC (rev 3960)
+++ trunk/ctdb/debian/rules	2011-11-06 13:20:08 UTC (rev 3961)
@@ -11,19 +11,15 @@
 DEB_HOST_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH_OS	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export DEB_HOST_GNU_TYPE
 export DEB_BUILD_GNU_TYPE
 export DEB_HOST_ARCH_OS
 
-CFLAGS = -g -Wall
+export DEB_CFLAGS_MAINT_APPEND  := -Wall
+export DEB_BUILD_MAINT_OPTIONS	:= hardening=+bindnow
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CFLAGS += -O0
-else
-  CFLAGS += -O2
-endif
-
 DESTDIR=$(CURDIR)/debian/tmp
 
 conf_args = \
@@ -34,7 +30,7 @@
 	dh $@
 
 override_dh_auto_configure: check-external-libs
-	CFLAGS="$(CFLAGS)" dh_auto_configure -- $(conf_args)
+	dh_auto_configure -- $(conf_args)
 
 override_dh_auto_test:
 	# skipping tests