[SCM] baloo packaging branch, master, updated. 1391c65420aad7cd4db13efb6fd89e51131acb37
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jul 1 12:18:33 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/baloo.git;a=commitdiff;h=aeb4784
The following commit has been merged in the master branch:
commit aeb478463300609bbdead3912640bf997653d2aa
Merge: c4822bf78986e96ef2dc6be6dcd4f4ef3f67e5ff 87e753698b5e6f648b45339312e3af82a62ded14
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jul 1 00:50:20 2015 +0200
Merge remote-tracking branch 'origin/kubuntu_stable'
Conflicts:
debian/changelog
debian/control
debian/changelog | 43 +++++++-
debian/control | 16 ++-
debian/libkf5baloo1.symbols | 227 ++++++++++++++++++++++++++++++++++++++
debian/libkf5balooxapian1.symbols | 57 ++++++++++
debian/rules | 6 +
5 files changed, 346 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index 779f6be,f40a595..9a010d2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,56 +1,68 @@@
-baloo-kf5 (5.9.2-0ubuntu1) UNRELEASED; urgency=medium
+baloo-kf5 (5.9.2-1~) UNRELEASED; urgency=medium
- * New upstream release
+ * New upstream release (5.9.0).
+ * New upstream release (5.9.1).
+ * New upstream release (5.9.2).
- -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 29 Jun 2015 17:04:12 +0200
+ -- Maximiliano Curia <maxy at debian.org> Tue, 30 Jun 2015 12:22:45 +0200
+ baloo-kf5 (5.9.1-0ubuntu1) wily; urgency=medium
+
+ * New upstream release
+
- -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 04 Jun 2015 20:12:12 +0200
-
-baloo-kf5 (5.9.0-0ubuntu1) UNRELEASED; urgency=medium
-
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ [ Harald Sitter ]
+ * Fix baloo -> baloo-kf5 transitional dependency requirement to >= rather
+ than as = cannot be met by the source:Upstream-Version substvar
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 23 Apr 2015 18:12:09 +0200
+
+baloo-kf5 (5.6.2-1) experimental; urgency=medium
+
+ [ Scarlett Clark ]
+ * New upstream release
+ * Bump version depends.
+ * Update renamed dependency kfilemetadata-dev
+ * Fix version.
+
+ [ Maximiliano Curia ]
+ * Prepare Debian release. (5.6.1-1)
+ * New upstream release (5.6.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 25 Mar 2015 23:17:29 +0100
+
+ 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
+
baloo-kf5 (5.6.1-0ubuntu1) vivid; urgency=medium
-- * New upstream release
- * Bump kfilemetadata version so hopefully armhf will find it.
++ * New upstream release
++ * Bump kfilemetadata version so hopefully armhf will find it.
-- Scarlett Clark <sgclark at kubuntu.org> Mon, 23 Feb 2015 09:52:31 -0800
@@@ -74,7 -87,12 +114,8 @@@ baloo-kf5 (5.0.2-0ubuntu1) utopic; urge
* New upstream release
* Bump version depends.
* Update renamed dependency kfilemetadata-dev
+ * Fix version.
- -- Scarlett Clark <sgclark at kubuntu.org> Thu, 18 Sep 2014 06:38:18 -0700
-
-baloo-kf5 (5.0.1b-0ubuntu1) UNRELEASED; urgency=medium
-
[ Jonathan Riddell ]
* New upstream bugfix release
diff --cc debian/control
index 4b36e17,a45a586..b26a581
--- a/debian/control
+++ b/debian/control
@@@ -92,3 -80,15 +92,15 @@@ Description: framework for searching an
Baloo is part of the KDE Plasma desktop.
.
This package contains the debugging symbols.
+
+ Package: baloo
-Priority: extra
+ Section: oldlibs
++Priority: extra
+ Architecture: any
+ Depends: baloo-kf5 (>= ${source:Upstream-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.
--
baloo packaging
More information about the pkg-kde-commits
mailing list