[SCM] libkomparediff2 packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-13-g3578d96

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkomparediff2.git;a=commitdiff;h=4421e68

The following commit has been merged in the master branch:
commit 4421e68b5929f2455a5a9b5baba278d7038cf26c
Merge: 1f43123c6827f0429bee2019355281d791b2e4b1 85bf7e90c1d578b9b2bd9c2a11b52d620635b316
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Aug 30 23:53:34 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_wily_archive'

 debian/changelog                                   | 173 +++++++++++++++++++
 debian/control                                     |  17 +-
 debian/libkomparediff2-4.install                   |   2 -
 debian/libkomparediff2-4.symbols                   | 183 --------------------
 ...libkomparediff2-4.acc => libkomparediff2-5.acc} |   0
 debian/libkomparediff2-5.install                   |   2 +
 debian/libkomparediff2-5.symbols                   | 187 +++++++++++++++++++++
 debian/libkomparediff2-dev.install                 |   4 +-
 debian/rules                                       |   2 +-
 debian/source/local-options                        |   1 -
 debian/watch                                       |   1 +
 11 files changed, 373 insertions(+), 199 deletions(-)

diff --cc debian/changelog
index 9e89bd6,4ea2a4b..7beef18
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,59 +1,66 @@@
 +libkomparediff2 (4:15.08.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (15.04.0).
 +  * New upstream release (15.08.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 30 Aug 2015 23:45:01 +0200
 +
+ libkomparediff2 (4:15.08.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:50:27 +0100
+ 
+ libkomparediff2 (4:15.07.90-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 11:26:53 +0100
+ 
+ libkomparediff2 (4:15.04.2-0ubuntu1) wily; urgency=medium
+ 
+   [ Harald Sitter ]
+   * KDE Frameworks 5 port
+ 
+   [ Scarlett Clark ]
+   * manual merge
+   * New upstream release
+   * New upstream release
+   * Vivid backport
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 22:30:59 +0200
+ 
+ libkomparediff2 (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+ 
+   * New upstream release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:50:52 -0700
+ 
+ libkomparediff2 (4:14.12.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove unstable from watch file, uscan fails with 
+     remote site does not even have current version
+     
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 08:43:27 -0800
+ 
+ libkomparediff2 (4:14.12.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+   * Remove kdelibs5-dev depend version as there was not a new release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 15 Dec 2014 16:10:05 +0100
+ 
+ libkomparediff2 (4:14.11.97-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 01 Dec 2014 18:03:50 +0100
+ 
  libkomparediff2 (4:4.14.2-1) unstable; urgency=medium
  
    * New upstream release (4.14.2).
diff --cc debian/control
index 6136a6c,0735245..4e3de45
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,11 +1,11 @@@
  Source: libkomparediff2
  Section: kde
  Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 +Build-Depends: cmake (>= 2.8.12~),
                 debhelper (>= 9),
 -               extra-cmake-modules (>= 0.0.9),
 +               extra-cmake-modules (>= 0.0.9~),
-                kde-sc-dev-latest (>= 4:4.12),
-                kdelibs5-dev (>= 4:4.12),
                 kio-dev,
                 libkf5codecs-dev,
                 libkf5config-dev,

-- 
libkomparediff2 packaging