[SCM] picmi packaging branch, master, updated. debian/4.13.1-1-52-g97383e6

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jul 29 20:52:14 UTC 2014


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

The following commit has been merged in the master branch:
commit 5d04b6d20cf08842b65b9a68bcc5323bfc2aab5f
Merge: b08ba56e838ec98f8aa6fd199871116ac4c195cb 3076e359bca39582aeace5b8d6546a8cd1612042
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 20:01:09 2014 +0200

    Merge commit '3076e359bca39582aeace5b8d6546a8cd1612042'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

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

diff --cc debian/changelog
index 08c2f75,1cfc4bc..914faf0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +picmi (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 12:58:55 +0200
 +
+ picmi (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:42:04 +0100
+ 
  picmi (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -64,3 -65,184 +71,183 @@@ picmi (4:4.10.2-1) experimental; urgenc
  
   -- Maximiliano Curia <maxy at debian.org>  Mon, 08 Apr 2013 13:50:03 +0200
  
+ picmi (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:32:14 +0100
+ 
+ picmi (4:4.12.97-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:58:52 +0200
+ 
+ picmi (4:4.12.95-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 12:59:25 +0100
+ 
+ picmi (4:4.12.90-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 12:08:30 +0000
+ 
+ picmi (4:4.12.3-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 21:19:56 +0100
+ 
+ picmi (4:4.12.2-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 05 Feb 2014 00:34:34 +0000
+ 
+ picmi (4:4.12.1-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 16 Jan 2014 08:49:24 +0000
+ 
+ picmi (4:4.12.0-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Dec 2013 17:51:01 +0000
+ 
+ picmi (4:4.11.97-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 29 Nov 2013 13:49:30 +0000
+ 
+ picmi (4:4.11.95-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 25 Nov 2013 18:43:27 +0100
+ 
+ picmi (4:4.11.80-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 18:03:23 +0100
+ 
+ picmi (4:4.11.2-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Sep 2013 15:00:15 +0100
+ 
+ picmi (4:4.11.1-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release.
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 06 Sep 2013 22:44:35 +0100
+ 
+ picmi (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:44:23 +0100
+ 
+ picmi (4:4.10.97-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC 2 release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 26 Jul 2013 20:12:40 +0100
+ 
+ picmi (4:4.10.95-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 19 Jul 2013 12:33:36 +0000
+ 
+ picmi (4:4.10.90-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bet release
+ 
+  -- Michał Zając <quintasan at kubuntu.org>  Fri, 28 Jun 2013 18:35:28 +0100
+ 
+ picmi (4:4.10.80-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 02:02:30 +0100
+ 
+ picmi (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 07 Jun 2013 00:56:25 +0100
+ 
+ picmi (4:4.10.3-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:05:00 +0000
+ 
+ picmi (4:4.10.2-1) experimental; urgency=low
+ 
+   * First release of kdegames after being split by upstream.
+   * Initial packaging (Closes: #705444).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 08 Apr 2013 13:50:03 +0200
+ 
+ picmi (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 15:05:32 +0200
+ 
+ picmi (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:59:20 +0000
+ 
+ picmi (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 12:24:04 +0000
+ 
+ picmi (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 16:34:12 +0000
+ 
+ picmi (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:50:18 +0100
+ 
+ picmi (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:50:18 +0000
+ 
+ picmi (4:4.9.90-0ubuntu2) raring; urgency=low
+ 
+   * Fix section to games and fix copyright holder
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Dec 2012 13:29:54 +0000
+ 
+ picmi (4:4.9.90-0ubuntu1) raring; urgency=low
+ 
+   * Initial release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Dec 2012 17:39:47 +0000
 -
diff --cc debian/control
index db44fd7,149b094..f9f2837
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: picmi
  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: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.0),
                 debhelper (>= 9),
@@@ -12,8 -13,10 +13,10 @@@
  Standards-Version: 3.9.5
  XS-Testsuite: autopkgtest
  Homepage: http://games.kde.org/
 -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/picmi
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/picmi
 -X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/picmi.git
 -X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/picmi.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/picmi.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/picmi.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/picmi
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/picmi
  
  Package: picmi
  Architecture: any

-- 
picmi packaging



More information about the pkg-kde-commits mailing list