Merge ~panfaust/kubuntu-packaging/+git/akonadi:work into ~kubuntu-packagers/kubuntu-packaging/+git/akonadi:kubuntu_yakkety_archive

[Jose Manuel Santamaria Lema]

This merge request contains 2 commits. The second commit is just fixing the format of the latest changelog entry.

The first commit re-introduces the -bin depend injection by libkf5akonadicore5 symbols file; this was removed in kubuntu to avoid circular dependencies, however that's not the correct solution.

They tried to fix the circular dependencies in debian here:
https://anonscm.debian.org/git/pkg-kde/applications/akonadi.git/commit/?id=95455706d6f2fc7538651f48b95afaa1581278c8
That's not the correct solution either. It moves the -bin dependency injection to other symbols file, so I have the impression that they weren't able to figure this out properly and they applied that wrong solution because they didn't find other way to do it.

The correct solution is adding something like this to the rules file:
lib_packages = $(filter lib%,$(shell dh_listpackages))
override_dh_shlibdeps:
        $(overridden_command) $(foreach p,$(lib_packages),-p$(p)) -- -xkdepimlibs-data -xlibkf5akonadicore-bin
        $(overridden_command) --remaining-packages -- -xkdepimlibs-data

This way we don't have circular dependencies and we can keep the -bin depend injection in the libkf5akonadicore5 symbols file, which is where it should be.

[Philip Muškovac (yofel)]

I think you got the correct solution here, but why are you excluding kdepimlibs-data?

and nitpicking: fo -> for in the changelog

[Jose Manuel Santamaria Lema (panfaust)]

Hi Philip, thank you for your reply

> I think you got the correct solution here, but why are you excluding
> kdepimlibs-data?

kdepimlibs-data is being built by the source package kdepimlibs, which build depends on libkf5akonadi-dev. Building the package as it is in this merge request but without that exclusion at least libkf5akonadiagentbase5 and libkf5akonadixml5 would depend on kdepimlibs-data. This is an important issue, because as I said kdepimlibs build depends on akonadi so we would be in a circular situation.

> and nitpicking: fo -> for in the changelog

Indeed, thanks for noticing the typo.

diff --git a/debian/changelog b/debian/changelog
index ed0af6e..fe95960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,18 +6,10 @@ akonadi (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
   * Add versions to dependencies. Fix merge.
   * Fix merger in patch.
   * Fix merge in series
-
-  [ Philip Muškovac ]
-  * Update the Vcs URLs now that the repositories are hosted on
-    Launchpad
-
-  [ Scarlett Clark ]
   * Fix symbols file.
   * Debian merge: Remaining changes:
     mysql-server version. 
   * Fix duplicate packages from merge. 
-  * Remove dependency to libkf5akonadi-bin in symbols file as it caused
-    intra-circular dep.
   * Fix install files.
   * Fix spelling error in README 
   * Add MultiArch: same to akonadiprivate
@@ -25,18 +17,24 @@ akonadi (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium
   * Add akonadiserver to breaks and replaces. 
   * New upstream bugfix release
 
+  [ Philip Muškovac ]
+  * Update the Vcs URLs now that the repositories are hosted on
+    Launchpad
+
   [ Clive Johnston ]
-  * Temporarily disabled patch 
+  * Temporarily disabled patches
   * New upstream release (16.04.2)
+  * New upstream release (16.04.3)
+  * Refreshing symbols
 
   [ Rik Mills ]
   * Install binaries in correct packages
   * Drop libakonadi-kde4 breaks/replaces - fixes installing kgpg
     calligra-libs & other packages
 
-  [ Clive Johnston ]
-  * New upstream release (16.04.3)
-  * Refreshing symbols
+  [ José Manuel Santamaría Lema ]
+  * Add in the rules file an override for dh_shlibdeps to exclude
+    libkf5akonadicore-bin, this way we avoid a circular dependencies.
 
  -- Clive Johnston <[e-mail]>  Fri, 08 Jul 2016 00:40:13 +0100
 
diff --git a/debian/libkf5akonadicore5.lintian-overrides b/debian/libkf5akonadicore5.lintian-overrides
new file mode 100644
index 0000000..92dfe71
--- /dev/null
+++ b/debian/libkf5akonadicore5.lintian-overrides
@@ -0,0 +1 @@
+libkf5akonadicore5: symbols-declares-dependency-on-other-package libkf5akonadicore-bin
diff --git a/debian/libkf5akonadicore5.symbols b/debian/libkf5akonadicore5.symbols
index 95eecaf..ffb3acf 100644
--- a/debian/libkf5akonadicore5.symbols
+++ b/debian/libkf5akonadicore5.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:16.04.3 amd64 i386
-libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#
+libKF5AkonadiCore.so.5 libkf5akonadicore5 #MINVER#, libkf5akonadicore-bin
  _Z5qHashRKN7Akonadi8RelationE@Base 15.07.90
  (optional=templinst)_ZN12KConfigGroup10writeEntryIxEEvPKcRK5QListIT_E6QFlagsIN11KConfigBase15WriteConfigFlagEE@Base 15.07.90
  _ZN7Akonadi10Collection10setEnabledEb@Base 15.07.90
diff --git a/debian/rules b/debian/rules
index 178c498..ab6f4f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 
 backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
+lib_packages = $(filter lib%,$(shell dh_listpackages))
 
 override_dh_auto_configure:
 	$(overridden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld-akonadi \
@@ -25,6 +26,10 @@ override_dh_installdocs:
 override_dh_makeshlibs:
 	$(overridden_command) -V -- -c0
 
+override_dh_shlibdeps:
+	$(overridden_command) $(foreach p,$(lib_packages),-p$(p)) -- -xkdepimlibs-data -xlibkf5akonadicore-bin
+	$(overridden_command) --remaining-packages -- -xkdepimlibs-data
+
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='akonadi-dbg (<= 15.12.1-1~~)'