[SCM] kollision packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-11-ge823d0f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kollision.git;a=commitdiff;h=6d7e7ab

The following commit has been merged in the master branch:
commit 6d7e7abbb308b26b80123d80cac73f7609e2bb3d
Merge: 420a78b0fcc1e4cce23f1e132f6e2265e1d8ff46 cede2dcf6f73f7f327bc641d859a53f03d8246a1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Sep 9 22:47:17 2015 +0200

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

 debian/changelog         | 30 ++++++++++++++++++++++++++++++
 debian/control           |  6 ++----
 debian/kollision.install | 24 +-----------------------
 debian/rules             |  2 +-
 debian/watch             |  1 +
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --cc debian/changelog
index 1f01c57,9068f30..7dd9b8f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,33 +1,41 @@@
 +kollision (4:15.08.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (15.04.0).
 +  * New upstream release (15.04.1).
 +  * New upstream release (15.08.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 09 Sep 2015 22:45:34 +0200
 +
+ kollision (4:15.08.0-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 17:32:36 +0100
+ 
+ kollision (4:15.07.90-0ubuntu1) wily; urgency=medium
+ 
+   * new upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 10:49:32 +0100
+ 
+ kollision (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 19:13:41 +0200
+ 
+ kollision (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:23:07 -0700
+ 
  kollision (4:14.12.2-1) experimental; urgency=medium
  
    * New upstream release (14.12.2).
diff --cc debian/control
index d89a715,815ca52..938fc58
--- a/debian/control
+++ b/debian/control
@@@ -1,38 -1,62 +1,36 @@@
  Source: kollision
 -Build-Depends: cmake,
 +Section: games
 +Priority: optional
 +Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 +Uploaders: Daniel Schepler <schepler at debian.org>,
 +           Sune Vuorela <sune at debian.org>,
 +           Fathi Boudra <fabo at debian.org>,
 +           Modestas Vainius <modax at debian.org>,
 +           George Kiagiadakis <gkiagiad at csd.uoc.gr>,
 +           Eshat Cakar <info at eshat.de>,
 +           Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
 +           Maximiliano Curia <maxy at debian.org>
 +Build-Depends: cmake (>= 2.8.12~),
                 debhelper (>= 9),
 -               extra-cmake-modules,
 -               gettext,
 -               kdoctools-dev,
 -               kgendesignerplugin,
 -               kinit-dev,
 +               extra-cmake-modules (>= 1.7.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,
 -               libkf5crash-dev,
                 libkf5dbusaddons-dev,
 -               libkf5emoticons-dev,
 -               libkf5globalaccel-dev,
 -               libkf5guiaddons-dev,
                 libkf5i18n-dev,
 -               libkf5iconthemes-dev,
 -               libkf5itemmodels-dev,
 -               libkf5itemviews-dev,
 -               libkf5jobwidgets-dev,
 -               libkf5kdegames-dev,
 +               libkf5kdegames-dev (>= 4.9.0~),
+                libkf5kdelibs4support-dev,
                 libkf5newstuff-dev,
 -               libkf5notifications-dev,
                 libkf5notifyconfig-dev,
 -               libkf5parts-dev,
 -               libkf5service-dev,
 -               libkf5solid-dev,
 -               libkf5sonnet-dev,
                 libkf5textwidgets-dev,
 -               libkf5unitconversion-dev,
                 libkf5widgetsaddons-dev,
 -               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
 -Section: games
 -Priority: optional
 -Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Uploaders: Daniel Schepler <schepler at debian.org>,
 -           Sune Vuorela <sune at debian.org>,
 -           Fathi Boudra <fabo at debian.org>,
 -           Modestas Vainius <modax at debian.org>,
 -           George Kiagiadakis <gkiagiad at csd.uoc.gr>,
 -           Eshat Cakar <info at eshat.de>,
 -           Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
 -           Maximiliano Curia <maxy at debian.org>
 +               qtbase5-dev (>= 5.4),
 +               qtdeclarative5-dev (>= 5.4)
  Standards-Version: 3.9.6
  Homepage: http://games.kde.org/
  Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/kollision.git

-- 
kollision packaging