Messages in this thread Patch in this message | | | Date | Thu, 25 Mar 2004 16:02:24 +0100 | From | Marc Lehmann <> | Subject | Re: [Swsusp-devel] lzf license |
| |
On Tue, Mar 23, 2004 at 12:47:26PM +0100, Arjan van de Ven <arjanv@redhat.com> wrote: > About bugfixes; I'd recommend using something like:
That sounds reasonable. Sorry for the delay, but I didn't receive your mail earlier (not being on the cc:).
I have added this notice to all core files of the distribution and released it as 1.3, assuming that this solves all the problems. It can temporarily be found here: http://data.plan9.de/liblzf-1.3.tar.gz
The files in the kernel diverge a tiny bit (being a slight subset), and I think it's easiest to just add the additional notice to the files:
kernel/power/lzf/lzf_c.c kernel/power/lzf/lzf_d.c
The following should be applied to both files:
diff -u -p @@ -24,6 +24,16 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, the contents of this file may be used under the terms of + * the GNU General Public License version 2 (the "GPL"), in which case the + * provisions of the GPL are applicable instead of the above. If you wish to + * allow the use of your version of this file only under the terms of the + * GPL and not to allow others to use your version of this file under the + * BSD license, indicate your decision by deleting the provisions above and + * replace them with the notice and other provisions required by the GPL. If + * you do not delete the provisions above, a recipient may use your version + * of this file under either the BSD or the GPL. */
-- -----==- | ----==-- _ | ---==---(_)__ __ ____ __ Marc Lehmann +-- --==---/ / _ \/ // /\ \/ / pcg@goof.com |e| -=====/_/_//_/\_,_/ /_/\_\ XX11-RIPE --+ The choice of a GNU generation | | - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |