[SCM] kdesignerplugin packaging branch, kubuntu_vivid_archive, updated. dda191e925011bc59b0dd5e2d74c7a68e2f90f6c

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdesignerplugin.git;a=commitdiff;h=dda191e

The following commit has been merged in the kubuntu_vivid_archive branch:
commit dda191e925011bc59b0dd5e2d74c7a68e2f90f6c
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Nov 28 13:23:09 2014 +0100

    Remove unused patch kubuntu_qtwebkit-5.1.diff
---
 debian/changelog                         |  6 ++++++
 debian/patches/kubuntu_qtwebkit-5.1.diff | 12 ------------
 debian/patches/series                    |  1 -
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a147b5..77c6f3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdesignerplugin (5.4.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Remove unused patch kubuntu_qtwebkit-5.1.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 28 Nov 2014 13:22:56 +0100
+
 kdesignerplugin (5.4.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_qtwebkit-5.1.diff b/debian/patches/kubuntu_qtwebkit-5.1.diff
deleted file mode 100644
index b848105..0000000
--- a/debian/patches/kubuntu_qtwebkit-5.1.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: kdesignerplugin-4.98.0/CMakeLists.txt
-===================================================================
---- kdesignerplugin-4.98.0.orig/CMakeLists.txt	2014-04-02 11:20:47.874922534 +0100
-+++ kdesignerplugin-4.98.0/CMakeLists.txt	2014-04-02 11:21:05.150922059 +0100
-@@ -11,6 +11,7 @@
- include(KDECMakeSettings)
- include(FeatureSummary)
- 
-+find_package(Qt5WebKitWidgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
- set(REQUIRED_QT_VERSION 5.2.0)
- find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
- find_package(Qt5Designer ${REQUIRED_QT_VERSION} NO_MODULE)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 389ae74..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_qtwebkit-5.1.diff

-- 
kdesignerplugin packaging