Fix FTBFS with gcc-6: auto_ptr is deprecated. First, -Wdeprecated should not cause...

* Fix FTBFS with gcc-6: auto_ptr is deprecated.  First, -Wdeprecated
  should not cause an error for package builds.  Second, use unique_ptr,
  Closes: #831187
* Upgrade standards version to 3.9.8 (no changes needed)

diff --git a/debian/changelog b/debian/changelog
index 4426bef..de19ef4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+moonshot-gss-eap (0.9.5-2) unstable; urgency=medium
+
+  * Fix FTBFS with gcc-6: auto_ptr is deprecated.  First, -Wdeprecated
+    should not cause an error for package builds.  Second, use unique_ptr,
+    Closes: #831187
+  * Upgrade standards version to 3.9.8 (no changes needed)
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 22 Aug 2016 21:38:12 -0400
+
 moonshot-gss-eap (0.9.5-1) unstable; urgency=medium
 
   * New upstream version

diff --git a/debian/control b/debian/control
index e81712a..12d36e1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, libshibsp-dev (>= 2.5+dfsg~moons
     libradsec-dev (>=0.0.4), libkrb5-dev (>= 1.9.1+dfsg-2), 
     libshibresolver-dev|libshib-resolver-dev, libjansson-dev, moonshot-ui-dev (>= 0.6-2), libssl-dev, libboost-dev, liblog4shib-dev|liblog4c++-dev, dh-autoreconf
 Build-Conflicts: libgss-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Homepage: http://www.project-moonshot.org/
 Vcs-Git: http://www.project-moonshot.org/git/moonshot.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/moonshot-gss-eap.git;a=summary

diff --git a/debian/rules b/debian/rules
index e610e19..4e54c1d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,17 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+CFLAGS= $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS+= -Wno-error=deprecated -Wno-error=deprecated-declarations
+CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS+= -Wno-error=deprecated -Wno-error=deprecated-declarations
+
+export CFLAGS
 
 %:
        dh $@  --with autoreconf
+override_dh_auto_configure:
+       dh_auto_configure -- "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)"