Merge branch 'debian-experimental'
diff --git a/debian/build-deps b/debian/build-deps
index 49e44d9..35820a6 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -9,15 +9,14 @@
@GST_EXTRA_BUILD_DEPENDS@
@GST_LIB_DEV_DEP@
gstreamer@GST_ABI@-doc
-gstreamer@GST_ABI@-plugins-base (>= 1.10.0)
+gstreamer@GST_ABI@-plugins-base (>= 1.12.0)
gstreamer@GST_ABI@-plugins-base-doc
gtk-doc-tools (>= 1.12)
liba52-0.7.4-dev
libcdio-dev (>= 0.76)
libdvdread-dev (>= 0.9.0)
libglib2.0-dev (>= 2.40)
-libgstreamer-plugins-base@GST_ABI@-dev (>= 1.10.0)
-libmad0-dev (>= 0.15)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.12.0)
libmp3lame-dev
libmpeg2-4-dev (>= 0.5.1)
libmpg123-dev (>= 1.13)
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 482ac37..a62a840 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@GST_ABI@-dev (>= 1.10.0)
+libgstreamer-plugins-base@GST_ABI@-dev (>= 1.12.0)
autotools-dev
dh-autoreconf
automake (>= 1.14)
@@ -15,11 +15,10 @@
libglib2.0-dev (>= 2.40)
liborc-0.4-dev (>= 1:0.4.17)
liba52-0.7.4-dev
-libmad0-dev (>= 0.15)
libmpeg2-4-dev (>= 0.5.1)
libsidplay1-dev
libdvdread-dev (>= 0.9.0)
-gstreamer@GST_ABI@-plugins-base (>= 1.10.0)
+gstreamer@GST_ABI@-plugins-base (>= 1.12.0)
libcdio-dev (>= 0.76)
libtwolame-dev (>= 0.3.10)
libopencore-amrnb-dev (>= 0.1.3)
diff --git a/debian/changelog b/debian/changelog
index d5fa042..7800d0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+gst-plugins-ugly1.0 (1.12.0-1) experimental; urgency=medium
+
+ * debian/rules: Install with --fail-missing so we don't miss files.
+ * debian/control{,.in}: Provide C/R/P for -amr package to ease upgrades in
+ Ubuntu.
+ * New upstream stable release
+
+ -- Iain Lane <iain.lane@canonical.com> Thu, 04 May 2017 15:19:30 +0300
+
+gst-plugins-ugly1.0 (1.11.91-1) experimental; urgency=medium
+
+ * New upstream release canditate
+
+ -- Sebastian Dröge <slomo@debian.org> Thu, 27 Apr 2017 17:17:42 +0300
+
+gst-plugins-ugly1.0 (1.11.90-1) experimental; urgency=medium
+
+ * New upstream release candidate.
+
+ -- Sebastian Dröge <slomo@debian.org> Fri, 07 Apr 2017 16:04:08 +0300
+
+gst-plugins-ugly1.0 (1.11.2-1) experimental; urgency=medium
+
+ * New development release
+
+ -- Sebastian Dröge <slomo@debian.org> Fri, 24 Feb 2017 14:48:20 +0200
+
+gst-plugins-ugly1.0 (1.11.1-1) experimental; urgency=medium
+
+ * New upstream development release.
+
+ -- Sebastian Dröge <slomo@debian.org> Thu, 12 Jan 2017 15:26:09 +0200
+
gst-plugins-ugly1.0 (1.10.4-1) unstable; urgency=medium
* New upstream bugfix release
diff --git a/debian/control b/debian/control
index 2a77960..b2891d8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,17 +12,16 @@
debhelper (>= 9),
dh-autoreconf,
dpkg-dev (>= 1.15.1),
- libgstreamer1.0-dev (>= 1.10.0),
+ libgstreamer1.0-dev (>= 1.12.0),
gstreamer1.0-doc,
- gstreamer1.0-plugins-base (>= 1.10.0),
+ gstreamer1.0-plugins-base (>= 1.12.0),
gstreamer1.0-plugins-base-doc,
gtk-doc-tools (>= 1.12),
liba52-0.7.4-dev,
libcdio-dev (>= 0.76),
libdvdread-dev (>= 0.9.0),
libglib2.0-dev (>= 2.40),
- libgstreamer-plugins-base1.0-dev (>= 1.10.0),
- libmad0-dev (>= 0.15),
+ libgstreamer-plugins-base1.0-dev (>= 1.12.0),
libmp3lame-dev,
libmpeg2-4-dev (>= 0.5.1),
libmpg123-dev (>= 1.13),
@@ -62,7 +61,9 @@
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
-Replaces: gstreamer1.0-plugins-bad (<< 1.7.2)
+Conflicts: gstreamer1.0-plugins-ugly-amr (<< 1.11.91)
+Replaces: gstreamer1.0-plugins-bad (<< 1.7.2),
+ gstreamer1.0-plugins-ugly-amr (<< 1.11.91)
Breaks: gstreamer1.0-plugins-bad (<< 1.7.2)
XB-GStreamer-Version: ${gstreamer:Version}
XB-GStreamer-Elements: ${gstreamer:Elements}
@@ -70,7 +71,8 @@
XB-GStreamer-URI-Sinks: ${gstreamer:URISinks}
XB-GStreamer-Encoders: ${gstreamer:Encoders}
XB-GStreamer-Decoders: ${gstreamer:Decoders}
-Provides: ${gstreamer:Provides}
+Provides: ${gstreamer:Provides},
+ gstreamer1.0-plugins-ugly-amr
Description: GStreamer plugins from the "ugly" 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 529a237..e7c5107 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -33,7 +33,9 @@
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
-Replaces: gstreamer1.0-plugins-bad (<< 1.7.2)
+Conflicts: gstreamer1.0-plugins-ugly-amr (<< 1.11.91)
+Replaces: gstreamer1.0-plugins-bad (<< 1.7.2),
+ gstreamer1.0-plugins-ugly-amr (<< 1.11.91)
Breaks: gstreamer1.0-plugins-bad (<< 1.7.2)
XB-GStreamer-Version: ${gstreamer:Version}
XB-GStreamer-Elements: ${gstreamer:Elements}
@@ -41,7 +43,8 @@
XB-GStreamer-URI-Sinks: ${gstreamer:URISinks}
XB-GStreamer-Encoders: ${gstreamer:Encoders}
XB-GStreamer-Decoders: ${gstreamer:Decoders}
-Provides: ${gstreamer:Provides}
+Provides: ${gstreamer:Provides},
+ gstreamer1.0-plugins-ugly-amr
Description: GStreamer plugins from the "ugly" 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-ugly.install b/debian/gstreamer-plugins-ugly.install
index 713ce23..9052000 100644
--- a/debian/gstreamer-plugins-ugly.install
+++ b/debian/gstreamer-plugins-ugly.install
@@ -7,10 +7,9 @@
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstdvdread.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstdvdsub.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstlame.so
-debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmad.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmpeg2dec.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmpg123.so
-debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstrmdemux.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstrealmedia.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstsid.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsttwolame.so
debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstx264.so
diff --git a/debian/rules b/debian/rules
index 7707b1a..a32c8f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@
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.10.0)
+gst_lib_dev_dep=$(gst_lib_dev) (>= 1.12.0)
gst_pkgname=gstreamer$(gst_abi)
gst_deb_abi=$(gst_abi)-0
@@ -136,6 +136,9 @@
sed 's/@GST_GCONF_LIB_DEV_DEP@/$(gst_gconf_lib_dev_dep)/g' >> $@; \
done
+space :=
+space +=
+X264_LIBRARY_PATHS := $(patsubst $(space),:,$(wildcard /usr/lib/*/x264-10bit/libx264.so.*))
DEB_CONFIGURE_EXTRA_FLAGS += \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
@@ -143,7 +146,8 @@
--enable-DEBUG \
--enable-debug \
--with-package-name=$(GST_PACKAGE_NAME) \
- --with-package-origin=$(GST_PACKAGE_ORIGIN)
+ --with-package-origin=$(GST_PACKAGE_ORIGIN) \
+ --with-x264-libraries=$(X264_LIBRARY_PATHS)
# only build the docs on arches which can
ifeq (,$(findstring $(DEB_HOST_ARCH),m68k arm))
@@ -161,6 +165,9 @@
rm -f debian/$(gst_pkgname)-$$f; \
done
+common-install-impl::
+ find $(CURDIR)/debian/tmp/ -name '*.la' -print -delete
+
common-binary-fixup-arch::
dh_gstscancodecs
@@ -169,4 +176,7 @@
# Disable inclusion of large upstream ChangeLog
DEB_INSTALL_CHANGELOGS_ALL :=
+# Fail when files aren't installed
+DEB_DH_INSTALL_ARGS := --fail-missing
+
.PHONY: maint
