[SCM] kaffeine packaging branch, master, updated. debian/0.8.4-5-42-g8a833e7

[José Manuel Santamaría Lema]

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

The following commit has been merged in the master branch:
commit 8a833e7418ca3a6bb5418901e74ea42eedde3dea
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sun May 13 00:07:32 2012 +0200

    Update xine-lib dependencies. (Closes: #656915)
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19ed950..90d0456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kaffeine (1.2.2-2) UNRELEASED; urgency=low
 
   [ José Manuel Santamaría Lema ]
   * Add ftbfs_gcc47.diff, avoids an FTBFS with GCC 4.7 (Closes: #667218)
+  * Update xine-lib dependencies. (Closes: #656915)
   * Amend package descriptions. (Closes: #627900)
   * Update Vcs-* fields, kaffeine packaging was just moved to git.
   * Bump Standards-Version to 3.9.3, no changes needed.
diff --git a/debian/control b/debian/control
index af063b7..7711dcb 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/kaffeine.git
 Package: kaffeine
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libxine1-ffmpeg, libxine1-x, libqt4-sql-sqlite
+ ${xine-ffmpeg:Depends}, ${xine-x:Depends}, 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 99df558..d7f6716 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,9 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --parallel --dbg-package=kaffeine-dbg --list-missing --with kde
+	dh $@ --parallel --dbg-package=kaffeine-dbg --list-missing --with kde --with xine
+
+override_dh_xine:
+	dh_xine -pkaffeine x ffmpeg
 
 .PHONY: override_dh_auto_test

-- 
kaffeine packaging