Bug#836626: fractalnow: diff for NMU version 0.8.1-1.1

[Mattia Rizzolo]

Control: tags 836626 + patch
Control: tags 836626 + pending

Dear maintainer,
I've prepared an NMU for fractalnow (versioned as 0.8.1-1.1) and
uploaded it to DELAYED/5. 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 fractalnow-0.8.1 fractalnow-0.8.1

 changelog                |   14 +++++++++++
 compat                   |    2 -
 control                  |    5 +--
 menu                     |    5 ---
 patches/buildflags.patch |   59 +++++++++++++++++++++++++++++++++++++++++++++++
 patches/series           |    1 
 rules                    |   49 ++++-----------------------------------
 7 files changed, 83 insertions(+), 52 deletions(-)

diff -Nru fractalnow-0.8.1/debian/changelog fractalnow-0.8.1/debian/changelog
--- fractalnow-0.8.1/debian/changelog	2012-07-11 10:11:35.000000000 +0000
+++ fractalnow-0.8.1/debian/changelog	2016-09-27 09:27:29.000000000 +0000
@@ -1,3 +1,17 @@
+fractalnow (0.8.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove menu file, as the menu system has been deprecated by the tech-ctte.
+  * d/rules: rewrite using the dh sequencer.
+  * Bump debhelper compat level to 10.
+  * Stop using hardening-wrapper and instead make use of dpkg-buildflags with
+        DEB_BUILD_MAINT_OPTIONS=hardening=+all
+    Closes: #836626
+  * Add patch so that the build system obey to build flags from the environment.
+  * Bump Standards-Version to 3.9.8, no changes needed.
+
+ -- Mattia Rizzolo <mat...@debian.org>  Tue, 27 Sep 2016 09:27:29 +0000
+
 fractalnow (0.8.1-1) unstable; urgency=low
 
   * Initial release (closes: Bug#677239, Bug#673395)
diff -Nru fractalnow-0.8.1/debian/compat fractalnow-0.8.1/debian/compat
--- fractalnow-0.8.1/debian/compat	2012-07-11 09:17:15.000000000 +0000
+++ fractalnow-0.8.1/debian/compat	2016-09-27 08:40:24.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru fractalnow-0.8.1/debian/control fractalnow-0.8.1/debian/control
--- fractalnow-0.8.1/debian/control	2012-07-19 12:52:57.000000000 +0000
+++ fractalnow-0.8.1/debian/control	2016-09-27 08:42:17.000000000 +0000
@@ -3,14 +3,13 @@
 Section: science
 Priority: optional
 Maintainer: Marc Pegon <pe.m...@free.fr>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                autotools-dev,
-               hardening-wrapper,
                libqt4-dev,
                libmpc-dev,
                libmpfr-dev,
                libgmp-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
 
 Package: fractalnow
 Architecture: any
diff -Nru fractalnow-0.8.1/debian/menu fractalnow-0.8.1/debian/menu
--- fractalnow-0.8.1/debian/menu	2012-07-11 14:17:38.000000000 +0000
+++ fractalnow-0.8.1/debian/menu	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-?package(fractalnow):needs="X11" section="Applications/Science/Mathematics"\
-title="QFractalNow"\
-description="Fast, advanced fractal generator."\
-command="/usr/bin/qfractalnow -q"\
-icon="/usr/share/pixmaps/qfractalnow.xpm"
diff -Nru fractalnow-0.8.1/debian/patches/buildflags.patch fractalnow-0.8.1/debian/patches/buildflags.patch
--- fractalnow-0.8.1/debian/patches/buildflags.patch	1970-01-01 00:00:00.000000000 +0000
+++ fractalnow-0.8.1/debian/patches/buildflags.patch	2016-09-27 09:04:56.000000000 +0000
@@ -0,0 +1,59 @@
+Description: tweak makefile to obey build flags from the environment
+Author: Mattia Rizzolo <mat...@debian.org>
+Last-Update: 2016-09-27
+Forwarded: no
+
+--- a/command-line/Makefile.configure
++++ b/command-line/Makefile.configure
+@@ -9,6 +9,7 @@
+ CC            = gcc
+ LD            = gcc
+ 
++ENV_CFLAGS    := $(CFLAGS)
+ CFLAGS        = -std=c99 -pedantic -Wall -Wextra -D${SPINLOCK_DEFINE}
+ 
+ ifdef DEBUG
+@@ -16,9 +17,9 @@
+ else
+ 	CFLAGS += -O2
+ endif
+-CFLAGS       += -I${INCLUDEDIR} -I${FRACTALLIBDIR}/include
++CFLAGS       += $(ENV_CFLAGS) -I${INCLUDEDIR} -I${FRACTALLIBDIR}/include
+ 
+-LDFLAGS   = ${STATIC_FLAG} -L${FRACTALLIBDIR}/bin -l${FRACTAL2D_LIB} -lmpc -lmpfr -lgmp -lm -lpthread 
++LDFLAGS   := ${STATIC_FLAG} -L${FRACTALLIBDIR}/bin -l${FRACTAL2D_LIB} -lmpc -lmpfr -lgmp -lm -lpthread $(LDFLAGS)
+ 
+ OBJECTS = \
+ 	$(OBJDIR)/anti_aliasing.o \
+--- a/lib/Makefile.configure
++++ b/lib/Makefile.configure
+@@ -10,6 +10,7 @@
+ 
+ ARFLAGS = -r -c -s
+ 
++ENV_CFLAGS := $(CFLAGS)
+ CFLAGS    = -std=c99 -pedantic -Wall -Wextra -D${SPINLOCK_DEFINE}
+ ifdef VERSION_NUMBER
+ CFLAGS   += -DVERSION_NUMBER=${VERSION_NUMBER}
+@@ -20,7 +21,7 @@
+ else
+ 	CFLAGS += -O2 -ffast-math
+ endif
+-CFLAGS    += -I${INCLUDEDIR}
++CFLAGS    += $(ENV_CFLAGS) -I${INCLUDEDIR}
+ 
+ OBJECTS = \
+ 	$(OBJDIR)/float_precision.o \
+--- a/gui/qfractalnow.pro.configure
++++ b/gui/qfractalnow.pro.configure
+@@ -14,7 +14,9 @@
+ INCLUDEPATH += . include $${FRACTALLIBPATH}/include
+ LIBS += -L$${FRACTALLIBPATH}/bin -l$${FRACTAL2D_LIB} -lmpc -lmpfr -lgmp -lpthread -lm
+ DEFINES += __STDC_LIMIT_MACROS __STDC_FORMAT_MACROS $${SPINLOCK_DEFINE}
+-QMAKE_LFLAGS += $${STATIC_FLAG}
++QMAKE_CFLAGS += $${CFLAGS}
++QMAKE_CXXFLAGS += $${CXXFLAGS}
++QMAKE_LFLAGS += $${STATIC_FLAG} $${LDFLAGS}
+ CONFIG += warn_on qt
+ CONFIG -= debug_and_release
+ 
diff -Nru fractalnow-0.8.1/debian/patches/series fractalnow-0.8.1/debian/patches/series
--- fractalnow-0.8.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ fractalnow-0.8.1/debian/patches/series	2016-09-27 08:45:15.000000000 +0000
@@ -0,0 +1 @@
+buildflags.patch
diff -Nru fractalnow-0.8.1/debian/rules fractalnow-0.8.1/debian/rules
--- fractalnow-0.8.1/debian/rules	2012-07-11 13:57:30.000000000 +0000
+++ fractalnow-0.8.1/debian/rules	2016-09-27 09:02:39.000000000 +0000
@@ -3,50 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-config.status:
-	dh_testdir
-	./configure -prefix $(CURDIR)/debian/fractalnow/usr
-
-build-arch: build
-
-build-indep: build
-
-build: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
+%:
 	dh $@
-	[ ! -f build-stamp ] || rm build-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	$(MAKE) install
-
-binary-indep: build install
 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installman
-	dh_installmenu
-	dh_install
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
+override_dh_auto_configure:
+	./configure -prefix $(CURDIR)/debian/fractalnow/usr
 
+override_dh_auto_test:
+	@# no tests available

signature.asc
Description: PGP signature