[SCM] snd packaging branch, master, updated. debian/11.4-1-5-g0bf6d62

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0bf6d62945ff79ef229bce0f788b0df9b6047d20
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Mon May 3 17:46:08 2010 +0200

    New upload.

diff --git a/debian/changelog b/debian/changelog
index 41c0bef..29a0cf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+snd (11.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Try to solve build failure on hurd.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Mon, 03 May 2010 17:44:57 +0200
+
 snd (11.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/05-kfreebsd.diff b/debian/patches/06-hurd.diff
similarity index 65%
copy from debian/patches/05-kfreebsd.diff
copy to debian/patches/06-hurd.diff
index 1788cda..ea35412 100644
--- a/debian/patches/05-kfreebsd.diff
+++ b/debian/patches/06-hurd.diff
@@ -1,16 +1,14 @@
-Origin: Debian
-Bug: http://bugs.debian.org/566779
 ---
- configure.ac |   30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
+ configure.ac |   25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
 
 --- snd.orig/configure.ac
 +++ snd/configure.ac
-@@ -1634,6 +1634,36 @@ case "$host" in
- 		;;
- 	esac
- 	;;
-+    *-*-kfreebsd*)
+@@ -1664,6 +1664,31 @@ case "$host" in
+                 ;;
+         esac
+         ;;
++    *-*-hurd*)
 +        LDSO_FLAGS="-shared"
 +        LIBS="$LIBS -lm"
 +        if test "$ac_cv_header_dlfcn_h" = yes ; then
@@ -29,11 +27,6 @@ Bug: http://bugs.debian.org/566779
 +        fi
 +
 +        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/99-autoconf.diff b/debian/patches/99-autoconf-hurd.diff
similarity index 62%
copy from debian/patches/99-autoconf.diff
copy to debian/patches/99-autoconf-hurd.diff
index 1618783..d9e7d90 100644
--- a/debian/patches/99-autoconf.diff
+++ b/debian/patches/99-autoconf-hurd.diff
@@ -1,17 +1,14 @@
-
-  rerun autoconf after change of confugure.ac in kfreebsd.diff
-
 ---
- configure |   33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
+ configure |   26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
 
 --- snd.orig/configure
 +++ snd/configure
-@@ -10812,6 +10812,39 @@ $as_echo "$alsa_ok" >&6; }
- 		;;
- 	esac
- 	;;
-+    *-*-kfreebsd*)
+@@ -10845,6 +10845,32 @@ $as_echo "$alsa_ok" >&6; }
+                 ;;
+         esac
+         ;;
++    *-*-hurd*)
 +        LDSO_FLAGS="-shared"
 +        LIBS="$LIBS -lm"
 +        if test "$ac_cv_header_dlfcn_h" = yes ; then
@@ -30,13 +27,6 @@
 +        fi
 +
 +        case $AUDIO_SYSTEM in
-+            JACK)
-+                $as_echo "#define HAVE_JACK_IN_LINUX 1" >>confdefs.h
-+
-+                $as_echo "#define HAVE_OSS 1" >>confdefs.h
-+
-+                AUDIO_LIB="-lsamplerate"
-+                ;;
 +            OSS)
 +                $as_echo "#define HAVE_OSS 1" >>confdefs.h
 +
diff --git a/debian/patches/series b/debian/patches/series
index 83c28d6..fc51cc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,6 @@
 03-manpage_warnings.diff
 04-gcc_warnings.diff
 05-kfreebsd.diff
+06-hurd.diff
 99-autoconf.diff
+99-autoconf-hurd.diff
diff --git a/debian/rules b/debian/rules
index 584d518..92caab0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 EXTRA_CONFIGURE_ARGS=--with-oss
 endif
 
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+EXTRA_CONFIGURE_ARGS=--with-oss
+endif
+
 %:
 	dh --with quilt $@
 

-- 
snd packaging