[SCM] kde-dev-scripts packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-12-ga69af5d

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit a946c70adc8f03d98b3c680869b65f3ac01ea546
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/control              | 2 +-
 debian/source/local-options | 1 -
 4 files changed, 4 insertions(+), 5 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 7320dc2..50d0f7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kde-dev-scripts (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kde-dev-scripts (4:14.11.97-0ubuntu1~ubuntu15.04~ppa6) vivid; urgency=medium
 
   [ Philip Muškovac ]
   * Merge with debian unstable, remaining changes:
@@ -12,8 +12,9 @@ kde-dev-scripts (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
   [ Jonathan Riddell ]
   * Build-dep on kdoctools-dev and remove kde4 build-deps
   * Add upstream_install-man.diff to install man pages
+  * PPA build
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sun, 23 Nov 2014 16:54:43 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 17:12:49 +0100
 
 kde-dev-scripts (4:4.14.2-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index 44edb86..f40bf47 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Suggests: cvs,
           dmalloc,
           gdb,
           kdelibs5-doc,
-          khelpcenter,
+          khelpcenter4,
           qt4-doc,
           valgrind,
           xsltproc
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-scripts packaging