From 6d8578329f9b649c6f11e64f46c67742e9656abc Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 22 Jan 2010 15:23:15 +0000 Subject: [PATCH] Lifted ban to derive GPLv3, extended copyright range to 2010 --- libburn/branches/ZeroSevenSix/COPYRIGHT | 6 ++-- .../branches/ZeroSevenSix/cdrskin/cdrskin.c | 2 +- .../branches/ZeroSevenSix/doc/cookbook.txt | 2 +- .../ZeroSevenSix/libburn/libdax_msgs.c | 4 +-- .../ZeroSevenSix/libburn/libdax_msgs.h | 4 +-- .../branches/ZeroSevenSix/test/libburner.c | 35 ++----------------- libburn/branches/ZeroSevenSix/test/telltoc.c | 4 +-- 7 files changed, 13 insertions(+), 44 deletions(-) diff --git a/libburn/branches/ZeroSevenSix/COPYRIGHT b/libburn/branches/ZeroSevenSix/COPYRIGHT index 25ca44e3..50f594cf 100644 --- a/libburn/branches/ZeroSevenSix/COPYRIGHT +++ b/libburn/branches/ZeroSevenSix/COPYRIGHT @@ -1,12 +1,12 @@ Derek Foreman and Ben Jansens Copyright (C) 2002-2006 Derek Foreman and Ben Jansens Mario Danic , Thomas Schmitt -Copyright (C) 2006-2009 Mario Danic, Thomas Schmitt +Copyright (C) 2006-2010 Mario Danic, Thomas Schmitt This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. + it under the terms of the GNU General Public License version 2 or later + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libburn/branches/ZeroSevenSix/cdrskin/cdrskin.c b/libburn/branches/ZeroSevenSix/cdrskin/cdrskin.c index b20b4b94..f2a38745 100644 --- a/libburn/branches/ZeroSevenSix/cdrskin/cdrskin.c +++ b/libburn/branches/ZeroSevenSix/cdrskin/cdrskin.c @@ -3143,7 +3143,7 @@ set_severities:; int major, minor, micro; printf( -"Cdrecord 2.01-Emulation Copyright (C) 2006-2009, see libburnia-project.org\n"); +"Cdrecord 2.01-Emulation Copyright (C) 2006-2010, see libburnia-project.org\n"); if(o->fallback_program[0]) { char *hargv[2]; diff --git a/libburn/branches/ZeroSevenSix/doc/cookbook.txt b/libburn/branches/ZeroSevenSix/doc/cookbook.txt index 11d7a5ef..ab466338 100644 --- a/libburn/branches/ZeroSevenSix/doc/cookbook.txt +++ b/libburn/branches/ZeroSevenSix/doc/cookbook.txt @@ -1,4 +1,4 @@ -libburnia-project.org Optical Media Rotisserie Recipes as of January 2009 +libburnia-project.org Optical Media Rotisserie Recipes as of January 2010 Content: - TAO Multi-Session CD Cookbook (CD-R, CD-RW) diff --git a/libburn/branches/ZeroSevenSix/libburn/libdax_msgs.c b/libburn/branches/ZeroSevenSix/libburn/libdax_msgs.c index 8c6ab09d..f8b094e7 100644 --- a/libburn/branches/ZeroSevenSix/libburn/libdax_msgs.c +++ b/libburn/branches/ZeroSevenSix/libburn/libdax_msgs.c @@ -1,8 +1,8 @@ /* libdax_msgs Message handling facility of libdax. - Copyright (C) 2006 - 2009 Thomas Schmitt , - provided under GPL version 2 + Copyright (C) 2006 - 2010 Thomas Schmitt , + provided under GPL */ #include diff --git a/libburn/branches/ZeroSevenSix/libburn/libdax_msgs.h b/libburn/branches/ZeroSevenSix/libburn/libdax_msgs.h index 37006da0..012a85a1 100644 --- a/libburn/branches/ZeroSevenSix/libburn/libdax_msgs.h +++ b/libburn/branches/ZeroSevenSix/libburn/libdax_msgs.h @@ -1,8 +1,8 @@ /* libdax_msgs Message handling facility of libdax. - Copyright (C) 2006-2009 Thomas Schmitt , - provided under GPL version 2 + Copyright (C) 2006-2010 Thomas Schmitt , + provided under GPL */ diff --git a/libburn/branches/ZeroSevenSix/test/libburner.c b/libburn/branches/ZeroSevenSix/test/libburner.c index ba56bdb7..74f54d3f 100644 --- a/libburn/branches/ZeroSevenSix/test/libburner.c +++ b/libburn/branches/ZeroSevenSix/test/libburner.c @@ -1,7 +1,7 @@ /* test/libburner.c , API illustration of burning data or audio tracks to CD */ -/* Copyright (C) 2005 - 2009 Thomas Schmitt */ -/* Provided under GPLv2,see also "License and copyright aspects" at file end */ +/* Copyright (C) 2005 - 2010 Thomas Schmitt */ +/* Provided under GPL, see also "License and copyright aspects" at file end */ /** Overview @@ -778,37 +778,6 @@ Read. Try. Think. Play. Write yourself some code. Be free of my copyright. Be also invited to study the code of cdrskin/cdrskin.c et al. - -Clarification in my name and in the name of Mario Danic, copyright holder -on toplevel of libburnia. To be fully in effect after the remaining other -copyrighted code has been replaced by ours and by copyright-free contributions -of our friends: - -We, the copyright holders, agree on the interpretation that -dynamical linking of our libraries constitutes "use of" and -not "derivation from" our work in the sense of GPL, provided -those libraries are compiled from our unaltered code. - -Thus you may link our libraries dynamically with applications -which are not under GPL. You may distribute our libraries and -application tools in binary form, if you fulfill the usual -condition of GPL to offer a copy of the source code -altered -or unaltered- under GPL. - -We ask you politely to use our work in open source spirit -and with the due reference to the entire open source community. - -If there should really arise the case where above clarification -does not suffice to fulfill a clear and neat request in open source -spirit that would otherwise be declined for mere formal reasons, -only in that case we will duely consider to issue a special license -covering only that special case. -It is the open source idea of responsible freedom which will be -decisive and you will have to prove that you exhausted all own -means to qualify for GPL. - -For now we are firmly committed to maintain one single license: GPL. - History: libburner is a compilation of my own contributions to test/burniso.c and fresh code which replaced the remaining parts under copyright of diff --git a/libburn/branches/ZeroSevenSix/test/telltoc.c b/libburn/branches/ZeroSevenSix/test/telltoc.c index 63f40894..f1fbb66a 100644 --- a/libburn/branches/ZeroSevenSix/test/telltoc.c +++ b/libburn/branches/ZeroSevenSix/test/telltoc.c @@ -1,7 +1,7 @@ /* test/telltoc.c , API illustration of obtaining media status info */ -/* Copyright (C) 2006 - 2007 Thomas Schmitt - Provided under GPL version 2 */ +/* Copyright (C) 2006 - 2010 Thomas Schmitt + Provided under GPL */ /** Overview