[Pkg-gstreamer-commits] [gst-plugins-bad1.0] 04/04: New upstream release candidate

Sebastian Dröge slomo at moszumanska.debian.org
Sat Jun 28 10:15:17 UTC 2014


This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository gst-plugins-bad1.0.

commit 330a02cd080c9ec670cd0419c0ddf9f43dddec1f
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Sat Jun 28 12:15:01 2014 +0200

    New upstream release candidate
---
 debian/build-deps                           |  4 ++--
 debian/build-deps.in                        |  4 ++--
 debian/changelog                            |  9 +++++++++
 debian/control                              |  7 ++++---
 debian/patches/01_fix-modplug-linking.patch | 18 ------------------
 debian/patches/series                       |  1 -
 debian/rules                                |  2 +-
 7 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/debian/build-deps b/debian/build-deps
index 7595581..5f773dc 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -10,7 +10,7 @@ flite-dev
 @GST_EXTRA_BUILD_DEPENDS@
 @GST_LIB_DEV_DEP@
 gstreamer at GST_ABI@-doc
-gstreamer at GST_ABI@-plugins-base (>= 1.3.3)
+gstreamer at GST_ABI@-plugins-base (>= 1.3.90)
 gstreamer at GST_ABI@-plugins-base-doc
 gtk-doc-tools (>= 1.12)
 ladspa-sdk
@@ -35,7 +35,7 @@ libglu1-mesa-dev
 libgme-dev
 libgnutls-dev (>= 2.11.3)
 libgsm1-dev
-libgstreamer-plugins-base at GST_ABI@-dev (>= 1.3.3)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 1.3.90)
 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 e11fdab..3f38373 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 (>= 1.3.3)
+libgstreamer-plugins-base at GST_ABI@-dev (>= 1.3.90)
 autotools-dev
 dh-autoreconf
 automake (>= 1.11)
@@ -29,7 +29,7 @@ libexif-dev (>= 0.6.16)
 libexempi-dev
 libiptcdata0-dev (>= 1.0.2)
 libwildmidi-dev (>= 0.2.3)
-gstreamer at GST_ABI@-plugins-base (>= 1.3.3)
+gstreamer at GST_ABI@-plugins-base (>= 1.3.90)
 libofa0-dev (>= 0.9.3)
 libdvdnav-dev (>= 4.1.2) [!hurd-any]
 libssl-dev
diff --git a/debian/changelog b/debian/changelog
index f31f2eb..870a2b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gst-plugins-bad1.0 (1.3.90-1) experimental; urgency=medium
+
+  * New upstream release candidate:
+    + debian/rules,
+      debian/build-deps.in:
+      - Build-depend on GStreamer core and base >= 1.3.90.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 28 Jun 2014 11:55:38 +0200
+
 gst-plugins-bad1.0 (1.3.3-2) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 7aae776..a0edeea 100644
--- a/debian/control
+++ b/debian/control
@@ -20,9 +20,10 @@ Build-Depends: autoconf (>= 2.62),
                libusb-1.0-0-dev [linux-any],
                libbluetooth-dev (<< 5) [linux-any],
                libsbc-dev (>= 1.1) [linux-any],
-               libgstreamer1.0-dev (>= 1.3.3),
+               libwayland-dev (>= 1.0) [linux-any],
+               libgstreamer1.0-dev (>= 1.3.90),
                gstreamer1.0-doc,
-               gstreamer1.0-plugins-base (>= 1.3.3),
+               gstreamer1.0-plugins-base (>= 1.3.90),
                gstreamer1.0-plugins-base-doc,
                gtk-doc-tools (>= 1.12),
                ladspa-sdk,
@@ -47,7 +48,7 @@ Build-Depends: autoconf (>= 2.62),
                libgme-dev,
                libgnutls-dev (>= 2.11.3),
                libgsm1-dev,
-               libgstreamer-plugins-base1.0-dev (>= 1.3.3),
+               libgstreamer-plugins-base1.0-dev (>= 1.3.90),
                libgtk2.0-dev (>= 2.14.0),
                libiptcdata0-dev (>= 1.0.2),
                libjasper-dev,
diff --git a/debian/patches/01_fix-modplug-linking.patch b/debian/patches/01_fix-modplug-linking.patch
deleted file mode 100644
index 8a49741..0000000
--- a/debian/patches/01_fix-modplug-linking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Tell libtool not to deduplicate linked libraries which causes problems in the case of circular deps. Force -lc to be added at the end.
-Author: Iain Lane <iain.lane at canonical.com>
-
-Index: b/ext/modplug/Makefile.am
-===================================================================
---- a/ext/modplug/Makefile.am
-+++ b/ext/modplug/Makefile.am
-@@ -2,8 +2,8 @@
- 
- libgstmodplug_la_SOURCES = gstmodplug.cc
- libgstmodplug_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MODPLUG_CFLAGS)
--libgstmodplug_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lstdc++ $(LIBM) $(MODPLUG_LIBS)
-+libgstmodplug_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lstdc++ $(LIBM) $(MODPLUG_LIBS) -lc
- libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
--libgstmodplug_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-+libgstmodplug_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) --preserve-dup-deps
- 
- noinst_HEADERS = gstmodplug.h
diff --git a/debian/patches/series b/debian/patches/series
index 6d98219..685da25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_fix-modplug-linking.patch
 02_opencv-linking.patch
diff --git a/debian/rules b/debian/rules
index 1981679..ac2b87b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,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) (>= 1.3.3)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 1.3.90)
 
 gst_pkgname=gstreamer$(gst_abi)
 gst_deb_abi=$(gst_abi)-0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-bad1.0.git



More information about the Pkg-gstreamer-commits mailing list