[SCM] snd packaging branch, master, updated. debian/11.2-2-8-g66d0b72

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

The following commit has been merged in the master branch:
commit 8ce390f6f08a36effb8c7dc71e9066de9288fa45
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu Feb 11 20:44:05 2010 +0100

    Update debian/patches.

diff --git a/debian/patches/00-makefile.diff b/debian/patches/00-makefile.diff
index 443541c..0f26f29 100644
--- a/debian/patches/00-makefile.diff
+++ b/debian/patches/00-makefile.diff
@@ -8,7 +8,7 @@ Reviewed-by: Alessio Treglia <quadrispro at ubuntu.com>
 
 --- snd.orig/makefile.in
 +++ snd/makefile.in
-@@ -184,14 +184,14 @@ audinfo: $(SNDLIB_HEADERS) $(S7_HEADERS)
+@@ -173,13 +173,13 @@ audinfo: $(SNDLIB_HEADERS) $(S7_HEADERS)
  	$(CC) $(LDFLAGS) $(CFLAGS) headers.o io.o audio.o sound.o audinfo.o -o audinfo $(JACK_LIBS) $(AUDIO_LIB) $(LIBS)
  
  install: snd
@@ -16,21 +16,20 @@ Reviewed-by: Alessio Treglia <quadrispro at ubuntu.com>
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}/man1
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${pkgdatadir}
+-	$(INSTALL) snd ${bindir}/snd
+-	$(INSTALL) ${top_srcdir}/snd.1 ${mandir}/man1
+-	(cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${pkgdatadir}/$${f}; done)
 +	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${bindir}
 +	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${mandir}
 +	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${mandir}/man1
 +	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${pkgdatadir}
- 	(cd po && $(MAKE) install)
--	$(INSTALL) snd ${bindir}/snd
--	$(INSTALL) ${top_srcdir}/snd.1 ${mandir}/man1
--	(cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${pkgdatadir}/$${f}; done)
 +	$(INSTALL) snd ${DESTDIR}/${bindir}/snd
 +	$(INSTALL) ${top_srcdir}/snd.1 ${DESTDIR}/${mandir}/man1
 +	(cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${DESTDIR}/${pkgdatadir}/$${f}; done)
  
  uninstall:
  	rm -f ${bindir}/snd
-@@ -199,14 +199,14 @@ uninstall:
+@@ -187,13 +187,13 @@ uninstall:
  	for f in ${SND_SCRIPTS};  do rm -f ${pkgdatadir}/$${f}; done
  
  install-strip: snd
@@ -38,14 +37,13 @@ Reviewed-by: Alessio Treglia <quadrispro at ubuntu.com>
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}/man1
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${pkgdatadir}
+-	$(INSTALL) -s snd ${bindir}/snd
+-	$(INSTALL) ${top_srcdir}/snd.1 ${mandir}/man1
+-	(cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${pkgdatadir}/$${f}; done) 
 +	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${bindir}
 +	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${mandir}
 +	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${mandir}/man1
 +	${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${pkgdatadir}
- 	(cd po && $(MAKE) install)
--	$(INSTALL) -s snd ${bindir}/snd
--	$(INSTALL) ${top_srcdir}/snd.1 ${mandir}/man1
--	(cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${pkgdatadir}/$${f}; done) 
 +	$(INSTALL) -s snd ${DESTDIR}/${bindir}/snd
 +	$(INSTALL) ${top_srcdir}/snd.1 ${DESTDIR}/${mandir}/man1
 +	(cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${DESTDIR}/${pkgdatadir}/$${f}; done)
diff --git a/debian/patches/03-manpage_warnings.diff b/debian/patches/03-manpage_warnings.diff
index 6bcb06a..512a36b 100644
--- a/debian/patches/03-manpage_warnings.diff
+++ b/debian/patches/03-manpage_warnings.diff
@@ -1,10 +1,12 @@
 Description: Fix manpages errors/warnings.
 Author: Alessio Treglia <quadrispro at ubuntu.com>
-Index: snd-10.9/snd.1
-===================================================================
---- snd-10.9.orig/snd.1	2009-09-28 11:07:20.187185021 +0200
-+++ snd-10.9/snd.1	2009-09-28 11:07:28.607183945 +0200
-@@ -19,9 +19,9 @@
+---
+ snd.1 |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- snd.orig/snd.1
++++ snd/snd.1
+@@ -19,9 +19,9 @@ snd oboe.snd
  loads oboe.snd into Snd.
  
  .SH OPTIONS
diff --git a/debian/patches/04-gcc_warnings.diff b/debian/patches/04-gcc_warnings.diff
index 3b7cf92..ecad697 100644
--- a/debian/patches/04-gcc_warnings.diff
+++ b/debian/patches/04-gcc_warnings.diff
@@ -6,7 +6,7 @@ Description: Add missing function prototypes to avoid compiler warnings.
 
 --- snd.orig/s7.c
 +++ snd/s7.c
-@@ -890,6 +890,10 @@ static const char *s7_type_name(s7_point
+@@ -898,6 +898,10 @@ static const char *s7_type_name(s7_point
  #endif
  
  
diff --git a/debian/patches/05-kfreebsd.diff b/debian/patches/05-kfreebsd.diff
index 6f70755..eca02e4 100644
--- a/debian/patches/05-kfreebsd.diff
+++ b/debian/patches/05-kfreebsd.diff
@@ -1,6 +1,10 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1684,6 +1684,36 @@
+---
+ configure.ac |   30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+--- snd.orig/configure.ac
++++ snd/configure.ac
+@@ -1631,6 +1631,36 @@ case "$host" in
  		;;
  	esac
  	;;
diff --git a/debian/patches/99-autoconf.diff b/debian/patches/99-autoconf.diff
index 53a6cc9..514f52a 100644
--- a/debian/patches/99-autoconf.diff
+++ b/debian/patches/99-autoconf.diff
@@ -1,9 +1,13 @@
 
   rerun autoconf after change of confugure.ac in kfreebsd.diff
 
---- a/configure
-+++ b/configure
-@@ -11017,6 +11017,39 @@
+---
+ configure |   33 +++++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
+--- snd.orig/configure
++++ snd/configure
+@@ -10695,6 +10695,39 @@ $as_echo "$alsa_ok" >&6; }
  		;;
  	esac
  	;;
diff --git a/debian/patches/series b/debian/patches/series
index e4a63e0..83c28d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 00-makefile.diff
-01-german.diff
+# 01-german.diff
 03-manpage_warnings.diff
 04-gcc_warnings.diff
 05-kfreebsd.diff

-- 
snd packaging