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

Sebastian Dröge sebastian.droege at collabora.co.uk
Thu Aug 9 09:03:59 UTC 2012 

The following commit has been merged in the master branch:
commit 7632ad0f9c9602e97c5dea680eb12da43208a54b
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Thu Aug 9 10:29:26 2012 +0200

    New upstream release

diff --git a/debian/build-deps b/debian/build-deps
index 919c000..11c25c3 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.91)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.93)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -12,8 +12,8 @@ debhelper (>= 9)
 dpkg-dev (>= 1.15.1)
 pkg-config (>= 0.11.0)
 gtk-doc-tools
-libglib2.0-dev (>= 2.31.14)
-liborc-0.4-dev (>= 1:0.4.11)
+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)
@@ -27,11 +27,11 @@ libxdamage-dev
 libxext-dev
 libxfixes-dev
 libxv-dev
-libgtk2.0-dev (>= 2.8)
+libgtk-3-dev
 libtag1-dev (>= 1.5)
 libwavpack-dev (>= 4.20)
-gstreamer at GST_ABI@-plugins-base (>= 0.11.91)
-libsoup-gnome2.4-dev (>= 2.26)
+gstreamer at GST_ABI@-plugins-base (>= 0.11.93)
+libsoup-gnome2.4-dev (>= 2.26.1)
 libpulse-dev (>= 1.0)
 libbz2-dev
 gstreamer at GST_ABI@-doc
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 919c000..11c25c3 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.91)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 0.11.93)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -12,8 +12,8 @@ debhelper (>= 9)
 dpkg-dev (>= 1.15.1)
 pkg-config (>= 0.11.0)
 gtk-doc-tools
-libglib2.0-dev (>= 2.31.14)
-liborc-0.4-dev (>= 1:0.4.11)
+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)
@@ -27,11 +27,11 @@ libxdamage-dev
 libxext-dev
 libxfixes-dev
 libxv-dev
-libgtk2.0-dev (>= 2.8)
+libgtk-3-dev
 libtag1-dev (>= 1.5)
 libwavpack-dev (>= 4.20)
-gstreamer at GST_ABI@-plugins-base (>= 0.11.91)
-libsoup-gnome2.4-dev (>= 2.26)
+gstreamer at GST_ABI@-plugins-base (>= 0.11.93)
+libsoup-gnome2.4-dev (>= 2.26.1)
 libpulse-dev (>= 1.0)
 libbz2-dev
 gstreamer at GST_ABI@-doc
diff --git a/debian/changelog b/debian/changelog
index 330a013..c19b094 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+gst-plugins-good1.0 (0.11.93-1) experimental; urgency=low
+
+  * New upstream release:
+    + debian/rules,
+      debian/build-deps.in:
+      - Build depend on GStreamer core/base >= 0.11.93.
+      - Build depend on GLib >= 2.32.
+      - Build depend on ORC >= 0.4.16.
+      - Build depend on libsoup >= 2.26.1.
+      - Build depend on GTK3 instead of GTK2.
+    + debian/gstreamer-plugins-good.install:
+      - Add the imagefreeze, interleave, deinterlace, monoscope,
+        smpte and wavpack plugins.
+    + debian/patches/0001-configure-Fix-GTK-required-version-variable-name.patch:
+      - Fix GTK configure check.
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 09 Aug 2012 10:23:42 +0200
+
 gst-plugins-good1.0 (0.11.92-1) experimental; urgency=low
 
   * New upstream release, "Money":
diff --git a/debian/control b/debian/control
index 0433dca..bf9fa4e 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.92),  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.91), 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, libglib2.0-dev (>= 2.31.14), liborc-0.4-dev (>= 1:0.4.11), 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, libgtk2.0-dev (>= 2.8), libtag1-dev (>= 1.5), libwavpack-dev (>= 4.20), gstreamer1.0-plugins-base (>= 0.11.91), libsoup-gnome2.4-dev (>= 2.26), 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.93),  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.93), 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, 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.93), 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)
 Standards-Version: 3.9.3
 
 Package: gstreamer1.0-plugins-good-doc
