[SCM] kblocks packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-7-gd715466

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit a6c631432e908562c3b94639415ec3fe6a0099c2
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 +++--
 2 files changed, 3 insertions(+), 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 8b5daca..a78be6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kblocks (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kblocks (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
   * New upstream release candidate.
   * Fix watch urls for new release location.
@@ -6,8 +6,9 @@ kblocks (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update the maintainer.
   * Recommend khelpcenter instead of khelpcenter4.
+  * PPA build
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sat, 22 Nov 2014 23:28:29 +0100
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 21:14:55 +0100
 
 kblocks (4:4.14.2-2) UNRELEASED; urgency=medium
 

-- 
kblocks packaging