[SCM] KDE Artwork module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-8-gdc321ff

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit ac127f221657bbc3c08c015dca4e305e94c07027
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 +++--
 debian/source/local-options | 1 -
 3 files changed, 3 insertions(+), 4 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 3f63941..8b7d501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kdeartwork (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kdeartwork (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * Merge with debian unstable, remaining changes:
     - don't build-depend on libqt4-opengl-dev on armel armhf
@@ -22,8 +22,9 @@ kdeartwork (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
     - remove obsolete colorschemes from kdeartwork.install
     - drop now obsolete build-depends on xscreensaver*, libqt4-opengl-dev
     - add obsolete files to not-installed
+  * PPA build
 
- -- Philip Muškovac <yofel at kubuntu.org>  Mon, 24 Nov 2014 23:09:05 +0100
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 21:47:17 +0100
 
 kdeartwork (4:4.14.2-1) unstable; urgency=medium
 
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
KDE Artwork module packaging