[SCM] plasma-desktop packaging branch, master, updated. 515fa4c30b05f349ed31c2656b7a498be469086c

Thu Jul 9 06:01:28 UTC 2015

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

The following commit has been merged in the master branch:
commit bc4dbece3fc0343b17d698b908b91140369f46af
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jul 8 12:28:14 2015 +0200

    New upstream patch: upstream-replace_license_reference_by_license_text
---
 debian/changelog                                   |   2 +
 debian/patches/series                              |   1 +
 ...tream-replace_license_reference_by_license_text | 150 +++++++++++++++++++++
 3 files changed, 153 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bee08fe..71be9ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ plasma-desktop (4:5.3.2-1~) UNRELEASED; urgency=medium
   * New upstream release (5.3.2).
   * Update copyright information.
   * Add the missing Breaks/Replaces.
+  * New upstream patch: upstream-
+    replace_license_reference_by_license_text
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 02 Jul 2015 11:15:45 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2a06167
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream-replace_license_reference_by_license_text
diff --git a/debian/patches/upstream-replace_license_reference_by_license_text b/debian/patches/upstream-replace_license_reference_by_license_text
new file mode 100644
index 0000000..e4375b3
--- /dev/null
+++ b/debian/patches/upstream-replace_license_reference_by_license_text
@@ -0,0 +1,150 @@
+commit 9eb2dee3312b66eff36b4ddb362a8fdca6ec6474
+Author: Jonathan Riddell <jr at jriddell.org>
+Date:   Thu Apr 23 16:10:00 2015 +0200
+
+    replace reference to licence with the bsd licence as the reference often goes missing
+
+diff --git a/cmake/modules/FindCanberra.cmake b/cmake/modules/FindCanberra.cmake
+index 7aad185..48e2d54 100644
+--- a/cmake/modules/FindCanberra.cmake
++++ b/cmake/modules/FindCanberra.cmake
+@@ -7,8 +7,29 @@
+ #
+ # Copyright (c) 2012 Raphael Kubo da Costa <rakuco at FreeBSD.org>
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++# 1. Redistributions of source code must retain the above copyright
++#    notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the above copyright
++#    notice, this list of conditions and the following disclaimer in the
++#    documentation and/or other materials provided with the distribution.
++# 3. Neither the name of the University nor the names of its contributors
++#    may be used to endorse or promote products derived from this software
++#    without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++# SUCH DAMAGE.
+ 
+ find_package(PkgConfig)
+ pkg_check_modules(PC_CANBERRA libcanberra)
+diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
+index 3f2fa33..fb5f9bc 100644
+--- a/cmake/modules/FindSynaptics.cmake
++++ b/cmake/modules/FindSynaptics.cmake
+@@ -7,8 +7,29 @@
+ #
+ # Copyright (c) 2015 David Edmundson <davidedmundson at kde.org>
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++# 1. Redistributions of source code must retain the above copyright
++#    notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the above copyright
++#    notice, this list of conditions and the following disclaimer in the
++#    documentation and/or other materials provided with the distribution.
++# 3. Neither the name of the University nor the names of its contributors
++#    may be used to endorse or promote products derived from this software
++#    without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++# SUCH DAMAGE.
+ 
+ find_package(PkgConfig)
+ pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
+diff --git a/kcms/touchpad/cmake/modules/FindX11_XCB.cmake b/kcms/touchpad/cmake/modules/FindX11_XCB.cmake
+index 2d7d5a1..c31d9b6 100644
+--- a/kcms/touchpad/cmake/modules/FindX11_XCB.cmake
++++ b/kcms/touchpad/cmake/modules/FindX11_XCB.cmake
+@@ -10,8 +10,29 @@
+ # Copyright (c) 2008 Helio Chissini de Castro, <helio at kde.org>
+ # Copyright (c) 2007 Matthias Kretz, <kretz at kde.org>
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++# 1. Redistributions of source code must retain the above copyright
++#    notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the above copyright
++#    notice, this list of conditions and the following disclaimer in the
++#    documentation and/or other materials provided with the distribution.
++# 3. Neither the name of the University nor the names of its contributors
++#    may be used to endorse or promote products derived from this software
++#    without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++# SUCH DAMAGE.
+ 
+ IF (NOT WIN32)
+   # use pkg-config to get the directories and then use these values
+diff --git a/kcms/touchpad/cmake/modules/FindXCB.cmake b/kcms/touchpad/cmake/modules/FindXCB.cmake
+index 99dda2d..4aebe50 100644
+--- a/kcms/touchpad/cmake/modules/FindXCB.cmake
++++ b/kcms/touchpad/cmake/modules/FindXCB.cmake
+@@ -14,8 +14,29 @@
+ #
+ # Copyright (c) 2012 Fredrik Höglund <fredrik at kde.org>
+ #
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++# 1. Redistributions of source code must retain the above copyright
++#    notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the above copyright
++#    notice, this list of conditions and the following disclaimer in the
++#    documentation and/or other materials provided with the distribution.
++# 3. Neither the name of the University nor the names of its contributors
++#    may be used to endorse or promote products derived from this software
++#    without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++# SUCH DAMAGE.
+ 
+ 
+ IF (NOT WIN32)

-- 
plasma-desktop packaging

