[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.10.5-1-3-g968fc3c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 2086ef05239f4dc9ac33dc6ce82a2d8a2ae2e9a7
Author: Pino Toscano <pino at debian.org>
Date:   Tue Aug 27 18:38:21 2013 +0200

    enable the kolabproxy Akonadi resource (#705406)
    
    - add the libkolabxml-dev and libkolab-dev build dependencies
    - update kdepim-runtime.install with the newly installed files
---
 debian/changelog              |    4 ++++
 debian/control                |    3 ++-
 debian/kdepim-runtime.install |    6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3548314..459774e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdepim-runtime (4:4.10.5-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Enable the kolabproxy Akonadi resource: (Closes: #705406)
+    - add the libkolabxml-dev and libkolab-dev build dependencies
+    - update kdepim-runtime.install with the newly installed files
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 Aug 2013 18:35:38 +0200
 
diff --git a/debian/control b/debian/control
index b96ae24..be1564a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.10),
  kdepimlibs5-dev (>= 4:4.10.1), kdelibs5-dev (>= 4:4.10), libakonadi-dev (>= 1.8),
  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
+ nepomuk-core-dev, libqjson-dev,
+ libkolabxml-dev, libkolab-dev (>= 0.2)
 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
diff --git a/debian/kdepim-runtime.install b/debian/kdepim-runtime.install
index d731a17..287f484 100644
--- a/debian/kdepim-runtime.install
+++ b/debian/kdepim-runtime.install
@@ -8,6 +8,7 @@ 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_localbookmarks_resource
 usr/bin/akonadi_maildispatcher_agent
 usr/bin/akonadi_mailtransport_dummy_resource
@@ -106,6 +107,7 @@ usr/share/akonadi/agents/kalarmresource.desktop
 usr/share/akonadi/agents/kcalresource.desktop
 usr/share/akonadi/agents/kdeaccountsresource.desktop
 usr/share/akonadi/agents/knutresource.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
@@ -127,6 +129,7 @@ usr/share/icons/hicolor/128x128/apps/ox.png
 usr/share/icons/hicolor/16x16/apps/ox.png
 usr/share/icons/hicolor/32x32/apps/ox.png
 usr/share/icons/hicolor/48x48/apps/ox.png
+usr/share/icons/hicolor/64x64/apps/kolab.png
 usr/share/icons/hicolor/64x64/apps/ox.png
 usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.desktop
 usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.es
@@ -137,6 +140,9 @@ usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.ui
 usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.desktop
 usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.es
 usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.ui
+usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.desktop
+usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.es
+usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.ui
 usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.desktop
 usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.es
 usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.ui

-- 
KDE PIM Runtime module packaging