[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:53 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kidletime.git;a=commitdiff;h=a45e3aa
The following commit has been merged in the master branch:
commit a45e3aa2713f9f8b01cf1e1b26afe38104c86bba
Merge: fc6f3a3991e8589d262ebfc8be134b457021c13a 89a58d7e24f0b7fed4c5eb7fa65c9d5c87a08ffd
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Wed Jul 8 11:23:13 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_vivid_backports' into kubuntu_unstable
Conflicts:
debian/changelog
debian/control
debian/changelog | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index 2ade32c,c02d9ff..9e28b08
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,25 @@@
+ kidletime (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ [ Jonathan Riddell ]
+ * Add pkg-config
+
+ [ Scarlett Clark ]
+ * Vivid backport
-
++
+ -- 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
+
- * Add pkg-config
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 15 Jun 2015 07:08:38 +0200
++ * 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