[SCM] knavalbattle packaging branch, master, updated. debian/14.12.2-1-6-gfd52db3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/knavalbattle.git;a=commitdiff;h=85dcb61

The following commit has been merged in the master branch:
commit 85dcb61edbcecd3313d0c7a5d9d2985f3999041c
Merge: 332f3f0f1ff2369b1123b67e1456285520424842 d67133fbc8ee4d43ffab9594eb7cbb96dd891feb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 17:31:08 2015 +0100

    Merge commit 'd67133fbc8ee4d43ffab9594eb7cbb96dd891feb'

 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index c87497a,976af68..b32d4f5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,9 +1,22 @@@
 +knavalbattle (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 12:33:09 +0100
 +
+ knavalbattle (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:57:02 -0700
+ 
 +knavalbattle (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Feb 2015 16:03:19 +0100
 +
  knavalbattle (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 305ae77,12d0aa0..cffb96a
--- a/debian/control
+++ b/debian/control
@@@ -14,12 -14,12 +14,12 @@@ Build-Depends: cmake
                 debhelper (>= 9),
                 kde-sc-dev-latest (>= 4:4.12),
                 kdelibs5-dev,
-                libkdegames-dev (>= 4:14.12.2),
+                libkdegames-dev (>= 4:14.12.3),
                 pkg-kde-tools (>= 0.14)
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
  Homepage: http://games.kde.org/
 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/knavalbattle.git/
 -Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/knavalbattle.git
 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/knavalbattle.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/knavalbattle.git
  
  Package: knavalbattle
  Architecture: any

-- 
knavalbattle packaging