[Pkg-gstreamer-commits] [SCM] GStreamer Bad Plugins 1.0 Packaging branch, master, updated. 32778db3831919b1f759000dcc55d5beaffed7e8

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit b44bf6e2a177b71d7336e9d9a7cb404275a3a003
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu May 3 19:55:18 2012 +0200

    Merge changes from 0.10.23-2.

diff --git a/debian/build-deps b/debian/build-deps
index 6237bba..38190ac 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -39,12 +39,10 @@ libmimic-dev (>= 1.0)
 libmms-dev (>= 0.4)
 libmodplug-dev
 libmpcdec-dev
-libmusicbrainz4-dev (>= 2.1.0)
 libofa0-dev (>= 0.9.3)
 libopenal-dev
-libopenspc-dev [i386]
 liborc-0.4-dev (>= 1:0.4.11)
-libpng12-dev
+libpng-dev
 librsvg2-dev (>= 2.14.0)
 librtmp-dev
 libschroedinger-dev (>= 1.0.7)
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 7cc13ce..2cd7fd6 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -20,12 +20,10 @@ libgsm1-dev
 libmms-dev (>= 0.4)
 libmpcdec-dev
 libsoundtouch-dev (>= 1.5.0)
-libmusicbrainz4-dev (>= 2.1.0)
 libgtk2.0-dev (>= 2.14.0)
 ladspa-sdk
 libsndfile1-dev (>= 1.0.16)
 libfaad-dev
-libopenspc-dev [i386]
 libdirectfb-dev (>= 0.9.25)
 libexif-dev (>= 0.6.16)
 libexempi-dev
@@ -47,7 +45,7 @@ libmimic-dev (>= 1.0)
 libgme-dev
 librsvg2-dev (>= 2.14.0)
 libcairo2-dev
-libpng12-dev
+libpng-dev
 libslv2-dev (>= 0.6.6)
 lv2core
 flite-dev
diff --git a/debian/changelog b/debian/changelog
index 65b695f..303cb7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ gst-plugins-bad1.0 (0.11.90-1) experimental; urgency=low
   [ Sebastian Dröge ]
   * Build-depend on GLib >= 2.31.14.
   * Remove obsolete Provides and Replaces
+  * Merge changes from 0.10.23-2.
 
- -- Sebastian Dröge <slomo at debian.org>  Thu, 03 May 2012 19:47:44 +0200
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 03 May 2012 19:55:08 +0200
 
 gst-plugins-bad0.11 (0.11.1-1~ppa1) oneiric; urgency=low
 
diff --git a/debian/control b/debian/control
index f03820c..1d9021a 100644
--- a/debian/control
+++ b/debian/control
@@ -47,12 +47,10 @@ Build-Depends: autoconf (>= 2.60),
                libmms-dev (>= 0.4),
                libmodplug-dev,
                libmpcdec-dev,
-               libmusicbrainz4-dev (>= 2.1.0),
                libofa0-dev (>= 0.9.3),
                libopenal-dev,
-               libopenspc-dev [i386],
                liborc-0.4-dev (>= 1:0.4.11),
-               libpng12-dev,
+               libpng-dev,
                librsvg2-dev (>= 2.14.0),
                librtmp-dev,
                libschroedinger-dev (>= 1.0.7),
diff --git a/debian/rules b/debian/rules
index ecf9d74..b73c650 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,12 +73,9 @@ VERSIONIZE= \
 #debug package
 DEB_DH_STRIP_ARGS := --dbg-package=$(gst_pkgname)-plugins-bad-dbg
 
-# enable the real and spc plugin on x86
+# enable the real plugin on x86
 ifeq ($(DEB_HOST_ARCH_CPU), i386)
 real = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstreal.so
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-spc = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstspc.so
-endif
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
@@ -123,7 +120,6 @@ pre-build::
 			-e 's, at linsys@,$(linsys),g' \
 			-e 's, at fbdev@,$(fbdev),g' \
 			-e 's, at vcd@,$(vcd),g' \
-			-e 's, at spc@,$(spc),g' \
 			-e 's, at dc1394@,$(dc1394),g' \
 			-e 's, at cdaudio@,$(cdaudio),g' \
 			-e 's, at resindvd@,$(resindvd),g' \

-- 
GStreamer Bad Plugins 1.0 Packaging