[SCM] kmahjongg packaging branch, master, updated. debian/4.13.1-1-57-g596455d

Wed Jul 30 14:18:38 UTC 2014

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

The following commit has been merged in the master branch:
commit 2b001d50200a9793d023891862164d72b77ec2d9
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Mon Jun 16 19:50:48 2014 +0200

    * Merge with debian, no remaining changes
---
 debian/changelog | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   | 38 +++++++++++++++++-------------------
 debian/copyright |  3 +--
 debian/rules     |  2 --
 4 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e62875..549d7d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kmahjongg (4:4.13.1-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with debian, no remaining changes
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 19:49:31 +0200
+
+kmahjongg (4:4.13.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 23 May 2014 12:54:49 +0200
+
 kmahjongg (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
@@ -22,12 +34,33 @@ kmahjongg (4:4.12.90-0ubuntu1) trusty; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 11:03:01 +0000
 
+kmahjongg (4:4.12.3-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Apr 2014 12:25:21 +0200
+
+kmahjongg (4:4.12.3-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Mar 2014 00:06:16 +0100
+
 kmahjongg (4:4.12.3-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:53:06 +0100
 
+kmahjongg (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:28 +0100
+
 kmahjongg (4:4.12.2-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
@@ -64,6 +97,19 @@ kmahjongg (4:4.11.80-0ubuntu1) trusty; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:43:41 +0100
 
+kmahjongg (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:07 +0100
+
+kmahjongg (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 07 Oct 2013 15:29:18 +0200
+
 kmahjongg (4:4.11.2-0ubuntu1) saucy; urgency=low
 
   * New upstream bugfix release
@@ -110,6 +156,19 @@ kmahjongg (4:4.10.80-0ubuntu1) saucy; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:24:06 +0100
 
+kmahjongg (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jul 2013 16:45:32 +0200
+
+kmahjongg (4:4.10.4-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update vcs fields.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 16:33:33 +0200
+
 kmahjongg (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
 
   * New upstream bugfix release
diff --git a/debian/control b/debian/control
index daeec8b..247893c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,36 +4,34 @@ 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.13.0),
- libkdegames-dev (>= 4:4.13.0),
- libkmahjongglib-dev (>= 4:4.10)
-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),
+               libkmahjongglib-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/kmahjongg
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kmahjongg
-X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kmahjongg.git
-X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kmahjongg.git
+X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kmahjongg.git
+X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kmahjongg.git
 
 Package: kmahjongg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-         kdegames-mahjongg-data (>= 4:4.10)
+Depends: kdegames-mahjongg-data (>= 4:4.10), ${misc:Depends}, ${shlibs:Depends}
 Recommends: khelpcenter4
-Replaces: kmahjongg-data
-Breaks: kmahjongg-data
 Description: mahjongg solitaire game
  KMahjongg is a solitaire game where the player removes matching Mahjongg tiles
  to clear the board.  A variety of tile layouts are included, as well as an
  editor to create new layouts.
  .
  This package is part of the KDE games module.
-
diff --git a/debian/copyright b/debian/copyright
index ba3fa7d..7023e50 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,7 +31,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
@@ -50,4 +50,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
 

-- 
kmahjongg packaging

