Bug#798614: package cleanup: build using dpkg-buildflags, enable parallel builds

[Matthias Klose <doko@debian.org>]

Package: src:hunspell
Version: 1.3.3-3
Severity: important
Tags: patch

  * Bump the standards version.
  * Build using dpkg-buildflags. Closes: #780626.
  * Enable parallel builds.

  * Bump the standards version.
  * Build using dpkg-buildflags. Closes: #780626.
  * Enable parallel builds.

diff -Nru hunspell-1.3.3/debian/control hunspell-1.3.3/debian/control
--- hunspell-1.3.3/debian/control	2014-07-08 17:22:55.000000000 +0000
+++ hunspell-1.3.3/debian/control	2015-09-11 01:00:46.000000000 +0000
@@ -5,7 +5,7 @@
  Tim Retout <diocles@debian.org>
 Build-Depends: debhelper (>= 8.1.3), libreadline-dev, libncurses5-dev,
  libncursesw5-dev, dh-autoreconf
-Standards-Version: 3.6.2
+Standards-Version: 3.9.6
 Section: text
 Homepage: http://hunspell.sourceforge.net/
 
diff -Nru hunspell-1.3.3/debian/rules hunspell-1.3.3/debian/rules
--- hunspell-1.3.3/debian/rules	2014-10-17 18:57:29.000000000 +0000
+++ hunspell-1.3.3/debian/rules	2015-09-11 00:45:26.000000000 +0000
@@ -18,12 +18,9 @@
 libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
 
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
+COMMA = ,
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+  NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
 # shared library versions, option 1
@@ -35,17 +32,20 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
-config.status: configure.ac
+configure-stamp:
 	dh_testdir
 	dh_autoreconf
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=cmdline) \
+	    ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 		--with-ui --with-readline --disable-rpath --libdir=$(libdir)
+	touch configure-stamp
 
 build: build-stamp
-build-stamp:  config.status
+build-stamp:  configure-stamp
 	dh_testdir
 
-	$(MAKE)
+	$(MAKE) $(NJOBS)
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) check
 endif
@@ -57,7 +57,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp configure-stamp
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f debian/ispellaff2myspell.1