[SCM] kcolorchooser packaging branch, kubuntu_vivid_archive, updated. debian/4.11.3-1-9-g1d8f671

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 64bb24c2e9ffa14078adb2bea54ec3135cac6ab0
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 6af9697..056a033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-kcolorchooser (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kcolorchooser (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.
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update the maintainer.
+  * PPA build
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sun, 23 Nov 2014 13:57:53 +0100
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 21:31:14 +0100
 
 kcolorchooser (4:4.11.3-2) 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

-- 
kcolorchooser packaging