[med-svn] r11386 - trunk/packages/vxl/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2012-06-19 11:41:24 +0000 (Tue, 19 Jun 2012)
New Revision: 11386

Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/compat
   trunk/packages/vxl/trunk/debian/control
   trunk/packages/vxl/trunk/debian/rules
Log:
Fix hardening -again-

Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2012-06-19 10:22:13 UTC (rev 11385)
+++ trunk/packages/vxl/trunk/debian/changelog	2012-06-19 11:41:24 UTC (rev 11386)
@@ -1,8 +1,9 @@
 vxl (1.14.0-18) unstable; urgency=low
 
   * Fix compilation with gcc 4.7. Closes: #674350
+  * Use CPPFLAGS for hardening (using dh/compat 9)
 
- -- Mathieu Malaterre <malat at debian.org>  Tue, 19 Jun 2012 10:17:57 +0000
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 19 Jun 2012 13:40:50 +0200
 
 vxl (1.14.0-17) unstable; urgency=low
 

Modified: trunk/packages/vxl/trunk/debian/compat
===================================================================
--- trunk/packages/vxl/trunk/debian/compat	2012-06-19 10:22:13 UTC (rev 11385)
+++ trunk/packages/vxl/trunk/debian/compat	2012-06-19 11:41:24 UTC (rev 11386)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/vxl/trunk/debian/control
===================================================================
--- trunk/packages/vxl/trunk/debian/control	2012-06-19 10:22:13 UTC (rev 11385)
+++ trunk/packages/vxl/trunk/debian/control	2012-06-19 11:41:24 UTC (rev 11386)
@@ -6,7 +6,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <malat at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), cmake (>= 2.4.5), libtiff5-dev | libtiff-dev,
+Build-Depends: debhelper (>= 9), cmake (>= 2.4.5), libtiff5-dev | libtiff-dev,
  libdcmtk2-dev, libpng-dev, libjpeg-dev, zlib1g-dev, libexpat-dev, python-dev (>= 2.6.6-3~),
  libgeotiff-dev, libcoin60-dev, libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev,

Modified: trunk/packages/vxl/trunk/debian/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules	2012-06-19 10:22:13 UTC (rev 11385)
+++ trunk/packages/vxl/trunk/debian/rules	2012-06-19 11:41:24 UTC (rev 11386)
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-DPKG_EXPORT_BUILDFLAGS = 1
--include /usr/share/dpkg/buildflags.mk
-export LDFLAGS=-Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
 SOVERSION = $(shell echo $(VER_FULL) | cut -f1-2 -d.)