[SCM] plasma-workspace packaging branch, master, updated. 1557b3a52060d97753635741e615f7aca2ef9009

Wed Jul 8 17:42:54 UTC 2015

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

The following commit has been merged in the master branch:
commit a44029d5f1b96d400ce2899233b95488da09fb61
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jul 8 10:15:56 2015 +0200

    New upstream patch: plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
---
 debian/changelog                                   |  2 +
 ...place_reference_to_license_with_the_bsd_license | 78 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 81 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 59fdca9..1ccbe99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ plasma-workspace (4:5.3.2-1~) UNRELEASED; urgency=medium
   * New upstream release (5.3.2).
   * Add the missing Breaks/Replaces.
   * Refresh patch.
+  * New upstream patch: plasma-workspace-upstream-
+    replace_reference_to_license_with_the_bsd_license
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 01 Jul 2015 16:04:50 +0200
 
diff --git a/debian/patches/plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license b/debian/patches/plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
new file mode 100644
index 0000000..69e2731
--- /dev/null
+++ b/debian/patches/plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
@@ -0,0 +1,78 @@
+commit 6882f14e7b3175a3db66436a9a31c0c7470af9dd
+Author: Jonathan Riddell <jr at jriddell.org>
+Date:   Thu Apr 23 16:10:01 2015 +0200
+
+    replace reference to licence with the bsd licence as the reference often goes missing
+
+diff --git a/cmake/FindQalculate.cmake b/cmake/FindQalculate.cmake
+index 707a9f7..72d65bc 100644
+--- a/cmake/FindQalculate.cmake
++++ b/cmake/FindQalculate.cmake
+@@ -12,8 +12,29 @@
+ #
+ # Copyright (c) 2007, Vladimir Kuznetsov, <ks.vladimir at gmail.com>
+ #
+-# 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(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES)
+ 
+diff --git a/cmake/MacroPushRequiredVars.cmake b/cmake/MacroPushRequiredVars.cmake
+index 650b566..54c2b3a 100644
+--- a/cmake/MacroPushRequiredVars.cmake
++++ b/cmake/MacroPushRequiredVars.cmake
+@@ -13,8 +13,29 @@
+ 
+ # Copyright (c) 2006, Alexander Neundorf, <neundorf 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.
+ 
+ MACRO(MACRO_PUSH_REQUIRED_VARS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f7424a5..2e17e2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kubuntu_startkde-qtpath.diff
 install_missing_header
+plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license

-- 
plasma-workspace packaging

