[SCM] kanagram packaging branch, master, updated. debian/4.12.4-1-129-ge3fc3ea

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jul 29 09:35:25 UTC 2014


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

The following commit has been merged in the master branch:
commit f5ec26a5187a958a9c8eaeac66753144a9c37ec2
Merge: 1db781a5357e322f69254022a20ee142e7843b39 2d958c8f472e17ae53f403f47b91102a122a9687
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 10:10:23 2014 +0200

    Merge commit '2d958c8f472e17ae53f403f47b91102a122a9687'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/watch

 debian/changelog     | 320 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 debian/control       |   5 +-
 debian/not-installed |   4 +
 3 files changed, 326 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 8538b72,7976e01..b6f666a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,39 +1,51 @@@
 +kanagram (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:33:33 +0200
 +
 +kanagram (4:4.13.1-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 23 May 2014 11:12:16 +0200
 +
+ kanagram (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:43:28 +0100
+ 
+ kanagram (4:4.13.0-0ubuntu2) utopic; urgency=medium
+ 
+   * Merge with debian, no remaining changes
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 04 Jun 2014 11:08:41 +0200
+ 
+ kanagram (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:39:04 +0100
+ 
+ kanagram (4:4.12.97-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:10:43 +0200
+ 
+ kanagram (4:4.12.95-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 11:57:35 +0100
+ 
+ kanagram (4:4.12.90-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:37:22 +0000
+ 
  kanagram (4:4.12.4-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -64,12 -195,145 +207,145 @@@ kanagram (4:4.10.2-1) experimental; urg
  
   -- Sune Vuorela <sune at debian.org>  Sun, 07 Apr 2013 15:56:03 +0000
  
+ kanagram (4:4.10.2-0ubuntu1) raring; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:37:21 +0200
+ 
+ kanagram (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:14:14 +0000
+ 
+ kanagram (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:32:06 +0000
+ 
+ kanagram (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 14:58:12 +0000
+ 
+ kanagram (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:25:04 +0100
+ 
+ kanagram (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:17:08 +0000
+ 
+ kanagram (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:37:08 +0000
+ 
+ kanagram (4:4.9.80-0ubuntu1) raring; urgency=low
+ 
+   [ Jonathan Riddell ]
+   * New upstream beta release
+ 
+   [ Philip Muškovac ]
 -  * Remove duplicate copyright field to make lintian happy 
++  * Remove duplicate copyright field to make lintian happy
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 23 Nov 2012 22:35:09 +0100
+ 
+ kanagram (4:4.9.3-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release (LP: #1074747)
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 06 Nov 2012 22:23:03 +0100
+ 
+ kanagram (4:4.9.2-0ubuntu1) quantal-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 02 Oct 2012 15:11:31 +0100
+ 
+ kanagram (4:4.9.1-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <apachelogger at ubuntu.com>  Mon, 10 Sep 2012 18:16:53 +0530
+ 
+ kanagram (4:4.9.0-0ubuntu1) quantal; urgency=low
+ 
+   * Use direct build-depends versions rather than kde-sc-dev-latest
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 26 Jul 2012 17:02:16 +0100
+ 
+ kanagram (4:4.8.90-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream beta release.
+ 
+  -- Felix Geyer <debfx at ubuntu.com>  Mon, 11 Jun 2012 22:04:57 +0200
+ 
+ kanagram (4:4.8.80-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 06 Jun 2012 13:54:49 +0100
+ 
  kanagram (4:4.8.4-1) unstable; urgency=low
  
    * New upstream release
  
   -- Sune Vuorela <sune at debian.org>  Sun, 17 Jun 2012 01:42:04 +0200
  
+ kanagram (4:4.8.3-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+     - add libssl-dev to build-dep
+     - bump Standards-Version to 3.9.3 (no change)
+ 
+  -- Jonathan Kolberg <bulldog98 at kubuntu.org>  Tue, 01 May 2012 00:14:21 +0200
+ 
+ kanagram (4:4.8.2-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 01 Apr 2012 22:51:57 +0200
+ 
+ kanagram (4:4.8.1-0ubuntu1) precise; urgency=low
+ 
 -  * New upstream release 
++  * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 04 Mar 2012 20:07:15 +0100
+ 
+ kanagram (4:4.8.0-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2012 12:10:27 +0000
+ 
+ kanagram (4:4.7.97-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 05 Jan 2012 12:18:24 +0000
+ 
+ kanagram (4:4.7.95-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 24 Dec 2011 19:04:59 +0100
+ 
+ kanagram (4:4.7.90-0ubuntu2) precise; urgency=low
+ 
+   * new upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 15 Dec 2011 14:17:56 +0000
+ 
  kanagram (4:4.7.4-2) unstable; urgency=low
  
    * Team upload. Upload to unstable.
@@@ -78,8 -342,8 +354,8 @@@
  
  kanagram (4:4.7.4-1) experimental; urgency=low
  
--  * New upstream release. 
--  
++  * New upstream release.
++
    [ José Manuel Santamaría Lema ]
    * Bump kde-sc-dev-latest build dependency to 4:4.7.4.
    * Add myself to Uploaders.
@@@ -92,3 -363,37 +375,36 @@@ kanagram (4:4.7.2-1) experimental; urge
    * Initial release. Start from the Kubuntu packaging, thanks!
  
   -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 10:43:56 -0300
+ 
+ kanagram (4:4.7.2-0r1) raring; urgency=low
+ 
+   [ Eshat Cakar ]
+   * Initial release. Start from the Kubuntu packaging, thanks!
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Oct 2011 17:44:12 +0200
+ 
+ kanagram (4:4.7.1-0ubuntu2) oneiric; urgency=low
+ 
+   * No-change rebuild so translations aren't stripped from .desktop
+     files anymore.
+ 
+  -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 15 Sep 2011 23:13:02 +0200
+ 
+ kanagram (4:4.7.1-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Kolberg <bulldog98 at kubuntu-de.org>  Fri, 09 Sep 2011 10:04:05 -0400
+ 
+ kanagram (4:4.7.0-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream release
+   * Use wildcard in install file so we do not need to worry about not-installed
+ 
+  -- Harald Sitter <apachelogger at ubuntu.com>  Sat, 23 Jul 2011 14:17:41 +0200
+ 
+ kanagram (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
+ 
 -  * Initial release 
++  * Initial release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 08 Jul 2011 13:28:38 +0200
 -
diff --cc debian/control
index 83f538e,61c6a83..0169cb3
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: kanagram
  Section: misc
  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: Eshat Cakar <info at eshat.de>,
             Sune Vuorela <sune at debian.org>,
             Maximiliano Curia <maxy at debian.org>
@@@ -12,8 -13,10 +13,10 @@@ Build-Depends: cmake
                 pkg-kde-tools (>= 0.14)
  Standards-Version: 3.9.5
  Homepage: https://projects.kde.org/projects/kde/kdeedu/kanagram
 -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram
 -X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kanagram.git
 -X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kanagram.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kanagram.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kanagram.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram
  
  Package: kanagram
  Architecture: any

-- 
kanagram packaging



More information about the pkg-kde-commits mailing list