[SCM] kaccounts-integration packaging branch, kubuntu_unstable, updated. ubuntu/4%15.07.90-0ubuntu1-5-g9ee3c24

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaccounts-integration.git;a=commitdiff;h=9ee3c24

The following commit has been merged in the kubuntu_unstable branch:
commit 9ee3c2419203814558274313386d31eb17ba8095
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Aug 26 16:19:05 2015 +0100

    add akonadi file
---
 debian/.gitattributes                | 1 -
 debian/kaccounts-integration.install | 1 +
 debian/source/local-options          | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/kaccounts-integration.install b/debian/kaccounts-integration.install
index 9de40e6..81206ad 100644
--- a/debian/kaccounts-integration.install
+++ b/debian/kaccounts-integration.install
@@ -1,3 +1,4 @@
+usr/lib/*/qt5/plugins/kaccounts/daemonplugins/kaccounts_akonadi_plugin.so
 usr/lib/*/qt5/plugins/kcm_kaccounts.so
 usr/lib/*/qt5/plugins/kded_accounts.so
 usr/share/kservices5/
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
kaccounts-integration packaging