[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.13.1-1-8-g83c47eb

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f6b5078b4835be1480e49047cc2f1f79017f4766
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 23:49:20 2014 +0200

    Reenable kolab integration. (Closes: #755678)
---
 debian/changelog              |  1 +
 debian/control                |  6 +++---
 debian/kdepim-runtime.install | 12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6d4dfb..dda6651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdepim-runtime (4:4.13.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Reenable kolab integration. (Closes: #755678)
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 12:53:08 +0200
 
diff --git a/debian/control b/debian/control
index fb1ed2d..a0596f2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends: cmake,
                libakonadi-dev (>= 1.12),
                libboost-dev (>= 1.40.0-2),
                libkgapi-dev (>= 1.9.81),
-#               libkolab-dev (>= 0.5),
-#               libkolabxml-dev (>= 1.0),
+               libkolab-dev (>= 0.5),
+               libkolabxml-dev (>= 1.0),
                libqjson-dev,
                libqtwebkit-dev,
                libstreamanalyzer-dev,
@@ -35,7 +35,7 @@ Package: kdepim-runtime
 Architecture: any
 Depends: akonadi-server (>= 1.8),
          kdepimlibs-kio-plugins,
-         libkolab0(>= 0.4.2-7~),
+         libkolab0 (>= 0.5),
          ${misc:Depends},
          ${shlibs:Depends}
 Replaces: akonadi-kde, libmaildir4
diff --git a/debian/kdepim-runtime.install b/debian/kdepim-runtime.install
index 96ba474..3931f97 100644
--- a/debian/kdepim-runtime.install
+++ b/debian/kdepim-runtime.install
@@ -9,11 +9,11 @@ usr/bin/akonadi_invitations_agent
 usr/bin/akonadi_kabc_resource
 usr/bin/akonadi_kcal_resource
 usr/bin/akonadi_kdeaccounts_resource
-# usr/bin/akonadi_kolabproxy_resource
+usr/bin/akonadi_kolabproxy_resource
 usr/bin/akonadi_localbookmarks_resource
 usr/bin/akonadi_maildispatcher_agent
 usr/bin/akonadi_mailtransport_dummy_resource
-# usr/bin/akonadi_microblog_resource
+usr/bin/akonadi_microblog_resource
 usr/bin/akonadi_migration_agent
 usr/bin/akonadi_mixedmaildir_resource
 usr/bin/akonadi_newmailnotifier_agent
@@ -105,12 +105,12 @@ usr/share/akonadi/agents/kalarmdirresource.desktop
 usr/share/akonadi/agents/kalarmresource.desktop
 usr/share/akonadi/agents/kcalresource.desktop
 usr/share/akonadi/agents/kdeaccountsresource.desktop
-# usr/share/akonadi/agents/kolabproxyresource.desktop
+usr/share/akonadi/agents/kolabproxyresource.desktop
 usr/share/akonadi/agents/localbookmarksresource.desktop
 usr/share/akonadi/agents/maildirresource.desktop
 usr/share/akonadi/agents/maildispatcheragent.desktop
 usr/share/akonadi/agents/mboxresource.desktop
-# usr/share/akonadi/agents/microblog.desktop
+usr/share/akonadi/agents/microblog.desktop
 usr/share/akonadi/agents/migrationagent.desktop
 usr/share/akonadi/agents/mixedmaildirresource.desktop
 usr/share/akonadi/agents/mtdummyresource.desktop
@@ -125,13 +125,13 @@ usr/share/applications/kde4/accountwizard.desktop
 usr/share/applications/kde4/akonaditray.desktop
 usr/share/autostart/kaddressbookmigrator.desktop
 usr/share/icons/hicolor/*/apps/akonaditray.png
-# usr/share/icons/hicolor/*/apps/kolab.png
+usr/share/icons/hicolor/*/apps/kolab.png
 usr/share/icons/hicolor/*/apps/ox.png
 usr/share/icons/hicolor/scalable/apps/akonaditray.svgz
 usr/share/kde4/apps/akonadi/accountwizard/contacts/
 usr/share/kde4/apps/akonadi/accountwizard/ical/
 usr/share/kde4/apps/akonadi/accountwizard/imap/
-# usr/share/kde4/apps/akonadi/accountwizard/kolab/
+usr/share/kde4/apps/akonadi/accountwizard/kolab/
 usr/share/kde4/apps/akonadi/accountwizard/mailbox/
 usr/share/kde4/apps/akonadi/accountwizard/maildir/
 usr/share/kde4/apps/akonadi/accountwizard/pop3/

-- 
KDE PIM Runtime module packaging