[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.4.5-1-36-gc3b07e7

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Thu Jan 13 19:51:16 UTC 2011


The following commit has been merged in the master branch:
commit 7cd964c68ba5f90ea23040a3891b741d86bd3ad2
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Jan 13 01:27:08 2011 +0100

    kde-config-phonon-xine depends on ${xine-x:Depends}
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |    3 +++
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f471193..10086e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ kdebase-runtime (4:4.5.95-0r1) UNRELEASED; urgency=low
       0.1~svn1175124-1 because they both install
       /usr/share/kde4/apps/desktoptheme/default/icons/network.svgz
   * Update installed files.
+  * Call dh_xine in rules, kde-config-phonon-xine now depends on
+    ${xine-x:Depends} (Closes: #575120)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Nov 2010 11:33:34 +0200
 
diff --git a/debian/control b/debian/control
index 874c148..5d84ea4 100644
--- a/debian/control
+++ b/debian/control
@@ -75,7 +75,7 @@ Description: help center
 Package: kde-config-phonon-xine
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends}
 Replaces: kdebase-runtime-data (<< 4:4.4.0), kdebase-runtime (<< 4:4.4.0)
 Description: advanced Phonon Xine configuration
  This package contains a configuration module for tweaking some of the more
diff --git a/debian/rules b/debian/rules
index e35afc6..6ad18ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,3 +12,6 @@ DEB_FIXPERMS_EXCLUDE := usr/lib/kde4/libexec/kdesud
 DEB_DH_MAKESHLIBS_ARGS_kdebase-runtime = -Xusr/lib/attica_kde.so
 
 include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+
+install/kde-config-phonon-xine::
+	dh_xine

-- 
KDE Base Runtime module packaging



More information about the pkg-kde-commits mailing list