Bug#854884: baloo: is this obsoleted by src:baloo-kf5?

[Andreas Beckmann <anbe@debian.org>]

Followup-For: Bug #854884
Control: tag -1 patch

Hi,

based on Boyuan's comment
  "In my understanding, perhaps baloo4 is completely useless in
   Debian Stretch with Plasma 5"
I'm attaching patches for src:baloo and src:baloo-kf5 to
* turn baloo4 into a transitional package pulling in baloo (>= 4:5) 
* let baloo-kf5 co-exist with the transitional baloo4

I tried to keep the changes minimal s.t. these packages should be
rebuildable for stretch-pu with versions 5.28.0-3~deb9u1 and
4.14.3-4~deb9u1. I'd expect simply dropping baloo4 from stretch
after it had been released would not be acceptable.


Andreas

diff -Nru baloo-4.14.3/debian/baloo4.install baloo-4.14.3/debian/baloo4.install
--- baloo-4.14.3/debian/baloo4.install	2014-08-02 08:09:41.000000000 +0200
+++ baloo-4.14.3/debian/baloo4.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-etc/dbus-1/system.d/org.kde.baloo.*
-usr/bin/baloo*
-usr/share/autostart/baloo_*
-usr/share/dbus-1/system-services/org.kde.baloo.*
-usr/share/icons/*/*/apps/baloo.png
-usr/share/polkit-1/actions/org.kde.baloo.*
diff -Nru baloo-4.14.3/debian/changelog baloo-4.14.3/debian/changelog
--- baloo-4.14.3/debian/changelog	2016-07-29 21:33:51.000000000 +0200
+++ baloo-4.14.3/debian/changelog	2017-07-02 11:41:43.000000000 +0200
@@ -1,3 +1,10 @@
+baloo (4:4.14.3-4) UNRELEASED; urgency=medium
+
+  * Turn baloo4 into a transitional package pulling in baloo-kf5.
+    (Closes: #854884)
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 02 Jul 2017 11:41:43 +0200
+
 baloo (4:4.14.3-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru baloo-4.14.3/debian/control baloo-4.14.3/debian/control
--- baloo-4.14.3/debian/control	2016-07-29 21:23:39.000000000 +0200
+++ baloo-4.14.3/debian/control	2017-07-02 11:41:43.000000000 +0200
@@ -26,21 +26,11 @@
 
 Package: baloo4
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-         baloo-utils,
-         libqt4-sql-sqlite
-Replaces: baloo (<< 4:4.13.2-0ubuntu3),
-          kde-runtime (<< 4:4.12.80),
-          kde-runtime-data (<< 4:4.12.80)
-Breaks: baloo (<< 4:4.13.2-0ubuntu3),
-        kde-runtime (<< 4:4.12.80),
-        kde-runtime-data (<< 4:4.12.80)
-Conflicts: baloo-kf5, baloo-kf5-data
-Description: framework for searching and managing metadata
+Depends: ${misc:Depends}, baloo (>= 4:5)
+Description: transitional package for upgrading to baloo-kf5
  A framework for searching and managing metadata in KDE.
  .
- This package contains the kdelibs4 version of the binaries, it can also
- be replaced with baloo-kf5.
+ This is a transitional package for upgrading to baloo-kf5.
 
 Package: baloo-utils
 Architecture: any

diff -Nru baloo-kf5-5.28.0/debian/changelog baloo-kf5-5.28.0/debian/changelog
--- baloo-kf5-5.28.0/debian/changelog	2016-12-07 14:31:44.000000000 +0100
+++ baloo-kf5-5.28.0/debian/changelog	2017-07-02 12:20:02.000000000 +0200
@@ -1,3 +1,10 @@
+baloo-kf5 (5.28.0-3) UNRELEASED; urgency=medium
+
+  * baloo-kf5: Make Breaks+Replaces: baloo4 versioned, this was turned into a
+    transitional package in 4.14.3-4.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 02 Jul 2017 12:20:02 +0200
+
 baloo-kf5 (5.28.0-2) unstable; urgency=medium
 
   * Add new patch: Disable-the-file-indexer-by-default.patch
diff -Nru baloo-kf5-5.28.0/debian/control baloo-kf5-5.28.0/debian/control
--- baloo-kf5-5.28.0/debian/control	2016-12-07 14:31:44.000000000 +0100
+++ baloo-kf5-5.28.0/debian/control	2017-07-02 12:19:57.000000000 +0200
@@ -61,8 +61,8 @@
 Section: utils
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: baloo (<< 4:5.0), baloo4, ${kde-l10n:all}
-Replaces: baloo (<< 4:5.0), baloo4, ${kde-l10n:all}
+Breaks: baloo (<< 4:5.0), baloo4 (<< 4.14.3-4~), ${kde-l10n:all}
+Replaces: baloo (<< 4:5.0), baloo4 (<< 4.14.3-4~), ${kde-l10n:all}
 Description: framework for searching and managing metadata
  A framework for searching and managing metadata in KDE Software.
  .