[SCM] kajongg packaging branch, master, updated. debian/4.13.1-1-64-gc3f069c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c813d2663485a56843f139e9b425b6f49c53fcab
Merge: b11cb1f60f41356b4eab312e0a3420f329a78a58 ceb4160175b946ede8751c4b9ea432295d718654
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 23:40:32 2014 +0200

    Merge commit 'ceb4160175b946ede8751c4b9ea432295d718654'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

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

diff --cc debian/changelog
index 28f486c,edeb4f9..4406552
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
 +kajongg (4:4.13.2-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Jul 2014 16:48:29 +0200
 +
+ kajongg (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   [ Rohan Garg ]
+   * Merge with debian, no remaining changes
+   * Add upstream_install_missing_files.diff to install qt.py, qt4.py and qt5.py
+ 
+   [ Jonathan Riddell ]
+   * new upstream release
+   * Remove upstream_install_missing_files.diff now upstream
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:42:29 +0100
+ 
  kajongg (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -58,6 -193,19 +199,19 @@@ kajongg (4:4.10.4-1) experimental; urge
  
   -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 16:33:45 +0200
  
+ kajongg (4:4.10.4-0ubuntu2) saucy; urgency=low
+ 
+   * Depend on kdegames-mahjongg-data instead of libkmahjongglib-data which
 -    doesn't exist anymore (LP: #1189431) 
++    doesn't exist anymore (LP: #1189431)
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 10 Jun 2013 14:34:52 +0200
+ 
+ kajongg (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 06 Jun 2013 23:35:40 +0100
+ 
  kajongg (4:4.10.2-2) experimental; urgency=low
  
    * Fix erroneous Upstream-Name in debian/copyright.
@@@ -73,3 -221,55 +227,54 @@@ kajongg (4:4.10.2-1) experimental; urge
  
   -- Maximiliano Curia <maxy at debian.org>  Mon, 08 Apr 2013 13:40:32 +0200
  
+ kajongg (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:36:26 +0200
+ 
+ kajongg (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Mar 2013 15:13:06 +0000
+ 
+ kajongg (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:31:06 +0000
+ 
+ kajongg (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 14:56:46 +0000
+ 
+ kajongg (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:24:17 +0100
+ 
+ kajongg (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * Install to /usr/games
+   * Version dependency on kdegames-data
+   * New upstream RC release
+   * Add kubuntu_01_licence_file.diff from upstream
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:15:58 +0000
+ 
+ kajongg (4:4.9.90-0ubuntu2) raring; urgency=low
+ 
 -  * Add breaks/replaces against kdegames-mahjongg-data << 4:4.9.90 
++  * Add breaks/replaces against kdegames-mahjongg-data << 4:4.9.90
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 08 Dec 2012 21:06:57 +0100
+ 
+ kajongg (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+ 
+   * Initial release
+   * Add build-deps on runtime dependencies, needed to install
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:36:05 +0000
 -
diff --cc debian/control
index bf0da9b,6cd96b5..44b69ce
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: kajongg
  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>,
@@@ -21,8 -22,10 +22,10 @@@ Standards-Version: 3.9.
  X-Python-Version: >= 2.6
  XS-Testsuite: autopkgtest
  Homepage: http://games.kde.org/
 -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kajongg
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kajongg
 -X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kajongg.git
 -X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kajongg.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kajongg.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kajongg.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kajongg
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kajongg
  
  Package: kajongg
  Architecture: all

-- 
kajongg packaging