[SCM] kiriki packaging branch, master, updated. debian/4.12.2-2-59-gacb1850

Tue Jul 29 22:20:58 UTC 2014

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

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

    merge
---
 debian/changelog | 13 +++++++++++++
 debian/compat    |  2 +-
 debian/control   | 34 ++++++++++++++++++++++++----------
 debian/copyright | 32 ++++++++++++++++++++------------
 debian/rules     | 10 ++++++++++
 5 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b6f228..f9857d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kiriki (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:42 +0000
+
+kiriki (4:4.10.2-1) experimental; urgency=low
+
+  * First release of kdegames after being split by upstream.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 09 Apr 2013 19:59:28 +0200
+
 kiriki (4:4.10.2-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release
@@ -39,3 +51,4 @@ kiriki (4:4.9.90-0ubuntu1) raring; urgency=low
   * Initial release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:55:57 +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 9446f0d..6b2c183 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,34 @@
 Source: kiriki
-Priority: extra
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-Build-Depends: cmake,
-               debhelper (>= 8.0.0),
-               kdelibs5-dev (>= 4:4.10.2),
-               libkdegames-dev (>= 4:4.10.2),
-               pkg-kde-tools
-Standards-Version: 3.9.3
 Section: games
-Homepage: http://www.kde.org
+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)
+Standards-Version: 3.9.4
+Homepage: http://games.kde.org/
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kiriki
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kiriki
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kiriki.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kiriki.git
 
 Package: kiriki
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdegames-data (>= ${source:Upstream-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: khelpcenter4
 Description: Yahtzee dice game
  Kiriki is a dice game for up to six players, where each player rolls five dice
  to make combinations with the highest score.
  .
  This package is part of the KDE games module.
+
diff --git a/debian/copyright b/debian/copyright
index a08c4d7..b2c84e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,24 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kiriki
-Source: http://kde.org
+Upstream-Contact: Albert Astals Cid <aacid at kde.org>
+                  Wolfgang Rohdewald <wolfgang at rohdewald.de>
+Source: http://www.kde.org/download/
 
 Files: *
-Copyright: 2005, 2008 by Albert Astals Cid <tsdgeos at terra.es>
+Copyright: 2005-2007, Albert Astals Cid <aacid at kde.org>
 License: GPL-2+
 
-Files: doc/index.docbook
-Copyright: 2007 by Albert Astals Cid <tsdgeos at terra.es>
-License: GFDL-1.2
+Files: doc/*
+Copyright: 2005-2007, Albert Astals Cid <aacid at kde.org>
+License: GFDL-1.2+
+
+Files: src/computer.cpp
+Copyright: 1998, the Free Software Foundation
+           2005-2007, Albert Astals Cid <aacid 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+
@@ -22,16 +29,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;
@@ -39,5 +46,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/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

-- 
kiriki packaging

