[SCM] kapptemplate packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-21-gae2e9a3

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit d3ce963b10cc3290d50d0cf5529e1bd2a789f4a2
Merge: 967469232c0a6b707b55132b91705b81abda5078 bc372be8b962aa563298013c2806c8f534b4c399
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Fri Dec 5 15:44:55 2014 +0000

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive' into HEAD

 debian/.gitattributes       | 1 -
 debian/changelog            | 5 +++--
 debian/source/local-options | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 7805411,099a71a..a44a238
--- a/debian/changelog
+++ b/debian/changelog
@@@ -9,15 -9,10 +9,16 @@@ kapptemplate (4:14.11.97-0ubuntu1) vivi
    * kapptemplate suggests kio-dev instead of kdelibs5-dev
    * Refresh kapptemplate.install
    * Switch to v3 dhmk for kf5
+   * PPA build
  
-  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 22 Nov 2014 17:48:28 +0100
+  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 20:55:35 +0100
  
 +kapptemplate (4:4.50.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * KDE Frameworks 5 Port.
 +
 + -- Harald Sitter <apachelogger at kubuntu.org>  Fri, 31 Oct 2014 11:59:11 +0100
 +
  kapptemplate (4:4.14.1-1) unstable; urgency=medium
  
    * New upstream release (4.14.1).

-- 
kapptemplate packaging