[SCM] Phonon GStreamer backend packaging branch, experimental, updated. debian/4.7.1-1-6-g02e21c2

Diane Trout diane-guest at moszumanska.debian.org
Sat Sep 13 23:19:33 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git;a=commitdiff;h=665024d

The following commit has been merged in the experimental branch:
commit 665024d7dcaceb3a821d202361dbdb967d986167
Author: Diane Trout <diane at ghic.org>
Date:   Sat Sep 13 16:16:06 2014 -0700

    Provide Qt5 build. This required creating a -common package for the icons and desktop file shared between the Qt4 and Qt5 versions.
---
 debian/changelog                                   |  3 ++
 debian/control                                     | 53 ++++++++++++++++++++++
 ...all => phonon-backend-gstreamer-common.install} |  1 -
 debian/phonon-backend-gstreamer.install            |  2 -
 debian/phonon4qt5-backend-gstreamer.install        |  1 +
 debian/rules                                       | 27 ++++++++++-
 6 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8bc9c7b..3b507cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ phonon-backend-gstreamer (4:4.8.0-1) UNRELEASED; urgency=low
   [ Diane Trout ]
   * New upstream release.
   * Build against gstreamer1.0
+  * Provide Qt5 build.
+    This required creating a -common package for the icons and desktop file
+    shared between the Qt4 and Qt5 versions.
 
  -- Diane Trout <diane at ghic.org>  Mon, 18 Aug 2014 22:38:36 -0700
 
diff --git a/debian/control b/debian/control
index 5f0f813..9506e0a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,11 @@ Build-Depends: automoc,
                libgstreamer1.0-dev,
                libphonon-dev (>= 4:4.8.0~),
                libphononexperimental-dev (>= 4:4.8.0~),
+               libphonon4qt5-dev (>= 4:4.8.0~),
+               libphonon4qt5experimental-dev (>= 4:4.8.0~),
                libqt4-dev (>= 4:4.8.1),
                libqt4-opengl-dev (>= 4:4.8.1),
+               libqt5opengl5-dev,
                libxml2-dev,
                pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.5
@@ -23,6 +26,24 @@ Homepage: http://phonon.kde.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-std/phonon-backend-gstreamer.git
 
+Package: phonon-backend-gstreamer-common
+Architecture: any
+Multi-Arch: same
+Suggests: phonon-backend-gstreamer, phonon4qt5-backend-gstreamer
+Replaces: phonon-backend-gstreamer (<< 4:4.7.1+)
+Breaks: phonon-backend-gstreamer (<< 4:4.7.1+)
+Description: Phonon GStreamer 1.0.x backend icons
+ This package contains GStreamer 1.0.x backend for Phonon multimedia
+ framework. It transparently adapts and reroutes all requests from Phonon
+ applications to the GStreamer framework which in turn performs requested
+ audio/video decoding/capture tasks.
+ .
+ You should install gstreamer1.0-plugins-good to get support for playing
+ popular free multimedia formats and gstreamer1.0-plugins-ugly to get support
+ for popular MPEG audio formats like MP3.
+ .
+ This package contains icons used by Phonon and Phonon4Qt5 backends.
+
 Package: phonon-backend-gstreamer
 Architecture: any
 Multi-Arch: same
@@ -59,4 +80,36 @@ Description: debugging symbols for the Phonon GStreamer 1.0 backend
  have been asked to provide a backtrace of the crash inside the Phonon
  internals, you may find this package useful.
 
+Package: phonon4qt5-backend-gstreamer
+Architecture: any
+Multi-Arch: same
+Provides: phonon-backend
+Pre-Depends: ${misc:Pre-Depends}
+Depends: phonon-backend-gstreamer-common (= ${binary:Version}),
+         gstreamer1.0-alsa [linux-any] | gstreamer1.0-audiosink,
+         gstreamer1.0-plugins-base,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: gstreamer1.0-plugins-good
+Suggests: gstreamer1.0-plugins-ugly
+Description: Phonon Qt5 GStreamer 1.0 backend
+ This package contains Qt5 GStreamer 1.0 backend for Phonon multimedia
+ framework. It transparently adapts and reroutes all requests from Phonon
+ applications to the GStreamer framework which in turn performs requested
+ audio/video decoding/capture tasks.
+ .
+ You should install gstreamer1.0-plugins-good to get support for playing
+ popular free multimedia formats and gstreamer1.0-plugins-ugly to get support
+ for popular MPEG audio formats like MP3.
 
