[SCM] filelight packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-7-g3f49ba1

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 5c7e7d87e01ec0fbe9fc280b5214d3a3b23d1b5a
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            | 8 ++++++--
 debian/source/local-options | 1 -
 3 files changed, 6 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 804b5a9..70d92c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-filelight (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+filelight (4:14.11.97-0ubuntu1~ubuntu15.04~ppa3) vivid; urgency=medium
 
+  [ Scarlett Clark ]
   * New upstream release candidate
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 02 Dec 2014 10:08:23 -0800
+  [ Jonathan Riddell ]
+  * PPA build
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Dec 2014 14:51:04 +0100
 
 filelight (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

-- 
filelight packaging