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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ebdb891d01550a01c76e7b1a25d59401bcbde70f
Merge: b9a25432153d39faeaa96815755554c732c2f60c 85396e147bae2720b5b134322cd96893cd547866
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 23:34:58 2014 +0200

    Merge commit '85396e147bae2720b5b134322cd96893cd547866'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |   4 ++
 2 files changed, 182 insertions(+)

diff --cc debian/changelog
index 4deccf1,eb7b5c2..331e716
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,45 +1,51 @@@
 +kiriki (4:4.13.2-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Jul 2014 17:00:32 +0200
 +
+ kiriki (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:59:20 +0100
+ 
+ kiriki (4:4.13.0-0ubuntu2) utopic; urgency=medium
+ 
+   * Merge with debian, no remaining changes
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 18:37:21 +0200
+ 
+ kiriki (4:4.13.0-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream KDE Software Compilation release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Apr 2014 22:04:57 +0100
+ 
+ kiriki (4:4.12.97-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:28:26 +0200
+ 
+ kiriki (4:4.12.95-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 12:30:27 +0100
+ 
+ kiriki (4:4.12.90-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:59:24 +0000
+ 
+ kiriki (4:4.12.3-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- 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
@@@ -50,3 -180,46 +186,45 @@@ kiriki (4:4.10.2-1) experimental; urgen
    * First release of kdegames after being split by upstream.
  
   -- Maximiliano Curia <maxy at debian.org>  Tue, 09 Apr 2013 19:59:28 +0200
+ 
+ kiriki (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:50:03 +0200
+ 
+ kiriki (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:47:25 +0000
+ 
+ kiriki (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:55:33 +0000
+ 
+ kiriki (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 15:39:58 +0000
+ 
+ kiriki (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:36:32 +0100
+ 
+ kiriki (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:31:39 +0000
+ 
+ kiriki (4:4.9.90-0ubuntu1) raring; urgency=low
+ 
+   * Initial release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:55:57 +0000
 -
diff --cc debian/control
index 4e4bb6e,e475f22..8a93772
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,9 @@@
  Source: kiriki
  Section: games
  Priority: optional
 -Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 +Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++X-Ubuntu-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>,
@@@ -18,8 -19,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/kiriki
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kiriki
 -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
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kiriki.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kiriki.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kiriki
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kiriki
  
  Package: kiriki
  Architecture: any

-- 
kiriki packaging