Merge tag 'debian/3.1-2' into develop

Buffix release

4 files changed, 14 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 9bc0eae..327746b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,26 @@
-dmidecode (3.1-2) UNRELEASED; urgency=medium
+dmidecode (3.1-2) unstable; urgency=medium
 
   * debian/control:
     - Change to my new email address.
     - Use secure homepage URI.
-    - Switch Vcs-* to new location.
+    - Switch Vcs-* to new location (Closes: #902259).
   * debian/copyright:
     - Change to my new email address.
     - Use secure copyright format URI.
+    - Add year 2018 to debian/*.
+  * debian/rules:
+    - Add "export DEB_CFLAGS_MAINT_APPEND  = -fPIE" and
+      "export DEB_LDFLAGS_MAINT_APPEND = -fPIE -pie" to fix missing CFLAGS
+      and LDFLAGS.
   * debian/watch:
     - Use secure URI.
+    - Switch to version 4.
   * Declare compliance with Debian Policy 4.1.5 (No changes needed).
   * Migrate to debhelper 11:
     - Change debian/compat to 11.
     - Bump minimum debhelper version in debian/control to >= 11.
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sat, 04 Aug 2018 20:16:22 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 05 Aug 2018 20:22:07 +0200
 
 dmidecode (3.1-1) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 16a90b4..27c20ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,7 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2003-2007 Petter Reinholdtsen <pere@debian.org>
            2011-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
-           2014-2017 Jörg Frings-Fürst <debian@jff.email>
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/rules b/debian/rules
index a0cbc4d..6699560 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND  = -fPIE
+export DEB_LDFLAGS_MAINT_APPEND = -fPIE -pie
+
 
 include /usr/share/dpkg/architecture.mk
 ifeq ($(origin CC),default)
diff --git a/debian/watch b/debian/watch
index e070fe7..fec0f68 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
 opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/_/./g;s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,pgpsigurlmangle=s/$/.sig/ \
 https://download.savannah.gnu.org/releases/dmidecode/dmidecode-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:bz2|xz))