[SCM] ktouch packaging branch, master, updated. debian/4.13.1-2-119-g4daced9

Maximiliano Curia maxy at moszumanska.debian.org
Fri Jul 18 07:15:48 UTC 2014 

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

The following commit has been merged in the master branch:
commit dd16acc3d9dbd445a203ed4f7aaf236ad1778b8b
Merge: 5082b21053302c2a7da04ea9cc282a5b49e54738 2e11fa60f99e0a639e0326716214c244be1420e2
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jul 17 15:22:27 2014 +0200

    Merge remote-tracking branch 'ubuntu/master'
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 326 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/control   |   2 +-
 2 files changed, 327 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 6e5a786,c047387..1b88252
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,12 +1,24 @@@
 +ktouch (4:4.13.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 12:54:27 +0200
 +
 +ktouch (4:4.13.1-2) unstable; urgency=medium
 +
 +  * Add missing dependency qtdeclarative4-kqtquickcharts-1.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 21 Jun 2014 10:21:00 +0200
 +
+ ktouch (4:4.13.2-0ubuntu1) utopic; urgency=medium
+ 
+   * New upstream release
+   * Merge with Debian:
+    - Add dependency on qtdeclarative4-kqtquickcharts-1 as the qml module
+      is needed for anything to be displayed. LP: #1310019
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Jun 2014 10:42:00 +0100
+ 
  ktouch (4:4.13.1-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -17,6 -14,6 +26,37 @@@
  
   -- Maximiliano Curia <maxy at debian.org>  Tue, 20 May 2014 18:36:48 +0200
  
++ktouch (4:4.13.0-0ubuntu1.1) trusty; urgency=medium
++
++  * Add dependency on qtdeclarative4-kqtquickcharts-1 as the qml module
++    is needed for anything to be displayed. LP: #1310019
++
++ -- Harald Sitter <apachelogger at kubuntu.org>  Tue, 22 Apr 2014 11:47:08 +0200
++
++ktouch (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:17:55 +0100
++
++ktouch (4:4.12.97-0ubuntu1) trusty; urgency=medium
++
++  * New upstream release candidate
++
++ -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:44:49 +0200
++
++ktouch (4:4.12.95-0ubuntu1) trusty; urgency=medium
++
++  * New upstream beta release
++
++ -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 12:44:41 +0100
++
++ktouch (4:4.12.90-0ubuntu1) trusty; urgency=medium
++
++  * New upstream beta release
++
++ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 11:31:12 +0000
++
  ktouch (4:4.12.4-1) unstable; urgency=medium
  
    * New upstream release.
@@@ -66,6 -63,138 +106,107 @@@ ktouch (4:4.10.4-1) experimental; urgen
  
   -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 14:31:13 +0200
  
 -ktouch (4:4.13.0-0ubuntu1.1) trusty; urgency=medium
 -
 -  * Add dependency on qtdeclarative4-kqtquickcharts-1 as the qml module
 -    is needed for anything to be displayed. LP: #1310019
 -
 - -- Harald Sitter <apachelogger at kubuntu.org>  Tue, 22 Apr 2014 11:47:08 +0200
 -
 -ktouch (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:17:55 +0100
 -
 -ktouch (4:4.12.97-0ubuntu1) trusty; urgency=medium
 -
 -  * New upstream release candidate
 -
 - -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:44:49 +0200
 -
 -ktouch (4:4.12.95-0ubuntu1) trusty; urgency=medium
 -
 -  * New upstream beta release
 -
 - -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 12:44:41 +0100
 -
 -ktouch (4:4.12.90-0ubuntu1) trusty; urgency=medium
 -
 -  * New upstream beta release
 -
 - -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 11:31:12 +0000
 -
+ ktouch (4:4.12.3-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 21:05:40 +0100
+ 
+ ktouch (4:4.12.2-0ubuntu1) trusty; urgency=medium
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 05 Feb 2014 00:17:00 +0000
+ 
+ ktouch (4:4.12.1-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 16 Jan 2014 08:31:32 +0000
+ 
+ ktouch (4:4.12.0-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Dec 2013 17:29:09 +0000
+ 
+ ktouch (4:4.11.97-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 29 Nov 2013 13:28:21 +0000
+ 
+ ktouch (4:4.11.95-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 25 Nov 2013 18:25:36 +0100
+ 
+ ktouch (4:4.11.80-0ubuntu1) trusty; urgency=low
+ 
+   * New upstream beta release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:51:32 +0100
+ 
+ ktouch (4:4.11.2-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Sep 2013 14:42:49 +0100
+ 
+ ktouch (4:4.11.1-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bugfix release.
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 06 Sep 2013 22:33:18 +0100
+ 
+ ktouch (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:30:39 +0100
+ 
+ ktouch (4:4.10.97-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC 2 release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 26 Jul 2013 19:53:17 +0100
+ 
+ ktouch (4:4.10.95-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream RC release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 19 Jul 2013 12:33:10 +0000
+ 
+ ktouch (4:4.10.90-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream bet release
+ 
+  -- Michał Zając <quintasan at kubuntu.org>  Fri, 28 Jun 2013 18:24:34 +0100
+ 
+ ktouch (4:4.10.80-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:38:37 +0100
+ 
+ ktouch (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+ 
+   * New upstream bugfix release
+ 
+  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 07 Jun 2013 00:43:52 +0100
+ 
+ ktouch (4:4.10.3-0ubuntu1) saucy; urgency=low
+ 
+   * New upstream release
+   * Merge with Debian
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 May 2013 16:55:08 +0000
+ 
  ktouch (4:4.10.2-1) experimental; urgency=low
  
    * New upstream release.
@@@ -120,3 -399,39 +411,38 @@@ ktouch (4:4.7.2-1) experimental; urgenc
    * Add ktouch-data package.
    
   -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 10:45:43 -0300
+ 
+ ktouch (4:4.7.2-0r1) raring; urgency=low
+ 
+   * Initial release. Start from the Kubuntu packaging, thanks!
+ 
+   [ Eshat Cakar ]
+   * Add ktouch-data package.
+   
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Oct 2011 18:55:10 +0200
+ 
+ ktouch (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 01:03:18 +0200
+ 
+ ktouch (4:4.7.1-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream release
+ 
+  -- Jonathan Kolberg <bulldog98 at kubuntu-de.org>  Fri, 09 Sep 2011 23:53:36 -0400
+ 
+ ktouch (4:4.7.0-0ubuntu1) oneiric; urgency=low
+ 
+   * New upstream release. 
+ 
+  -- Philip Muškovac <yofel at kubuntu.org>  Sun, 24 Jul 2011 23:35:13 +0200
+ 
+ ktouch (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
+ 
+   * Initial release (moved out of ktouch)
+   * Repack upstream source to include a copy of the FDL
+ 
+  -- Harald Sitter <apachelogger at ubuntu.com>  Mon, 11 Jul 2011 00:00:09 +0200
 -
diff --cc debian/control
index 0545edb,a6b9c5e..8dd133d
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,7 @@@
  Source: ktouch
  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>
  Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake,
                 debhelper (>= 9),

-- 
ktouch packaging

More information about the pkg-kde-commits mailing list