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

Tue Jul 29 20:52:13 UTC 2014

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

The following commit has been merged in the master branch:
commit 3076e359bca39582aeace5b8d6546a8cd1612042
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Tue Jun 17 17:06:40 2014 +0100

    merge with debian
---
 debian/.gitattributes           |  1 +
 debian/changelog                | 67 +++++++++++++++++++++++++++++++++++++++++
 debian/control                  | 20 ++++++------
 debian/copyright                |  3 +-
 debian/rules                    |  4 +--
 debian/tests/control            |  4 +++
 debian/tests/testsuite          |  4 +++
 debian/tests/testsuite.xsession |  8 +++++
 8 files changed, 98 insertions(+), 13 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 928091d..1cfc4bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,70 @@
+picmi (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+  * Merge with Debian, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Jun 2014 10:42:04 +0100
+
+picmi (4:4.13.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 23 May 2014 11:03:27 +0200
+
+picmi (4:4.12.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Apr 2014 12:24:06 +0200
+
+picmi (4:4.12.3-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Mar 2014 00:05:55 +0100
+
+picmi (4:4.12.2-1) experimental; urgency=medium
+
+  * Bump Standards-Version to 3.9.5, no changes needed.
+  * New upstream release.
+  * Add autopkgtests.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:31:41 +0100
+
+picmi (4:4.11.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org>  Thu, 07 Nov 2013 14:28:53 +0100
+
+picmi (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 07 Oct 2013 15:29:27 +0200
+
+picmi (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jul 2013 00:15:40 +0200
+
+picmi (4:4.10.4-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update vcs fields.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 10:54:34 +0200
+
+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.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
diff --git a/debian/control b/debian/control
index f87c19e..149b094 100644
--- a/debian/control
+++ b/debian/control
@@ -4,20 +4,23 @@ 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.13.0),
- libkdegames-dev (>= 4:4.13.0)
-Standards-Version: 3.9.4
+Build-Depends: cmake (>= 2.8.0),
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.12),
+               kdelibs5-dev (>= 4:4.11),
+               libkdegames-dev (>= 4:4.11),
+               pkg-kde-tools (>= 0.14)
+Standards-Version: 3.9.5
+XS-Testsuite: autopkgtest
 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
+X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/picmi.git
+X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/picmi.git
 
 Package: picmi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: khelpcenter4
 Description: Number logic game
  Picmi is a number logic game in which cells in a grid have to be colored or
@@ -25,4 +28,3 @@ Description: Number logic game
  hidden picture.
  .
  This package is part of the KDE games module.
-
diff --git a/debian/copyright b/debian/copyright
index da3049e..26a3f18 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,7 +29,7 @@ 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
@@ -48,4 +48,3 @@ License: 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 24e3402..035773e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 
 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
 
@@ -14,3 +12,5 @@ generate-icons:
 	while read src dest; do \
 		convert debian/tmp/$$src debian/icons/$$dest; \
 	done <debian/icon-list
+
+.PHONY: override_dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..34cd609
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: testsuite
+Depends: @, @builddeps@, build-essential,
+         xvfb, xauth, dbus-x11
+Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100755
index 0000000..fa0feb1
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..7e49196
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,8 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+kdeinit4
+dh_auto_test
+ret=$?
+kdeinit4_shutdown
+exit $ret

-- 
picmi packaging

