[SCM] KDE Multimedia module packaging branch, master, updated. debian/4.8.4-1-4-g0083de0

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdemultimedia.git;a=commitdiff;h=0083de0

The following commit has been merged in the master branch:
commit 0083de03b6cab88fb5c214c28ef778bb92737265
Author: Pino Toscano <pino at debian.org>
Date:   Fri Jun 29 10:51:46 2012 +0200

    dragonplayer does not use Xine anymore (#491622)
    
    - drop ${xine-x:Depends} from its depends
    - adjust its description to mention Phonon instead
    - stop using the xine debhelper addon
    - drop the libxine-dev build dependency
---
 debian/changelog |    5 +++++
 debian/control   |    6 +++---
 debian/rules     |    5 -----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5da4f7..805fcf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ kdemultimedia (4:4.8.4-2) UNRELEASED; urgency=low
     the ffmpegthumbs repository) to respect CXXFLAGS when building ffmpegthumbs;
     patch upstream_don-t-reset-the-default-options-in-CXXFLAGS-when-bui.patch.
   * Fix typo in description of patch libav_compat.diff.
+  * dragonplayer does not use Xine anymore: (Closes: #491622)
+    - drop ${xine-x:Depends} from its depends
+    - adjust its description to mention Phonon instead
+    - stop using the xine debhelper addon
+    - drop the libxine-dev build dependency
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Jun 2012 18:03:49 +0200
 
diff --git a/debian/control b/debian/control
index cfdcc2a..b4c2c6b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.8.4),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
  kdelibs5-dev (>= 4:4.8), libphonon-dev (>= 4:4.6.0really4.3.80),
  libasound2-dev (>= 1.0.14a) [linux-any],
- libcdparanoia-dev, libflac-dev, libmusicbrainz3-dev, libpulse-dev (>= 0.9.12), libxine-dev (>= 1.1.16.3),
+ libcdparanoia-dev, libflac-dev, libmusicbrainz3-dev, libpulse-dev (>= 0.9.12),
  libogg-dev, libtag1-dev (>= 1.6), libtheora-dev, libvorbis-dev, libx11-dev,
  libavcodec-dev, libswscale-dev, libavformat-dev, libavutil51
 Standards-Version: 3.9.3
@@ -117,12 +117,12 @@ Description: CDDB library for KDE Platform (development)
 Package: dragonplayer
 Section: video
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: simple video player
  A video player with a different philosophy: Simple, uncluttered interface.
  .
  Features:
-  - Plays DVDs, VCDs, all video formats supported by Xine.
+  - Plays DVDs, VCDs, all video formats supported by the Phonon backend in use.
   - Bundled with a simple web-page KPart.
   - Starts quickly.
  .
diff --git a/debian/rules b/debian/rules
index 3d364fa..d5b597d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-dh = --with=xine
-
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 .PHONY: override_dh_auto_test
@@ -11,6 +9,3 @@ override_dh_makeshlibs:
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=kdemultimedia-dbg
-
-override_dh_xine:
-	$(overridden_command) -pdragonplayer

-- 
KDE Multimedia module packaging