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

Modestas Vainius modax at alioth.debian.org
Sun Mar 27 20:53:05 UTC 2011


The following commit has been merged in the master branch:
commit a51d12dbc7826eca5d60bdf8b00fa77fce7cf783
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Mar 27 23:01:46 2011 +0300

    No longer do custom phonon setup.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |    5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ae0a93..cc8f280 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ kdebase-runtime (4:4.6.1-0r2) UNRELEASED; urgency=low
     conflicts with kdelibs4-dev and kdelibs-dbg, fix install file.
   * Disable testsuite.
   * Remove a link to common-licenses/BSD from debian/copyright.
+  * No longer do custom phonon setup.
 
   [ George Kiagiadakis ]
   * Change my email address in uploaders.
diff --git a/debian/control b/debian/control
index 7c91860..168d298 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Breaks: kdebase-bin (<< 4:4.2.90), kdelibs5 (<< 4:4.4.0), kdelibs-bin (<< 4:4.1.
 Conflicts: kdelibs4-dev
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
  kdebase-runtime-data (>= ${source:Version}), ${sameVersionDep:kdelibs5-plugins:kdebase-runtime},
- oxygen-icon-theme (>= 4:4.4), phonon-backend-xine | phonon-backend,
+ oxygen-icon-theme (>= 4:4.4),
  shared-desktop-ontologies, plasma-scriptengine-javascript (= ${binary:Version})
 Recommends: virtuoso-minimal
 Suggests: djvulibre-bin, icoutils
diff --git a/debian/rules b/debian/rules
index 57d63f1..62981e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,9 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 override_dh_makeshlibs:
 	$(overriden_command) -Xusr/lib/attica_kde.so
 
-# exclude dependency on phonon metapackage. KDE4 does its own phonon setup
 override_dh_shlibdeps:
-	$(overriden_command) -pplasma-scriptengine-javascript -- -xkdebase-runtime -xphonon
-	$(overriden_command) --remaining-packages -- -xphonon
+	$(overriden_command) -pplasma-scriptengine-javascript -- -xkdebase-runtime
+	$(overriden_command) --remaining-packages
 
 override_dh_fixperms:
 	$(overriden_command) -Xusr/lib/kde4/libexec/kdesud

-- 
KDE Base Runtime module packaging



More information about the pkg-kde-commits mailing list