[SCM] vlc/master: Refresh patches.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Mon Jun 6 21:51:22 UTC 2011


The following commit has been merged in the master branch:
commit 2d2880d22fc41d560c5b160f212a8d03ce52e1d1
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Jun 6 23:18:48 2011 +0200

    Refresh patches.

diff --git a/debian/patches/900_weaken_schroedinger_deps.diff b/debian/patches/900_weaken_schroedinger_deps.diff
index 1443bc1..1017369 100644
--- a/debian/patches/900_weaken_schroedinger_deps.diff
+++ b/debian/patches/900_weaken_schroedinger_deps.diff
@@ -1,7 +1,7 @@
 From: siretart at tauware.de
 Subject: Weaken dependencies on libschroedinger
-
-This allows vlc to build on debian/squeeze.
+ This allows vlc to build on debian/squeeze.
+Forwarded: not-needed
 
 diff --git a/configure.ac b/configure.ac
 index f961846..a958d20 100644
diff --git a/debian/patches/xulrunner-1.9.1.patch b/debian/patches/xulrunner-1.9.1.patch
index 5256542..0efc5ad 100644
--- a/debian/patches/xulrunner-1.9.1.patch
+++ b/debian/patches/xulrunner-1.9.1.patch
@@ -2,30 +2,6 @@ Description: Make vlc compatible with xulrunner 1.9.1
 Author: Benjamin Drung <bdrung at debian.org>
 Forwarded: not-needed
 
---- a/configure
-+++ b/configure
-@@ -48354,9 +48354,9 @@
-           if test -n "$i"
-           then
-             echo "Trying to find $i package" >&5
--            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i >= 1.9.2" >&5
--$as_echo_n "checking for $i >= 1.9.2... " >&6; }
--            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&5
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i >= 1.9.1" >&5
-+$as_echo_n "checking for $i >= 1.9.1... " >&6; }
-+            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.1" 2>&5
-             then
-               echo "Using $i pkg-config package." >&5
-               echo "Using $i package." >&6
-@@ -48584,7 +48584,7 @@
- done
- test -n "$MOZILLA_CONFIG" || MOZILLA_CONFIG="no"
- 
--            test "${MOZILLA_CONFIG}" = "no" && as_fn_error $? "Please install the Mozilla development tools (version 1.9.2 or higher) or use --disable-mozilla." "$LINENO" 5
-+            test "${MOZILLA_CONFIG}" = "no" && as_fn_error $? "Please install the Mozilla development tools (version 1.9.1 or higher) or use --disable-mozilla." "$LINENO" 5
- 
- 
- fi
 --- a/configure.ac
 +++ b/configure.ac
 @@ -4562,8 +4562,8 @@

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list