[SCM] kwin packaging branch, kubuntu_vivid_archive, updated. 0b2ac60b9399b388ff882808e502d5007358fde4

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwin.git;a=commitdiff;h=0b2ac60

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

    remove obsolete patch kubuntu_kf5-version.diff
---
 debian/changelog                        |  6 ++++++
 debian/patches/kubuntu_kf5-version.diff | 36 ---------------------------------
 2 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89ef706..91833c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kwin (4:5.1.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * remove obsolete patch kubuntu_kf5-version.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 28 Nov 2014 13:24:27 +0100
+
 kwin (4:5.1.1-0ubuntu1) vivid; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/kubuntu_kf5-version.diff b/debian/patches/kubuntu_kf5-version.diff
deleted file mode 100644
index 7a6dcd6..0000000
--- a/debian/patches/kubuntu_kf5-version.diff
+++ /dev/null
@@ -1,36 +0,0 @@
- Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- kwin (4:5.0.95-0ubuntu1~ubuntu14.10~ppa2) utopic; urgency=medium
- .
-   * New upstream beta release
-Author: Jonathan Riddell <jriddell at ubuntu.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- kwin-5.0.95.orig/CMakeLists.txt
-+++ kwin-5.0.95/CMakeLists.txt
-@@ -4,7 +4,7 @@ set(PROJECT_VERSION_MAJOR 5)
- 
- cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
- set(QT_MIN_VERSION "5.3.0")
--set(KF5_MIN_VERSION "5.3.0")
-+set(KF5_MIN_VERSION "5.2.0")
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
- 

-- 
kwin packaging