From 390cb5a06eb1ced39f02d9d9641ed801175b6d6d Mon Sep 17 00:00:00 2001 From: Christian Starkjohann Date: Fri, 7 Nov 2008 15:07:40 +0000 Subject: - allow distribution under GPLv3 as well --- usbdrv/License.txt | 6 ++++-- usbdrv/Readme.txt | 9 +++++---- usbdrv/asmcommon.inc | 2 +- usbdrv/oddebug.c | 2 +- usbdrv/oddebug.h | 2 +- usbdrv/usbconfig-prototype.h | 2 +- usbdrv/usbdrv.c | 2 +- usbdrv/usbdrv.h | 2 +- usbdrv/usbdrvasm.S | 2 +- usbdrv/usbdrvasm.asm | 2 +- usbdrv/usbdrvasm12.inc | 2 +- usbdrv/usbdrvasm128.inc | 2 +- usbdrv/usbdrvasm15.inc | 2 +- usbdrv/usbdrvasm16.inc | 2 +- usbdrv/usbdrvasm165.inc | 2 +- usbdrv/usbdrvasm20.inc | 2 +- usbdrv/usbportability.h | 2 +- 17 files changed, 24 insertions(+), 21 deletions(-) (limited to 'usbdrv') diff --git a/usbdrv/License.txt b/usbdrv/License.txt index f6a232e..e9b2752 100644 --- a/usbdrv/License.txt +++ b/usbdrv/License.txt @@ -1,6 +1,8 @@ OBJECTIVE DEVELOPMENT GmbH's AVR-USB driver software is distributed under the -terms and conditions of the GNU GPL version 2, see the text below. In addition -to the requirements in the GPL, we STRONGLY ENCOURAGE you to do the following: +terms and conditions of the GNU GPL version 2 or the GNU GPL version 3. It is +your choice whether you apply the terms of version 2 or version 3. The full +text of GPLv2 is included below. In addition to the requirements in the GPL, +we STRONGLY ENCOURAGE you to do the following: (1) Publish your entire project on a web site and drop us a note with the URL. Use the form at http://www.obdev.at/avrusb/feedback.html for your submission. diff --git a/usbdrv/Readme.txt b/usbdrv/Readme.txt index f846689..7828f64 100644 --- a/usbdrv/Readme.txt +++ b/usbdrv/Readme.txt @@ -115,10 +115,11 @@ usbdrv.c because this module has been deliberately optimized for gcc. USING AVR-USB FOR FREE ====================== The AVR firmware driver is published under the GNU General Public License -Version 2 (GPL2). See the file "License.txt" for details. +Version 2 (GPL2) and the GNU General Public License Version 3 (GPL3). It is +your choice whether you apply the terms of version 2 or version 3. -If you decide for the free GPL2, we STRONGLY ENCOURAGE you to do the following -things IN ADDITION to the obligations from the GPL2: +If you decide for the free GPL2 or GPL3, we STRONGLY ENCOURAGE you to do the +following things IN ADDITION to the obligations from the GPL: (1) Publish your entire project on a web site and drop us a note with the URL. Use the form at http://www.obdev.at/avrusb/feedback.html for your submission. @@ -139,7 +140,7 @@ to your modifications for our commercial license offerings. COMMERCIAL LICENSES FOR AVR-USB =============================== -If you don't want to publish your source code under the terms of the GPL2, +If you don't want to publish your source code under the terms of the GPL, you can simply pay money for AVR-USB. As an additional benefit you get USB PIDs for free, licensed exclusively to you. See the file "CommercialLicense.txt" for details. diff --git a/usbdrv/asmcommon.inc b/usbdrv/asmcommon.inc index b9b985d..1af53b8 100644 --- a/usbdrv/asmcommon.inc +++ b/usbdrv/asmcommon.inc @@ -4,7 +4,7 @@ * Creation Date: 2007-11-05 * Tabsize: 4 * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * Revision: $Id$ */ diff --git a/usbdrv/oddebug.c b/usbdrv/oddebug.c index 612e036..466e68f 100644 --- a/usbdrv/oddebug.c +++ b/usbdrv/oddebug.c @@ -4,7 +4,7 @@ * Creation Date: 2005-01-16 * Tabsize: 4 * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ diff --git a/usbdrv/oddebug.h b/usbdrv/oddebug.h index 80d9760..c56af1c 100644 --- a/usbdrv/oddebug.h +++ b/usbdrv/oddebug.h @@ -4,7 +4,7 @@ * Creation Date: 2005-01-16 * Tabsize: 4 * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ diff --git a/usbdrv/usbconfig-prototype.h b/usbdrv/usbconfig-prototype.h index 79fe346..d125739 100644 --- a/usbdrv/usbconfig-prototype.h +++ b/usbdrv/usbconfig-prototype.h @@ -4,7 +4,7 @@ * Creation Date: 2005-04-01 * Tabsize: 4 * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ diff --git a/usbdrv/usbdrv.c b/usbdrv/usbdrv.c index 2df6ad7..d774a5f 100644 --- a/usbdrv/usbdrv.c +++ b/usbdrv/usbdrv.c @@ -4,7 +4,7 @@ * Creation Date: 2004-12-29 * Tabsize: 4 * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ diff --git a/usbdrv/usbdrv.h b/usbdrv/usbdrv.h index fe3a3f7..a10a7ee 100644 --- a/usbdrv/usbdrv.h +++ b/usbdrv/usbdrv.h @@ -4,7 +4,7 @@ * Creation Date: 2004-12-29 * Tabsize: 4 * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ diff --git a/usbdrv/usbdrvasm.S b/usbdrv/usbdrvasm.S index f7d22e9..47a1850 100644 --- a/usbdrv/usbdrvasm.S +++ b/usbdrv/usbdrvasm.S @@ -4,7 +4,7 @@ * Creation Date: 2007-06-13 * Tabsize: 4 * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * Revision: $Id$ */ diff --git a/usbdrv/usbdrvasm.asm b/usbdrv/usbdrvasm.asm index 4a5486f..a534b73 100644 --- a/usbdrv/usbdrvasm.asm +++ b/usbdrv/usbdrvasm.asm @@ -4,7 +4,7 @@ * Creation Date: 2006-03-01 * Tabsize: 4 * Copyright: (c) 2006 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ diff --git a/usbdrv/usbdrvasm12.inc b/usbdrv/usbdrvasm12.inc index 3d815e7..2b38157 100644 --- a/usbdrv/usbdrvasm12.inc +++ b/usbdrv/usbdrvasm12.inc @@ -4,7 +4,7 @@ * Creation Date: 2004-12-29 * Tabsize: 4 * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ diff --git a/usbdrv/usbdrvasm128.inc b/usbdrv/usbdrvasm128.inc index 619ff98..23b1f99 100644 --- a/usbdrv/usbdrvasm128.inc +++ b/usbdrv/usbdrvasm128.inc @@ -4,7 +4,7 @@ * Creation Date: 2008-10-11 * Tabsize: 4 * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ diff --git a/usbdrv/usbdrvasm15.inc b/usbdrv/usbdrvasm15.inc index 1232018..1e9ddcb 100644 --- a/usbdrv/usbdrvasm15.inc +++ b/usbdrv/usbdrvasm15.inc @@ -4,7 +4,7 @@ * Creation Date: 2007-08-06 * Tabsize: 4 * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * Revision: $Id$ */ diff --git a/usbdrv/usbdrvasm16.inc b/usbdrv/usbdrvasm16.inc index 36fae4a..e4a0226 100644 --- a/usbdrv/usbdrvasm16.inc +++ b/usbdrv/usbdrvasm16.inc @@ -4,7 +4,7 @@ * Creation Date: 2007-06-15 * Tabsize: 4 * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * Revision: $Id$ */ diff --git a/usbdrv/usbdrvasm165.inc b/usbdrv/usbdrvasm165.inc index 2ebf321..fdf3a2a 100644 --- a/usbdrv/usbdrvasm165.inc +++ b/usbdrv/usbdrvasm165.inc @@ -4,7 +4,7 @@ * Creation Date: 2007-04-22 * Tabsize: 4 * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * Revision: $Id$ */ diff --git a/usbdrv/usbdrvasm20.inc b/usbdrv/usbdrvasm20.inc index fe618f6..8f07d3c 100644 --- a/usbdrv/usbdrvasm20.inc +++ b/usbdrv/usbdrvasm20.inc @@ -5,7 +5,7 @@ * Creation Date: 2008-03-05 * Tabsize: 4 * Copyright: (c) 2008 by Jeroen Benschop and OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * Revision: $Id$ */ diff --git a/usbdrv/usbportability.h b/usbdrv/usbportability.h index 43d9a48..3a28ccb 100644 --- a/usbdrv/usbportability.h +++ b/usbdrv/usbportability.h @@ -4,7 +4,7 @@ * Creation Date: 2008-06-17 * Tabsize: 4 * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH - * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt) + * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt) * This Revision: $Id$ */ -- cgit v1.2.3