[ttssh2-commit] [10568] CygTerm+のソースヘッダのライセンス表示をGPLv2に統一した

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2023年 2月 3日 (金) 21:54:45 JST


Revision: 10568
          https://osdn.net/projects/ttssh2/scm/svn/commits/10568
Author:   zmatsuo
Date:     2023-02-03 21:54:45 +0900 (Fri, 03 Feb 2023)
Log Message:
-----------
CygTerm+のソースヘッダのライセンス表示をGPLv2に統一した

- tar ball内全体が COPYING に従っている方が分かりやすい
- ソースの一部がBSDでexeがGPLなのは分かりにくい

ticket #46561

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/46561

Modified Paths:
--------------
    trunk/cygwin/cygterm/cygterm.cpp
    trunk/cygwin/cygterm/cygterm_cfg.cpp
    trunk/cygwin/cygterm/cygterm_cfg.h
    trunk/cygwin/cygterm/sub.cpp
    trunk/cygwin/cygterm/sub.h

-------------- next part --------------
Modified: trunk/cygwin/cygterm/cygterm.cpp
===================================================================
--- trunk/cygwin/cygterm/cygterm.cpp	2023-02-03 09:17:53 UTC (rev 10567)
+++ trunk/cygwin/cygterm/cygterm.cpp	2023-02-03 12:54:45 UTC (rev 10568)
@@ -3,19 +3,20 @@
 // Copyright (C) 2000-2006 NSym.
 // (C) 2006- TeraTerm Project
 //---------------------------------------------------------------------------
-// This program is free software; you can redistribute it and/or modify it
+// This file is part of CygTerm+
+//
+// CygTerm+ is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License (GPL) 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,
+// CygTerm+ 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.
+// along with cygterm; if not, see <https://www.gnu.org/licenses/>.
 //---------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////

Modified: trunk/cygwin/cygterm/cygterm_cfg.cpp
===================================================================
--- trunk/cygwin/cygterm/cygterm_cfg.cpp	2023-02-03 09:17:53 UTC (rev 10567)
+++ trunk/cygwin/cygterm/cygterm_cfg.cpp	2023-02-03 12:54:45 UTC (rev 10568)
@@ -2,28 +2,20 @@
  * (C) 2022- TeraTerm Project
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * This file is part of CygTerm+
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ * CygTerm+ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License (GPL) as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * CygTerm+ 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 cygterm; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>

Modified: trunk/cygwin/cygterm/cygterm_cfg.h
===================================================================
--- trunk/cygwin/cygterm/cygterm_cfg.h	2023-02-03 09:17:53 UTC (rev 10567)
+++ trunk/cygwin/cygterm/cygterm_cfg.h	2023-02-03 12:54:45 UTC (rev 10568)
@@ -2,28 +2,20 @@
  * (C) 2022- TeraTerm Project
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * This file is part of CygTerm+
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ * CygTerm+ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License (GPL) as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * CygTerm+ 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 cygterm; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #pragma once

Modified: trunk/cygwin/cygterm/sub.cpp
===================================================================
--- trunk/cygwin/cygterm/sub.cpp	2023-02-03 09:17:53 UTC (rev 10567)
+++ trunk/cygwin/cygterm/sub.cpp	2023-02-03 12:54:45 UTC (rev 10568)
@@ -2,28 +2,20 @@
  * Copyright (C) 2022- TeraTerm Project
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * This file is part of CygTerm+
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ * CygTerm+ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License (GPL) as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * CygTerm+ 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 cygterm; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>

Modified: trunk/cygwin/cygterm/sub.h
===================================================================
--- trunk/cygwin/cygterm/sub.h	2023-02-03 09:17:53 UTC (rev 10567)
+++ trunk/cygwin/cygterm/sub.h	2023-02-03 12:54:45 UTC (rev 10568)
@@ -2,28 +2,20 @@
  * Copyright (C) 2022- TeraTerm Project
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * This file is part of CygTerm+
  *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ * CygTerm+ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License (GPL) as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * CygTerm+ 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 cygterm; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #pragma once


ttssh2-commit メーリングリストの案内
Back to archive index