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

Tue Jul 29 22:21:03 UTC 2014

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

The following commit has been merged in the master branch:
commit c5d7b81c2c0cc2070ed82401570fe5d0977b185f
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Mon Jun 16 18:37:12 2014 +0200

    * Merge with debian, no remaining changes
---
 debian/changelog | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   | 36 ++++++++++++++++++------------------
 debian/copyright |  3 +--
 debian/rules     |  2 --
 4 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cacb518..b43f28e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kiriki (4:4.13.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge with debian, no remaining changes
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 18:36:13 +0200
+
 kiriki (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
@@ -28,6 +34,21 @@ kiriki (4:4.12.3-0ubuntu1) trusty; urgency=medium
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:50:44 +0100
 
+kiriki (4:4.12.2-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Apr 2014 12:25:00 +0200
+
+kiriki (4:4.12.2-1) experimental; urgency=medium
+
+  * Do not disable an empty test set.
+  * Bump Standards-Version to 3.9.5, no changes needed.
+  * New upstream release.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:32:14 +0100
+
 kiriki (4:4.12.2-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
@@ -64,6 +85,19 @@ kiriki (4:4.11.80-0ubuntu1) trusty; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:42:10 +0100
 
+kiriki (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:27 +0100
+
+kiriki (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 07 Oct 2013 15:29:40 +0200
+
 kiriki (4:4.11.2-0ubuntu1) saucy; urgency=low
 
   * New upstream bugfix release
@@ -110,6 +144,19 @@ kiriki (4:4.10.80-0ubuntu1) saucy; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:21:05 +0100
 
+kiriki (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jul 2013 15:55:57 +0200
+
+kiriki (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:46 +0200
+
 kiriki (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
 
   * New upstream bugfix release
diff --git a/debian/control b/debian/control
index 31bb186..46f14b4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,34 +1,34 @@
 Source: kiriki
 Section: games
 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>
+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.13.0),
- libkdegames-dev (>= 4:4.13.0)
-Standards-Version: 3.9.4
+           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: cmake,
+               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
 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
+X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kiriki.git
+X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kiriki.git
 
 Package: kiriki
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs: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 b2c84e5..57800e8 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..1a1dd13 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
 

-- 
kiriki packaging

