[SCM] baloo packaging branch, kubuntu_vivid_archive, updated. 94265d355ee26d2dc7200c8afce559806da31e1c

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/baloo.git;a=commitdiff;h=94265d3

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 94265d355ee26d2dc7200c8afce559806da31e1c
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sun Apr 19 15:29:53 2015 +0200

     Fix baloo-kf5 replaces/conflicts baloo versions
    
    * Fix baloo-kf5 replaces/conflicts baloo versions
    * Fix baloo to depend on baloo-kf5 without epoch
    * Add transitional baloo package with 4: epoch
    * Remove baloo provides
    * Release to Archive
---
 debian/changelog | 22 +++++++++++++++++++++-
 debian/control   | 16 ++++++++++++++--
 debian/rules     |  6 ++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c32c18..2b7e71a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,26 @@
-baloo-kf5 (5.6.2-0ubuntu1) UNRELEASED; urgency=medium
+baloo-kf5 (5.6.2-0ubuntu4) vivid; urgency=medium
+
+  * Fix baloo-kf5 replaces/conflicts baloo versions
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 26 Mar 2015 15:42:24 +0100
+
+baloo-kf5 (5.6.2-0ubuntu3) vivid; urgency=medium
+
+  * Fix baloo to depend on baloo-kf5 without epoch
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 23:37:42 +0100
+
+baloo-kf5 (5.6.2-0ubuntu2) vivid; urgency=medium
+
+  * Add transitional baloo package with 4: epoch
+  * Remove baloo provides
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 21:27:57 +0100
+
+baloo-kf5 (5.6.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
+  * Release to Archive
  
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 19 Mar 2015 20:54:03 -0700
 
diff --git a/debian/control b/debian/control
index a622e67..2d09be5 100644
--- a/debian/control
+++ b/debian/control
@@ -43,8 +43,8 @@ Package: baloo-kf5
 Section: utils
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: baloo (<< 5.0)
-Provides: baloo
+Conflicts: baloo (<< 4:5.0)
+Replaces: baloo (<< 4:5.0)
 Description: framework for searching and managing metadata
  A framework for searching and managing metadata in KDE Software.
  .
@@ -80,3 +80,15 @@ Description: framework for searching and managing metadata
  Baloo is part of the KDE Plasma desktop.
  .
  This package contains the debugging symbols.
+
+Package: baloo
+Priority: extra
+Section: oldlibs
+Architecture: any
+Depends: baloo-kf5 (= ${source:Version}), ${misc:Depends}
+Description: transitional package for baloo
+ A framework for searching and managing metadata in KDE Software.
+ .
+ Baloo is part of the KDE Plasma desktop.
+ .
+ This package can be safely removed.
diff --git a/debian/rules b/debian/rules
index c0080e0..6f849ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,3 +9,9 @@ override_dh_strip:
 override_dh_auto_test:
 	PYBUILD_TEST_ARGS="export `dbus-launch`"\
 	dh_auto_test
+
+BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?//')
+
+override_dh_gencontrol:
+	dh_gencontrol -pbaloo -- '-v4:$(BINARY_VERSION_NO_EPOCH)'
+	dh_gencontrol --remaining-packages

-- 
baloo packaging