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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0a2ae5b3785cbff716a68a1bcea4ab5c3720a11c
Merge: bc14ad2899ae02cc329bd6f2389944ef42e20a2a 1a1bb6429d4368955897a7f3892c64897dd63293
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jul 30 15:47:51 2014 +0200

    Merge commit '1a1bb6429d4368955897a7f3892c64897dd63293'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |   5 +-
 2 files changed, 222 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 2757135,bfa2ef1..98a9431
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
 +kmahjongg (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:32:12 +0200
 +
+ kmahjongg (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 12:02:11 +0100
+ 
+ kmahjongg (4:4.13.1-1ubuntu1) utopic; urgency=medium
+ 
+   * Merge with debian, no remaining changes
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 19:53:31 +0200
+ 
  kmahjongg (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -63,3 -195,84 +201,83 @@@ kmahjongg (4:4.10.2-1) experimental; ur
  
   -- Maximiliano Curia <maxy at debian.org>  Wed, 10 Apr 2013 13:03:05 +0200
  
+ kmahjongg (4:4.10.2-0ubuntu2) saucy; urgency=low
+ 
+   * Rebuild without libkdegamesprivate1.
+ 
+  -- Colin Watson <cjwatson at ubuntu.com>  Wed, 22 May 2013 22:40:05 +0100
+ 
+ kmahjongg (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:51:40 +0200
+ 
+ kmahjongg (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Mar 2013 16:28:44 +0000
+ 
+ kmahjongg (4:4.10.0-0ubuntu4) raring; urgency=low
+ 
+   * kmahjongg-data Breaks/Replaces kmahjongg << 4:4.10.0-0ubuntu3~ instead
+     to support backport versions
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 23 Feb 2013 13:58:18 +0100
+ 
+ kmahjongg (4:4.10.0-0ubuntu3) raring; urgency=low
+ 
+   * Fix versioning, 4.10 should have been 4.10.0
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 08 Feb 2013 16:22:31 +0530
+ 
+ kmahjongg (4:4.10.0-0ubuntu2) raring; urgency=low
+ 
+   * kmahjongg-data Breaks/Replaces kmahjongg to support upgrades from
+     Quantal
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 08 Feb 2013 16:16:59 +0530
+ 
+ kmahjongg (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:57:31 +0000
+ 
+ kmahjongg (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 15:44:34 +0000
+ 
+ kmahjongg (4:4.9.97-0ubuntu3) raring; urgency=low
+ 
+   * Put transitional package into section oldlibs
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Jan 2013 14:19:47 +0000
+ 
+ kmahjongg (4:4.9.97-0ubuntu2) raring; urgency=low
+ 
+   * Add transitional package for kdegames-mahjongg-data
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Jan 2013 14:01:38 +0000
+ 
+ kmahjongg (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:37:59 +0100
+ 
+ kmahjongg (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:33:32 +0000
+ 
+ kmahjongg (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+ 
+   * Initial release
+   * New package kmahjongg-data
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:58:38 +0000
 -
diff --cc debian/control
index e05b2b7,77b0e34..44faccc
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: kmahjongg
  Section: games
  Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -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/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
  Uploaders: Daniel Schepler <schepler at debian.org>,
             Sune Vuorela <sune at debian.org>,
             Fathi Boudra <fabo at debian.org>,
@@@ -19,8 -20,10 +20,10 @@@ Build-Depends: cmake
                 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-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
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kmahjongg.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kmahjongg.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kmahjongg
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kmahjongg
  
  Package: kmahjongg
  Architecture: any

-- 
kmahjongg packaging