Am Sonntag, den 15.05.2011, 09:24 +0200 schrieb Reinhard Tartler:
On Sun, May 15, 2011 at 09:01:23 (CEST), siret...@users.alioth.debian.org
wrote:
The following commit has been merged in the master branch:
commit f7177c22d1d8c2729765007947840eca2ff24f23
Author: Reinhard Tartler siret...@tauware.de
Date: Sun May 15 09:00:35 2011 +0200
Weaken dependencies on libschroedinger
This changes makes backports to squeeze easier and works around #599095
diff --git a/debian/control b/debian/control
index 991ee40..51fb1c7 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.10),
+ libschroedinger-dev (= 1.0.9),
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
new file mode 100644
index 000..1443bc1
--- /dev/null
+++ b/debian/patches/900_weaken_schroedinger_deps.diff
@@ -0,0 +1,18 @@
+From: siret...@tauware.de
+Subject: Weaken dependencies on libschroedinger
+
+This allows vlc to build on debian/squeeze.
+
+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 ac233f6..dfcd62a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
052_as-needed.patch
200_osdmenu_paths.patch
xulrunner-1.9.1.patch
+900_weaken_schroedinger_deps.diff
what do you think about this change?
I'm considering doing a quick upload, maybe with urgency=medium, but I'd
like to hear your opinions as well.
I took the other way and NMUed schroedinger. This way, we now finally
have 1.0.10 libschroedinger on sparc.
Cheers,
Reinhard
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers
