[SCM] kolf packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-2-g8d69126

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 8d691262473ef178df73cc1a669badd8e38c6c48
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Nov 14 18:36:22 2014 +0100

     Merge with debian, packaging now in Debian git, remaining changes:
    
    * Merge with debian, packaging now in Debian git, remaining changes:
     - add not-installed file
---
 debian/changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index be152c8..a10e8e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-kolf (4:14.11.90-0ubuntu1) UNRELEASED; urgency=medium
+kolf (4:14.11.90-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
+  * Merge with debian, packaging now in Debian git, remaining changes:
+   - add not-installed file
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 14 Nov 2014 18:10:33 +0100
 

-- 
kolf packaging