debuild: update debhelper version and remove obsolete patches

debuild/Makefile

@@ -76,13 +76,6 @@ deb: $(debsrc) $(addprefix debian/nwjs/, $(nwjs))
 	tar xfz $(debsrc)
 # Add the NW.js binaries to the source package.
 	cd debian/source && rm -f include-binaries && for x in $(addprefix debian/nwjs/, $(nwjs)); do echo "$$x" >> include-binaries; done
-# This works around some problems compiling externals on Precise and earlier
-# (patch from pd-extended by Hans-Christoph Steiner, modified for pd-l2ork).
-# This can be removed once Ubuntu 12.04 finally goes the way of the dodo.
-#	cd $(debdist) && patch -p1 < ../precise-configure.patch
-# Patch the user config dir name so that purr-data can coexist with pd-l2ork.
-# Not needed with purr-data 2.4.5+ any more.
-#	cd $(debdist) && patch -Np1 < ../userconfig.patch
 # Make sure to copy the Debian files which may have uncommitted changes.
 # Then run debuild to create the package.
 	cd $(debdist) && cp -R ../debian . && debuild $(DEBUILD_FLAGS)

debuild/debian/changelog

+purr-data (2.4.9+git3840+b9f17566-1) bionic; urgency=low
+
+  * Build from latest upstream source.
+
+ -- Albert Graef <aggraef@gmail.com>  Fri, 09 Mar 2018 10:45:41 +0100
+
 purr-data (2.0+git3322+50e3805-1) xenial; urgency=low
 
   * Build from latest upstream source.

debuild/debian/compat

-7
+9

debuild/debian/control

@@ -2,7 +2,7 @@ Source: purr-data
 Section: sound
 Priority: extra
 Maintainer: Albert Graef <aggraef@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, pkg-config, bison, flex, libgtk2.0-dev, python-dev, dh-python | python-support, flite1-dev, ladspa-sdk, libasound2-dev, libjack-dev, libbluetooth-dev, libcairo2-dev, libgl1-mesa-dev | libgl-dev, libglew1.6-dev | libglew-dev, libgsl-dev | libgsl0-dev, libmagick++-dev, libavifile-0.7-dev, libdc1394-22-dev, libfftw3-dev, libfluidsynth-dev, libftgl-dev, libgmerlin-avdec-dev, libgsm1-dev, libjpeg-dev, libmp3lame-dev, libmpeg3-dev, libquicktime-dev, libraw1394-dev, libsmpeg-dev, libsndobj-dev, libspeex-dev, libstk0-dev, libtiff5-dev, libv4l-dev, libdv4-dev, libiec61883-dev, libxv-dev, libxxf86vm-dev, libunicap2-dev, libvorbis-dev, zlib1g-dev (>= 1:1.1.3), rsync, libgconf2-dev, libnss3-dev, libxtst-dev, libxss-dev
+Build-Depends: debhelper (>= 9), autoconf, automake, libtool, pkg-config, bison, flex, libgtk2.0-dev, python-dev, dh-python | python-support, flite1-dev, ladspa-sdk, libasound2-dev, libjack-dev, libbluetooth-dev, libcairo2-dev, libgl1-mesa-dev | libgl-dev, libglew1.6-dev | libglew-dev, libgsl-dev | libgsl0-dev, libmagick++-dev, libavifile-0.7-dev, libdc1394-22-dev, libfftw3-dev, libfluidsynth-dev, libftgl-dev, libgmerlin-avdec-dev, libgsm1-dev, libjpeg-dev, libmp3lame-dev, libmpeg3-dev, libquicktime-dev, libraw1394-dev, libsmpeg-dev, libsndobj-dev, libspeex-dev, libstk0-dev, libtiff5-dev, libv4l-dev, libdv4-dev, libiec61883-dev, libxv-dev, libxxf86vm-dev, libunicap2-dev, libvorbis-dev, zlib1g-dev (>= 1:1.1.3), rsync, libgconf2-dev, libnss3-dev, libxtst-dev, libxss-dev
 Standards-Version: 3.9.5
 Homepage: https://git.purrdata.net/jwilkes/purr-data
 

debuild/precise-configure.patch