+Package: phonon4qt5-backend-gstreamer-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Multi-Arch: same
+Depends: phonon4qt5-backend-gstreamer (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for the Phonon Qt5 GStreamer 1.0 backend
+ This package contains debugging symbols for the Phonon Qt5 GStreamer 1.0
+ backend. If you have a problem with this backend and wish to debug it or you
+ have been asked to provide a backtrace of the crash inside the Phonon
+ internals, you may find this package useful.
diff --git a/debian/phonon-backend-gstreamer.install b/debian/phonon-backend-gstreamer-common.install
similarity index 65%
copy from debian/phonon-backend-gstreamer.install
copy to debian/phonon-backend-gstreamer-common.install
index 9b1c258..ab2f676 100644
--- a/debian/phonon-backend-gstreamer.install
+++ b/debian/phonon-backend-gstreamer-common.install
@@ -1,3 +1,2 @@
-usr/lib/*/qt4/plugins/phonon_backend/phonon_gstreamer.so
 usr/share/icons/hicolor/*/apps/phonon-gstreamer.*
 usr/share/kde4/services/phononbackends/gstreamer.desktop
diff --git a/debian/phonon-backend-gstreamer.install b/debian/phonon-backend-gstreamer.install
index 9b1c258..0350a04 100644
--- a/debian/phonon-backend-gstreamer.install
+++ b/debian/phonon-backend-gstreamer.install
@@ -1,3 +1 @@
 usr/lib/*/qt4/plugins/phonon_backend/phonon_gstreamer.so
-usr/share/icons/hicolor/*/apps/phonon-gstreamer.*
-usr/share/kde4/services/phononbackends/gstreamer.desktop
diff --git a/debian/phonon4qt5-backend-gstreamer.install b/debian/phonon4qt5-backend-gstreamer.install
new file mode 100644
index 0000000..be7f4d0
--- /dev/null
+++ b/debian/phonon4qt5-backend-gstreamer.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/plugins/phonon4qt5_backend/phonon_gstreamer.so
diff --git a/debian/rules b/debian/rules
index 043435a..e0fd802 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,33 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DPLUGIN_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/
+	$(overridden_command) -B obj-qt4 -- -DPLUGIN_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/
+	$(overridden_command) -B obj-qt5 -- \
+	                      -DPLUGIN_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/ \
+	                      -DPHONON_BUILD_PHONON4QT5=ON
+
+override_dh_auto_build:
+	$(overridden_command) -B obj-qt4
+	$(overridden_command) -B obj-qt5
+
+override_dh_auto_install:
+	$(overridden_command) -B obj-qt4
+	$(overridden_command) -B obj-qt5
+
+override_dh_install:
+	$(overridden_command) --fail-missing
+
+override_dh_auto_clean:
+	$(overridden_command) -B obj-qt4
+	$(overridden_command) -B obj-qt5
 
 override_dh_shlibdeps:
 	$(overridden_command) -- -xphonon
 
+override_dh_auto_test:
+	$(overridden_command) -B obj-qt4
+	$(overridden_command) -B obj-qt5
+
 override_dh_strip:
-	$(overridden_command) --dbg-package=phonon-backend-gstreamer-dbg
+	$(overridden_command) -pphonon-backend-gstreamer --dbg-package=phonon-backend-gstreamer-dbg
+	$(overridden_command) -pphonon4qt5-backend-gstreamer --dbg-package=phonon4qt5-backend-gstreamer-dbg

-- 
Phonon GStreamer backend packaging



More information about the pkg-kde-commits mailing list