[SCM] lokalize packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-5-g17d8499

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 5821d9d8abf1e3e43efd46c19597abb42ee1a8a8
Merge: 34158f445c99ad80aaa5cfa971b3b7b359313407 7a17686cdeac509fe93b911a8b2618d744aaeb38
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 2 13:10:48 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 522f303,6e78ea4..ba90069
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
 +lokalize (4:14.12.2-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.2).
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 20 Feb 2015 09:19:58 +0100
 +
+ lokalize (4:14.12.2-0ubuntu2) UNRELEASED; urgency=medium
+ 
+   * Add back kdelibs parent version depend. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 20 Feb 2015 14:01:34 -0800
+ 
  lokalize (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
lokalize packaging