[SCM] picmi packaging branch, master, updated. debian/4.13.1-1-52-g97383e6

[Maximiliano Curia]

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

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

    merge
---
 debian/changelog | 14 ++++++++++++++
 debian/compat    |  2 +-
 debian/control   | 31 ++++++++++++++++++++-----------
 debian/copyright | 37 ++++++++++++++++++++++++++++++-------
 debian/rules     | 10 ++++++++++
 5 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e939e0..9511e08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+picmi (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:05:00 +0000
+
+picmi (4:4.10.2-1) experimental; urgency=low
+
+  * First release of kdegames after being split by upstream.
+  * Initial packaging (Closes: #705444).
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 08 Apr 2013 13:50:03 +0200
+
 picmi (4:4.10.2-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release
@@ -47,3 +60,4 @@ picmi (4:4.9.90-0ubuntu1) raring; urgency=low
   * Initial release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Dec 2012 17:39: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 cacdbaf..c5361c4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,28 @@
 Source: picmi
-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: 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/picmi
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/picmi
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/picmi.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/picmi.git
 
 Package: picmi
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: nonogram puzzle game
- nonogram puzzle game
+Recommends: khelpcenter4
+Description: Number logic game
+ Picmi is a number logic game in which cells in a grid have to be colored or
+ left blank according to numbers given at the side of the grid to reveal a
+ hidden picture.
  .
  This package is part of the KDE games module.
+
diff --git a/debian/copyright b/debian/copyright
index 6e59b38..da3049e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,24 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: picmi
-Source: http://kde.org
+Upstream-Contact: Jakob Gruber <jakob.gruber at gmail.com>
+Source: http://www.kde.org/download/
 
 Files: *
-Copyright: 2012 Jakob Gruber <jakob.gruber at gmail.com>
-License: GPL-2
+Copyright: 2012, Jakob Gruber <jakob.gruber at gmail.com>
+License: GPL-2+
+
+Files: doc/*
+Copyright: 2012, Jakob Gruber <jakob.gruber at gmail.com>
+License: GFDL-1.2+
+
+Files: src/logic/levelloader.cpp
+       src/logic/levelloader.h
+Copyright: 2011, Julian Helfferich <julian.helfferich at gmail.com>
+           2012, Jakob Gruber <jakob.gruber at gmail.com>
+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+
@@ -18,11 +29,23 @@ 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".
+
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

-- 
picmi packaging