[SCM] ktimer packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-6-gcf0dcb7

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 134d19f4594bc8b2d4d4a0f12b4094e7c3cedf93
Merge: a2bbda0d2e1793be5ac21c112594ba805ef32973 089ac793b1ecfbaee8e896c0085866b803fc888a
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 2 12:10:02 2015 +0100

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

 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --cc debian/changelog
index a8f94fe,a941785..ff04f3e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -8,8 -1,9 +8,9 @@@ ktimer (4:14.12.2-1) experimental; urge
  ktimer (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
 -  * Remove unstable from watch file, uscan fails with 
 +  * Remove unstable from watch file, uscan fails with
      remote site does not even have current version
+   * Add back the kdelibs parent version depend. 
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 10 Feb 2015 09:32:19 -0800
  

-- 
ktimer packaging