[SCM] kreversi packaging branch, kubuntu_vivid_archive, updated. debian/4.13.1-1-7-g40755bc

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit f16b0475ee3955a3147076428cd1128849e7fd5f
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 05e1815..352f0fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kreversi (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kreversi (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream RC release
   * Merge with Debian, no changes
diff --git a/debian/control b/debian/control
index 728ab5c..1e0bf64 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/kreversi.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/kreversi.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kreversi.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kreversi.git
 
 Package: kreversi
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: khelpcenter
+Recommends: khelpcenter4
 Description: reversi board game
  KReversi is a board game where two players place pieces on the board to flip
  the opponent's pieces.  When neither player can flip any more pieces, the
diff --git a/debian/watch b/debian/watch
index 848ea60..2e65ca2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/kreversi-([\d.]+).tar.xz
-
-http://download.kde.org/unstable/applications/([\d.]+)/src/kreversi-([\d.]+).tar.xz
+http://download.kde.org/stable/([\d.]+)/src/kreversi-([\d.]+).tar.xz

-- 
kreversi packaging