[SCM] KDE Base Runtime module packaging branch, kde4.8, updated. debian/4.7.4-2-15-g87c6a80

Eshat Cakar eshat-guest at alioth.debian.org
Sun Mar 18 17:02:33 UTC 2012


The following commit has been merged in the kde4.8 branch:
commit 30577a870c44d2df9f528c10926885ece9b2bcbc
Merge: 3e55faaf0cf447483d4075845339cbcb81299eee 8e26daf3dec9198178d7dc9aef7744e1d011faa7
Author: Eshat Cakar <info at eshat.de>
Date:   Sun Mar 18 17:56:24 2012 +0100

    Merge branch 'master' into kde4.8
    
    Conflicts:
    	debian/changelog

 debian/changelog                      |   12 ++++++++++++
 debian/control                        |   14 ++------------
 debian/kde-config-phonon-xine.install |    2 --
 debian/kde-runtime.links              |    2 --
 debian/rules                          |    6 ------
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --cc debian/changelog
index b8b6514,ec2fb77..db76e3f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,15 +1,28 @@@
 +kde-runtime (4:4.8.1-0r0) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Eshat Cakar ]
 +  * Add libqca2-dev to build dependecies.
 +  * Update not-installed files.
 +  * Update installed files.
 +  * Bump kdelibs5-dev build dependency to version 4:4.8.
 +  * Bump kde-sc-dev-latest build dependency to version 4:4.8.1.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Mar 2012 20:54:47 +0100
 +
+ kde-runtime (4:4.7.4-2) unstable; urgency=low
+ 
+   * Team upload. Upload to unstable.
+   * Update uploaders, remove Armin.
+ 
+   [ Felix Geyer ]
+   * Drop /usr/bin/trash4 symlink since it's not needed anymore and was broken
+     anyway. (Closes: #573441)
+   * Don't build the phonon xine kcm since the xine backend has been removed.
+ 
+  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 06 Mar 2012 17:34:57 +0100
+ 
  kde-runtime (4:4.7.4-1) experimental; urgency=low
  
    * New upstream release.
diff --cc debian/control
index 54e2dd9,5d6436d..4d45d2d
--- a/debian/control
+++ b/debian/control
@@@ -3,18 -3,18 +3,18 @@@ Section: kd
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
-  Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
+  Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
   José Manuel Santamaría Lema <panfaust at gmail.com>, Eshat Cakar <info at eshat.de>
 -Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
 +Build-Depends: kde-sc-dev-latest (>= 4:4.8.1),
   cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
 - kdelibs5-dev (>= 4:4.7), libphonon-dev (>= 4:4.6.0really4.4.3), kdelibs5-plugins,
 + kdelibs5-dev (>= 4:4.8), libphonon-dev (>= 4:4.6.0really4.4.3), kdelibs5-plugins,
   libsmbclient-dev, libsoprano-dev (>= 2.6.50),
   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),
 + libqca2-dev,shared-desktop-ontologies (>= 0.7),
   libntrack-qt4-dev [linux-any], libpulse-dev (>= 0.9.16), libcanberra-dev,
   libnm-util-dev (>= 0.7)  [linux-any], network-manager-dev (>= 0.7.0) [linux-any],
   libqtwebkit-dev, libqzeitgeist-dev

-- 
KDE Base Runtime module packaging



More information about the pkg-kde-commits mailing list