[SCM] vlc/master: Drop libschroedinger weaken patch (upstream weakened it to 1.0.6).
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Mon Jul 18 07:52:21 UTC 2011
The following commit has been merged in the master branch:
commit 403b712534a76d9f7fbd3d8a5382bae733aeabf2
Author: Benjamin Drung <bdrung at debian.org>
Date: Mon Jul 18 09:51:34 2011 +0200
Drop libschroedinger weaken patch (upstream weakened it to 1.0.6).
diff --git a/debian/control b/debian/control
index 07402f0..ac21be5 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Build-Depends: autopoint,
libqt4-dev (>= 4.4.0),
libraw1394-dev (>= 2.0.1) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
librsvg2-dev,
- libschroedinger-dev (>= 1.0.9),
+ libschroedinger-dev (>= 1.0.6),
libsdl-image1.2-dev,
libsdl1.2-dev (>= 1.2.10),
libshout3-dev,
diff --git a/debian/patches/900_weaken_schroedinger_deps.diff b/debian/patches/900_weaken_schroedinger_deps.diff
deleted file mode 100644
index 1017369..0000000
--- a/debian/patches/900_weaken_schroedinger_deps.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-From: siretart at tauware.de
-Subject: Weaken dependencies on libschroedinger
- This allows vlc to build on debian/squeeze.
-Forwarded: not-needed
-
-diff --git a/configure.ac b/configure.ac
-index f961846..a958d20 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3068,7 +3068,7 @@ PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto])
- dnl
- dnl schroedinger decoder plugin (for dirac format video)
- dnl
--PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.10], [dirac decoder and encoder using schroedinger], [auto])
-+PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.9], [dirac decoder and encoder using schroedinger], [auto])
-
- dnl
- dnl PNG decoder module
diff --git a/debian/patches/series b/debian/patches/series
index 3400aa7..909c771 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
200_osdmenu_paths.patch
xulrunner-1.9.1.patch
-900_weaken_schroedinger_deps.diff
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list