[SCM] KDE metapackages branch, kde4.12, updated. debian/82-7-ge6cbca4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/meta-kde.git;a=commitdiff;h=78fbee9

The following commit has been merged in the kde4.12 branch:
commit 78fbee9c4b6f84eceed1d5c1bfc5091cfbecc099
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Feb 7 10:04:56 2014 +0100

    Replace kbattleship with knavalbattle.
---
 debian/changelog | 3 +++
 debian/control   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a73470..d5abc19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ meta-kde (5:83) UNRELEASED; urgency=medium
   * Make the minimum kdepim version the same as the minimum KDE SC version.
   * Remove the "4" from the short description of kdenetwork.
 
+  [ Maximiliano Curia ]
+  * Replace kbattleship with knavalbattle.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Dec 2013 19:51:16 +0100
 
 meta-kde (5:82) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5d6895f..4f7e118 100644
--- a/debian/control
+++ b/debian/control
@@ -177,7 +177,6 @@ Depends: ${misc:Depends},
  granatier (>= ${kde:Version}),
  kapman (>= ${kde:Version}),
  katomic (>= ${kde:Version}),
- kbattleship (>= ${kde:Version}),
  kblackbox (>= ${kde:Version}),
  kblocks (>= ${kde:Version}),
  kbounce (>= ${kde:Version}),
@@ -193,6 +192,7 @@ Depends: ${misc:Depends},
  klines (>= ${kde:Version}),
  kmahjongg (>= ${kde:Version}),
  kmines (>= ${kde:Version}),
+ knavalbattle (>= ${kde:Version}),
  knetwalk (>= ${kde:Version}),
  kolf (>= ${kde:Version}),
  kollision (>= ${kde:Version}),
@@ -204,8 +204,8 @@ Depends: ${misc:Depends},
  kspaceduel (>= ${kde:Version}),
  ksquares (>= ${kde:Version}),
  ksudoku (>= ${kde:Version}),
- ktuberling (>= ${kde:Version}),
  ktron (>= ${kde:Version}),
+ ktuberling (>= ${kde:Version}),
  kubrick (>= ${kde:Version}),
  lskat (>= ${kde:Version}),
  palapeli (>= ${kde:Version}),

-- 
KDE metapackages