[libfishsound] 01/02: Format patches for gbp-pq.

[Martin Steghöfer]

This is an automated email from the git hooks/post-receive script.

martin.steghoefer-guest pushed a commit to branch master
in repository libfishsound.

commit f033491798f2269dd0058404289283618019e6dc
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Wed Oct 22 20:56:41 2014 +0200

    Format patches for gbp-pq.
---
 ...-configure.ac-to-specify-config-macro-dir.patch | 39 ++++++++++++++++++++++
 ... => 0002-flac-set-vendor_string.length-0.patch} | 13 ++------
 debian/patches/010-configure-macro-dir.patch       | 30 -----------------
 debian/patches/series                              |  4 +--
 4 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/debian/patches/0001-Patch-configure.ac-to-specify-config-macro-dir.patch b/debian/patches/0001-Patch-configure.ac-to-specify-config-macro-dir.patch
new file mode 100644
index 0000000..a30f574
--- /dev/null
+++ b/debian/patches/0001-Patch-configure.ac-to-specify-config-macro-dir.patch
@@ -0,0 +1,39 @@
+From: Petter Reinholdtsen <pere at hungry.com>
+Date: Tue, 21 Oct 2014 15:14:47 +0200
+Subject: Patch configure.ac to specify config macro dir.
+
+Author: Dimitri John Ledkov <xnox at ubuntu.com> and
+        Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2014-10-21
+
+Patch fetched from ubuntu to use m4/ as the autoconf macro directory.
+---
+ Makefile.am  | 2 ++
+ configure.ac | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index e4d735a..b18097e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -31,6 +31,8 @@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = doc include src
+ 
+ EXTRA_DIST = fishsound.pc.in README.win32 \
+diff --git a/configure.ac b/configure.ac
+index 206094c..8e657a5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@ AC_C_CONST
+ AC_C_BIGENDIAN
+ 
+ dnl Add parameters for aclocal
++AC_CONFIG_MACRO_DIR([m4])
+ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+ 
+ # Checks for header files.
diff --git a/debian/patches/050-flac-set-vendor_string.length-0.patch b/debian/patches/0002-flac-set-vendor_string.length-0.patch
similarity index 72%
rename from debian/patches/050-flac-set-vendor_string.length-0.patch
rename to debian/patches/0002-flac-set-vendor_string.length-0.patch
index b45c11d..5fa5846 100644
--- a/debian/patches/050-flac-set-vendor_string.length-0.patch
+++ b/debian/patches/0002-flac-set-vendor_string.length-0.patch
@@ -1,14 +1,10 @@
-From 9201079c5155c7b27db98de6543b05631362364d Mon Sep 17 00:00:00 2001
 From: Conrad Parker <conrad at metadecks.org>
 Date: Tue, 20 Apr 2010 07:13:53 +0900
-Subject: [PATCH] flac: set vendor_string.length = 0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Subject: flac: set vendor_string.length = 0
 
-Avoids debug crash with libFLAC 1.2.1; tested on Windows (x64)
+Origin: upstream, http://git.xiph.org/?p=libfishsound.git;a=commit;h=9201079c5155c7b27db98de6543b05631362364d
 
-Reported-by: Денис Кулаков <kulakov_denis at mail.ru>
+Avoids debug crash with libFLAC 1.2.1; tested on Windows (x64)
 ---
  src/libfishsound/flac.c | 1 +
  1 file changed, 1 insertion(+)
@@ -25,6 +21,3 @@ index b42ea78..930c77b 100644
    metadata->data.vorbis_comment.num_comments = length;
    metadata->data.vorbis_comment.comments = comments;
  
--- 
-1.8.5.2
-
diff --git a/debian/patches/010-configure-macro-dir.patch b/debian/patches/010-configure-macro-dir.patch
deleted file mode 100644
index 0ef7e10..0000000
--- a/debian/patches/010-configure-macro-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Patch configure.ac to specify config macro dir.
-Author: Dimitri John Ledkov <xnox at ubuntu.com> and
-        Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2014-10-21
-
-Index: libfishsound/configure.ac
-===================================================================
---- libfishsound.orig/configure.ac	2014-10-21 15:22:39.276493028 +0200
-+++ libfishsound/configure.ac	2014-10-21 15:25:03.137793149 +0200
-@@ -40,6 +40,7 @@
- AC_C_BIGENDIAN
- 
- dnl Add parameters for aclocal
-+AC_CONFIG_MACRO_DIR([m4])
- AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
- 
- # Checks for header files.
-Index: libfishsound/Makefile.am
-===================================================================
---- libfishsound.orig/Makefile.am	2014-10-21 15:22:39.276493028 +0200
-+++ libfishsound/Makefile.am	2014-10-21 15:25:03.137793149 +0200
-@@ -31,6 +31,8 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
- 
-+ACLOCAL_AMFLAGS = -I m4
-+
- SUBDIRS = doc include src
- 
- EXTRA_DIST = fishsound.pc.in README.win32 \
diff --git a/debian/patches/series b/debian/patches/series
index d571ec6..28d419a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-010-configure-macro-dir.patch
-050-flac-set-vendor_string.length-0.patch
+0001-Patch-configure.ac-to-specify-config-macro-dir.patch
+0002-flac-set-vendor_string.length-0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/libfishsound.git