[SCM] kaffeine packaging branch, master, updated. debian/1.2.2-4-8-gb3f84d0

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kaffeine.git;a=commitdiff;h=169a3ab

The following commit has been merged in the master branch:
commit 169a3ab9c7825eac51065f84db00a55b52b6b151
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jun 8 20:44:55 2016 +0200

    the new version switches from Xine to VLC
    
    - replace the libxine2-dev build dependency with libvlc-dev
    - stop using the xine dh addon
    - do not use the ${xine-ffmpeg:Depends} and ${xine-x:Depends} substvars
---
 debian/changelog | 4 ++++
 debian/control   | 5 +++--
 debian/rules     | 5 +----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6d958b..957670c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ kaffeine (2.0.2-0r1) UNRELEASED; urgency=medium
   * Use the right dh addon:
     - switch from kde to kf5 dh addon
     - bump the pkg-kde-tools build dependency to >= 0.15.16
+  * The new version switches from Xine to VLC, so:
+    - replace the libxine2-dev build dependency with libvlc-dev
+    - stop using the xine dh addon
+    - do not use the ${xine-ffmpeg:Depends} and ${xine-x:Depends} substvars
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 08 Jun 2016 20:25:35 +0200
 
diff --git a/debian/control b/debian/control
index ce73a5b..1cb5f27 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools (>= 0.15.16),
  libkf5solid-dev (>= 5.11.0),
  libkf5widgetsaddons-dev (>= 5.11.0),
  libkf5xmlgui-dev (>= 5.11.0),
- libxine2-dev, libx11-dev, libxss-dev
+ libvlc-dev,
+ libx11-dev, libxss-dev
 Standards-Version: 3.9.8
 Homepage: http://kaffeine.kde.org
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/kaffeine.git
@@ -26,7 +27,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/kaffeine.git
 Package: kaffeine
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- ${xine-ffmpeg:Depends}, ${xine-x:Depends}, libqt4-sql-sqlite
+ libqt4-sql-sqlite
 Suggests: libdvdcss2
 Description: versatile media player for KDE
  Kaffeine is a media player for KDE. While it supports multiple Phonon
diff --git a/debian/rules b/debian/rules
index 6c99eae..6a23277 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --parallel --with kf5 --with xine
-
-override_dh_xine:
-	dh_xine -pkaffeine x ffmpeg
+	dh $@ --parallel --with kf5
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='kaffeine-dbg (<< 1.2.2-4~)'

-- 
kaffeine packaging