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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d4cbb1280cab79f7d38b24c7aecb3336bfc0c99e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 13 11:41:04 2015 +0200

    Prepare initial debian release (5.3.0-1)
---
 debian/changelog                                   |  9 +++++
 debian/patches/series                              |  1 +
 ...place_reference_to_license_with_the_bsd_license | 42 ++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4e257c2..1bab2b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,14 @@
+plasma-mediacenter (5.3.0-1~) UNRELEASED; urgency=medium
+
+  * Initial Debian release.
+  * New upstream patch:
+    upstream_replace_reference_to_license_with_the_bsd_license
+
+ -- Maximiliano Curia <maxy at debian.org>  Wed, 13 May 2015 11:40:13 +0200
+
 plasma-mediacenter (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Harald Sitter ]
   * KDE Frameworks 5 port
 
  -- Harald Sitter <sitter at kde.org>  Fri, 13 Feb 2015 13:25:51 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1102447
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..c79b289
--- /dev/null
+++ b/debian/patches/upstream_replace_reference_to_license_with_the_bsd_license
@@ -0,0 +1,42 @@
+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