[SCM] kigo packaging branch, master, updated. debian/4.13.1-1-57-g045c369

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 61e37d66e7145065254ac1ece5ff37c3fddb75b5
Merge: e2a93b729eb66bdc5063dd1e4c3f48e809619d03 867484becc098afd6bf44c57e7e5b093b57ac7e5
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 19:02:14 2014 +0200

    Merge commit '867484becc098afd6bf44c57e7e5b093b57ac7e5'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

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

diff --cc debian/changelog
index 20dc58b,89cce9c..ed47e26
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
 +kigo (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:18:50 +0200
 +
+ kigo (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:58:50 +0100
+ 
+ kigo (4:4.13.1-1ubuntu1) utopic; urgency=medium
+ 
+   * Merge with debian, no remaining changes
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 18:16:26 +0200
+ 
  kigo (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -57,3 -187,51 +193,50 @@@ kigo (4:4.10.2-1) experimental; urgency
  
   -- Maximiliano Curia <maxy at debian.org>  Mon, 08 Apr 2013 13:50:03 +0200
  
+ kigo (4:4.10.2-0ubuntu2) saucy; urgency=low
+ 
+   * Rebuild without libkdegamesprivate1.
+ 
+  -- Colin Watson <cjwatson at ubuntu.com>  Wed, 22 May 2013 22:39:32 +0100
+ 
+ kigo (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:49:38 +0200
+ 
+ kigo (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:46:50 +0000
+ 
+ kigo (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:55:06 +0000
+ 
+ kigo (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:10 +0000
+ 
+ kigo (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:10 +0100
+ 
+ kigo (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:31:05 +0000
+ 
+ kigo (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+ 
+   * Initial release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:54:56 +0000
 -
diff --cc debian/control
index bf4fffd,a6b7b78..5e609a6
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: kigo
  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>,
@@@ -18,8 -19,10 +19,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/kigo
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kigo
 -X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kigo.git
 -X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kigo.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kigo.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kigo.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kigo
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kigo
  
  Package: kigo
  Architecture: any

-- 
kigo packaging