[SCM] cantor packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-2-6-ga3c774a

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit e3b46f5ecd8da24be2d77ce9919eef8b80b3402b
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/source/local-options | 1 -
 3 files changed, 3 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 35e4ee8..6bfc434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-cantor (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+cantor (4:14.11.97-0ubuntu1~ubuntu15.04~ppa2) vivid; urgency=medium
 
   [ Scarlett Clark ]
   * New upstream release candidate
 
   [ Jonathan Riddell ]
   * Tidy up debian/copyright
+  * PPA build
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 02 Dec 2014 09:53:39 -0800
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Dec 2014 11:52:32 +0100
 
 cantor (4:14.11.95-0ubuntu2) vivid; urgency=medium
 
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

-- 
cantor packaging