[SCM] libkdcraw packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-6-g3770b0d

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 921e1efb6dcebf9ffe09f535ce9cfc5a7bad0d94
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            | 8 ++++++--
 debian/source/local-options | 1 -
 3 files changed, 6 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 26692bb..e2fed54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-libkdcraw (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+libkdcraw (4:14.11.97-0ubuntu1~ubuntu15.04~ppa3) vivid; urgency=medium
 
+  [ Philip Muškovac ]
   * 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.
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sat, 22 Nov 2014 11:38:36 +0100
+  [ Jonathan Riddell ]
+  * PPA build
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 13:19:29 +0100
 
 libkdcraw (4:4.14.0-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

-- 
libkdcraw packaging