[SCM] killbots packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-6-g25f81b1

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 6bf664a97d17b3adeeb1ae71b04bae769dd704d9
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        | 2 +-
 3 files changed, 2 insertions(+), 3 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 75387d4..00bd72f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-killbots (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+killbots (4:14.11.97-0ubuntu1~ubuntu15.0~ppa1) vivid; urgency=medium
 
   * New upstream release candidate
 
diff --git a/debian/control b/debian/control
index ab6a344..75d8435 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/killbots.git
 Package: killbots
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: khelpcenter
+Recommends: khelpcenter4
 Description: port of the classic BSD console game robots
  killbots is a simple game of evading killer robots. The robots are numerous
  and their sole objective is to destroy you.  Fortunately for you, their

-- 
killbots packaging