[SCM] kidletime packaging branch, master, updated. debian/5.37.0-2-86-g062b4e5
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:43:54 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kidletime.git;a=commitdiff;h=52974a6
The following commit has been merged in the master branch:
commit 52974a6e74fb8d8d8a8d34c55e4d18ab0b991fe4
Merge: a45e3aa2713f9f8b01cf1e1b26afe38104c86bba 0ebd4d420788fb37a9ec243c55207566d99075c5
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Wed Jul 8 12:50:33 2015 -0700
Merge branch 'kubuntu_vivid_backports' into kubuntu_unstable
Conflicts:
debian/changelog
debian/changelog | 3 ++-
debian/libkf5idletime5.install | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index 9e28b08,e15f607..21837a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -5,21 -5,9 +5,22 @@@ kidletime (5.11.0-0ubuntu1) UNRELEASED
[ Scarlett Clark ]
* Vivid backport
-
+ * Add missing file.
+
-- Scarlett Clark <sgclark at kubuntu.org> Wed, 08 Jul 2015 08:20:44 -0700
+
+kidletime (5.11.0-1) unstable; urgency=medium
+
+ * New upstream release (5.10.0).
+ * New upstream release (5.11.0).
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 26 Jun 2015 16:08:49 +0200
+
+kidletime (5.10.0-0ubuntu2) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 03 Jun 2015 20:54:10 +0200
kidletime (5.10.0-0ubuntu1) wily; urgency=medium
--
kidletime packaging
More information about the pkg-kde-commits
mailing list