[SCM] kfloppy packaging branch, kubuntu_vivid_archive, updated. debian/4.12.2-2-5-g9420c51

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit d15d7eaf74a4b98190e6b07cd07dd4cbeaca8e0f
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/source/local-options | 1 -
 3 files changed, 1 insertion(+), 3 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 0528271..1d5ceb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kfloppy (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kfloppy (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release candidate
 
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

-- 
kfloppy packaging