[SCM] akonadi-contacts packaging branch, master, updated. 780bbe030a31b3602d2206738d6a651bdf971916

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-contacts.git;a=commitdiff;h=86426a2

The following commit has been merged in the master branch:
commit 86426a2e9353f16f4f4e44622df6b325a50613ee
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Aug 20 14:41:39 2017 +0200

    Merge libkf5contacteditor-data into akonadi-contacts-data
    
    Two .categories files and the granlee theme can be in the
    akonadi-contacts-data package
---
 debian/akonadi-contacts-data.install    |  3 +++
 debian/control                          | 10 +++++++---
 debian/libkf5contacteditor-data.install |  4 ----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/akonadi-contacts-data.install b/debian/akonadi-contacts-data.install
index b9de8d9..c82994f 100644
--- a/debian/akonadi-contacts-data.install
+++ b/debian/akonadi-contacts-data.install
@@ -4,3 +4,6 @@ usr/share/kservices5/akonadi/contact/
 usr/share/kservices5/akonadicontact_actions.desktop
 usr/share/kservicetypes5/kaddressbookimprotocol.desktop
 usr/share/locale/
+etc/xdg/akonadi-contacts.categories
+etc/xdg/contact-editor.categories
+usr/share/contacteditor/grantleetheme/
diff --git a/debian/control b/debian/control
index 1cd8dbd..98a91c2 100644
--- a/debian/control
+++ b/debian/control
@@ -99,14 +99,16 @@ Breaks: kdepimlibs-data,
         libkf5akonadimime5 (<< 4:15.07.90+git20150819.1000),
         libkf5akonadisocialutils5 (<< 4:15.07.90+git20150819.1000),
         libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000),
-        ${kde-l10n:all}
+        ${kde-l10n:all},
+        libkf5contacteditor-data
 Replaces: kdepimlibs-data,
           libakonadi-kf5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadicontact5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadimime5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadisocialutils5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000),
-          ${kde-l10n:all}
+          ${kde-l10n:all},
+          libkf5contacteditor-data
 Description: Akonadi contacts access library - data files
  This library provides contacts manipulation helpers using the
  Akonadi PIM data server.
@@ -118,7 +120,7 @@ Description: Akonadi contacts access library - data files
 Package: libkf5contacteditor5
 Architecture: any
 Multi-Arch: same
-Depends: libkf5contacteditor-data (= ${source:Version}),
+Depends: akonadi-contacts-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Akonadi contact editor library
@@ -151,12 +153,14 @@ Breaks: kdepimlibs-data (<< 4:16.08~),
         libkf5akonadicontact5 (<< 4:16.04.3~),
         libkf5akonadisocialutils5 (<< 4:16.04.3~),
         libkf5akonadixml5 (<< 4:16.04.3~),
+        akonadi-contacts-data (<< 4:17.08~),
         ${kde-l10n:all}
 Replaces: kdepimlibs-data (<< 4:16.08~),
           libakonadi-kf5 (<< 4:16.04.3~),
           libkf5akonadicontact5 (<< 4:16.04.3~),
           libkf5akonadisocialutils5 (<< 4:16.04.3~),
           libkf5akonadixml5 (<< 4:16.04.3~),
+          akonadi-contacts-data (<< 4:17.08~),
           ${kde-l10n:all}
 Description: Akonadi contacts editor library - data files
  This library provides contacts manipulation helpers using the
diff --git a/debian/libkf5contacteditor-data.install b/debian/libkf5contacteditor-data.install
deleted file mode 100644
index e9041d2..0000000
--- a/debian/libkf5contacteditor-data.install
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/xdg/akonadi-contacts.categories
-etc/xdg/contact-editor.categories
-usr/share/contacteditor/grantleetheme/default/addresseslocation.css
-usr/share/contacteditor/grantleetheme/default/addresseslocation.html

-- 
akonadi-contacts packaging