[SCM] khangman packaging branch, master, updated. debian/4.13.1-1-126-gaf8e271

Maximiliano Curia maxy at moszumanska.debian.org
Thu Aug 14 12:09:00 UTC 2014 

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

The following commit has been merged in the master branch:
commit 03e2f901719c252ad95d348ec3d8314cdf460218
Merge: 3d19c0e7d9c8d19102fb549714c75a6738039fc8 a65cbc31dc1006ae4cc5a4a4b84e93b33da01709
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jul 29 10:01:26 2014 +0200

    Merge commit 'a65cbc31dc1006ae4cc5a4a4b84e93b33da01709'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/khangman.install
    	debian/not-installed
    	debian/watch

 debian/changelog        | 333 +++++++++++++++++++++++++++++++++++++++++++++++-
 debian/control          |   5 +-
 debian/khangman.install |   2 -
 debian/not-installed    |   3 +
 4 files changed, 338 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 47f19ca,fb720a4..579b136
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
 +khangman (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:23:14 +0200
 +
+ khangman (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * new upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Jun 2014 11:58:10 +0100
+ 
+ khangman (4:4.13.1-1ubuntu1) utopic; urgency=medium
+ 
+   * Merge with Debian, no remaining changes
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 17:15:02 +0200
+ 
  khangman (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -59,12 -194,161 +200,161 @@@ khangman (4:4.10.2-1) experimental; urg
  
   -- Sune Vuorela <sune at debian.org>  Sun, 07 Apr 2013 16:49:01 +0000
  
+ khangman (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:07 +0200
+ 
+ khangman (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:17 +0000
+ 
+ khangman (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 11:54:32 +0000
+ 
+ khangman (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 15:38:01 +0000
+ 
+ khangman (4:4.9.97-0ubuntu1) raring; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:35:44 +0100
+ 
+ khangman (4:4.9.95-0ubuntu1) raring; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:30:30 +0000
+ 
+ khangman (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 17:54:34 +0000
+ 
+ khangman (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 23:29:53 +0100
+ 
+ khangman (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:36:48 +0100
+ 
+ khangman (4:4.9.2-0ubuntu1) quantal-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 02 Oct 2012 15:28:11 +0100
+ 
+ khangman (4:4.9.1-0ubuntu1) quantal; urgency=low
+ 
+   [ Harald Sitter ]
+   * New upstream release
+ 
+   [ Philip Muškovac ]
 -  * Change sonames from 4.9.0 to 4.9.* 
++  * Change sonames from 4.9.0 to 4.9.*
+ 
+  -- Harald Sitter <apachelogger at ubuntu.com>  Mon, 10 Sep 2012 18:32:54 +0530
+ 
+ khangman (4:4.9.0-0ubuntu2) quantal; urgency=low
+ 
+   * Build-dep on kdelibs 4.9.0a, adjust .install files to new library
+     version no
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Aug 2012 11:57:52 +0100
+ 
+ khangman (4:4.9.0-0ubuntu1) quantal; urgency=low
+ 
+   * Use direct build-depends versions rather than kde-sc-dev-latest
+   * New upstream release
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 26 Jul 2012 22:26:10 +0100
+ 
+ khangman (4:4.8.90-0ubuntu1) quantal; urgency=low
+ 
+   [ Felix Geyer ]
+   * New upstream beta release.
+ 
+   [ Jonathan Riddell ]
+   * Install new files
+ 
+  -- Felix Geyer <debfx at ubuntu.com>  Mon, 11 Jun 2012 23:29:58 +0200
+ 
+ khangman (4:4.8.80-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 06 Jun 2012 14:07:37 +0100
+ 
  khangman (4:4.8.4-1) unstable; urgency=low
  
    * Prepare new upstream
  
   -- Sune Vuorela <sune at debian.org>  Sun, 17 Jun 2012 00:34:51 +0200
  
+ khangman (4:4.8.3-0ubuntu1) quantal; urgency=low
+ 
+   * New upstream release
+     - Add libssl-dev to build-dep
+     - Bump Standard-Version to 3.9.3 (no change)
+ 
+  -- Jonathan Kolberg <bulldog98 at kubuntu.org>  Thu, 03 May 2012 10:19:57 +0200
+ 
+ khangman (4:4.8.2-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Mon, 02 Apr 2012 00:01:01 +0200
+ 
+ khangman (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:28:30 +0100
+ 
+ khangman (4:4.8.0-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 20 Jan 2012 12:10:30 +0000
+ 
+ khangman (4:4.7.97-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 05 Jan 2012 12:18:27 +0000
+ 
+ khangman (4:4.7.95-0ubuntu1) precise; urgency=low
+ 
+   * New upstream release candidate
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 24 Dec 2011 20:21:25 +0100
+ 
+ khangman (4:4.7.90-0ubuntu1) precise; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 16 Dec 2011 13:14:40 +0000
+ 
  khangman (4:4.7.4-2) unstable; urgency=low
  
    * Team upload. Upload to unstable.
@@@ -73,8 -357,8 +363,8 @@@
  
  khangman (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.
  
@@@ -88,3 -379,36 +385,35 @@@ khangman (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:42:24 -0300
+ 
+ khangman (4:4.7.2-0r2) raring; urgency=low
+ 
+   * Initial release. Start from the Kubuntu packaging, thanks!
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Oct 2011 00:10:57 +0200
+ 
+ khangman (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>  Fri, 16 Sep 2011 00:55:17 +0200
+ 
+ khangman (4:4.7.1-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Kolberg <bulldog98 at kubuntu-de.org>  Fri, 09 Sep 2011 23:33:04 -0400
+ 
+ khangman (4:4.7.0-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <apachelogger at ubuntu.com>  Sat, 23 Jul 2011 14:54:56 +0200
+ 
+ khangman (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
+ 
+   * Initial release (moved out of kdeedu)
+   * Repack upstream source to include a copy of GFDL1.2
+ 
+  -- Harald Sitter <apachelogger at ubuntu.com>  Sun, 10 Jul 2011 11:55:40 +0200
 -
diff --cc debian/control
index d47bd1a,8987719..bd25baf
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
  Source: khangman
  Section: kde
  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>
@@@ -13,8 -14,10 +14,10 @@@ Build-Depends: cmake
                 pkg-kde-tools (>= 0.12)
  Standards-Version: 3.9.5
  Homepage: http://edu.kde.org/
 -Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/khangman
 -Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/khangman
 -X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/khangman.git
 -X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/khangman.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/khangman.git
 +Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/khangman.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/khangman
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/khangman
  
  Package: khangman
  Architecture: any

-- 
khangman packaging

More information about the pkg-kde-commits mailing list