[SCM] kmahjongg packaging branch, master, updated. debian/4.13.1-1-57-g596455d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kmahjongg.git;a=commitdiff;h=f7d00a6

The following commit has been merged in the master branch:
commit f7d00a619c27251ad6a28468a8572338c44798ef
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Thu Dec 6 14:27:41 2012 +0000

    * PPA build
    * New package kmahjongg-data
---
 debian/changelog              |  6 ++++--
 debian/control                | 17 +++++++++--------
 debian/kmahjongg-data.install |  5 +++++
 debian/kmahjongg.install      |  2 ++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8feb6fa..5979f71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-kmahjongg (4:4.9.80-0ubuntu1) UNRELEASED; urgency=low
+kmahjongg (4:4.9.90-0ubuntu1) UNRELEASED; urgency=low
 
   * Initial release
+  * PPA build
+  * New package kmahjongg-data
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 24 Nov 2012 05:40:53 +0000
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Dec 2012 17:39:45 +0000
diff --git a/debian/control b/debian/control
index 22503e2..9f65b4d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,25 +4,26 @@ Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 Build-Depends: cmake,
                debhelper (>= 8.0.0),
                pkg-kde-tools,
-               kdelibs5-dev (>= 4:4.9.80),
-               libkdegames-dev (>= 4:4.9.80),
-               libkmahjongglib-dev (>= 4:4.9.80)
+               kdelibs5-dev (>= 4:4.9.90),
+               libkdegames-dev (>= 4:4.9.90),
+               libkmahjongglib-dev (>= 4:4.9.90)
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://www.kde.org
 
-Package: kdegames-mahjongg-data
+Package: kmahjongg-data
 Architecture: all
 Depends: ${misc:Depends}
-Description: tilesets and backgrounds for Mahjongg games
- This package contains a collection of tilesets and backgrounds for KMahjongg
- and KShisen.
+Replaces: kdegames-mahjongg-data
+Breaks: kdegames-mahjongg-data
+Description: tilesets and backgrounds for kmahjongg
+ This package contains a collection of tilesets and backgrounds for KMahjongg.
  .
  This package is part of the KDE games module.
 
 Package: kmahjongg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdegames-mahjongg-data (>= ${source:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, kmahjongg-data (>= ${source:Version}),
  kdegames-data
 Description: mahjongg solitaire game
  KMahjongg is a solitaire game where the player removes matching Mahjongg tiles
diff --git a/debian/kmahjongg-data.install b/debian/kmahjongg-data.install
new file mode 100644
index 0000000..94097bc
--- /dev/null
+++ b/debian/kmahjongg-data.install
@@ -0,0 +1,5 @@
+usr/share/kde4/apps/kmahjongg/layouts/
+usr/share/icons/hicolor/
+usr/share/doc/kde/HTML/
+usr/share/kde4/apps/kmahjongg
+usr/share/kde4/config.kcfg
diff --git a/debian/kmahjongg.install b/debian/kmahjongg.install
new file mode 100644
index 0000000..855ff32
--- /dev/null
+++ b/debian/kmahjongg.install
@@ -0,0 +1,2 @@
+usr/share/applications/kde4/kmahjongg.desktop
+usr/bin/kmahjongg

-- 
kmahjongg packaging