[SCM] amor packaging branch, kubuntu_vivid_archive, updated. debian/4.13.3-1-8-gad31ea1

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/amor.git;a=commitdiff;h=7e57787

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 7e57787fa0910c25cfe0e1ece07ff5e9576d34f7
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 679472f..0050188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-amor (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+amor (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release candidate
 
diff --git a/debian/control b/debian/control
index dfbdb9a..83a112b 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Architecture: any
 Section: games
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: kde-window-manager
-Suggests: khelpcenter
+Suggests: khelpcenter4
 Description: desktop companion
  AMOR, or Amusing Misuse Of Resources, displays an animated character who
  wanders about the screen, doing tricks and giving the occasional hint.
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

-- 
amor packaging