[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=a75dcb3
The following commit has been merged in the master branch:
commit a75dcb3c9d852c37110e143786582b4ba9eda40a
Merge: d402138a3ded051a2151acac7b6bfebf0a3be0dc 52974a6e74fb8d8d8a8d34c55e4d18ab0b991fe4
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Fri Jul 10 15:36:57 2015 -0700
Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
Conflicts:
debian/changelog
debian/changelog | 14 ++++++++++++++
debian/control | 2 +-
debian/libkf5idletime5.install | 1 +
3 files changed, 16 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index fb86d16,21837a6..2f20917
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,9 -4,23 +4,23 @@@ kidletime (5.12.0-0ubuntu1) UNRELEASED
* Add pkg-config
[ Scarlett Clark ]
- * Vivid backport
- * Add missing file.
+ * New upstream release
++ * Fix merge, remove unused broken backport.
- -- Scarlett Clark <sgclark at kubuntu.org> Wed, 08 Jul 2015 08:20:44 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Jul 2015 08:11:35 -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