[SCM] libkmahjongg4 packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-1-g14d77ee

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 14d77ee30f9afe4c4d3d9cfbfdd6df4ba319b8b3
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 3 13:23:35 2015 +0100

    Give source a number 4 suffix to unconflict with the new source that is ported to KDE Frameworks 5
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04a5539..cf35970 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libkmahjongg4 (4:14.12.2-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Give source a number 4 suffix to unconflict with the new source
+    that is ported to KDE Frameworks 5
+
+ -- Harald Sitter <sitter at kde.org>  Tue, 03 Mar 2015 13:19:22 +0100
+
 libkmahjongg (4:14.12.2-1) experimental; urgency=medium
 
   * New upstream release (14.12.2).
diff --git a/debian/control b/debian/control
index 10a79c1..f4802ff 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,8 @@ Build-Depends: cmake,
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
 Homepage: http://games.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/libkmahjongg.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/libkmahjongg.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/libkmahjongg4.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/libkmahjongg4.git
 
 Package: libkmahjongglib4
 Architecture: any

-- 
libkmahjongg4 packaging