Bug#836657: switchsh: please drop the build dependency on hardening-wrapper

2016-09-25 Thread Chris Lamb 
tags 836657 + pending patch
thanks

I've re-uploaded switchsh 0~20070801-3.3 to DELAYED/5 to correct an issue with
the previous upload:
  
  switchsh (0~20070801-3.3) unstable; urgency=medium
  
* Non-maintainer upload.
* Drop build dependency on hardening-wrapper by moving to dpkg-buildflags.
  (Closes: #836657)

The full debdiff is attached.


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-
diff -u switchsh-0~20070801/debian/changelog 
switchsh-0~20070801/debian/changelog
--- switchsh-0~20070801/debian/changelog
+++ switchsh-0~20070801/debian/changelog
@@ -1,3 +1,11 @@
+switchsh (0~20070801-3.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop build dependency on hardening-wrapper by moving to dpkg-buildflags.
+(Closes: #836657)
+
+ -- Chris Lamb   Sun, 25 Sep 2016 12:13:00 +0200
+
 switchsh (0~20070801-3.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u switchsh-0~20070801/debian/control switchsh-0~20070801/debian/control
--- switchsh-0~20070801/debian/control
+++ switchsh-0~20070801/debian/control
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Raphael Geissert 
-Build-Depends: debhelper (>= 5), cdbs, hardening-wrapper, quilt
+Build-Depends: debhelper (>= 5), cdbs, quilt
 Standards-Version: 3.8.0
 Homepage: http://www.linux.it/~md/software/
 XS-DM-Upload-Allowed: yes
diff -u switchsh-0~20070801/debian/rules switchsh-0~20070801/debian/rules
--- switchsh-0~20070801/debian/rules
+++ switchsh-0~20070801/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS:=hardening=+all
 
-CFLAGS += -pedantic -Werror -Wextra -Wformat -Wformat-security
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -pedantic -Werror -Wextra 
-Wformat -Wformat-security
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk

Bug#836657: switchsh: please drop the build dependency on hardening-wrapper

2016-09-24 Thread Chris Lamb 
tags 836657 + pending patch
thanks

switchsh 0~20070801-3.3 uploaded to DELAYED/5. The corresponding debdiff is
attached.


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-
diff -u switchsh-0~20070801/debian/changelog 
switchsh-0~20070801/debian/changelog
--- switchsh-0~20070801/debian/changelog
+++ switchsh-0~20070801/debian/changelog
@@ -1,3 +1,11 @@
+switchsh (0~20070801-3.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop build dependency on hardening-wrapper by moving to dpkg-buildflags.
+(Closes: #836657)
+
+ -- Chris Lamb   Sat, 24 Sep 2016 22:23:00 +0200
+
 switchsh (0~20070801-3.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u switchsh-0~20070801/debian/control switchsh-0~20070801/debian/control
--- switchsh-0~20070801/debian/control
+++ switchsh-0~20070801/debian/control
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Raphael Geissert 
-Build-Depends: debhelper (>= 5), cdbs, hardening-wrapper, quilt
+Build-Depends: debhelper (>= 5), cdbs, quilt
 Standards-Version: 3.8.0
 Homepage: http://www.linux.it/~md/software/
 XS-DM-Upload-Allowed: yes
diff -u switchsh-0~20070801/debian/rules switchsh-0~20070801/debian/rules
--- switchsh-0~20070801/debian/rules
+++ switchsh-0~20070801/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_HARDENING=1
-
-CFLAGS += -pedantic -Werror -Wextra -Wformat -Wformat-security
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -pedantic -Werror -Wextra 
-Wformat -Wformat-security
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk