[SCM] granatier packaging branch, master, updated. debian/4.12.4-1-62-gd70ecc7

Tue Jul 29 21:00:33 UTC 2014

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

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

    merge
---
 debian/changelog | 22 ++++++++++++++++++
 debian/compat    |  2 +-
 debian/control   | 37 ++++++++++++++++++++----------
 debian/copyright | 69 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 debian/rules     |  9 ++++++++
 5 files changed, 118 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f99779d..091af71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+granatier (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:24 +0000
+
+granatier (4:4.10.2-2) experimental; urgency=low
+
+  * Fix erroneous Upstream-Name in debian/copyright.
+  * Add a basic manpage.
+  * Simplify copyright file.
+  * Reshuffle dependencies to reduce resolver tries.
+
+ -- Maximiliano Curia <maxy at debian.org>  Thu, 02 May 2013 15:35:17 +0200
+
+granatier (4:4.10.2-1) experimental; urgency=low
+
+  * First release of kdegames after being split by upstream.
+
+ -- Maximiliano Curia <maxy at debian.org>  Sun, 07 Apr 2013 23:27:24 +0200
+
 granatier (4:4.10.2-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release
@@ -41,3 +62,4 @@ granatier (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
   * Initial release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:34:47 +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 ce8abea..0404d8e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,33 @@
 Source: granatier
-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: kdelibs5-dev (>= 4:4.10),
+ libkdegames-dev (>= 4:4.10),
+ kde-sc-dev-latest (>= 4:4.10.2),
+ cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14)
+Standards-Version: 3.9.4
+Homepage: http://games.kde.org/
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/granatier
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/granatier
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/granatier.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/granatier.git
 
 Package: granatier
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdegames-data (>= ${source:Upstream-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: khelpcenter4
 Description: Bomberman clone
- Granatier is a clone of the classic Bomberman game,
- inspired by the work of the Clanbomber clone.
+ Granatier is a clone of the classic Bomberman game, inspired by the work of
+ the Clanbomber clone.
  .
  This package is part of the KDE games module.
diff --git a/debian/copyright b/debian/copyright
index 4777e64..202a48f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,40 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: granatier
-Source: http://kde.org
+Upstream-Contact: Mathias Kraus <k.hias at gmx.de>
+                  Albert Astals Cid <aacid at kde.org>
+                  Wolfgang Rohdewald <wolfgang at rohdewald.de>
+Source: http://www.kde.org/download/
 
 Files: *
-Copyright: 2009 Mathias Kraus <k.hias at gmx.de>
-           2007-2008 Thomas Gallinari <tg8187 at yahoo.fr>
-           2007-2008 Pierre-Beno
+Copyright: 2006,2007, Mauricio Piacentini <mauricio at tabuleiro.com>
+           2007, Matt Williams <matt at milliams.com>
+           2007-2008, Alexandre Galinier <alex.galinier at hotmail.com>
+           2007-2008, Alexia Allanic <alexia_allanic at yahoo.fr>
+           2007-2008, Gaël Courcelle <gael.courcelle at gmail.com>
+           2007-2008, Johann Hingue <yoan1703 at hotmail.fr>
+           2007-2008, Nathalie Liesse <nathalie.liesse at gmail.com>
+           2007-2008, Pierre-Benoît Besse <besse.pb at gmail.com>
+           2007-2008, Thomas Gallinari <tg8187 at yahoo.fr>
+           2008-2012, Mathias Kraus <k.hias at gmx.de>
 License: GPL-2+
 
+Files: doc/*
+Copyright: 2009, Mathias Kraus <k.hias at gmx.de>
+License: GFDL-1.2+
+
+Files: *.png *.svgz *.xpm
+Copyright: 2009, Mathias Kraus <k.hias at gmx.de>
+           2009, Arturo Silva <jasilva28 at gmail.com>
+License: GPL-2+
+
+Files: src/config/playerselector.cpp
+       src/config/playerselector.h
+Copyright: 2012, Mathias Kraus <k.hias at gmx.de>
+           2009-2012, Stefan Majewsky <majewsky at gmx.net>
+License: LGPL-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+
@@ -20,12 +45,40 @@ 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+
+ 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;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ 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".
+
+License: LGPL-2
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License version 2 as published by the Free Software Foundation.
+ .
+ This library 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 GNU
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
 
diff --git a/debian/rules b/debian/rules
index c07512b..24e3402 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +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

-- 
granatier packaging

