Package: gstreamer0.10-ffmpeg
Version: 0.10.12-3
This patch is with the -2 version, so the changelog need to be merged.
--
YunQiang Su
diff -ru debian/changelog gstreamer0.10-ffmpeg-0.10.12/debian/changelog
--- debian/changelog 2011-09-08 16:38:47.000000000 +0800
+++ gstreamer0.10-ffmpeg-0.10.12/debian/changelog 2011-11-02 14:32:22.098456356 +0800
@@ -1,15 +1,16 @@
-gstreamer0.10-ffmpeg (0.10.12-3) unstable; urgency=low
+gstreamer0.10-ffmpeg (0.10.12-2~deepin4) oneiric; urgency=low
- * debian/control:
- + Depend on libavcodec53 (<< 5:0) instead of libavcodec52 (Closes: #640862).
+ * Multiarch it.
- -- Sebastian Dröge <sl...@debian.org> Thu, 08 Sep 2011 10:37:22 +0200
+ -- YunQiang Su <wzss...@gmail.com> Sun, 30 Oct 2011 14:59:22 +0800
-gstreamer0.10-ffmpeg (0.10.12-2) unstable; urgency=low
+gstreamer0.10-ffmpeg (0.10.12-1ubuntu1) oneiric; urgency=low
- * Upload to unstable (Closes: #640317).
-
- -- Sebastian Dröge <sl...@debian.org> Mon, 05 Sep 2011 10:32:37 +0200
+ * Don't declare dependencies on libavcodec manually. Libavcodec's shlibs
+ file is more accurate and less error prone. With libav 0.7, it's
+ libavcodec53, not 52.
+
+ -- Reinhard Tartler <siret...@tauware.de> Tue, 09 Aug 2011 16:20:54 +0200
gstreamer0.10-ffmpeg (0.10.12-1) experimental; urgency=low
diff -ru debian/control gstreamer0.10-ffmpeg-0.10.12/debian/control
--- debian/control 2011-09-08 16:37:15.000000000 +0800
+++ gstreamer0.10-ffmpeg-0.10.12/debian/control 2011-11-02 00:10:03.083827487 +0800
@@ -6,30 +6,29 @@
Loic Minier <l...@dooz.org>,
Sebastian Dröge <sl...@debian.org>,
Sjoerd Simons <sjo...@debian.org>
-Build-Depends: debhelper (>= 7),
- cdbs (>= 0.4.8),
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93),
dpkg-dev (>= 1.15.1),
autotools-dev,
zlib1g-dev,
libglib2.0-dev (>= 2.4.0),
pkg-config (>= 0.11.0),
- libgstreamer0.10-dev (>= 0.10.31),
- libgstreamer-plugins-base0.10-dev (>= 0.10.31),
+ libgstreamer0.10-dev (>= 0.10.35-2~),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.35-2~),
liborc-0.4-dev (>= 1:0.4.6),
- gstreamer-tools (>= 0.10.14),
+ gstreamer-tools (>= 0.10.35-2~),
libavcodec-dev (>= 4:0.7),
libpostproc-dev (>= 4:0.7),
libavformat-dev (>= 4:0.7),
libswscale-dev (>= 4:0.7),
libbz2-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Package: gstreamer0.10-ffmpeg
Architecture: any
Section: libs
Depends: ${misc:Depends},
- ${shlibs:Depends},
- libavcodec53 (<< 5:0) | libavcodec-extra-53 (<< 5:0)
+ ${shlibs:Depends}
XB-GStreamer-Version: ${gstreamer:Version}
XB-GStreamer-Elements: ${gstreamer:Elements}
XB-GStreamer-URI-Sources: ${gstreamer:URISources}
diff -ru debian/gstreamer0.10-ffmpeg.install gstreamer0.10-ffmpeg-0.10.12/debian/gstreamer0.10-ffmpeg.install
--- debian/gstreamer0.10-ffmpeg.install 2011-07-20 19:13:11.000000000 +0800
+++ gstreamer0.10-ffmpeg-0.10.12/debian/gstreamer0.10-ffmpeg.install 2011-10-30 14:58:22.634788289 +0800
@@ -1 +1 @@
-debian/tmp/usr/lib/*/*.so*
+debian/tmp/usr/lib/*/*/*.so*
diff -ru debian/rules gstreamer0.10-ffmpeg-0.10.12/debian/rules
--- debian/rules 2011-07-20 19:13:11.000000000 +0800
+++ gstreamer0.10-ffmpeg-0.10.12/debian/rules 2011-10-30 14:57:42.626589894 +0800
@@ -27,6 +27,7 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
DEB_CONFIGURE_EXTRA_FLAGS += --with-system-ffmpeg \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--with-package-name=$(GST_PACKAGE_NAME) \
--with-package-origin=$(GST_PACKAGE_ORIGIN)
@@ -35,8 +36,8 @@
DEB_DH_STRIP_ARGS := --dbg-package=gstreamer0.10-ffmpeg-dbg
install/gstreamer0.10-ffmpeg::
- rm -f debian/gstreamer0.10-ffmpeg/usr/lib/gstreamer-0.10/libgst*.la
- rm -f debian/gstreamer0.10-ffmpeg/usr/lib/gstreamer-0.10/libgst*.a
+ rm -f debian/gstreamer0.10-ffmpeg/usr/lib/*/gstreamer-0.10/libgst*.la
+ rm -f debian/gstreamer0.10-ffmpeg/usr/lib/*/gstreamer-0.10/libgst*.a
common-binary-fixup-arch::
dh_gstscancodecs
