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

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 2 16:25:18 UTC 2017


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

The following commit has been merged in the master branch:
commit a39db1439ec21279e0720c4de5fa6aa2f90eecb7
Merge: 9476553c5c4f01854529fb3dc30d57881bac2e36 567e2e016c5ea6e91860387246d5434b68ee4db3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Aug 20 14:35:49 2017 +0200

    Merge remote-tracking branch 'neon/Neon/stable'

 debian/akonadi-contacts-data.install    |   2 +-
 debian/changelog                        |  78 ++++++++++++++++++++++
 debian/control                          |  71 ++++++++++++++++++--
 debian/libkf5akonadicontact-dev.install |   1 -
 debian/libkf5contacteditor-data.install |   4 ++
 debian/libkf5contacteditor-dev.install  |  13 ++++
 debian/libkf5contacteditor5.install     |   2 +
 debian/rules                            |   3 +
 debian/upstream/signing-key.asc         | 112 ++++++++++++++++++++++++++++++++
 debian/watch                            |   4 +-
 10 files changed, 281 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 05c6ace,de78428..34d264e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,83 +1,90 @@@
+ akonadi-contacts (4:17.08.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Thu, 17 Aug 2017 09:29:41 +0000
+ 
+ akonadi-contacts (4:17.04.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 12 Jul 2017 10:17:16 +0000
+ 
+ akonadi-contacts (4:17.04.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 07 Jun 2017 12:19:28 +0000
+ 
+ akonadi-contacts (4:17.04.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Thu, 11 May 2017 18:08:14 +0000
+ 
+ akonadi-contacts (4:17.04.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 19 Apr 2017 13:02:22 +0000
+ 
+ akonadi-contacts (4:16.12.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 08 Mar 2017 13:45:39 +0000
+ 
+ akonadi-contacts (4:16.12.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 08 Feb 2017 16:54:42 +0000
+ 
+ akonadi-contacts (4:16.12.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 11 Jan 2017 13:12:24 +0000
+ 
+ akonadi-contacts (4:16.12.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 14 Dec 2016 16:21:52 +0000
+ 
+ akonadi-contacts (4:16.08.3-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Mon, 21 Nov 2016 13:52:12 +0000
+ 
+ akonadi-contacts (4:16.08.2-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Fri, 14 Oct 2016 13:38:11 +0000
+ 
 +akonadi-contacts (4:16.08.1-1~1.gbp8b6dd4) UNRELEASED; urgency=medium
 +
 +  ** SNAPSHOT build @8b6dd44104a0f78e13b7822385048bcffd13aa3a **
 +
 +  [ Jonathan Riddell ]
 +  * Initial packaging based on kdepimlibs
 +
 +  [ Automatic packaging ]
 +  * Update build-deps and deps with the info from cmake
 +  * Update build-deps and deps with the info from cmake
 +
 + -- Automatic packaging <maxy+jenkins at gnuservers.com.ar>  Thu, 08 Sep 2016 21:07:32 +0200
+ akonadi-contacts (4:16.08.1-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Fri, 16 Sep 2016 13:06:12 +0000
+ 
+ akonadi-contacts (4:16.08.0-0neon) xenial; urgency=medium
+ 
+   * New release
+ 
+  -- Neon CI <neon at kde.org>  Wed, 17 Aug 2016 11:47:08 +0000
+ 
 -akonadi-contacts (4:16.07.90-0) unstable; urgency=low
 -
 -  * Initial packaging based on kdepimlibs
 -
 - -- Jonathan Riddell <jr at jriddell.org>  Wed, 10 Aug 2016 16:03:01 +0000
diff --cc debian/control
index a798c35,71ddc00..1cd8dbd
--- a/debian/control
+++ b/debian/control
@@@ -11,19 -11,19 +11,19 @@@ Uploaders: Sune Vuorela <sune at debian.or
             Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12~),
                 debhelper (>= 9),
 -               extra-cmake-modules (>= 5.19.0~),
 +               extra-cmake-modules (>= 5.23.0~),
                 kdesignerplugin (>= 5.16.0~),
                 kdoctools-dev (>= 5.19.0~),
 -               kio-dev (>= 5.19.0~),
 +               kio-dev (>= 5.23.0~),
                 libboost-dev (>= 1.34.0~),
                 libboost-graph-dev (>= 1.34.0~),
 -               libgrantlee5-dev (>= 5.0~),
 +               libgrantlee5-dev (>= 5.1~),
                 libkf5akonadi-dev (>= 4:16.04~),
-                libkf5akonadimime-dev (>= 5.3.1~),
+                libkf5akonadimime-dev (>= 4:15.12.1~),
                 libkf5akonadiserver-dev (>= 4:15.12.1~),
                 libkf5calendarcore-dev (>= 15.12.0~),
 -               libkf5codecs-dev (>= 5.19.0~),
 -               libkf5completion-dev (>= 5.19.0~),
 +               libkf5codecs-dev (>= 5.23.0~),
 +               libkf5completion-dev (>= 5.23.0~),
                 libkf5config-dev (>= 5.19.0~),
                 libkf5contacts-dev (>= 15.12.0~),
                 libkf5dbusaddons-dev (>= 5.19.0~),
@@@ -73,8 -76,9 +76,9 @@@ Architecture: an
  Multi-Arch: foreign
  Depends: libkf5akonadi-dev (>= 4:16.04~),
           libkf5akonadicontact5 (= ${binary:Version}),
 -         libkf5calendarcore-dev (>= 5.2.0~),
 +         libkf5calendarcore-dev (>= 5.3.1~),
 +         libkf5contacts-dev (>= 5.3.1~),
+          libkf5contacteditor-dev,
 -         libkf5contacts-dev (>= 5.2.0~),
           ${misc:Depends},
           ${shlibs:Depends}
  Description: Akonadi contacts access library - development files
@@@ -100,7 -105,53 +105,63 @@@ Replaces: kdepimlibs-data
            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)
+           libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000),
+           ${kde-l10n:all}
 -Description: akonadi-contacts - data files
 - This package contains data files for the akonadi-contacts libraries.
 +Description: Akonadi contacts access library - data files
-  This package contains data files for all libraries that are part of
-  akonadi-contacts.
++ This library provides contacts manipulation helpers using the
++ Akonadi PIM data server.
++ .
++ This package is part of the KDE Development Platform PIM libraries module.
++ .
++ This package contains the data files.
+ 
+ Package: libkf5contacteditor5
+ Architecture: any
+ Multi-Arch: same
+ Depends: libkf5contacteditor-data (= ${source:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
+ Description: Akonadi contact editor library
+  This library provides contacts manipulation helpers using the
+  Akonadi PIM data server.
+  .
+  This package is part of the KDE Development Platform PIM libraries module.
+ 
+ Package: libkf5contacteditor-dev
+ Section: libdevel
+ Architecture: any
+ Multi-Arch: foreign
+ Depends: libkf5contacteditor5 (= ${binary:Version}),
+          ${misc:Depends},
+          ${shlibs:Depends}
 -Description: Akonadi contacts access library - development files
++Description: Akonadi contacts editor library - development files
+  This library provides contacts manipulation helpers using the
+  Akonadi PIM data server.
+  .
+  This package is part of the KDE Development Platform PIM libraries module.
+  .
+  This package contains the development files.
+ 
+ Package: libkf5contacteditor-data
+ Architecture: all
+ Multi-Arch: foreign
+ Depends: ${misc:Depends}, ${shlibs:Depends}
+ Breaks: 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~),
+         ${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~),
+           ${kde-l10n:all}
 -Description: akonadi-contacts - data files
 - This package contains data files for the akonadi-contacts libraries.
++Description: Akonadi contacts editor library - data files
++ This library provides contacts manipulation helpers using the
++ Akonadi PIM data server.
++ .
++ This package is part of the KDE Development Platform PIM libraries module.
++ .
++ This package contains the data files.
diff --cc debian/rules
index b3a0e50,66a3744..f3e8c3a
mode 100755,100644..100644
--- a/debian/rules
+++ b/debian/rules

-- 
akonadi-contacts packaging



More information about the pkg-kde-commits mailing list