[SCM] Akonadi packaging branch, debian/sid, updated. debian/16.04.3-2-19-g220d330

[Sandro Knauß]

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

The following commit has been merged in the debian/sid branch:
commit f759e75e966674923d93de8d8c6f2d9bbc2ee21e
Author: Sandro Knauß <hefee at debian.org>
Date:   Tue Nov 22 21:16:10 2016 +0100

    Merge libkf5akonadicore-bin into akonadi-server package
---
 debian/akonadi-server.install        |  1 +
 debian/changelog                     |  1 +
 debian/control                       | 14 +++++++-------
 debian/libkf5akonadicore-bin.install |  1 -
 debian/libkf5akonadicore5.symbols    |  2 +-
 debian/libkf5akonadiwidgets5.symbols |  2 +-
 debian/rules                         |  3 +--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/akonadi-server.install b/debian/akonadi-server.install
index e46b954..5839db5 100644
--- a/debian/akonadi-server.install
+++ b/debian/akonadi-server.install
@@ -4,6 +4,7 @@ usr/bin/akonadi_agent_server
 usr/bin/akonadi_control
 usr/bin/akonadi_rds
 usr/bin/akonadictl
+usr/bin/akonadiselftest
 usr/bin/akonadiserver
 usr/bin/asapcat
 usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service
diff --git a/debian/changelog b/debian/changelog
index 02cb578..c650e8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ akonadi (4:16.04.3-4~) UNRELEASED; urgency=medium
 
   [ Sandro Knauß ]
   * Remove unused source.lintian-overrides file.
+  * Merge libkf5akonadicore-bin into akonadi-server package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Nov 2016 17:36:51 +0100
 
diff --git a/debian/control b/debian/control
index 8a56e2b..f313ed5 100644
--- a/debian/control
+++ b/debian/control
@@ -49,8 +49,8 @@ Depends: akonadi-backend-mysql (= ${source:Version}) | akonadi-backend-sqlite (=
 Suggests: akonadi-backend-mysql (= ${source:Version}),
           akonadi-backend-postgresql (= ${source:Version}),
           akonadi-backend-sqlite (= ${binary:Version})
-Breaks: kdepimlibs-data (<<  4:16.04), kmail (<< 4:16.04), korganizer (<< 4:16.04), akonadiconsole (<< 4:16.04)
-Replaces: kdepimlibs-data (<<  4:16.04)
+Breaks: kdepimlibs-data (<<  4:16.04), kmail (<< 4:16.04), korganizer (<< 4:16.04), akonadiconsole (<< 4:16.04), libkf5akonadicore-bin (<< 4:16.04.3-4)
+Replaces: kdepimlibs-data (<<  4:16.04), libkf5akonadicore-bin (<< 4:16.04.3-4)
 Description: Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service. It provides a common framework for applications to store and
@@ -123,11 +123,11 @@ Description: Akonadi core library
 
 Package: libkf5akonadicore-bin
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Tools for Akonadi core library
- Tools used by Akonadi PIM data server core classes.
- .
- This package is part of the KDE Development Platform PIM libraries module.
+Depends: akonadi-server (>= 4:16.04.3-4), ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
 
 Package: libkf5akonadiwidgets5
 Architecture: any
diff --git a/debian/libkf5akonadicore-bin.install b/debian/libkf5akonadicore-bin.install
deleted file mode 100644
index ebf26fd..0000000
--- a/debian/libkf5akonadicore-bin.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/akonadiselftest
diff --git a/debian/libkf5akonadicore5.symbols b/debian/libkf5akonadicore5.symbols
index 686042c..d69b735 100644
--- a/debian/libkf5akonadicore5.symbols
+++ b/debian/libkf5akonadicore5.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:16.04.3 alpha mips mips64el mipsel
-libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#, libkf5akonadicore-bin
+libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#
  _Z5qHashRKN7Akonadi8RelationE at Base 15.07.90
  (optional=templinst)_ZN12KConfigGroup10writeEntryIxEEvPKcRK5QListIT_E6QFlagsIN11KConfigBase15WriteConfigFlagEE at Base 15.07.90
  _ZN7Akonadi10Collection10setEnabledEb at Base 15.07.90
diff --git a/debian/libkf5akonadiwidgets5.symbols b/debian/libkf5akonadiwidgets5.symbols
index 84d540d..ba1944f 100644
--- a/debian/libkf5akonadiwidgets5.symbols
+++ b/debian/libkf5akonadiwidgets5.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:16.04.0 amd64
-libKF5AkonadiWidgets.so.5 libkf5akonadiwidgets5 #MINVER#, libkf5akonadicore-bin
+libKF5AkonadiWidgets.so.5 libkf5akonadiwidgets5 #MINVER#
  _ZN7Akonadi10ControlGui11qt_metacallEN11QMetaObject4CallEiPPv at Base 15.07.90
  _ZN7Akonadi10ControlGui11qt_metacastEPKc at Base 15.07.90
  _ZN7Akonadi10ControlGui16staticMetaObjectE at Base 15.07.90
diff --git a/debian/rules b/debian/rules
index 412ad2b..b3a8b95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,7 @@ override_dh_makeshlibs:
 	$(overridden_command) -V -- -c0
 
 override_dh_shlibdeps:
-	$(overridden_command) -plibkf5akonadiwidgets5 -- -xkdepimlibs-data -xlibkf5akonadicore-bin
-	$(overridden_command) --remaining-packages -- -xkdepimlibs-data
+	$(overridden_command) -- -xkdepimlibs-data
 
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='akonadi-dbg (<= 15.12.1-1~~)'

-- 
Akonadi packaging