[SCM] granatier packaging branch, master, updated. debian/4.12.4-1-62-gd70ecc7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 896b5f68ed3241b95e419d9603dc3c16936cc8db
Merge: 1859fff07108130c4acc3458137c287bbfaa30eb 333c51762acd8c30e5c89694b7675cf447b2c2bd
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 20:24:34 2014 +0200

    Merge commit '333c51762acd8c30e5c89694b7675cf447b2c2bd'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |   3 +
 2 files changed, 187 insertions(+)

diff --cc debian/changelog
index 233d155,f2cfd7e..d5878c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,39 +1,45 @@@
 +granatier (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 12:54:14 +0200
 +
+ granatier (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:40:55 +0100
+ 
+ granatier (4:4.13.0-0ubuntu2) utopic; urgency=medium
+ 
+   * Merge with Debian, no remaining changes
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 02 Jun 2014 15:51:05 +0200
+ 
+ granatier (4:4.13.0-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream KDE Software Compilation release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Apr 2014 21:36:11 +0100
+ 
+ granatier (4:4.12.97-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:07:33 +0200
+ 
+ granatier (4:4.12.95-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 11:54:25 +0100
+ 
+ granatier (4:4.12.90-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:34:16 +0000
+ 
  granatier (4:4.12.4-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -66,3 -201,47 +207,46 @@@ granatier (4:4.10.2-1) experimental; ur
  
   -- Maximiliano Curia <maxy at debian.org>  Sun, 07 Apr 2013 23:27:24 +0200
  
+ granatier (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:35:07 +0200
+ 
+ granatier (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:11:33 +0000
+ 
+ granatier (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:29:34 +0000
+ 
+ granatier (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 14:54:43 +0000
+ 
+ granatier (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:23:07 +0100
+ 
+ granatier (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * Install to /usr/games
+   * Version dependency on kdegames-data
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:14:34 +0000
+ 
+ granatier (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+ 
+   * Initial release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:34:47 +0000
 -
diff --cc debian/control
index 0276c86,b8b03ca..37fc30d
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: granatier
  Section: games
  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>
 +Maintainer: Debian 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/granatier
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/granatier
 -X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/granatier.git
 -X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/granatier.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/granatier.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/granatier.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/granatier
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/granatier
  
  Package: granatier
  Architecture: any

-- 
granatier packaging