[med-svn] r17025 - trunk/packages/adun.app/trunk/debian

[Yavor Doganov]

Author: yavor-guest
Date: 2014-06-01 02:33:28 +0000 (Sun, 01 Jun 2014)
New Revision: 17025

Modified:
   trunk/packages/adun.app/trunk/debian/changelog
   trunk/packages/adun.app/trunk/debian/rules
Log:
Simplify hardening.


Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog	2014-05-31 01:42:36 UTC (rev 17024)
+++ trunk/packages/adun.app/trunk/debian/changelog	2014-06-01 02:33:28 UTC (rev 17025)
@@ -4,9 +4,9 @@
     and fix some important warnings (Closes: #749733).
   * debian/patches/enable-scripting-extension.patch: New.
   * debian/patches/series: Update.
-  * debian/rules: Enable hardening build.
-    (CPPFLAGS, CFLAGS): New variables.
-    (override_dh_auto_build): Use them.
+  * debian/rules: Include /usr/share/dpkg/buildflags.mk, enable hardening
+    build.
+    (override_dh_auto_build): Use CPPFLAGS/CFLAGS/OBJCFLAGS.
     (mipsen-flags): Remove; binutils bug fixed long time ago.
     (override_dh_makeshlibs): Add to placate lintian.
   * debian/control (Section): Change to "science", more appropriate.

Modified: trunk/packages/adun.app/trunk/debian/rules
===================================================================
--- trunk/packages/adun.app/trunk/debian/rules	2014-05-31 01:42:36 UTC (rev 17024)
+++ trunk/packages/adun.app/trunk/debian/rules	2014-06-01 02:33:28 UTC (rev 17025)
@@ -2,15 +2,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/buildflags.mk
 include /usr/share/GNUstep/debian/config.mk
 
 export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR)
 
 d_app := $(CURDIR)/debian/adun.app
-CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS) \
-		-Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
 
 # Avoid building the bundled StepTalk framework.
 export external := no