[SCM] kblackbox packaging branch, kubuntu_vivid_archive, updated. debian/4.11.3-2-7-gf9a982d

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 7f0c8c7d9ccb33b37a3d2edb20977b0a846a8dd7
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      | 7 ++++---
 2 files changed, 4 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 306b91c..4858042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-kblackbox (4:14.11.95-0ubuntu1) UNRELEASED; urgency=medium
+kblackbox (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
 
-  * New upstream beta release.
+  * New upstream release candidate.
   * Fix watch urls for new release location.
   * Update Vcs urls for the new repository location.
   * 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 22:55:44 +0100
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 21:09:12 +0100
 
 kblackbox (4:4.11.3-3) UNRELEASED; urgency=medium
 

-- 
kblackbox packaging