[SCM] charmtimetracker packaging branch, master, updated. debian/1.10.0-1-12-gec7733e

[Sandro Knauß]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/charmtimetracker.git;a=commitdiff;h=b27495e

The following commit has been merged in the master branch:
commit b27495edadb1b1c62f57298f692f31b3af920fba
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Thu May 26 11:04:33 2016 +0200

    Added patch to fix the licenses in cmake folder.
---
 ...-Modules-FindXCB.cmake-relicense-to-GPLv2.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/CMake-Modules-FindXCB.cmake-relicense-to-GPLv2.patch b/debian/patches/CMake-Modules-FindXCB.cmake-relicense-to-GPLv2.patch
new file mode 100644
index 0000000..7a9d22f
--- /dev/null
+++ b/debian/patches/CMake-Modules-FindXCB.cmake-relicense-to-GPLv2.patch
@@ -0,0 +1,38 @@
+From cc6ce0f1c640e7fb04f098586bdf11a08ade86b6 Mon Sep 17 00:00:00 2001
+From: Allen Winter <allen.winter at kdab.com>
+Date: Mon, 16 May 2016 12:50:26 -0400
+Subject: CMake/Modules/FindXCB.cmake - relicense to GPLv2+ ISSUE:
+ #278
+
+Change-Id: Iaf0b2ccc300714f582efcfe6f0573f1148798075
+---
+ Charm/CMake/Modules/FindXCB.cmake | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/Charm/CMake/Modules/FindXCB.cmake b/Charm/CMake/Modules/FindXCB.cmake
+index c06e269..cfabe4f 100644
+--- a/Charm/CMake/Modules/FindXCB.cmake
++++ b/Charm/CMake/Modules/FindXCB.cmake
+@@ -1,6 +1,18 @@
+ # Copyright (C) 2015-2016 Klaralvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
+ 
+-# Redistribution and use is allowed according to the terms of the BSD license
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License along
++# with this program; if not, write to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ #
+ # Try to find XCB library and include path.
+-- 
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 92481e8..cb09279 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 notinstall_license.txt.patch
+CMake-Modules-FindXCB.cmake-relicense-to-GPLv2.patch

-- 
charmtimetracker packaging