[SCM] konquest packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-7-ga6ad438

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 6e7f32dff09b1e056863b212be39f2061f848378
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 16:34:56 2014 +0100

    update to 14.11.97
---
 debian/.gitattributes | 1 -
 debian/changelog      | 2 +-
 debian/control        | 6 +++---
 debian/watch          | 4 +---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 463b418..32d28c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-konquest (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+konquest (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream RC release
 
diff --git a/debian/control b/debian/control
index 3787864..027c49d 100644
--- a/debian/control
+++ b/debian/control
@@ -18,13 +18,13 @@ Build-Depends: cmake,
                pkg-kde-tools (>= 0.14)
 Standards-Version: 3.9.5
 Homepage: http://games.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/konquest.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/konquest.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/konquest.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/konquest.git
 
 Package: konquest
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: khelpcenter
+Recommends: khelpcenter4
 Description: simple turn-based strategy game
  Konquest is a game of galactic conquest for KDE, where rival empires vie to
  conquer planets and crush all opposition.  The game can be played with up to
diff --git a/debian/watch b/debian/watch
index a71a712..974ebb3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/konquest-([\d.]+).tar.xz
-
-http://download.kde.org/unstable/applications/([\d.]+)/src/konquest-([\d.]+).tar.xz
+http://download.kde.org/stable/([\d.]+)/src/konquest-([\d.]+).tar.xz

-- 
konquest packaging