[SCM] KDE Base Runtime module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-12-g82e0584

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 068a402ba990a3a2ec91ac8a83122335997434e5
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            | 2 +-
 debian/control              | 2 +-
 debian/source/local-options | 1 -
 4 files changed, 2 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 f843d49..0226562 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kde-runtime (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kde-runtime (4:14.11.97-0ubuntu1~ubuntu15.04~ppa2) vivid; urgency=medium
 
   [ Philip Muškovac ]
   * Merge with debian git, remaining changes:
diff --git a/debian/control b/debian/control
index 6a27048..b330f46 100644
--- a/debian/control
+++ b/debian/control
@@ -137,7 +137,7 @@ Description: shared data files for the KDE base runtime module
  .
  This package is part of the KDE base runtime module.
 
-Package: khelpcenter
+Package: khelpcenter4
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: htdig
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 Base Runtime module packaging