[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.7.4-1-3-g980f4dd

Felix Geyer debfx-guest at alioth.debian.org
Sat Mar 3 13:20:07 UTC 2012


The following commit has been merged in the master branch:
commit 980f4dd61e5ea1d0f1ecf0ead0923dad5c1ac5a9
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Mar 3 14:19:19 2012 +0100

    Don't build the phonon xine kcm since the xine backend has been removed.
---
 debian/changelog                      |    1 +
 debian/control                        |   12 +-----------
 debian/kde-config-phonon-xine.install |    2 --
 debian/rules                          |    6 ------
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6dc66a..43115ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kde-runtime (4:4.7.4-2) UNRELEASED; urgency=low
   [ Felix Geyer ]
   * Drop /usr/bin/trash4 symlink since it's not needed anymore and was broken
     anyway.
+  * Don't build the phonon xine kcm since the xine backend has been removed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Mar 2012 13:42:41 +0100
 
diff --git a/debian/control b/debian/control
index 5f64a55..f3b51a9 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
  libstreamanalyzer-dev (>= 0.6.3), libstrigiqtdbusclient-dev (>= 0.6.3),
  libopenexr-dev, libbz2-dev, libx11-dev, libxcursor-dev,
  libasound2-dev (>= 1.0.14a) [linux-any],
- libjpeg-dev, libxine-dev, libslp-dev,
+ libjpeg-dev, libslp-dev,
  liblzma-dev, libattica-dev (>= 0.1.4), libssh-dev (>= 0.4.0), libexiv2-dev (>= 0.12),
  shared-desktop-ontologies (>= 0.7),
  libntrack-qt4-dev [linux-any], libpulse-dev (>= 0.9.16), libcanberra-dev,
@@ -98,16 +98,6 @@ Description: help center
  .
  This package is part of the KDE base runtime module.
 
-Package: kde-config-phonon-xine
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine-x:Depends}, ${xine-console:Depends}
-Description: advanced Phonon Xine configuration
- This package contains a configuration module for tweaking some of the more
- advanced settings for Phonon's Xine backend.
- .
- This package is part of the KDE base runtime module.
-
 Package: plasma-scriptengine-javascript
 Section: kde
 Architecture: any
diff --git a/debian/kde-config-phonon-xine.install b/debian/kde-config-phonon-xine.install
deleted file mode 100644
index 50bf7f3..0000000
--- a/debian/kde-config-phonon-xine.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/kde4/kcm_phononxine.so
-usr/share/kde4/services/kcm_phononxine.desktop
diff --git a/debian/rules b/debian/rules
index cb01606..2d26b11 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
@@ -20,7 +18,3 @@ override_dh_fixperms:
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=kde-runtime-dbg
-
-override_dh_xine:
-	$(overridden_command) -pkde-config-phonon-xine
-

-- 
KDE Base Runtime module packaging



More information about the pkg-kde-commits mailing list