From f7e43063915c58d03c68f570092d0fb8539af59f Mon Sep 17 00:00:00 2001 From: Charles Wilson Date: Mon, 16 Aug 2010 15:45:08 +0000 Subject: [PATCH] Update license for cygstart to GPLv3+ --- AUTHORS | 4 ++-- ChangeLog | 5 +++-- NEWS | 2 ++ PROGLIST | 2 +- README | 4 ++-- TODO | 1 - src/cygstart/cygstart.1 | 25 ++++++++++++------------- src/cygstart/cygstart.c | 13 ++++++------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/AUTHORS b/AUTHORS index bfe64ee..71ca29b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -26,9 +26,9 @@ Rob Siklos readshortcut.c, readshortcut.1 (GPLv3+) -Michael Schaap +Michael Schaap cygstart.c, cygstart.1 - (GPLv2+) + (GPLv3+) Robert Collins: demonstrated how to consolidate the build process diff --git a/ChangeLog b/ChangeLog index a376358..af079a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ 2010-08-16 Charles Wilson - Change license for realpath to GPLv3+ - * src/realpath/realpath.c: Update license to GPLv3+. + Change license for cygstart to GPLv3+ + * src/cygstart/cygstart.c: Update license to GPLv3+. + * src/cygstart/cygstart.1: Ditto. * AUTHORS: Update licensing info for realpath. * NEWS: Ditto. * PROGLIST: Ditto. diff --git a/NEWS b/NEWS index 45cee4b..e776e74 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ * Updated license for readshortcut to GPLv3+ (with permission from Rob Siklos) * Updated license for realpath to GPLv3+ (was GPLv2+) + * Updated license for cygstart to GPLv3+ (was GPLv2+; no objections + from Michael Schaap) 1.4.4 * Fix longstanding bug in mkshortcut, in which failure was diff --git a/PROGLIST b/PROGLIST index 65ebb1b..1ff7ced 100644 --- a/PROGLIST +++ b/PROGLIST @@ -86,7 +86,7 @@ cygstart.exe A command-line tool which allows you to let Windows start a program or open a file or URL in its associated application. It is similar to the Windows command-line start command. - (GPLv2+) + (GPLv3+) cygdrop.exe A command-line tool which allows you to let start a Cygwin or Windows diff --git a/README b/README index eeae2dc..c77bfcb 100644 --- a/README +++ b/README @@ -51,10 +51,10 @@ GPLv3+: conv unix2dos dos2unix d2u u2d ipck msgtool semstat semtool shmtool - lpr readshortcut realpath + cygstart lpr readshortcut realpath GPLv2+: - cygstart cygdrop mkshortcut cygicons.dll + cygdrop mkshortcut cygicons.dll GPLv2: banner diff --git a/TODO b/TODO index 29c0cc0..d35eceb 100644 --- a/TODO +++ b/TODO @@ -16,7 +16,6 @@ * GPLv3 conversion: - banner is GPLv2 only. Contact original author. - - cygstart is GPLv2+, but courtesy contact original author - cygdrop is GPLv2+, but courtesy contact original author - mkshortcut is GPLv2+, but courtesy contact original author - cygicons.dll compilation is GPLv2+, but includes artwork that diff --git a/src/cygstart/cygstart.1 b/src/cygstart/cygstart.1 index 668116a..7afa295 100644 --- a/src/cygstart/cygstart.1 +++ b/src/cygstart/cygstart.1 @@ -176,22 +176,21 @@ Open a Word document in a maximized window .SH COPYRIGHT Copyright (C) 2002 Michael Schaap .PP -\fBcygstart\fP is free software; you can redistribute it and/or modify +\fBcygstart\fP 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, or (at your option) any -later version. +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. .PP -\fBcygstart\fP 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. +\fBcygstart\fP 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. .PP -You should have received a copy of the GNU General Public License; -see the file COPYING. If not, write to the -Free Software Foundation, -59 Temple Place, -Suite 330, Boston, MA 02111-1307, USA. - +You should have received a copy of the GNU General Public License +along with this program. If not, see +.BR +.PP +See the COPYING file for full license information. .\"{{{ Author .SH AUTHOR Michael Schaap diff --git a/src/cygstart/cygstart.c b/src/cygstart/cygstart.c index 0e9e62d..33ea493 100644 --- a/src/cygstart/cygstart.c +++ b/src/cygstart/cygstart.c @@ -3,10 +3,10 @@ * * (c) 2002 Michael Schaap * - * 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 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 3 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 @@ -14,10 +14,9 @@ * 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. + * along with this program. If not, see . * - * See the COPYING file for license information. + * See the COPYING file for full license information. */ #if HAVE_CONFIG_H -- 2.43.5