[SCM] KDE PIM Runtime module packaging branch, kde4.11, updated. debian/4.10.5-2-9-g3c157d4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=7bca0fc

The following commit has been merged in the kde4.11 branch:
commit 7bca0fc84ead7c059c3f27ca5d6d3785be97c2f6
Merge: 93b7172229b66d0c6376f7930cb6a0c8c7efe59a a25cbb42b3741c1160dd798d1efe318b2ea74f38
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Oct 6 09:15:29 2013 +0200

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

 debian/changelog                        |   22 +++++++++++++++++-----
 debian/control                          |   10 ++++++----
 debian/kdepim-runtime.lintian-overrides |    3 ++-
 debian/rules                            |    6 +++---
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 81cfbc6,049f59f..837d039
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,6 +1,14 @@@
 +kdepim-runtime (4:4.11.2-1) experimental; urgency=low
 +
 +  * New upstream release.
++  * Update build-dependencies.
++  * Update install files.
++
++ -- Maximiliano Curia <maxy at debian.org>  Sat, 05 Oct 2013 13:20:15 +0200
++
+ kdepim-runtime (4:4.10.5-2) unstable; urgency=low
+ 
+   * Team upload.
  
    [ Pino Toscano ]
    * Enable the kolabproxy Akonadi resource: (Closes: #705406)
diff --cc debian/control
index 812db66,40fc761..aedc186
--- a/debian/control
+++ b/debian/control
@@@ -11,11 -11,8 +11,10 @@@ Build-Depends: kde-sc-dev-latest (>= 4:
   libxml2-dev, xsltproc, libstrigiqtdbusclient-dev, libboost-dev (>= 1.40.0-2),
   libstreamanalyzer-dev, shared-mime-info (>= 0.30), shared-desktop-ontologies (>= 0.10),
   nepomuk-core-dev, libqjson-dev,
-  libkolabxml-dev, libkolab-dev (>= 0.2),
-  libkgapi2-2-dev,
-  libqtwebkit-dev,
+  libkolabxml-dev, libkolab-dev (>= 0.4.2-7~),
+  libkgapi-dev, libqtwebkit-dev,
 + libx11-dev,
 + pkg-config
  Standards-Version: 3.9.4
  Homepage: http://pim.kde.org/
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kdepim-runtime.git

-- 
KDE PIM Runtime module packaging