[Pkg-gstreamer-commits] [SCM] GStreamer Bad Plugins 1.0 Packaging branch, master, updated. debian/0.11.93-1-3-g0ffbf37

Sebastian Dröge sebastian.droege at collabora.co.uk
Fri Sep 14 09:59:28 UTC 2012 

The following commit has been merged in the master branch:
commit 0ffbf37c383a5637cc5cc7a5982a0df3b551f2e0
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Fri Sep 14 11:31:59 2012 +0200

    New upstream release

diff --git a/debian/build-deps b/debian/build-deps
index 9ce71ad..7363c20 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -11,7 +11,7 @@ flite-dev
 @GST_LIB_DEV_DEP@
 gstreamer at GST_ABI@-doc
 gstreamer at GST_ABI@-plugins-base-doc
-gtk-doc-tools
+gtk-doc-tools (>= 1.12)
 ladspa-sdk
 libass-dev (>= 0.9.4)
 libbz2-dev
@@ -27,8 +27,8 @@ libfaad-dev
 libglib2.0-dev (>= 2.32)
 libgme-dev
 libgsm1-dev
-libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.93)
-libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.93)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.94)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.94)
 libgtk2.0-dev (>= 2.14.0)
 libiptcdata0-dev (>= 1.0.2)
 libjasper-dev
diff --git a/debian/build-deps.in b/debian/build-deps.in
index af61c39..8a5da68 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -1,6 +1,6 @@
 @GST_LIB_DEV_DEP@
 @GST_EXTRA_BUILD_DEPENDS@
-libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.93)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.94)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -11,7 +11,7 @@ cdbs (>= 0.4.93)
 debhelper (>= 9)
 dpkg-dev (>= 1.15.1)
 pkg-config (>= 0.11.0)
-gtk-doc-tools
+gtk-doc-tools (>= 1.12)
 libglib2.0-dev (>= 2.32)
 liborc-0.4-dev (>= 1:0.4.16)
 libbz2-dev
@@ -29,7 +29,7 @@ libexif-dev (>= 0.6.16)
 libexempi-dev
 libiptcdata0-dev (>= 1.0.2)
 libwildmidi-dev (>= 0.2.3)
-libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.93)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.94)
 libofa0-dev (>= 0.9.3)
 libdvdnav-dev (>= 4.1.2) [!hurd-any]
 libssl-dev
diff --git a/debian/changelog b/debian/changelog
index c782d07..69bd17c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gst-plugins-bad1.0 (0.11.94-1) experimental; urgency=low
+
+  * New upstream release:
+    + debian/build-deps.in,
+      debian/rules:
+      - Build depend on GStreamer core/base >= 0.11.94.
+      - Build depend on gtk-doc >= 1.12.
+    + debian/gstreamer-plugins-bad.install,
+      debian/rules:
+      - Add the freeze, gdp, id3tag, inter, jpegformat, liveadder,
+        pnm, siren, spandsp, speed, dvb, resindvd plugins.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 14 Sep 2012 11:30:28 +0200
+
 gst-plugins-bad1.0 (0.11.93-1) experimental; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 47d88e8..0c57f82 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,12 @@ Build-Depends: autoconf (>= 2.62),
                libasound2-dev (>= 0.9.1) [linux-any],
                libcdaudio-dev [linux-any],
                libdc1394-22-dev (>= 2.0.0) [linux-any],
-               libgstreamer1.0-dev (>= 0.11.93),
+               libgudev-1.0-dev (>= 143) [linux-any],
+               libusb-1.0-0-dev [linux-any],
+               libgstreamer1.0-dev (>= 0.11.94),
                gstreamer1.0-doc,
                gstreamer1.0-plugins-base-doc,
-               gtk-doc-tools,
+               gtk-doc-tools (>= 1.12),
                ladspa-sdk,
                libass-dev (>= 0.9.4),
                libbz2-dev,
@@ -35,8 +37,8 @@ Build-Depends: autoconf (>= 2.62),
                libglib2.0-dev (>= 2.32),
                libgme-dev,
                libgsm1-dev,
-               libgstreamer-plugins-base1.0-dev (>= 0.11.93),
-               libgstreamer-plugins-base1.0-dev (>= 0.11.93),
+               libgstreamer-plugins-base1.0-dev (>= 0.11.94),
+               libgstreamer-plugins-base1.0-dev (>= 0.11.94),
                libgtk2.0-dev (>= 2.14.0),
                libiptcdata0-dev (>= 1.0.2),
                libjasper-dev,
@@ -105,6 +107,8 @@ Depends: ${misc:Depends},
          libgstreamer-plugins-bad1.0-0 (= ${binary:Version}),
 Provides: ${gstreamer:Provides}
 Suggests: frei0r-plugins
+Replaces: gstreamer1.0-plugins-base (<< 0.11.94)
+Conflicts: gstreamer1.0-plugins-base (<< 0.11.94)
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -131,6 +135,8 @@ Section: debug
 Priority: extra
 Depends: gstreamer1.0-plugins-bad (= ${binary:Version}),
          ${misc:Depends}
