Bug#836662: wdq2wav: diff for NMU version 1.0.0-1.1

[Mattia Rizzolo]

Control: tags 836662 + patch
Control: tags 836662 + pending

Dear maintainer,

I've prepared an NMU for wdq2wav (versioned as 1.0.0-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

diffstat for wdq2wav-1.0.0 wdq2wav-1.0.0

 changelog                |   15 ++++++++
 compat                   |    2 -
 control                  |    4 +-
 dirs                     |    1 
 patches/buildflags.patch |   17 ++++++++++
 patches/series           |    1 
 rules                    |   79 +----------------------------------------------
 7 files changed, 39 insertions(+), 80 deletions(-)

diff -Nru wdq2wav-1.0.0/debian/changelog wdq2wav-1.0.0/debian/changelog
--- wdq2wav-1.0.0/debian/changelog	2013-10-05 19:39:03.000000000 +0000
+++ wdq2wav-1.0.0/debian/changelog	2016-09-27 20:15:54.000000000 +0000
@@ -1,3 +1,18 @@
+wdq2wav (1.0.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch to have the build system obey to build flags from the env.
+  * Stop using hardening-wrapper and instead make use of dpkg-buildflags.
+    Closes: #836662
+  * Rewrite debian/rules using the dh sequencer:
+    + stop manually installing binary and manpage: the upstream build
+      system already does it (though it doesn't create the needed directories,
+      hence debian/dirs is actually needed).
+  * Bump debhelper compat level to 10.
+  * Bump Standards-Version to 3.9.8, no changes needed.
+
+ -- Mattia Rizzolo <mat...@debian.org>  Tue, 27 Sep 2016 20:15:54 +0000
+
 wdq2wav (1.0.0-1) unstable; urgency=low
 
   * New upstream
diff -Nru wdq2wav-1.0.0/debian/compat wdq2wav-1.0.0/debian/compat
--- wdq2wav-1.0.0/debian/compat	2009-08-02 11:49:23.000000000 +0000
+++ wdq2wav-1.0.0/debian/compat	2016-09-27 20:04:43.000000000 +0000
@@ -1 +1 @@
-7
+10
diff -Nru wdq2wav-1.0.0/debian/control wdq2wav-1.0.0/debian/control
--- wdq2wav-1.0.0/debian/control	2013-10-05 21:00:18.000000000 +0000
+++ wdq2wav-1.0.0/debian/control	2016-09-27 20:13:14.000000000 +0000
@@ -2,8 +2,8 @@
 Section: contrib/utils
 Priority: extra
 Maintainer: Kevin M. Rosenberg <k...@debian.org>
-Build-Depends: debhelper (>> 7.0.0), hardening-wrapper
-Standards-Version: 3.9.4.0
+Build-Depends: debhelper (>= 10)
+Standards-Version: 3.9.8
 Homepage: http://files.b9.com/wdq2wav/
 Vcs-Git: git://git.b9.com/wdq2wav.git
 
diff -Nru wdq2wav-1.0.0/debian/dirs wdq2wav-1.0.0/debian/dirs
--- wdq2wav-1.0.0/debian/dirs	2007-09-04 06:29:42.000000000 +0000
+++ wdq2wav-1.0.0/debian/dirs	2016-09-27 20:10:16.000000000 +0000
@@ -1,3 +1,2 @@
 usr/bin
 usr/share/man/man1
-
diff -Nru wdq2wav-1.0.0/debian/patches/buildflags.patch wdq2wav-1.0.0/debian/patches/buildflags.patch
--- wdq2wav-1.0.0/debian/patches/buildflags.patch	1970-01-01 00:00:00.000000000 +0000
+++ wdq2wav-1.0.0/debian/patches/buildflags.patch	2016-09-27 20:03:01.000000000 +0000
@@ -0,0 +1,17 @@
+Description: Tech the build system to obey to buildflags from the environment
+ Also swap '-o $(base)' and '$(base).cpp)': the compiling source is supposed to be the last argument
+Author: Mattia Rizzolo <mat...@debian.org>
+Forwarded: no
+Last-Update: 2016-09-27
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@
+ 	groff -man -Thtml wdq2wav.1 > wdq2wav.html
+ 
+ wdq2wav: wdq2wav.cpp wdq2wav.h
+-	g++ -Wall -DLINUX -O2 -I. $(base).cpp -o $(base)
++	g++ -Wall -DLINUX -O2 $(CXXFLAGS) $(CPPFLAGS) -I. -o $(base) $(base).cpp $(LDFLAGS)
+ 
+ install: compile
+ 	install -m 0755 -o root -g root wdq2wav $(DESTDIR)/usr/bin
diff -Nru wdq2wav-1.0.0/debian/patches/series wdq2wav-1.0.0/debian/patches/series
--- wdq2wav-1.0.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ wdq2wav-1.0.0/debian/patches/series	2016-09-27 19:57:55.000000000 +0000
@@ -0,0 +1 @@
+buildflags.patch
diff -Nru wdq2wav-1.0.0/debian/rules wdq2wav-1.0.0/debian/rules
--- wdq2wav-1.0.0/debian/rules	2013-10-05 21:10:43.000000000 +0000
+++ wdq2wav-1.0.0/debian/rules	2016-09-27 20:06:10.000000000 +0000
@@ -1,79 +1,6 @@
 #!/usr/bin/make -f
 
-CFLAGS = -Wall -g
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-export DEB_BUILD_HARDENING=1
-export DPKG_EXPORT_BUILDFLAGS=1
-export DEB_BUILD_MAINT_OPTIONS="hardening=+all" 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-
-build: build-stamp build-arch build-indep
-
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	DPKG_EXPORT_BUILDFLAGS=1
-	$(MAKE)
-	dh_install wdq2wav usr/bin
-
-binary-indep: 
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installcron
-	dh_installman wdq2wav.1
-	dh_installinfo
-	dh_installchangelogs 
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-build-indep:
-
-build-arch:
-
-binary: clean binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+	dh $@

signature.asc
Description: PGP signature