[SCM] KDE Web Development module packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-6-g3c5b22e

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 0c2ffb01d3683c91aecc63bc214fd3bc32f11292
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 3633975..fb401b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kdewebdev (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kdewebdev (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release candidate
 
diff --git a/debian/control b/debian/control
index 403ae2d..d2eecf0 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,7 @@ Package: klinkstatus
 Architecture: any
 Section: web
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: khelpcenter
+Suggests: khelpcenter4
 Description: web link validity checker
  KLinkStatus is KDE's web link validity checker. It allows you to
  search internal and external links throughout your web site. Simply
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 Web Development module packaging