[SCM] ktouch packaging branch, master, updated. debian/14.12.2-1-6-gdead7f7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit dead7f7746d6aa695d9a8c2e350fab3dab7b7cf3
Merge: de719b04ff405a53eba5e089fbf071c03048422b 24e56a2f8a1216fbd7e6776aca1ada39adddc404
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 20:33:48 2015 +0100

    Merge commit '24e56a2f8a1216fbd7e6776aca1ada39adddc404'

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

diff --cc debian/changelog
index baad27c,496b717..fd18247
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,11 +1,24 @@@
 +ktouch (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 13:21:12 +0100
 +
+ ktouch (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * Add back kdelibs parent version depend. 
+   * New upstream release
+   * Fix kdelibs5 version in build depends. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:03:11 -0700
+ 
 +ktouch (4:14.12.2-1) experimental; urgency=medium
 +
 +  * Prepare Debian release.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 19 Feb 2015 22:37:42 +0100
 +
  ktouch (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
ktouch packaging