+Replaces: gstreamer1.0-plugins-base-dbg (<< 0.11.94)
+Conflicts: gstreamer1.0-plugins-base-dbg (<< 0.11.94)
 Description: GStreamer plugins from the "bad" set (debug symbols)
  GStreamer is a streaming media framework, based on graphs of filters
  which operate on media data.  Applications using this library can do
diff --git a/debian/control.in b/debian/control.in
index d5dbe3d..076d1b6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -41,6 +41,8 @@ Depends: ${misc:Depends},
          libgstreamer-plugins-bad at GST_DEB_ABI@ (= ${binary:Version}),
 Provides: ${gstreamer:Provides}
 Suggests: frei0r-plugins
+Replaces: gstreamer1.0-plugins-base (<< 0.11.94)
+Conflicts: gstreamer1.0-plugins-base (<< 0.11.94)
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -67,6 +69,8 @@ Section: debug
 Priority: extra
 Depends: @GST_PKGNAME at -plugins-bad (= ${binary:Version}),
          ${misc:Depends}
+Replaces: gstreamer1.0-plugins-base-dbg (<< 0.11.94)
+Conflicts: gstreamer1.0-plugins-base-dbg (<< 0.11.94)
 Description: GStreamer plugins from the "bad" set (debug symbols)
  GStreamer is a streaming media framework, based on graphs of filters
  which operate on media data.  Applications using this library can do
diff --git a/debian/gstreamer-plugins-bad.install b/debian/gstreamer-plugins-bad.install
index e50a351..98e140f 100644
--- a/debian/gstreamer-plugins-bad.install
+++ b/debian/gstreamer-plugins-bad.install
@@ -7,7 +7,6 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstautoconvert.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstbayer.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstbz2.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstcamerabin2.so
-debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstopus.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstcoloreffects.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstcurl.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstdataurisrc.so
@@ -19,12 +18,18 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstdvdspu.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstfaad.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstfestival.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstfragmented.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstfreeze.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstflite.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstgaudieffects.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstgdp.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstgeometrictransform.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstgme.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstgsm.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstid3tag.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstinter.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstinterlace.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstjpegformat.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstliveadder.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmimic.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmms.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmodplug.so
@@ -32,7 +37,9 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmpegpsdemux.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmpegtsdemux.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmpegtsmux.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmpg123.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstopus.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstpcapparse.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstpnm.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstrawparse.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstremovesilence.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstrtmp.so
@@ -42,7 +49,10 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstscaletempoplugin.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstschro.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsdpelem.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsegmentclip.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsiren.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsoundtouch.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstspandsp.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstspeed.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstshm.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsmooth.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstvideoparsersbad.so
@@ -53,3 +63,5 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgsty4mdec.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstzbar.so
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/gstreamer- at GST_ABI@/presets/
+ at dvb@
+ at resindvd@
diff --git a/debian/rules b/debian/rules
index da12e61..45de148 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ gst_abi=$(gst_major).$(gst_minor)
 gst_lib=libgstreamer$(gst_abi)-0
 gst_lib_dev=libgstreamer$(gst_abi)-dev
 # what gstreamer version is needed
-gst_lib_dev_dep=$(gst_lib_dev) (>= 0.11.93)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 0.11.94)
 
 gst_pkgname=gstreamer$(gst_abi)
 gst_deb_abi=$(gst_abi)-0
@@ -55,6 +55,8 @@ gst_extra_build_depends =
 gst_extra_build_depends += libasound2-dev (>= 0.9.1) [linux-any]
 gst_extra_build_depends += , libcdaudio-dev [linux-any]
 gst_extra_build_depends += , libdc1394-22-dev (>= 2.0.0) [linux-any]
+gst_extra_build_depends += , libgudev-1.0-dev (>= 143) [linux-any]
+gst_extra_build_depends += , libusb-1.0-0-dev [linux-any]
 
 # The plugins are basically the same.
 # Link special names to a template file.
@@ -86,6 +88,7 @@ cdaudio = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstcd
 dc1394 = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstdc1394.so
 decklink = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstdecklink.so
 linsys = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstlinsys.so
+uvch264 = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstuvch264.so
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
@@ -93,7 +96,7 @@ cdaudio = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstcd
 endif
 
 ifneq ($(DEB_HOST_ARCH_OS),hurd)
-resindvd = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libresindvd.so
+resindvd = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstresindvd.so
 endif
 
 # Let's decide the package name and url depending on the distribution
@@ -127,6 +130,7 @@ pre-build::
 			-e 's, at dc1394@,$(dc1394),g' \
 			-e 's, at cdaudio@,$(cdaudio),g' \
 			-e 's, at resindvd@,$(resindvd),g' \
+			-e 's, at uvch264@,$(uvch264),g' \
 			-e 's/@GST_ABI@/$(gst_abi)/g' \
 			debian/gstreamer-$$p.install \
 			> debian/$(gst_pkgname)-$$p.install; \

-- 
GStreamer Bad Plugins 1.0 Packaging

More information about the Pkg-gstreamer-commits mailing list