[SCM] kholidays packaging branch, master, updated. ubuntu/15.08.0-0ubuntu1-11-g917608e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kholidays.git;a=commitdiff;h=cc06e52

The following commit has been merged in the master branch:
commit cc06e52c15c66fbb4f602b31651fd0000cd5331a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Sep 8 13:04:25 2015 +0200

    Update copyright file.
---
 debian/copyright | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 82de32e..f10ee2e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,10 @@ Upstream-Name: kholidays
 Source: http://download.kde.org/pub/kde/unstable/applications/
 
 Files: *
-Copyright: 2004-2012 Allen Winter <winter at kde.org>
-           2010 John Layt <john at layt.net>
-           2008 David Jarvie <djarvie at kde.org>
-           2001 Cornelius Schumacher <schumacher at kde.org>
+Copyright: 2004-3009, Allen Winter <winter at kde.org>
+           2001, Cornelius Schumacher <schumacher at kde.org>
+           2008, David Jarvie <djarvie at kde.org>
+           2010, John Layt <john at layt.net>
 License: LGPL-2+
 
 Files: kholidays/parsers/plan2/holidayparserplan.cpp
@@ -18,10 +18,42 @@ Copyright: 2002-2008, Free Software
            2002-2006, Free Software Foundation, Inc
 License: GPL-3+_BisonException
 
+Files: src/lunarphase.cpp
+Copyright: 2004-2009, Allen Winter <winter at kde.org>
+License: BSD-4-clause or LGPL-2+
+
 Files: debian/*
 Copyright: 2015 Harald Sitter <sitter at kde.org>
 License: LGPL-2+
 
+License: BSD-4-clause
+ 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. All advertising materials mentioning features or use of this software
+    must display the following acknowledgement:
+      This product includes software developed by the University of
+      California, Berkeley and its contributors.
+ 4. 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
+
 License: LGPL-2+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public

-- 
kholidays packaging