summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-19 12:25:28 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-19 12:25:28 +0100
commitd4706c6dbf9d0f0b795eb431f5fb6d2396625a10 (patch)
tree140a98b68c9af180705147618c156804676ca78a /debian
parent3633443938f2dae689c80509281a94e4230eab44 (diff)
Remove oldstyle hardening tags & useless comments
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/rules16
2 files changed, 7 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index dd40392..7e06f5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ simple-scan (3.15.4-1) UNRELEASED; urgency=medium
* debian/control:
- Change Architecture to linux-any to prevent build error
on systems with no systemd.
+ * debian/rules:
+ - Remove oldstyle hardening tags.
+ - Remove useless comments.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 19 Jan 2015 09:43:33 +0100
diff --git a/debian/rules b/debian/rules
index 66ff5ec..0a0bbe9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#!/usr/bin/make -f
#
# 2014-07-22 Jörg Frings-Fürst <debian@jff-webhosting.net>
@@ -6,23 +6,15 @@
# - enable hardening
# - install NEWS as upstream changelog
#
+# 2015-01-19 Jörg Frings-Fürst <debian@jff-webhosting.net>
#
-
+# - remove old style hardening.
+# - remove useless comments.
#
# Hardening
#
-#
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-#export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-#export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-#export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-#export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-#LDFLAGS+=-Wl,--as-needed
%:
dh $@ --with=autoreconf,scour