[SCM] idjc/master: Add patch to fix bashism in configure.ac (Closes: #623799).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6d338eebef188c18df708bf8f4125b8b7f07e2a8
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 24 10:11:32 2011 +0200

    Add patch to fix bashism in configure.ac (Closes: #623799).

diff --git a/debian/patches/fix-bashism-in-configure.patch b/debian/patches/bashism-in-configure.patch
similarity index 62%
copy from debian/patches/fix-bashism-in-configure.patch
copy to debian/patches/bashism-in-configure.patch
index 4dfb642..1cfecc6 100644
--- a/debian/patches/fix-bashism-in-configure.patch
+++ b/debian/patches/bashism-in-configure.patch
@@ -1,27 +1,29 @@
-Description: Adjust bashism in configure.in to fix FTBFS.
-Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=77;filename=fix-bashism-in-configure.patch;att=1;bug=582037
-Bug-Debian: http://bugs.debian.org/582037
+Description: Fix bashism in configure.ac to make the package build with
+ dash as /bin/sh instead of bash.
+Author: Jonathan Nieder <jrnieder at gmail.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623799
+Forwarded: no
 ---
- configure.in |    4 ++--
+ configure.ac |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- idjc.orig/configure.in
-+++ idjc/configure.in
-@@ -48,7 +48,7 @@ if test $makeffmpeg != "no" ; then
+--- idjc.orig/configure.ac
++++ idjc/configure.ac
+@@ -50,7 +50,7 @@ if test $makeffmpeg != "no" ; then
              AC_SUBST(HAVE_AVCODEC, 1)
              
              AC_MSG_CHECKING([for avcodec.h in legacy ffmpeg directory])
 -            gcc `pkg-config --cflags libavcodec` ffmpeg_avcodec.c -o /dev/null &> /dev/null
-+            gcc `pkg-config --cflags libavcodec` ffmpeg_avcodec.c -o /dev/null > /dev/null 2>&1
++            gcc `pkg-config --cflags libavcodec` ffmpeg_avcodec.c -o /dev/null >/dev/null 2>&1
              if test $? -eq 0 ; then
                  AC_MSG_RESULT([yes])
                  AC_DEFINE(FFMPEG_AVCODEC, 1, [if set use legacy include file location])
-@@ -106,7 +106,7 @@ fi
+@@ -108,7 +108,7 @@ fi
  PKG_CHECK_MODULES([PYGTK], [pygtk-2.0 >= 2.6.0])
  
  AC_MSG_CHECKING([for mutagen])
 -python -c "import mutagen" &>/dev/null
-+python -c "import mutagen" > /dev/null 2>&1
++python -c "import mutagen" >/dev/null 2>$1
  if test $? -ne 0 ; then
      AC_MSG_RESULT([no])
      AC_MSG_ERROR([required dependency (mutagen / python-mutagen) is missing])
diff --git a/debian/patches/series b/debian/patches/series
index 94152c6..00473e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ idjc_script.patch
 # fix-bashism-in-configure.patch
 idjc-twolame.patch
 libav-0.7.patch
+bashism-in-configure.patch

-- 
idjc packaging