[Pkg-gstreamer-commits] [SCM] GStreamer Good Plugins 1.0 Packaging branch, master, updated. debian/0.11.94-1-3-ge6ebf0a

Sebastian Dröge sebastian.droege at collabora.co.uk
Tue Sep 18 08:10:13 UTC 2012


The following commit has been merged in the master branch:
commit e6ebf0a35d1e778698e2456a29e149414fed5d85
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Tue Sep 18 09:41:16 2012 +0200

    New upstream release

diff --git a/debian/build-deps b/debian/build-deps
index 49b400a..396e676 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -1,6 +1,6 @@
 @GST_LIB_DEV_DEP@
 @GST_EXTRA_BUILD_DEPENDS@
-libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.94)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.99)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -30,10 +30,11 @@ libxv-dev
 libgtk-3-dev
 libtag1-dev (>= 1.5)
 libwavpack-dev (>= 4.20)
-gstreamer at GST_ABI@-plugins-base (>= 0.11.94)
+gstreamer at GST_ABI@-plugins-base (>= 0.11.99)
 libsoup-gnome2.4-dev (>= 2.26.1)
 libpulse-dev (>= 1.0)
 libbz2-dev
 gstreamer at GST_ABI@-doc
 gstreamer at GST_ABI@-plugins-base-doc
 libjack-dev (>= 1:0.99.10)
+libvpx-dev (>= 1.1.0)
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 49b400a..396e676 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.94)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.99)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -30,10 +30,11 @@ libxv-dev
 libgtk-3-dev
 libtag1-dev (>= 1.5)
 libwavpack-dev (>= 4.20)
-gstreamer at GST_ABI@-plugins-base (>= 0.11.94)
+gstreamer at GST_ABI@-plugins-base (>= 0.11.99)
 libsoup-gnome2.4-dev (>= 2.26.1)
 libpulse-dev (>= 1.0)
 libbz2-dev
 gstreamer at GST_ABI@-doc
 gstreamer at GST_ABI@-plugins-base-doc
 libjack-dev (>= 1:0.99.10)
+libvpx-dev (>= 1.1.0)
diff --git a/debian/changelog b/debian/changelog
index 732fcdb..514ec2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gst-plugins-good1.0 (0.11.99-1) experimental; urgency=low
+
+  * New upstream release:
+    + debian/rules,
+      debian/build-deps.in:
+      - Build depend on GStreamer core/base >= 0.11.99.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 18 Sep 2012 09:38:33 +0200
+
 gst-plugins-good1.0 (0.11.94-1) experimental; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index b79ea9b..bb0ed03 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintainers at lists.a
 Uploaders: Loic Minier <lool at dooz.org>,
            Sebastian Dröge <slomo at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: libgstreamer1.0-dev (>= 0.11.94),  libraw1394-dev (>= 2.0.0) [linux-any] , libiec61883-dev (>= 1.0.0) [linux-any] , libavc1394-dev [linux-any] , libv4l-dev [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], libgstreamer-plugins-base1.0-dev (>= 0.11.94), autotools-dev, dh-autoreconf, automake (>= 1.11), autoconf (>= 2.62), libtool (>= 2.2.6), autopoint (>= 0.17), cdbs (>= 0.4.93), debhelper (>= 9), dpkg-dev (>= 1.15.1), pkg-config (>= 0.11.0), gtk-doc-tools (>= 1.12), libglib2.0-dev (>= 2.32), liborc-0.4-dev (>= 1:0.4.16), libcairo2-dev (>= 1.10.0), libcaca-dev, libspeex-dev (>= 1.1.6), libpng-dev, libshout3-dev, libjpeg-dev, libaa1-dev (>= 1.4p5), libflac-dev (>= 1.1.4), libdv4-dev | libdv-dev, libxdamage-dev, libxext-dev, libxfixes-dev, libxv-dev, libgtk-3-dev, libtag1-dev (>= 1.5), libwavpack-dev (>= 4.20), gstreamer1.0-plugins-base (>= 0.11.94), libsoup-gnome2.4-dev (>= 2.26.1), libpulse-dev (>= 1.0), libbz2-dev, gstreamer1.0-doc, gstreamer1.0-plugins-base-doc, libjack-dev (>= 1:0.99.10)
