[SCM] cervisia packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-7-g7df1fe0

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/cervisia.git;a=commitdiff;h=11b1c1d

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 11b1c1d6f855a91d7cd03bb723f72104a4940276
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 03132ce..73042ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cervisia (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+cervisia (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release candidate
 
diff --git a/debian/control b/debian/control
index faa9b17..43b28fc 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: cervisia
 Architecture: any
 Section: devel
 Depends: cvsservice, ${misc:Depends}, ${shlibs:Depends}
-Suggests: khelpcenter
+Suggests: khelpcenter4
 Description: graphical CVS client
  Cervisia is a front-end for the CVS version control system client.
  .
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

-- 
cervisia packaging