[SCM] ardour3/master: Added missing zlib license.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Sep 17 01:37:08 UTC 2013


The following commit has been merged in the master branch:
commit 9bce5b69826845cb3ab1696b0a69817ce5ad869b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Sep 17 03:39:18 2013 +0200

    Added missing zlib license.

diff --git a/debian/copyright b/debian/copyright
index 92c8ce2..dc03b8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -630,6 +630,13 @@ Copyright:
  unknown. Code by Laurent de Soras <laurent at ohmforce.com>
 License: WTFPL-2
 
+Files:
+ tools/omf/loader.cc
+ tools/omf/omftool.cc
+Copyright:
+ 2009 Hannes Breul
+License: zlib
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
@@ -831,3 +838,20 @@ License: WTFPL-2
  This work is free. You can redistribute it and/or modify it under the
  terms of the Do What The Fuck You Want To Public License, Version 2,
  as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.
+
+License: 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.

-- 
ardour3 packaging



More information about the pkg-multimedia-commits mailing list