Skip to content

Commit

Permalink
2017-09-08 21:31 UTC Viktor Szakats (vszakats users.noreply.github.com)
Browse files Browse the repository at this point in the history 
  * debian/copyright
  * LICENSE.txt
    * sync Harbour license with current GPL 2
    * update GPL 2 text from:
      https://www.gnu.org/licenses/gpl-2.0.txt

  * tests/updcopyh.hb
    * catch the above
  • Loading branch information
@vszakats
vszakats committed Sep 8, 2017
1 parent a75b0e1 commit b31db1e
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 40 deletions.
10 changes: 10 additions & 0 deletions ChangeLog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */

2017-09-08 21:31 UTC Viktor Szakats (vszakats users.noreply.github.com)
* debian/copyright
* LICENSE.txt
* sync Harbour license with current GPL 2
* update GPL 2 text from:
https://www.gnu.org/licenses/gpl-2.0.txt

* tests/updcopyh.hb
* catch the above

2017-09-08 21:07 UTC Viktor Szakats (vszakats users.noreply.github.com)
* config/postinst.hb
* doc/xhb-diff.txt
Expand Down
37 changes: 18 additions & 19 deletions LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ 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 software; see the file LICENSE.txt. If not, write to
the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA (or visit the website https://www.gnu.org/).
along with this program; see the file LICENSE.txt. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/).

As a special exception, the Harbour Project gives permission for
additional uses of the text contained in its release of Harbour.
Expand Down Expand Up @@ -561,9 +561,8 @@ all use GNU GPL 2. Find it below:
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand All @@ -576,7 +575,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.

When we speak of free software, we are referring to freedom, not
Expand Down Expand Up @@ -616,7 +615,7 @@ patent must be licensed for everyone's free use or not licensed at all.

The precise terms and conditions for copying, distribution and
modification follow.

GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

Expand Down Expand Up @@ -671,7 +670,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
Expand Down Expand Up @@ -729,7 +728,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
Expand Down Expand Up @@ -786,7 +785,7 @@ impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
Expand Down Expand Up @@ -839,8 +838,8 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Programs

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
Expand All @@ -852,7 +851,7 @@ 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.

<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>

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
Expand All @@ -864,16 +863,16 @@ the "copyright" line and a pointer to where the full notice is found.
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.
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) 19yy name of author
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.
Expand All @@ -896,5 +895,5 @@ necessary. Here is a sample; alter the names:
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 Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
37 changes: 18 additions & 19 deletions debian/copyright
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ 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 software; see the file LICENSE.txt. If not, write to
the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA (or visit the website https://www.gnu.org/).
along with this program; see the file LICENSE.txt. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/).

As a special exception, the Harbour Project gives permission for
additional uses of the text contained in its release of Harbour.
Expand Down Expand Up @@ -561,9 +561,8 @@ all use GNU GPL 2. Find it below:
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand All @@ -576,7 +575,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.

When we speak of free software, we are referring to freedom, not
Expand Down Expand Up @@ -616,7 +615,7 @@ patent must be licensed for everyone's free use or not licensed at all.

The precise terms and conditions for copying, distribution and
modification follow.

GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

Expand Down Expand Up @@ -671,7 +670,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
Expand Down Expand Up @@ -729,7 +728,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
Expand Down Expand Up @@ -786,7 +785,7 @@ impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
Expand Down Expand Up @@ -839,8 +838,8 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Programs

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
Expand All @@ -852,7 +851,7 @@ 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.

<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>

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
Expand All @@ -864,16 +863,16 @@ the "copyright" line and a pointer to where the full notice is found.
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.
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) 19yy name of author
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.
Expand All @@ -896,5 +895,5 @@ necessary. Here is a sample; alter the names:
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 Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
10 changes: 8 additions & 2 deletions tests/updcopyh.hb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,16 @@ PROCEDURE Main()
" * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + hb_eol() + ;
" * (or visit their website at https://www.gnu.org/licenses/)." + hb_eol()

LOCAL cGPHOld := ;
LOCAL cGPH1Old := ;
" * along with this software; see the file COPYING.txt. If not, write to" + hb_eol() + ;
" * the Free Software Foundation, Inc., 59 Temple Place, Suite 330," + hb_eol() + ;
" * Boston, MA 02111-1307 USA (or visit the web site https://www.gnu.org/)." + hb_eol()

LOCAL cGPH2Old := ;
"along with this software; see the file LICENSE.txt. If not, write to" + hb_eol() + ;
"the Free Software Foundation, Inc., 59 Temple Place, Suite 330," + hb_eol() + ;
"Boston, MA 02111-1307 USA (or visit the website https://www.gnu.org/)." + hb_eol()

LOCAL cGPHNew := ;
" * along with this program; see the file LICENSE.txt. If not, write to" + hb_eol() + ;
" * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor," + hb_eol() + ;
Expand All @@ -49,7 +54,8 @@ PROCEDURE Main()
LOCAL hReplace := { ;
cGPL1Old => cGPL1New, ;
cGPL2Old => cGPL2New, ;
cGPHOld => cGPHNew }
cGPH1Old => cGPHNew, ;
cGPH2Old => cGPHNew }

FOR EACH aFile IN hb_DirScan( ".", hb_osFileMask() )

Expand Down

0 comments on commit b31db1e

Please sign in to comment.