[SCM] snd packaging branch, master, updated. debian/11.3-1-6-g85a12ee

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

The following commit has been merged in the master branch:
commit c71d4089b44bb614d52fbdd233a36e0d5ec7f47e
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Sun Mar 21 20:28:52 2010 +0100

    Refresh patches.

diff --git a/debian/patches/00-makefile.diff b/debian/patches/00-makefile.diff
index 0f26f29..11476b7 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
-@@ -173,13 +173,13 @@ audinfo: $(SNDLIB_HEADERS) $(S7_HEADERS)
+@@ -182,13 +182,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
@@ -17,19 +17,19 @@ Reviewed-by: Alessio Treglia <quadrispro at ubuntu.com>
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}/man1
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${pkgdatadir}
 -	$(INSTALL) snd ${bindir}/snd
--	$(INSTALL) ${top_srcdir}/snd.1 ${mandir}/man1
+-	$(INSTALL_DATA) ${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}
 +	$(INSTALL) snd ${DESTDIR}/${bindir}/snd
-+	$(INSTALL) ${top_srcdir}/snd.1 ${DESTDIR}/${mandir}/man1
++	$(INSTALL_DATA) ${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
-@@ -187,13 +187,13 @@ uninstall:
+@@ -196,13 +196,13 @@ uninstall:
  	for f in ${SND_SCRIPTS};  do rm -f ${pkgdatadir}/$${f}; done
  
  install-strip: snd
@@ -38,14 +38,14 @@ Reviewed-by: Alessio Treglia <quadrispro at ubuntu.com>
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}/man1
 -	${SHELL} ${top_srcdir}/mkinstalldirs ${pkgdatadir}
 -	$(INSTALL) -s snd ${bindir}/snd
--	$(INSTALL) ${top_srcdir}/snd.1 ${mandir}/man1
+-	$(INSTALL_DATA) ${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}
 +	$(INSTALL) -s snd ${DESTDIR}/${bindir}/snd
-+	$(INSTALL) ${top_srcdir}/snd.1 ${DESTDIR}/${mandir}/man1
++	$(INSTALL_DATA) ${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)
  
  Makefile: Makefile.in config.status
diff --git a/debian/patches/04-gcc_warnings.diff b/debian/patches/04-gcc_warnings.diff
index ecad697..6188e7b 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
-@@ -898,6 +898,10 @@ static const char *s7_type_name(s7_point
+@@ -948,6 +948,10 @@ static s7_pointer make_protected_string(
  #endif
  
  
diff --git a/debian/patches/05-kfreebsd.diff b/debian/patches/05-kfreebsd.diff
index c704a05..1788cda 100644
--- a/debian/patches/05-kfreebsd.diff
+++ b/debian/patches/05-kfreebsd.diff
@@ -6,7 +6,7 @@ Bug: http://bugs.debian.org/566779
 
 --- snd.orig/configure.ac
 +++ snd/configure.ac
-@@ -1631,6 +1631,36 @@ case "$host" in
+@@ -1634,6 +1634,36 @@ case "$host" in
  		;;
  	esac
  	;;
diff --git a/debian/patches/99-autoconf.diff b/debian/patches/99-autoconf.diff
index 514f52a..1618783 100644
--- a/debian/patches/99-autoconf.diff
+++ b/debian/patches/99-autoconf.diff
@@ -7,7 +7,7 @@
 
 --- snd.orig/configure
 +++ snd/configure
-@@ -10695,6 +10695,39 @@ $as_echo "$alsa_ok" >&6; }
+@@ -10812,6 +10812,39 @@ $as_echo "$alsa_ok" >&6; }
  		;;
  	esac
  	;;

-- 
snd packaging