[SCM] kapman packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-12-gc9927f8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kapman.git;a=commitdiff;h=93ec99a

The following commit has been merged in the master branch:
commit 93ec99a28c4a7fa72945acd617270beb9f021ea8
Merge: f8d448f57be2987cf3aba1efadafe524d8bb2d32 61dfa1d16c87e9226763f3104d87b715ada3d1b7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Sep 8 12:32:31 2015 +0200

    Merge tag 'ubuntu/4%15.08.0-0ubuntu1'
    
    'kapman Ubuntu release 4:15.08.0-0ubuntu1'

 debian/changelog      | 31 +++++++++++++++++++++++++++++++
 debian/control        |  7 +++----
 debian/kapman.install | 13 +------------
 debian/rules          |  2 +-
 debian/watch          |  1 +
 5 files changed, 37 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index ff40806,f948305..b99a20c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,34 +1,43 @@@
 +kapman (4:15.08.0-1~) UNRELEASED; 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).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 08 Sep 2015 12:30:15 +0200
 +
+ kapman (4:15.08.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:07:35 +0100
+ 
+ kapman (4:15.07.90-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+   * new upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 09:32:51 +0100
+ 
+ kapman (4:15.04.2-0ubuntu1) wily; urgency=medium
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+   * New upstream release
+   * Vivid backport
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 18:36:34 +0200
+ 
+ kapman (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:21:45 -0700
+ 
  kapman (4:14.12.2-1) experimental; urgency=medium
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
diff --cc debian/control
index 3407c35,39358ae..f666f66
--- a/debian/control
+++ b/debian/control
@@@ -9,13 -9,20 +9,11 @@@ Uploaders: Daniel Schepler <schepler at de
             George Kiagiadakis <gkiagiad at csd.uoc.gr>,
             Eshat Cakar <info at eshat.de>,
             Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 +Build-Depends: cmake (>= 2.8.12~),
                 debhelper (>= 9),
 -               extra-cmake-modules,
 -               gettext,
 -               kdoctools-dev,
 -               kgendesignerplugin,
 -               kinit-dev,
++<<<<<<< HEAD
 +               extra-cmake-modules (>= 1.3.0~),
-                kde-sc-dev-latest (>= 4:4.12),
-                kdelibs5-dev,
                 kio-dev,
-                libkdegames-dev (>= 4:14.12.2),
 -               libkf5archive-dev,
 -               libkf5attica-dev,
 -               libkf5auth-dev,
 -               libkf5bookmarks-dev,
 -               libkf5codecs-dev,
 -               libkf5completion-dev,
                 libkf5config-dev,
                 libkf5configwidgets-dev,
                 libkf5coreaddons-dev,
@@@ -25,9 -43,18 +23,10 @@@
                 libkf5windowsystem-dev,
                 libkf5xmlgui-dev,
                 libphonon4qt5-dev,
+                libphonon4qt5experimental-dev,
 -               libqt5svg5-dev,
 +               libqt5svg5-dev (>= 5.4),
-                pkg-kde-tools (>= 0.14),
+                pkg-kde-tools (>> 0.15.15),
 -               qtbase5-dev,
 -               qtdeclarative5-dev
 +               qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6
  Homepage: http://games.kde.org/
  Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/kapman.git

-- 
kapman packaging