[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=fc6f3a3
The following commit has been merged in the master branch:
commit fc6f3a3991e8589d262ebfc8be134b457021c13a
Merge: c31e4ae93ccfe61852f0d97d508cdb0161388b33 35d3d05ec935f1299cefcbac398fc59a405d0691
Author: Harald Sitter <sitter at kde.org>
Date: Thu Jul 2 08:00:43 2015 +0200
Merge branch 'master' into kubuntu_unstable
Conflicts:
debian/control
debian/changelog | 7 +++++++
debian/control | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index 0855902,e1c036a..2ade32c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,26 @@@
+ 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
+
+kidletime (5.10.0-0ubuntu1) wily; urgency=medium
+
+ [ Maximiliano Curia ]
+ * New upstream release (5.10.0).
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 03 Jun 2015 20:54:10 +0200
+
kidletime (5.9.0-1) experimental; urgency=medium
* New upstream release (5.9.0).
--
kidletime packaging
More information about the pkg-kde-commits
mailing list