+Build-Depends: libgstreamer1.0-dev (>= 0.11.99),  libraw1394-dev (>= 2.0.0) [linux-any] , libiec61883-dev (>= 1.0.0) [linux-any] , libavc1394-dev [linux-any] , libv4l-dev [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], libgstreamer-plugins-base1.0-dev (>= 0.11.99), autotools-dev, dh-autoreconf, automake (>= 1.11), autoconf (>= 2.62), libtool (>= 2.2.6), autopoint (>= 0.17), cdbs (>= 0.4.93), debhelper (>= 9), dpkg-dev (>= 1.15.1), pkg-config (>= 0.11.0), gtk-doc-tools (>= 1.12), libglib2.0-dev (>= 2.32), liborc-0.4-dev (>= 1:0.4.16), libcairo2-dev (>= 1.10.0), libcaca-dev, libspeex-dev (>= 1.1.6), libpng-dev, libshout3-dev, libjpeg-dev, libaa1-dev (>= 1.4p5), libflac-dev (>= 1.1.4), libdv4-dev | libdv-dev, libxdamage-dev, libxext-dev, libxfixes-dev, libxv-dev, libgtk-3-dev, libtag1-dev (>= 1.5), libwavpack-dev (>= 4.20), gstreamer1.0-plugins-base (>= 0.11.99), libsoup-gnome2.4-dev (>= 2.26.1), libpulse-dev (>= 1.0), libbz2-dev, gstreamer1.0-doc, gstreamer1.0-plugins-base-doc, libjack-dev (>= 1:0.99.10), libvpx-dev (>= 1.1.0)
 Standards-Version: 3.9.3
 
 Package: gstreamer1.0-plugins-good-doc
@@ -58,6 +58,7 @@ Depends: ${misc:Depends},
          gstreamer1.0-pulseaudio | gstreamer1.0-audiosink,
          gstreamer1.0-plugins-base,
 Recommends: gstreamer1.0-x
+Conflicts: gstreamer1.0-plugins-bad (<< 0.11.99)
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -84,6 +85,7 @@ Priority: extra
 Depends: gstreamer1.0-plugins-good (= ${binary:Version}),
          gstreamer1.0-pulseaudio (= ${binary:Version}),
          ${misc:Depends}
+Conflicts: gstreamer1.0-plugins-bad-dbg (<< 0.11.99)
 Description: GStreamer plugins from the "good" set
  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 1055416..bd4f262 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -58,6 +58,7 @@ Depends: ${misc:Depends},
          @GST_PKGNAME at -pulseaudio | @GST_PKGNAME at -audiosink,
          gstreamer at GST_ABI@-plugins-base,
 Recommends: @GST_PKGNAME at -x
+Conflicts: gstreamer1.0-plugins-bad (<< 0.11.99)
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -84,6 +85,7 @@ Priority: extra
 Depends: @GST_PKGNAME at -plugins-good (= ${binary:Version}),
          @GST_PKGNAME at -pulseaudio (= ${binary:Version}),
          ${misc:Depends}
+Conflicts: gstreamer1.0-plugins-bad-dbg (<< 0.11.99)
 Description: GStreamer plugins from the "good" set
  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-good.install b/debian/gstreamer-plugins-good.install
index b813919..49c150a 100644
--- a/debian/gstreamer-plugins-good.install
+++ b/debian/gstreamer-plugins-good.install
@@ -57,6 +57,7 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstvideobox.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstvideocrop.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstvideofilter.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstvideomixer.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstvpx.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstwavenc.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstwavpack.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstwavparse.so
diff --git a/debian/rules b/debian/rules
index 7966861..521fab5 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.94)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 0.11.99)
 
 gst_pkgname=gstreamer$(gst_abi)
 gst_deb_abi=$(gst_abi)-0

-- 
GStreamer Good Plugins 1.0 Packaging



More information about the Pkg-gstreamer-commits mailing list