[SCM] plasma-mediacenter packaging branch, master, updated. 25555f27cc86566f8965330ec5bc184e1ba5807f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 04ce23e3c4b0695b8c42cbc1bf74c3ab6b1e18ea
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 4 01:26:12 2015 +0200

    Remove upstream patch: upstream_replace_reference_to_license_with_the_bsd_license
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 -
 ...place_reference_to_license_with_the_bsd_license | 42 ----------------------
 3 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4203aaf..935fc4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 plasma-mediacenter (5.4.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.4.0).
+  * Remove upstream patch:
+    upstream_replace_reference_to_license_with_the_bsd_license
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Sep 2015 23:35:57 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 1102447..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_replace_reference_to_license_with_the_bsd_license
diff --git a/debian/patches/upstream_replace_reference_to_license_with_the_bsd_license b/debian/patches/upstream_replace_reference_to_license_with_the_bsd_license
deleted file mode 100644
index c79b289..0000000
--- a/debian/patches/upstream_replace_reference_to_license_with_the_bsd_license
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 6eb54f7a33b0e07b031f9ec94ea4196972d57d05
-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/FindTaglib.cmake b/cmake/FindTaglib.cmake
-index f9da791..c23d582 100644
---- a/cmake/FindTaglib.cmake
-+++ b/cmake/FindTaglib.cmake
-@@ -7,8 +7,29 @@
- 
- # Copyright (c) 2006, Laurent Montel, <montel 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 TAGLIB_MIN_VERSION)
-   set(TAGLIB_MIN_VERSION "1.4")

-- 
plasma-mediacenter packaging