[SCM] kfilemetadata packaging branch, kubuntu_unstable, updated. 4b2029ae309b8ecee7f669e4b297cdf2f8a1eff3
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Thu Nov 13 13:09:15 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kfilemetadata.git;a=commitdiff;h=4b2029a
The following commit has been merged in the kubuntu_unstable branch:
commit 4b2029ae309b8ecee7f669e4b297cdf2f8a1eff3
Merge: a44ddd8178dda45c650d0668b9bd54837eba1e6f 291257d5d16cff8f78a3481d88c64011663a8b81
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date: Thu Nov 13 13:09:13 2014 +0000
Merge remote-tracking branch 'origin/master' into HEAD
debian/changelog | 7 +++++++
debian/source/lintian-overrides | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index 5079524,1e989ab..a6d0f04
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,9 +1,27 @@@
-kfilemetadata-kf5 (5.0.2-0ubuntu1) UNRELEASED; urgency=medium
+kfilemetadata-kf5 (5.1.1-0ubuntu1) vivid; urgency=medium
+ * New upstream release.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 10 Nov 2014 19:43:03 +0100
+
+kfilemetadata-kf5 (5.1.0.1-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 01 Oct 2014 15:44:16 +0200
+
+kfilemetadata-kf5 (5.0.2-0ubuntu1) utopic; urgency=medium
+
++<<<<<<<
+ * New upstream release
+ * Rename -dev package without version for consistency.
+ * Add replace/ break to the old package.
++=======
+ * New upstream release
+ * Rename -dev package without version for consistency.
+ * Add replace/ break to the old package.
+ * Remove no-human-maintainers lintian-override per ScottK
++>>>>>>>
-- Scarlett Clark <sgclark at kubuntu.org> Thu, 18 Sep 2014 07:04:40 -0700
--
kfilemetadata packaging
More information about the pkg-kde-commits
mailing list