[med-svn] r15497 - trunk/packages/igstk/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-12-11 12:38:18 +0000 (Wed, 11 Dec 2013)
New Revision: 15497

Modified:
   trunk/packages/igstk/trunk/debian/changelog
   trunk/packages/igstk/trunk/debian/rules
Log:
force propagation of hardening options; upload to unstable


Modified: trunk/packages/igstk/trunk/debian/changelog
===================================================================
--- trunk/packages/igstk/trunk/debian/changelog	2013-12-11 10:22:44 UTC (rev 15496)
+++ trunk/packages/igstk/trunk/debian/changelog	2013-12-11 12:38:18 UTC (rev 15497)
@@ -1,4 +1,4 @@
-igstk (4.4.0-3) UNRELEASED; urgency=medium
+igstk (4.4.0-3) unstable; urgency=medium
 
   * debian/control:
      - cme fix dpkg-control
@@ -10,7 +10,9 @@
   * debian/watch: Adapt to new download page
   * debian/get-orig-source: There is no point in just repackaging upstream
     download tarball
-  * debian/rules: use dh
+  * debian/rules:
+     - use dh
+     - force propagation of hardening options
 
  -- Andreas Tille <tille at debian.org>  Wed, 11 Dec 2013 09:01:23 +0100
 

Modified: trunk/packages/igstk/trunk/debian/rules
===================================================================
--- trunk/packages/igstk/trunk/debian/rules	2013-12-11 10:22:44 UTC (rev 15496)
+++ trunk/packages/igstk/trunk/debian/rules	2013-12-11 12:38:18 UTC (rev 15497)
@@ -10,10 +10,10 @@
 DEB_CMAKE_EXTRA_FLAGS = \
               -DCMAKE_INSTALL_PREFIX:PATH=/usr \
               -DCMAKE_BUILD_TYPE:STRING=Release \
-              -DCMAKE_CXX_FLAGS="-Wno-deprecated" \
+              -DCMAKE_CXX_FLAGS="-Wno-deprecated $(CXXFLAGS)" \
               -DCMAKE_VERBOSE_MAKEFILE=$(DH_VERBOSE) \
-              -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
-              -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
+              -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed $(LDFLAGS)" \
+              -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed $(LDFLAGS)" \
               -DCMAKE_SKIP_RPATH:BOOL=ON \
               -DIGSTK_WITH_LIBRARY_VERSION:BOOL=ON \
               -DIGSTK_DEVELOPMENT_VERSION:BOOL=ON \