[SCM] attica packaging branch, kubuntu_vivid_backports, updated. ubuntu/5.14.0-0ubuntu1-12-g5381d53
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Tue Sep 29 23:23:57 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/attica.git;a=commitdiff;h=9283ef9
The following commit has been merged in the kubuntu_vivid_backports branch:
commit 9283ef940d1c2a8277bc508a1b692089a13e84f6
Merge: bd0b925bbfbb56e2922bfbb372899a4088ca49fd ab5185f79b87be29175d31a208a22eadf4fb1af8
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Tue Sep 29 15:27:57 2015 -0700
* Vivid backport. * Manual merge, fix changelog failure.
-- Scarlett Clark <sgclark at kubuntu.org> Tue, 29 Sep 2015 14:53:15 -0700
* Vivid backport.
* Manual merge, fix changelog failure.
-- Scarlett Clark <sgclark at kubuntu.org> Tue, 29 Sep 2015 14:53:15 -0700
debian/changelog | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index e60c9ec,413c897..e0a1ad9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,13 +1,20 @@@
- attica-kf5 (5.9.0-0ubuntu2) UNRELEASED; urgency=medium
-attica-kf5 (5.14.0-0ubuntu1) UNRELEASED; urgency=medium
++attica-kf5 (5.14.0-0ubuntu2) UNRELEASED; urgency=medium
+
+ * Fix control line 9 failure.
+ * Fix merge.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 29 Sep 2015 15:12:00 -0700
+
+attica-kf5 (5.14.0-0ubuntu1) wily; urgency=medium
+ [ Clive Johnston ]
* new upstream release
- -- Clive Johnston <clivejo at aol.com> Thu, 17 Sep 2015 13:03:00 +0100
+ [ Scarlett Clark ]
+ * Vivid backport.
+ * Manual merge, fix changelog failure.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 29 Sep 2015 14:53:15 -0700
attica-kf5 (5.13.0-0ubuntu1) wily; urgency=medium
--
attica packaging
More information about the pkg-kde-commits
mailing list