diff --git a/debian/gstreamer-plugins-good.install b/debian/gstreamer-plugins-good.install
index e2da249..54200a7 100644
--- a/debian/gstreamer-plugins-good.install
+++ b/debian/gstreamer-plugins-good.install
@@ -13,6 +13,7 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstavi.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstcacasink.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstcutter.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstdebug.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstdeinterlace.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstdv.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgsteffectv.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstequalizer.so
@@ -22,11 +23,14 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstflxdec.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstgoom.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstgoom2k1.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgsticydemux.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstimagefreeze.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstinterleave.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstid3demux.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstjack.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstjpeg.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstlevel.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmatroska.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmonoscope.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmulaw.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmultifile.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstmultipart.so
@@ -41,6 +45,7 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstrtpmanager.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstrtsp.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstshapewipe.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstshout2.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsmpte.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstsouphttpsrc.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstspectrum.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstspeex.so
@@ -52,6 +57,7 @@ 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@/libgstwavenc.so
+debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstwavpack.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstwavparse.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstximagesrc.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgsty4menc.so
diff --git a/debian/patches/0001-configure-Fix-GTK-required-version-variable-name.patch b/debian/patches/0001-configure-Fix-GTK-required-version-variable-name.patch
new file mode 100644
index 0000000..555023b
--- /dev/null
+++ b/debian/patches/0001-configure-Fix-GTK-required-version-variable-name.patch
@@ -0,0 +1,25 @@
+From 1a92f7b8126c67b88d91513e6d731a61579f8ef7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Thu, 9 Aug 2012 10:25:38 +0200
+Subject: [PATCH 1/2] configure: Fix GTK required version variable name
+
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2a16a18..848c92f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -234,7 +234,7 @@ AC_SUBST(GSTPB_PREFIX)
+ 
+ dnl GTK is optional and used in examples
+ HAVE_GTK=no
+-GT_REQ=3.0.0
++GTK_REQ=3.0.0
+ if test "x$BUILD_EXAMPLES" = "xyes"; then
+   PKG_CHECK_MODULES(GTK, gtk+-$with_gtk >= $GTK_REQ, HAVE_GTK=yes, HAVE_GTK=no)
+   dnl some examples need gtk+-x11
+-- 
+1.7.10.4
+
diff --git a/debian/patches/0002-configure-And-fix-the-GTK-check-to-use-the-correct-p.patch b/debian/patches/0002-configure-And-fix-the-GTK-check-to-use-the-correct-p.patch
new file mode 100644
index 0000000..c271e1e
--- /dev/null
+++ b/debian/patches/0002-configure-And-fix-the-GTK-check-to-use-the-correct-p.patch
@@ -0,0 +1,29 @@
+From 90740c3fee9ba089ef141de8c78dedde4078c2fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege at collabora.co.uk>
+Date: Thu, 9 Aug 2012 10:31:39 +0200
+Subject: [PATCH 2/2] configure: And fix the GTK check to use the correct
+ pkg-config package name
+
+---
+ configure.ac |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 848c92f..a3442ca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,9 +236,9 @@ dnl GTK is optional and used in examples
+ HAVE_GTK=no
+ GTK_REQ=3.0.0
+ if test "x$BUILD_EXAMPLES" = "xyes"; then
+-  PKG_CHECK_MODULES(GTK, gtk+-$with_gtk >= $GTK_REQ, HAVE_GTK=yes, HAVE_GTK=no)
++  PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQ, HAVE_GTK=yes, HAVE_GTK=no)
+   dnl some examples need gtk+-x11
+-  PKG_CHECK_MODULES(GTK_X11, gtk+-x11-$with_gtk >= $GTK_REQ, HAVE_GTK_X11=yes, HAVE_GTK_X11=no)
++  PKG_CHECK_MODULES(GTK_X11, gtk+-x11-3.0 >= $GTK_REQ, HAVE_GTK_X11=yes, HAVE_GTK_X11=no)
+   AC_SUBST(GTK_LIBS)
+   AC_SUBST(GTK_CFLAGS)
+ fi
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2497acb..3ef4f35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+0001-configure-Fix-GTK-required-version-variable-name.patch
+0002-configure-And-fix-the-GTK-check-to-use-the-correct-p.patch
 99_ltmain_as-needed.patch
diff --git a/debian/rules b/debian/rules
index 58e9169..9b0535b 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.92)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 0.11.93)
 
 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