[SCM] kde-base-artwork packaging branch, kubuntu_vivid_archive, updated. debian/4.11.5-1-5-g6f402c4

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit c6b3bc8ed9a58626130a683ab62cb7d313ac4780
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 16:34:55 2014 +0100

    update to 14.11.97
---
 debian/.gitattributes | 1 -
 debian/changelog      | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 094a8cc..f9191a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-kde-base-artwork (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kde-base-artwork (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release candidate.
   * Fix watch urls for new release location.
   * Update Vcs urls for the new repository location.
   * Update the maintainer.
+  * PPA build
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sun, 23 Nov 2014 14:19:24 +0100
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 21:35:27 +0100
 
 kde-base-artwork (4:4.11.5-1) unstable; urgency=low
 

-- 
kde-base-artwork packaging