[SCM] knavalbattle packaging branch, master, updated. debian/4.13.1-1-55-g20572e6

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jul 29 21:54:48 UTC 2014 

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

The following commit has been merged in the master branch:
commit df05b5a4dd6c8255262e790d325d651874678d3e
Merge: 0c3a5a6b49fb22d76101eddafa75ff0af3ca8ecf 3b93bdc8229bcda873b473e9d14081060a78bca5
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 23:11:24 2014 +0200

    Merge commit '3b93bdc8229bcda873b473e9d14081060a78bca5'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |   3 +
 2 files changed, 205 insertions(+)

diff --cc debian/changelog
index d032cbf,85c2d52..58262af
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +knavalbattle (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:28:03 +0200
 +
+ knavalbattle (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+   * Merge with Debian, no changes
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Jun 2014 10:41:54 +0100
+ 
  knavalbattle (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -66,3 -67,199 +73,198 @@@ knavalbattle (4:4.10.2-1) experimental
  
   -- Maximiliano Curia <maxy at debian.org>  Wed, 10 Apr 2013 15:51:01 +0200
  
+ knavalbattle (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:08:39 +0100
+ 
+ knavalbattle (4:4.12.97-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:33:04 +0200
+ 
+ knavalbattle (4:4.12.95-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 12:34:43 +0100
+ 
+ knavalbattle (4:4.12.90-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 11:05:05 +0000
+ 
+ knavalbattle (4:4.12.3-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:54:58 +0100
+ 
+ knavalbattle (4:4.12.2-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 05 Feb 2014 00:07:15 +0000
+ 
+ knavalbattle (4:4.12.1-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 16 Jan 2014 08:23:17 +0000
+ 
+ knavalbattle (4:4.12.0-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Dec 2013 17:15:32 +0000
+ 
+ knavalbattle (4:4.11.97-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 29 Nov 2013 13:16:09 +0000
+ 
+ knavalbattle (4:4.11.95-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 25 Nov 2013 18:13:25 +0100
+ 
+ knavalbattle (4:4.11.80-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream beta release
+   * Update install files
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:44:52 +0100
+ 
+ knavalbattle (4:4.11.2-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Sep 2013 14:31:39 +0100
+ 
+ knavalbattle (4:4.11.1-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release.
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 06 Sep 2013 22:27:01 +0100
+ 
+ knavalbattle (4:4.11.0-0ubuntu1) saucy; urgency=low
+ 
+   [ Howard Chan ]
+   * New upstream release
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 14 Aug 2013 00:21:45 +0100
+ 
+ knavalbattle (4:4.10.97-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC 2 release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 26 Jul 2013 19:42:09 +0100
+ 
+ knavalbattle (4:4.10.95-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 19 Jul 2013 12:32:45 +0000
+ 
+ knavalbattle (4:4.10.90-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bet release
+ 
+  -- Michał Zając <quintasan at kubuntu.org>  Fri, 28 Jun 2013 18:18:30 +0100
+ 
+ knavalbattle (4:4.10.80-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:26:13 +0100
+ 
+ knavalbattle (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+ 
+   [ Rohan Garg ]
+   * New upstream bugfix release
+ 
+   [ Jonathan Riddell ]
+   * remove incorrect knavalbattle.menu
+   * translational Priority: extra
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 07 Jun 2013 00:37:33 +0100
+ 
+ knavalbattle (4:4.10.3-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream release
+   * Merge with Debian, remaining change:
+    - rename binary from kbattleship to knavalbattle
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:46 +0000
+ 
+ knavalbattle (4:4.10.2-1) experimental; urgency=low
+ 
+   * First release of kdegames after being split by upstream.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 10 Apr 2013 15:51:01 +0200
+ 
+ knavalbattle (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:52:54 +0200
+ 
+ knavalbattle (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:33:51 +0000
+ 
+ knavalbattle (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:58:51 +0000
+ 
+ knavalbattle (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+   * Add missing .install file
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 15:46:26 +0000
+ 
+ knavalbattle (4:4.9.97-0ubuntu3) raring; urgency=low
+ 
+   * Rename kbattleships to kbattleship as that's the correct name of the
+     old package
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 14 Jan 2013 19:49:21 +0100
+ 
+ knavalbattle (4:4.9.97-0ubuntu2) raring; urgency=low
+ 
+   * Add transitional package for kbattleships
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Jan 2013 14:15:01 +0000
+ 
+ knavalbattle (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:39:09 +0100
+ 
+ knavalbattle (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:35:09 +0000
+ 
+ knavalbattle (4:4.9.90-0ubuntu1) raring; urgency=low
+ 
+   * Initial release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 18:00:35 +0000
 -
diff --cc debian/control
index ab10fcc,db64341..fac3607
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: knavalbattle
  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/knavalbattle
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/knavalbattle
 -X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/knavalbattle.git
 -X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/knavalbattle.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/knavalbattle.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/knavalbattle.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/knavalbattle
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/knavalbattle
  
  Package: knavalbattle
  Architecture: any

-- 
knavalbattle packaging

More information about the pkg-kde-commits mailing list