[SCM] idjc/master: Remove ancient patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Apr 24 08:12:24 UTC 2011


The following commit has been merged in the master branch:
commit 046c773c41ce9cc4b2938a6fc20aa7d0e18b14d9
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 24 10:12:16 2011 +0200

    Remove ancient patch.

diff --git a/debian/patches/fix-bashism-in-configure.patch b/debian/patches/fix-bashism-in-configure.patch
deleted file mode 100644
index 4dfb642..0000000
--- a/debian/patches/fix-bashism-in-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
----
- configure.in |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- idjc.orig/configure.in
-+++ idjc/configure.in
-@@ -48,7 +48,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
-             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
- 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
- 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 00473e4..62c8332 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 desktop_file.patch
 idjc_script.patch
-# fix-bashism-in-configure.patch
 idjc-twolame.patch
 libav-0.7.patch
 bashism-in-configure.patch

-- 
idjc packaging



More information about the pkg-multimedia-commits mailing list