[Pkg-gstreamer-commits] [gst-plugins-bad1.0] 01/01: Only enable bluez plugin on Linux, it's not available elsewhere.

[Sebastian Dröge]

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 7e9be1c7ec5ef93e84a38ae44b678a0deeb4a38a
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Fri Sep 27 13:53:32 2013 +0200

    Only enable bluez plugin on Linux, it's not available elsewhere.
---
 debian/build-deps                    |    1 -
 debian/build-deps.in                 |    1 -
 debian/changelog                     |    9 +++++++++
 debian/control                       |    2 +-
 debian/gstreamer-plugins-bad.install |    2 +-
 debian/rules                         |    3 +++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/build-deps b/debian/build-deps
index a9cd4b3..3e051a9 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -15,7 +15,6 @@ gstreamer at GST_ABI@-plugins-base-doc
 gtk-doc-tools (>= 1.12)
 ladspa-sdk
 libass-dev (>= 0.9.4)
-libbluetooth-dev (<< 5)
 libbz2-dev
 libcairo2-dev
 libchromaprint-dev
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 73de1c1..a2a155e 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -68,7 +68,6 @@ libsrtp0-dev
 libopencv-dev (>= 2.0.0)
 libopenjpeg-dev
 libsbc-dev (>= 1.1)
-libbluetooth-dev (<< 5)
 libgnutls-dev (>= 2.11.3)
 libchromaprint-dev
 libwebp-dev (>= 0.2.1)
diff --git a/debian/changelog b/debian/changelog
index f2265e4..8506af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gst-plugins-bad1.0 (1.2.0-3) unstable; urgency=low
+
+  * debian/rules,
+    debian/build-deps.in,
+    debian/gstreamer-plugins-bad.install:
+    + Only enable bluez plugin on Linux, it's not available elsewhere.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 27 Sep 2013 13:52:58 +0200
+
 gst-plugins-bad1.0 (1.2.0-2) unstable; urgency=low
 
   * debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch:
diff --git a/debian/control b/debian/control
index 780a0a5..9115a05 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: autoconf (>= 2.62),
                libdc1394-22-dev (>= 2.0.0) [linux-any],
                libgudev-1.0-dev (>= 143) [linux-any],
                libusb-1.0-0-dev [linux-any],
+               libbluetooth-dev (<< 5) [linux-any],
                libgstreamer1.0-dev (>= 1.2.0),
                gstreamer1.0-doc,
                gstreamer1.0-plugins-base (>= 1.0.0),
@@ -25,7 +26,6 @@ Build-Depends: autoconf (>= 2.62),
                gtk-doc-tools (>= 1.12),
                ladspa-sdk,
                libass-dev (>= 0.9.4),
-               libbluetooth-dev (<< 5),
                libbz2-dev,
                libcairo2-dev,
                libchromaprint-dev,
diff --git a/debian/gstreamer-plugins-bad.install b/debian/gstreamer-plugins-bad.install
index a81de3a..170e2ee 100644
--- a/debian/gstreamer-plugins-bad.install
+++ b/debian/gstreamer-plugins-bad.install
@@ -8,7 +8,7 @@ debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstassrender.so
 debian/tmp/usr/lib/*/gstreamer- at GST_ABI@/libgstaudiovisualizers.so
 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@/libgstbluez.so
+ at bluez@
 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@/libgstchromaprint.so
diff --git a/debian/rules b/debian/rules
index bbf4c94..c5dd1f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,7 @@ 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]
+gst_extra_build_depends += , libbluetooth-dev (<< 5) [linux-any]
 
 # The plugins are basically the same.
 # Link special names to a template file.
@@ -89,6 +90,7 @@ dc1394 = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstdc1
 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
+bluez = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstbluez.so
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
@@ -131,6 +133,7 @@ pre-build::
 			-e 's, at cdaudio@,$(cdaudio),g' \
 			-e 's, at resindvd@,$(resindvd),g' \
 			-e 's, at uvch264@,$(uvch264),g' \
+			-e 's, at bluez@,$(bluez),g' \
 			-e 's/@GST_ABI@/$(gst_abi)/g' \
 			debian/gstreamer-$$p.install \
 			> debian/$(gst_pkgname)-$$p.install; \

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