[SCM] ksirk packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-3-gbe90b88

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 123cf231d0f6b3a7547367e6ee61dd645313860c
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 92768fe..b906034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ksirk (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+ksirk (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream RC release
   * Merge with Debian, remaining changes:

-- 
ksirk packaging