From 06d5ed134a37e22575c0ce18c061d9ef115151e0 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Sat, 23 Jun 2018 13:52:57 +0200 Subject: [PATCH] Release some more of the code under "GPLv2 or later", so it is compatible with GPLv3 See: https://github.com/felis/USB_Host_Shield_2.0/issues/364#issuecomment-387479546 --- hexdump.h | 20 ++++++++++++++------ sink_parser.h | 20 ++++++++++++++------ version_helper.h | 19 +++++++++++++------ 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/hexdump.h b/hexdump.h index c9c7d7d0..3cdb9e2a 100644 --- a/hexdump.h +++ b/hexdump.h @@ -1,11 +1,18 @@ /* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved. -This software may be distributed and modified under the terms of the GNU -General Public License version 2 (GPL2) as published by the Free Software -Foundation and appearing in the file GPL2.TXT included in the packaging of -this file. Please note that GPL2 Section 2[b] requires that all works based -on this software must also be made publicly available under the terms of -the GPL2 ("Copyleft"). +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 Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Contact information ------------------- @@ -14,6 +21,7 @@ Circuits At Home, LTD Web : http://www.circuitsathome.com e-mail : support@circuitsathome.com */ + #if !defined(_usb_h_) || defined(__HEXDUMP_H__) #error "Never include hexdump.h directly; include Usb.h instead" #else diff --git a/sink_parser.h b/sink_parser.h index a23637d2..62a99838 100644 --- a/sink_parser.h +++ b/sink_parser.h @@ -1,11 +1,18 @@ /* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved. -This software may be distributed and modified under the terms of the GNU -General Public License version 2 (GPL2) as published by the Free Software -Foundation and appearing in the file GPL2.TXT included in the packaging of -this file. Please note that GPL2 Section 2[b] requires that all works based -on this software must also be made publicly available under the terms of -the GPL2 ("Copyleft"). +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 Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Contact information ------------------- @@ -14,6 +21,7 @@ Circuits At Home, LTD Web : http://www.circuitsathome.com e-mail : support@circuitsathome.com */ + #if !defined(_usb_h_) || defined(__SINK_PARSER_H__) #error "Never include hexdump.h directly; include Usb.h instead" #else diff --git a/version_helper.h b/version_helper.h index 0cb3b4ad..a2681c34 100644 --- a/version_helper.h +++ b/version_helper.h @@ -1,11 +1,18 @@ /* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved. -This software may be distributed and modified under the terms of the GNU -General Public License version 2 (GPL2) as published by the Free Software -Foundation and appearing in the file GPL2.TXT included in the packaging of -this file. Please note that GPL2 Section 2[b] requires that all works based -on this software must also be made publicly available under the terms of -the GPL2 ("Copyleft"). +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 Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Contact information -------------------