[SCM] libkdeedu packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-7-g6d23c3a

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit dac8700bc3ea17f1c47f487c028fe0611346e7ad
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            | 7 ++++---
 debian/source/local-options | 1 -
 3 files changed, 4 insertions(+), 5 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 0ebe335..24ed41f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-libkdeedu (4:14.11.95-0ubuntu1) UNRELEASED; urgency=medium
+libkdeedu (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.
   * Drop kdeedu-kvtml-data and libkeedu-data packages as the files were
     moved to kdeedu-data
+  * PPA build
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sat, 22 Nov 2014 12:20:44 +0100
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 28 Nov 2014 20:23:38 +0100
 
 libkdeedu (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

-- 
libkdeedu packaging