Skip to content

Commit

Permalink
Clarify license as being GPL v2.0 only
Browse files Browse the repository at this point in the history
Remove instructions for applying license to new code.
  • Loading branch information
Tim Bird committed Apr 23, 2015
1 parent de29326 commit 6eb5d47
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 62 deletions.
61 changes: 2 additions & 59 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

[NOTE: grabserial specifies version 2.0 of this license only!]

10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Expand Down Expand Up @@ -278,62 +280,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

{description}
Copyright (C) {year} {fullname}

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.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:

Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.

{signature of Ty Coon}, 1 April 1989
Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
10 changes: 7 additions & 3 deletions grabserial
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@
#
# grabserial - program to read a serial port and send the data to stdout
#
# Copyright 2006 Sony Corporation
# Copyright 2006,2015 Sony Corporation
#
# This program is provided under the Gnu General Public License (GPL)
# version 2 ONLY.
# version 2 ONLY. This program is distributed WITHOUT ANY WARRANTY.
# See the LICENSE file, which should have accompanied this program,
# for the text of the license.
#
# 2006-09-07 by Tim Bird <tim.bird@sonymobile.com>
#
# To do:
# * buffer output chars??
#
# CHANGELOG:
# 2015.04.23 - Version 1.8.1 - remove instructions for applying LICENSE text
# to new files, and add no-warranty language to grabserial.
# 2015.03.10 - Version 1.8.0 - add -o option for saving output to a file
# add -T option for absolute times. Both contributed by ramaxlo
# 2015.03.10 - Version 1.7.1 - add line feed to instantpat result line
Expand All @@ -33,7 +37,7 @@

MAJOR_VERSION=1
MINOR_VERSION=8
REVISION=0
REVISION=1

import os, sys
import getopt
Expand Down

0 comments on commit 6eb5d47

Please sign in to comment.