[SCM] ktimer packaging branch, kubuntu_xenial_archive, updated. debian/15.08.0-1-10-g1be12d2

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktimer.git;a=commitdiff;h=1be12d2

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 1be12d25ec3c5554ebda511252da05c0c04c0116
Merge: 5e051011a68226b062ae9d9d1e09f24bb3892a16 e93dbe0d33b09f5d2000d660e3de41780685d25b
Author: Clive Johnston <clivejo at aol.com>
Date:   Tue Feb 9 16:19:08 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog | 18 ++++++++++++++++--
 debian/control   |  7 ++++---
 debian/copyright | 20 +++++++++++++++++++-
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index f8e9d82,f50e723..bec2050
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,16 +1,36 @@@
- ktimer (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++ktimer (4:15.12.0-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Merged with Debian 
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:20:42 +0000
++ -- Clive Johnston <clivejo at aol.com>  Tue, 09 Feb 2016 16:18:17 +0000
++
+ ktimer (4:15.12.0-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:22:43 +0100
  
 +ktimer (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:47:59 +0100
 +
 +ktimer (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:27:45 +0100
 +
+ ktimer (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.08.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 10 Sep 2015 14:47:08 +0200
+ 
  ktimer (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * new upstream release

-- 
ktimer packaging