[SCM] sonic-pi/master: debian/copyright: Document zlib license for two hh files.

pere at users.alioth.debian.org pere at users.alioth.debian.org
Fri Feb 19 17:57:11 UTC 2016


The following commit has been merged in the master branch:
commit c3d8d3fca7ae7d91f29cf4701440be947c20f11b
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Feb 19 17:52:50 2016 +0000

    debian/copyright: Document zlib license for two hh files.

diff --git a/debian/copyright b/debian/copyright
index c82ffe8..34cadc9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -521,6 +521,11 @@ Copyright: 2008 Dolfeus
 Source: http://freesound.org/people/Dolfeus/sounds/55232/
 License: CC0
 
+Files: app/gui/qt/udp.hh
+       app/gui/qt/oscpkt.hh
+Copyright: 2010, Julien Pommier
+License: Zlib
+
 Files: app/server/vendor/ruby-beautify/*
 Copyright: 2012 Ernie Brodeur
 Source: https://github.com/erniebrodeur/ruby-beautify/tree/v0.92.2
@@ -703,3 +708,20 @@ License: CC0
  .
  For more information, see
  https://creativecommons.org/publicdomain/zero/1.0/legalcode
+
+Licence: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute
+ it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.

-- 
sonic-pi packaging



More information about the pkg-multimedia-commits mailing list