[SCM] kdeedu-data packaging branch, kubuntu_vivid_archive, updated. 53fd438d54e14ce09d54a3c7f7e7dfcf22472b5b

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit f5546b1668a1866be11bf6e764243689c71b3b57
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            | 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 d43825f..57e3cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-kdeedu-data (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kdeedu-data (4:14.11.97-0ubuntu1~ubuntu15.04~ppa2) vivid; urgency=medium
 
+  [ Philip Muškovac ]
   * New upstream release candidate, renamed to kdeedu-data
     - Drop libkeduvocdocument4, libkdeedu-dev, libkdeedu-dbg as only the
       architecture independent files are shipped in kdeedu-data and drop
@@ -12,7 +13,10 @@ kdeedu-data (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
 
   * FIXME: No copyright information present!
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sun, 23 Nov 2014 20:01:06 +0100
+  [ Jonathan Riddell ]
+  * PPA build
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 12:21:49 +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

-- 
kdeedu-data packaging