[SCM] analitza packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-5-gfd42c24

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 31d0360245a85c561cb2962ef077d8e8b0242560
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 f75c65a..8ea58a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-analitza (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+analitza (4:14.11.97-0ubuntu1~ubuntu15.04~ppa2) vivid; urgency=medium
 
   * New upstream release
   * Change build-deps for Qt 5 build
   * Change pkg-kde script to version 3 in debian/rules
+  * PPA build
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 13:37:46 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 15:41:29 +0100
 
 analitza (4:4.14.0-1) unstable; 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

-- 
analitza packaging