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

Wed Jul 30 14:18:32 UTC 2014

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

The following commit has been merged in the master branch:
commit c84b32779c8a6439fd26c9e62b45351c590b06fb
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Fri May 24 08:48:15 2013 +0000

    merge
---
 debian/changelog              | 21 ++++++++++++++++
 debian/compat                 |  2 +-
 debian/control                | 57 ++++++++++++++++++++-----------------------
 debian/copyright              | 35 ++++++++++++++++----------
 debian/kmahjongg-data.install |  5 ----
 debian/kmahjongg.install      | 14 ++++++++++-
 debian/rules                  | 10 ++++++++
 7 files changed, 94 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af987fd..336419c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+kmahjongg (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * Merge with Debian
+  * Replace/break kmahjongg-data
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:44 +0000
+
+kmahjongg (4:4.10.2-1) experimental; urgency=low
+
+  * First release of kdegames after being split by upstream.
+
+ -- Maximiliano Curia <maxy at debian.org>  Wed, 10 Apr 2013 13:03:05 +0200
+
+kmahjongg (4:4.10.2-0ubuntu2) saucy; urgency=low
+
+  * Rebuild without libkdegamesprivate1.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Wed, 22 May 2013 22:40:05 +0100
+
 kmahjongg (4:4.10.2-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release
@@ -72,3 +92,4 @@ kmahjongg (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
   * New package kmahjongg-data
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:58:38 +0000
+
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index f9b75ce..b729acb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,30 +1,35 @@
 Source: kmahjongg
-Priority: extra
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-Build-Depends: cmake,
-               debhelper (>= 8.0.0),
-               pkg-kde-tools,
-               kdelibs5-dev (>= 4:4.10.2),
-               libkdegames-dev (>= 4:4.10.2),
-               libkmahjongglib-dev (>= 4:4.9.90)
-Standards-Version: 3.9.3
 Section: games
-Homepage: http://www.kde.org
-
-Package: kmahjongg-data
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: kdegames-mahjongg-data (<< 4:4.9.97-0ubuntu2), kmahjongg (<< 4:4.10.0-0ubuntu3~)
-Breaks: kdegames-mahjongg-data (<< 4:4.9.97-0ubuntu2), kmahjongg (<< 4:4.10.0-0ubuntu3~)
-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.
+Priority: optional
+Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Daniel Schepler <schepler at debian.org>,
+ Sune Vuorela <sune at debian.org>,
+ Fathi Boudra <fabo at debian.org>,
+ Modestas Vainius <modax at debian.org>,
+ George Kiagiadakis <gkiagiad at csd.uoc.gr>,
+ Eshat Cakar <info at eshat.de>,
+ Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+ Maximiliano Curia <maxy at debian.org>
+Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
+ cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14),
+ kdelibs5-dev (>= 4:4.10),
+ libkdegames-dev (>= 4:4.10),
+ libkmahjongglib-dev (>= 4:4.10)
+Standards-Version: 3.9.4
+Homepage: http://games.kde.org/
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kmahjongg
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kmahjongg
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kmahjongg.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kmahjongg.git
 
 Package: kmahjongg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kmahjongg-data (>= ${source:Version}),
- kdegames-data
+Depends: ${shlibs:Depends}, ${misc:Depends},
+         kdegames-mahjongg-data (>= 4:4.10)
+Recommends: khelpcenter4
+Replaces: kmahjongg-data
+Breaks: kmahjongg-data
 Description: mahjongg solitaire game
  KMahjongg is a solitaire game where the player removes matching Mahjongg tiles
  to clear the board.  A variety of tile layouts are included, as well as an
@@ -32,11 +37,3 @@ Description: mahjongg solitaire game
  .
  This package is part of the KDE games module.
 
-Package: kdegames-mahjongg-data
-Architecture: all
-Section: oldlibs
-Depends: kmahjongg-data
-Description: dummy package now renamed to kmahjongg-data
- Dummy transitional package for kmahjongg-data
-
-
diff --git a/debian/copyright b/debian/copyright
index 0648b41..ba3fa7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,26 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kmahjongg
-Source: http://kde.org
+Upstream-Contact: Christian Krippendorf <coding at christian-krippendorf.de>
+                  Albert Astals Cid <aacid at kde.org>
+                  Wolfgang Rohdewald <wolfgang at rohdewald.de>
+Source: http://www.kde.org/download/
 
 Files: *
-Copyright: 1997 Mathias Mueller <in5y158 at public.uni-hamburg.de>
-           2006-2007 Mauricio Piacentini <mauricio at tabuleiro.com>
+Copyright: 1997, Mathias Mueller <in5y158 at public.uni-hamburg.de>
+           2006, Mauricio Piacentini <piacentini at kde.org>
 License: GPL-2+
 
-Files: doc/index.docbook
-Copyright: 2005 John Hayes <justlinux at bellsouth.net>
-License: GFDL-1.2
+Files: doc/*
+Copyright: 2005, John Hayes <justlinux at bellsouth.net>
+License: GFDL-1.2+
+
+Files: TileCoord.h
+Copyright: 1992-2006, Trolltech ASA.
+           2006, Mauricio Piacentini <piacentini at kde.org>
+License: GPL-2+
 
 Files: debian/*
-Copyright: 2012 Jonathan Riddell <jriddell at ubuntu.com>
+Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -23,16 +31,16 @@ License: GPL-2+
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: GFDL-1.2
+License: GFDL-1.2+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.2
  or any later version published by the Free Software Foundation;
@@ -40,5 +48,6 @@ License: GFDL-1.2
  A copy of the license is included in the section entitled "GNU
  Free Documentation License".
  .
- On Debian systems, the complete text of the GNU Free Documentation License
- version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
+
diff --git a/debian/kmahjongg-data.install b/debian/kmahjongg-data.install
deleted file mode 100644
index 94097bc..0000000
--- a/debian/kmahjongg-data.install
+++ /dev/null
@@ -1,5 +0,0 @@
-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
index f547643..7510f0a 100644
--- a/debian/kmahjongg.install
+++ b/debian/kmahjongg.install
@@ -1,2 +1,14 @@
-usr/share/applications/kde4/kmahjongg.desktop
+../icons/kmahjongg-16.xpm /usr/share/pixmaps
+../icons/kmahjongg.xpm /usr/share/pixmaps
 usr/games/kmahjongg
+usr/share/applications/kde4/kmahjongg.desktop
+usr/share/doc/kde/HTML/en/kmahjongg/*
+usr/share/icons/hicolor/128x128/apps/kmahjongg.png
+usr/share/icons/hicolor/16x16/apps/kmahjongg.png
+usr/share/icons/hicolor/22x22/apps/kmahjongg.png
+usr/share/icons/hicolor/32x32/apps/kmahjongg.png
+usr/share/icons/hicolor/48x48/apps/kmahjongg.png
+usr/share/icons/hicolor/64x64/apps/kmahjongg.png
+usr/share/icons/hicolor/scalable/apps/kmahjongg.svgz
+usr/share/kde4/apps/kmahjongg/*
+usr/share/kde4/config.kcfg/kmahjongg.kcfg
diff --git a/debian/rules b/debian/rules
index e36ca20..24e3402 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,5 +2,15 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+.PHONY: override_dh_auto_test
+
 override_dh_auto_configure:
 	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
+
+override_dh_auto_install:
+	$(overridden_command) --destdir=debian/tmp
+
+generate-icons:
+	while read src dest; do \
+		convert debian/tmp/$$src debian/icons/$$dest; \
+	done <debian/icon-list

-- 
kmahjongg packaging

