[SCM] kompare packaging branch, kubuntu_xenial_archive, updated. debian/15.08.1-1-12-g5eea800

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kompare.git;a=commitdiff;h=5eea800

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 5eea800d0bd78aa3c51eced0bfb0ef25332b5461
Merge: d4f45dbb428834c06627704ccf015101de7a5c52 73f560f3cea88fb2dfbf7c270e254a403da424a4
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 6 17:55:31 2016 +0000

    Merged with Debian

 debian/changelog                 | 38 ++++++++++++++++++++++------
 debian/control                   |  7 +++---
 debian/copyright                 | 53 +++++++++-------------------------------
 debian/kompare.lintian-overrides |  1 -
 debian/not-installed             |  4 ---
 5 files changed, 46 insertions(+), 57 deletions(-)

diff --cc debian/changelog
index 15983cb,4ccba9d..afb59b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,25 +1,46 @@@
- kompare (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++kompare (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
++  * Merged with Debian 
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 14:07:57 +0000
++ -- Clive Johnston <clivejo at aol.com>  Sat, 06 Feb 2016 17:54:24 +0000
++
+ kompare (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:23:45 +0100
  
 +kompare (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * Vivid backport
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 12:37:55 +0100
 +
 +kompare (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:12:22 +0100
 +
+ kompare (4:15.08.1-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 02:45:03 +0200
+ 
+ kompare (4:15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.1).
+   * New upstream release (15.04.3).
+   * New upstream release (15.08.0).
+   * Update copyright file.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Sep 2015 12:01:35 +0200
++>>>>>>> master
+ 
  kompare (4:15.08.0-0ubuntu1) wily; urgency=medium
  
    * new upstream release

-- 
kompare packaging