[SCM] snd packaging branch, master, updated. debian/11.2-1-10-g8d17d72

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Thu Jan 28 09:20:00 UTC 2010


The following commit has been merged in the master branch:
commit 8d17d72ebf81a74e0b205bfc318741dadc97c17d
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu Jan 28 10:19:49 2010 +0100

    Run autoconf to regenerate configure script; update series file.

diff --git a/debian/patches/05-kfreebsd.diff b/debian/patches/99-autoconf.diff
similarity index 63%
copy from debian/patches/05-kfreebsd.diff
copy to debian/patches/99-autoconf.diff
index 6f70755..53a6cc9 100644
--- a/debian/patches/05-kfreebsd.diff
+++ b/debian/patches/99-autoconf.diff
@@ -1,6 +1,9 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1684,6 +1684,36 @@
+
+  rerun autoconf after change of confugure.ac in kfreebsd.diff
+
+--- a/configure
++++ b/configure
+@@ -11017,6 +11017,39 @@
  		;;
  	esac
  	;;
@@ -24,16 +27,19 @@
 +
 +        case $AUDIO_SYSTEM in
 +            JACK)
-+                AC_DEFINE(HAVE_JACK_IN_LINUX)
-+                AC_DEFINE(HAVE_OSS)
++                $as_echo "#define HAVE_JACK_IN_LINUX 1" >>confdefs.h
++
++                $as_echo "#define HAVE_OSS 1" >>confdefs.h
++
 +                AUDIO_LIB="-lsamplerate"
 +                ;;
 +            OSS)
-+                AC_DEFINE(HAVE_OSS)
++                $as_echo "#define HAVE_OSS 1" >>confdefs.h
++
 +                AUDIO_SYSTEM=OSS
 +                ;;
 +        esac
 +        ;;
-     *-*-sunos4*) 
-         AC_DEFINE(MUS_SUN)
- 	LIBS="$LIBS -lm"
+     *-*-sunos4*)
+         $as_echo "#define MUS_SUN 1" >>confdefs.h
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9033c92..e4a63e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 01-german.diff
 03-manpage_warnings.diff
 04-gcc_warnings.diff
+05-kfreebsd.diff
+99-autoconf.diff

-- 
snd packaging



More information about the pkg-multimedia-commits mailing list