[SCM] snd/master: Imported Debian patch 11.7-5

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9ba5d38f6d455ec667319c2228219e7cc0aabd3a
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Nov 9 01:57:12 2015 +0100

    Imported Debian patch 11.7-5

diff --git a/debian/changelog b/debian/changelog
index 75dee68..09c39e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+snd (11.7-5) unstable; urgency=medium
+
+  * QA upload.
+  * Switch Build-Depends to unversioned libgsl-dev.  (Closes: #804500)
+  * Update 06-hurd.diff to fix FTBFS on hurd, thanks to Svante Signell.
+    (Closes: #801604)
+  * Switch to debhelper compat level 9.
+  * 01-hardening.diff: New, honor CPPFLAGS which contain hardening flags.
+
+ -- Andreas Beckmann <anbe at debian.org>  Mon, 09 Nov 2015 01:57:12 +0100
+
 snd (11.7-4) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index d2802b3..3929c0e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: snd
 Section: sound
 Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
  ladspa-sdk,
  xutils-dev,
- libgsl0-dev (>= 1.1.1),
+ libgsl-dev,
  dh-autoreconf,
  autotools-dev (>= 20100122.1~),
  libfftw3-dev (>= 2.1.3),
diff --git a/debian/patches/01-hardening.diff b/debian/patches/01-hardening.diff
new file mode 100644
index 0000000..4165fc8
--- /dev/null
+++ b/debian/patches/01-hardening.diff
@@ -0,0 +1,14 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: honor CPPFLAGS which contain hardening flags
+
+--- a/makefile.in
++++ b/makefile.in
+@@ -6,7 +6,7 @@ SHELL = @SHELL@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = ${INSTALL} -m 0644
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CPPFLAGS@ @CFLAGS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ XEN_CFLAGS = @XEN_CFLAGS@
+ CAIRO_CFLAGS = @CAIRO_CFLAGS@
diff --git a/debian/patches/06-hurd.diff b/debian/patches/06-hurd.diff
index 3b8a245..bfdf17e 100644
--- a/debian/patches/06-hurd.diff
+++ b/debian/patches/06-hurd.diff
@@ -2,13 +2,15 @@
  configure.ac |   25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
---- snd.orig/configure.ac
-+++ snd/configure.ac
-@@ -1684,6 +1684,31 @@ case "$host" in
+Index: snd-11.7/configure.ac
+===================================================================
+--- snd-11.7.orig/configure.ac
++++ snd-11.7/configure.ac
+@@ -1684,6 +1684,36 @@ case "$host" in
                  ;;
          esac
          ;;
-+    *-*-hurd*)
++    *-*-gnu*)
 +        LDSO_FLAGS="-shared"
 +        LIBS="$LIBS -lm"
 +        if test "$ac_cv_header_dlfcn_h" = yes ; then
@@ -26,8 +28,13 @@
 +               fi
 +        fi
 +
-+        case $AUDIO_SYSTEM in
-+            OSS)
++	case $AUDIO_SYSTEM in
++	JACK)
++		AC_DEFINE(HAVE_JACK_IN_LINUX)
++		AC_DEFINE(HAVE_OSS)
++		AUDIO_LIB="-lsamplerate"
++		;;
++	OSS)
 +                AC_DEFINE(HAVE_OSS)
 +                AUDIO_SYSTEM=OSS
 +                ;;
diff --git a/debian/patches/series b/debian/patches/series
index 7b10ac4..9065402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 00-makefile.diff
+01-hardening.diff
 03-manpage_warnings.diff
 04-gcc_warnings.diff
 05-kfreebsd.diff

-- 
snd packaging