[SCM] kajongg packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-12-g5bec228

[Jonathan Riddell]

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

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

    update to 14.11.97
---
 debian/.gitattributes | 1 -
 debian/changelog      | 8 ++++++--
 debian/control        | 2 +-
 3 files changed, 7 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 e70bb8c..fa99eb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-kajongg (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kajongg (4:14.11.97-0ubuntu1~ubuntu15.04~ppa4) vivid; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release candidate
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 02 Dec 2014 10:19:17 -0800
+  [ Jonathan Riddell ]
+  * PPA build
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 11:51:27 +0100
 
 kajongg (4:14.11.95-0ubuntu2) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2fc33c1..6918082 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Depends: kdegames-mahjongg-data (>= 4:4.10),
          vorbis-tools,
          ${misc:Depends},
          ${python:Depends}
-Recommends: khelpcenter
+Recommends: khelpcenter4
 Description: classical Mah Jongg game
  This is the classical Mah Jongg for four players.
  If you are looking for the Mah Jongg solitaire please use the application

-- 
kajongg packaging