[SCM] kshisen packaging branch, kubuntu_vivid_archive, updated. debian/4.13.1-1-5-gf50a607

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 7e150d7373121ef52c20966e790eb0b634c398c2
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 16:34:56 2014 +0100

    update to 14.11.97
---
 debian/.gitattributes | 1 -
 debian/changelog      | 2 +-
 2 files changed, 1 insertion(+), 2 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 503f49b..53bd40e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kshisen (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kshisen (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream RC release
 

-- 
kshisen packaging