[SCM] idjc/master: Remove bashism-in-configure.patch, not needed anymore.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Dec 3 14:47:14 UTC 2011
The following commit has been merged in the master branch:
commit 5c64706eb6c004137cb72495c0c52cf840bce54e
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Dec 3 15:46:44 2011 +0100
Remove bashism-in-configure.patch, not needed anymore.
diff --git a/debian/patches/bashism-in-configure.patch b/debian/patches/bashism-in-configure.patch
deleted file mode 100644
index 384be17..0000000
--- a/debian/patches/bashism-in-configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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: https://sourceforge.net/support/tracker.php?aid=3292381
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- 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
- if test $? -eq 0 ; then
- AC_MSG_RESULT([yes])
- AC_DEFINE(FFMPEG_AVCODEC, 1, [if set use legacy include file location])
-@@ -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
- 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 9692f05..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-bashism-in-configure.patch
--
idjc packaging
More information about the pkg-multimedia-commits
mailing list