[SCM] xbmc-pvr-addons/master: Fix missing copyright information in debian/copyright

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Mon Mar 31 11:06:54 UTC 2014


The following commit has been merged in the master branch:
commit 707044bbd64acb0d6469a4bd760016cf72f38ade
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Mar 31 12:22:45 2014 +0200

    Fix missing copyright information in debian/copyright

diff --git a/debian/changelog b/debian/changelog
index b04c008..958adda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xbmc-pvr-addons (12.0+79+ge1c3fb1+dfsg1-2) unstable; urgency=low
+
+  * Fix missing copyright information in debian/copyright
+
+ -- Balint Reczey <balint at balintreczey.hu>  Mon, 31 Mar 2014 12:20:52 +0200
+
 xbmc-pvr-addons (12.0+79+ge1c3fb1+dfsg1-1) unstable; urgency=low
 
   * Drop xmlParser.* from original tarball due to their non-free license
diff --git a/debian/copyright b/debian/copyright
index a7755cc..d4baa1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,10 +40,60 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
+Files: lib/cmyth
+Copyright: 2004-2012, Eric Lund
+           2004-2012, Jon Gettler
+           2012, Christian Fetzer
+           2006-2012, Sergio Slobodrian
+           2006-2009, Simon Hyde
+           2002  Ulric Eriksson <ulric at siag.nu>
+           2006 Alexander Chemeris
+License:  LGPL-2.1+
+
+Files: lib/libhts/sha1.*
+Copyright: 2007 Michael Niedermayer
+License:  LGPL-2.1+
+
+Files: lib/platform/windows/dlfcn-win32.*
+Copyright: 2007 Ramiro Polla
+License:  LGPL-2.1+
+
+Files: lib/cmyth/libcmyth/channel.c
+Copyright: 2005-2013 Team XBMC (http://www.xbmc.org)
+License: GPL-2+
+
 Files: lib/rapidxml
 Copyright: 2006, 2007 Marcin Kalicinski
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
+License: Expat or BSL-1.0
+ Use of this software is granted under one of the following two licenses,
+ to be chosen freely by the user.
+ .
+ 1. Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+ .
+ 2. The MIT License
+ Permission is hereby graented, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-- 
xbmc-pvr-addons packaging



More information about the pkg-multimedia-commits mailing list