[SCM] kde-dev-utils packaging branch, kubuntu_vivid_archive, updated. debian/4.12.2-2-6-g18aceb6

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/kde-dev-utils.git;a=commitdiff;h=3d4b08c

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 3d4b08c0b38abc2475c8970ae2577c228134c0ff
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            | 8 ++++++--
 debian/source/local-options | 1 -
 3 files changed, 6 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 e623f39..ab13a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-kde-dev-utils (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kde-dev-utils (4:14.11.97-0ubuntu1~ubuntu15.04~ppa2) vivid; urgency=medium
 
+  [ Philip Muškovac ]
   * New upstream release candidate
   * Fix watch urls for new release location
   * Update Vcs urls for the new repository location
   * Update the maintainer
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sun, 23 Nov 2014 17:57:50 +0100
+  [ Jonathan Riddell ]
+  * PPA build
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Dec 2014 14:59:30 +0100
 
 kde-dev-utils (4:4.12.2-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

-- 
kde-dev-utils packaging