-Fix up LDFLAGS for Precise and earlier (patch by Hans-Christoph Steiner,
-updated to pd-l2ork by Albert Graef).
-Description: fix ./configure dying thinking we're cross-compiling
- When building using debuild on Debian/squeeze or Ubuntu < quantal,
- ./configure somehow gets some LDFLAGS for shared libraries and uses them in
- the gcc tests.  The executable then fails to run since its a shared library,
- and ./configure thinks we're cross-compiling.  This patch forces no LDFLAGS.
-
-diff --git a/externals/Makefile b/externals/Makefile
-index 7b64f45..6b7c49b 100644
---- a/externals/Makefile
-+++ b/externals/Makefile
-@@ -611,6 +611,7 @@ $(gem_src)/Gem.pd_linux: $(gem_src)/configure
- 	test -s $(gem_src)/Gem.pd_linux || \
- 		cd $(gem_src) && ./configure \
- 			CXXFLAGS="-DHAVE_S_STUFF_H" \
-+			LDFLAGS= \
- 			--prefix=$(prefix) \
- 			--with-video=plugins \
- 			--with-film=plugins \
-@@ -649,7 +650,7 @@ $(externals_src)/gem2pdp/configure: $(externals_src)/gem2pdp/configure.ac
- 	cd $(externals_src)/gem2pdp && aclocal && autoconf
- 
- $(externals_src)/gem2pdp/Makefile: $(externals_src)/gem2pdp/Makefile.in
--	cd $(externals_src)/gem2pdp && ./configure --with-pddir=$(pd_src) \
-+	cd $(externals_src)/gem2pdp && ./configure LDFLAGS= --with-pddir=$(pd_src) \
- 		--with-gemdir=$(gem_src)  --with-pdpdir=$(externals_src)/pdp
- 
- gem2pdp: $(externals_src)/gem2pdp/configure $(externals_src)/gem2pdp/Makefile
-@@ -885,7 +886,7 @@ $(IEM16_DIR)/configure: $(IEM16_DIR)/configure.ac $(IEM16_DIR)/aclocal.m4
- 
- $(IEM16_DIR)/Make.config: $(IEM16_DIR)/Make.config.in \
- $(IEM16_DIR)/configure
--	cd $(IEM16_DIR) && ./configure --disable-library \
-+	cd $(IEM16_DIR) && ./configure LDFLAGS= --disable-library \
- 		--with-pd=$(pd_src)
- 
- iem16: $(IEM16_DIR)/Make.config
-@@ -1269,11 +1270,11 @@ $(externals_src)/OSCx/configure: $(externals_src)/OSCx/configure.ac
- 	cd $(externals_src)/OSCx && autoconf
- 
- $(externals_src)/OSCx/Makefile: $(externals_src)/OSCx/Makefile.in
--	cd $(externals_src)/OSCx && ./configure
-+	cd $(externals_src)/OSCx && ./configure LDFLAGS=
- $(externals_src)/OSCx/libOSC/Makefile: $(externals_src)/OSCx/libOSC/Makefile.in
--	cd $(externals_src)/OSCx && ./configure
-+	cd $(externals_src)/OSCx && ./configure LDFLAGS=
- $(externals_src)/OSCx/src/Makefile: $(externals_src)/OSCx/src/Makefile.in
--	cd $(externals_src)/OSCx && ./configure
-+	cd $(externals_src)/OSCx && ./configure LDFLAGS=
- 
- $(externals_src)/OSCx/src/OSCroute.$(EXTENSION):  $(externals_src)/OSCx/configure \
- $(externals_src)/OSCx/Makefile
-@@ -1356,7 +1357,7 @@ $(externals_src)/pdp/configure: $(externals_src)/pdp/configure.ac
- 	cd $(externals_src)/pdp && autoconf
- 
- $(externals_src)/pdp/Makefile.config: $(externals_src)/pdp/configure $(externals_src)/pdp/Makefile.config.in
--	cd $(externals_src)/pdp && ./configure PD_CPPFLAGS="-I$(pd_src)/src" \
-+	cd $(externals_src)/pdp && ./configure LDFLAGS= PD_CPPFLAGS="-I$(pd_src)/src" \
- 		$(PDP_OPTIONS)
- 
- $(externals_src)/pdp/pdp.$(EXTENSION): $(externals_src)/pdp/Makefile.config 
-@@ -1770,6 +1771,7 @@ $(zexy_src)/configure: $(zexy_src)/configure.ac
- 
- $(zexy_src)/Makefile: $(zexy_src)/configure $(zexy_src)/Makefile.am $(zexy_src)/src/Makefile.am
- 	cd $(zexy_src) && ./configure --disable-library \
-+		LDFLAGS= \
- 		--with-extension=$(EXTENSION) \
- 		--prefix=$(prefix) \
- 		--libdir=$(objectsdir) \
-diff --git a/externals/iem16/src/Makefile b/externals/iem16/src/Makefile
-index 25e5bbe..5be876d 100644
---- a/externals/iem16/src/Makefile
-+++ b/externals/iem16/src/Makefile
-@@ -22,7 +22,7 @@ aclocal.m4: acinclude.m4
- 	aclocal
- 
- Make.config: Make.config.in configure
--	./configure $(CONFIGUREFLAGS)
-+	./configure $(CONFIGUREFLAGS) LDFLAGS=
- 
- -include $(SOURCES:.c=.d)
- 
-diff --git a/externals/moocow/extended/Makefile b/externals/moocow/extended/Makefile
-index 2726d1a..9da4944 100644
---- a/externals/moocow/extended/Makefile
-+++ b/externals/moocow/extended/Makefile
-@@ -36,7 +36,7 @@ MOOCOW_BUILD_VERSION ?=2009-04-27.002
- #	CFLAGS="$(shell echo $(CFLAGS))" ##-- works
- CONFIGURE_ARGS=\
- 	CFLAGS="$(CFLAGS) -I/sw/include" \
--	LDFLAGS="$(LDFLAGS) -L$(pd_src)/src -L$(pd_src)/bin -L$(pd_src)/obj -L/sw/lib" \
-+	LDFLAGS="-L$(pd_src)/src -L$(pd_src)/bin -L$(pd_src)/obj -L/sw/lib" \
- 	--with-pd-include="$(pd_src)/src" \
- 	--with-pd-dir="$(MOOCOW_BUILD)" \
- 	--disable-dependency-tracking

debuild/userconfig.patch

-diff --git a/pd/src/s_file.c b/pd/src/s_file.c
-index 32f54c31..304524d5 100644
---- a/pd/src/s_file.c
-+++ b/pd/src/s_file.c
-@@ -46,7 +46,7 @@ void sys_doflags( void);
- 
- #ifdef UNIX
- 
--#define USER_CONFIG_DIR ".pd-l2ork"
-+#define USER_CONFIG_DIR ".purr-data"
- 
- static char *sys_prefbuf;
-