[SCM] kbruch packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-4-g7473ba7

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit c6ca4253692d493d565bd3f303947b550c99d894
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 +++--
 debian/source/local-options | 1 -
 3 files changed, 3 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 198b766..6915ba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kbruch (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kbruch (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 @@ kbruch (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>  Sun, 23 Nov 2014 13:00:54 +0100
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 21:19:15 +0100
 
 kbruch (4:4.14.1-1) unstable; urgency=medium
 
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

-- 
kbruch packaging