[SCM] KDE Development Platform Libraries module packaging branch, kubuntu_vivid, updated. debian/4.14.2-3-4-ge95a2c7

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=e95a2c7

The following commit has been merged in the kubuntu_vivid branch:
commit e95a2c7ed7854e54f4e015e39d87b63f40a8bc4c
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Jan 21 15:24:47 2015 +0100

     Readd kdelibs5-plugins depends on katepart
    
    * Readd kdelibs5-plugins depends on katepart
    * Remove katepart from the kdelibs5-plugins depends to allow kate to build
---
 debian/.gitattributes       |  1 -
 debian/changelog            | 12 ++++++++++++
 debian/source/local-options |  1 -
 3 files changed, 12 insertions(+), 2 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 bfc1648..bd89de4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kde4libs (4:4.14.2-4~ubuntu3) vivid; urgency=medium
+
+  * Readd kdelibs5-plugins depends on katepart
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Wed, 26 Nov 2014 23:41:37 +0100
+
+kde4libs (4:4.14.2-4~ubuntu2) vivid; urgency=medium
+
+  * Remove katepart from the kdelibs5-plugins depends to allow kate to build 
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Wed, 26 Nov 2014 00:12:14 +0100
+
 kde4libs (4:4.14.2-4~ubuntu1) vivid; urgency=medium
 
   * Merge with Debian Git, remaining changes:
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

-- 
KDE Development Platform Libraries module packaging