[SCM] kiten packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-6-g43567c5

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit e99d0da8c8f121d20dd09b60f1dc8e4254dc168e
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 +-
 debian/source/local-options | 1 -
 4 files changed, 2 insertions(+), 4 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 872b224..033eba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kiten (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kiten (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release candidate
 
diff --git a/debian/control b/debian/control
index c0e0a02..1c68f19 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Architecture: any
 Depends: fonts-vlgothic | fonts-japanese-gothic,
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: khelpcenter
+Suggests: khelpcenter4
 Description: Japanese reference and study aid for KDE
  Kiten is a collection of Japanese reference tools and study aids for KDE,
  including a Japanese/English dictionary, Kanji dictionary, and Kanji quiz.
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
kiten packaging