From 86879b8b83608f043ceaa197192fef6d0d823533 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 13 Aug 2017 18:53:52 +0000 Subject: [PATCH] 2017-08-13 18:53 UTC Viktor Szakats (vszakats users.noreply.github.com) * config/global.mk * config/postinst.hb * debian/copyright * doc/oldnews.txt * package/mpkg_win.nsi * package/winuni/mpkg_win_uni.bat * package/winuni/mpkg_win_uni.nsi * README.md * COPYING.txt -> LICENSE.txt * COPYING.txt -> LICENSE.txt --- ChangeLog.txt | 12 ++++++++++++ COPYING.txt => LICENSE.txt | 2 +- README.md | 4 ++-- config/global.mk | 4 ++-- config/postinst.hb | 4 ++-- debian/copyright | 2 +- doc/oldnews.txt | 2 +- package/mpkg_win.nsi | 6 +++--- package/winuni/mpkg_win_uni.bat | 4 ++-- package/winuni/mpkg_win_uni.nsi | 6 +++--- 10 files changed, 29 insertions(+), 17 deletions(-) rename COPYING.txt => LICENSE.txt (99%) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4401e61d3b..e21d81c41c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,18 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2017-08-13 18:53 UTC Viktor Szakats (vszakats users.noreply.github.com) + * config/global.mk + * config/postinst.hb + * debian/copyright + * doc/oldnews.txt + * package/mpkg_win.nsi + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + * README.md + * COPYING.txt -> LICENSE.txt + * COPYING.txt -> LICENSE.txt + 2017-08-13 18:27 UTC Viktor Szakats (vszakats users.noreply.github.com) * * * update copyright headers with new FSF postal address diff --git a/COPYING.txt b/LICENSE.txt similarity index 99% rename from COPYING.txt rename to LICENSE.txt index 3d6d6a164a..14f857708c 100644 --- a/COPYING.txt +++ b/LICENSE.txt @@ -37,7 +37,7 @@ 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 COPYING.txt. If not, write to +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 web site https://www.gnu.org/). diff --git a/README.md b/README.md index 5ac633d352..0f1a93fa3f 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ and interfaces to many popular APIs. hope they will be useful, but there is NO GUARANTEE that they are complete, accurate, non-infringing or usable for any purpose whatsoever. Contributors are NOT LIABLE for any damages that result from using - Harbour in any ways. For more legal details, see [COPYING](COPYING.txt). + Harbour in any ways. For more legal details, see [LICENSE](LICENSE.txt). If you think you can make Harbour better, start to contribute. See [How to Participate](#how-to-participate). @@ -1956,4 +1956,4 @@ Supported shells per host platforms: This document Copyright © 2009-2015 Viktor Szakats (vszakats.net/harbour)
Licensed under [Creative Commons Attribution-ShareAlike 3.0](http://creativecommons.org/licenses/by-sa/3.0/)
-See [COPYING](COPYING.txt). +See [LICENSE](LICENSE.txt). diff --git a/config/global.mk b/config/global.mk index 8c70cfe8e3..7d5eca2362 100644 --- a/config/global.mk +++ b/config/global.mk @@ -1,6 +1,6 @@ # --------------------------------------------------------------- # Copyright 2009 Viktor Szakats (vszakats.net/harbour) -# See COPYING.txt for licensing terms. +# See LICENSE.txt for licensing terms. # --------------------------------------------------------------- # --------------------------------------------------------------- @@ -1922,7 +1922,7 @@ ifneq ($(HB_INSTALL_PREFIX),) endif else # Require HB_INSTALL_PREFIX on non-*nix when install is used, - # so that obligatory supplement files (like COPYING.txt) are always + # so that obligatory supplement files (like LICENSE.txt) are always # copied to install destination. ifneq ($(filter install,$(HB_MAKECMDGOALS)),) ifeq ($(HB_PLATFORM_UNIX),) diff --git a/config/postinst.hb b/config/postinst.hb index a7235c2b7e..93386a4ea7 100644 --- a/config/postinst.hb +++ b/config/postinst.hb @@ -4,7 +4,7 @@ * * Copyright 2009-2010 Viktor Szakats (vszakats.net/harbour) * Copyright 2003 Przemyslaw Czerpak (druzus/at/priv.onet.pl) (embedded autoinstall bash script) - * See COPYING.txt for licensing terms. + * See LICENSE.txt for licensing terms. */ #pragma -w3 @@ -64,7 +64,7 @@ PROCEDURE Main( ... ) mk_hb_FCopy( aFile[ F_NAME ], tmp + hb_ps() + iif( GetEnvC( "HB_PLATFORM" ) == "dos", "CHANGES", "" ) ) NEXT - mk_hb_FCopy( "COPYING.txt", tmp + hb_ps() ) + mk_hb_FCopy( "LICENSE.txt", tmp + hb_ps() ) mk_hb_FCopy( "README.md", tmp + hb_ps() ) ELSE OutStd( hb_StrFormat( "! Error: Cannot create directory '%1$s'", tmp ) + hb_eol() ) diff --git a/debian/copyright b/debian/copyright index 3d6d6a164a..14f857708c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -37,7 +37,7 @@ 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 COPYING.txt. If not, write to +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 web site https://www.gnu.org/). diff --git a/doc/oldnews.txt b/doc/oldnews.txt index 9f1eb58d97..68fe8159d1 100644 --- a/doc/oldnews.txt +++ b/doc/oldnews.txt @@ -3,7 +3,7 @@ http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. A summary of the license and the full legal text is included - in file: COPYING.txt. If you wish to distribute some or all of this + in file: LICENSE.txt. If you wish to distribute some or all of this work under different terms, please contact respective author(s). The license applies to all entries on or after Version 1.1.0. */ diff --git a/package/mpkg_win.nsi b/package/mpkg_win.nsi index 83857e654b..c1535c2728 100644 --- a/package/mpkg_win.nsi +++ b/package/mpkg_win.nsi @@ -1,6 +1,6 @@ ; --------------------------------------------------------------- ; Copyright 2009 Viktor Szakats (vszakats.net/harbour) -; See COPYING.txt for licensing terms. +; See LICENSE.txt for licensing terms. ; ; Harbour Nullsoft installer script (for Windows/MS-DOS) ; [ Do not try to use this script directly. It won't work. ] @@ -61,7 +61,7 @@ InstallDir C:\$%HB_PKGNAMI% ;-------------------------------- ; License Language String -LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_INSTALL_PREFIX%\COPYING.txt" +LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_INSTALL_PREFIX%\LICENSE.txt" ;-------------------------------- ; The stuff to install @@ -73,7 +73,7 @@ Section "Main components" hb_main ; Set output path to the installation directory. SetOutPath $INSTDIR - File /nonfatal "$%HB_INSTALL_PREFIX%\COPYING.txt" + File /nonfatal "$%HB_INSTALL_PREFIX%\LICENSE.txt" File /nonfatal "$%HB_INSTALL_PREFIX%\README.md" ; Let it work also for MS-DOS packages where short filename is used here File /nonfatal "$%HB_INSTALL_PREFIX%\Change*" diff --git a/package/winuni/mpkg_win_uni.bat b/package/winuni/mpkg_win_uni.bat index 08d29da184..cd5af2e22a 100644 --- a/package/winuni/mpkg_win_uni.bat +++ b/package/winuni/mpkg_win_uni.bat @@ -2,7 +2,7 @@ rem --------------------------------------------------------------- rem Copyright 2009-2013 Viktor Szakats (vszakats.net/harbour) -rem See COPYING.txt for licensing terms. +rem See LICENSE.txt for licensing terms. rem --------------------------------------------------------------- rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, HB_DIR_7Z, HB_DIR_MINGW, @@ -101,7 +101,7 @@ rem ; Create unified archive echo.> _hbfiles echo "%HB_DR%RELNOTES.txt" >> _hbfiles echo "%HB_DR%README.md" >> _hbfiles -echo "%HB_DR%COPYING.txt" >> _hbfiles +echo "%HB_DR%LICENSE.txt" >> _hbfiles echo "%HB_DR%ChangeLog*.txt" >> _hbfiles echo "%HB_DR%bin\*-%HB_VS%.dll" >> _hbfiles echo "%HB_DR%bin\harbour.exe" >> _hbfiles diff --git a/package/winuni/mpkg_win_uni.nsi b/package/winuni/mpkg_win_uni.nsi index 83ec1b00a3..67b6c7cdb2 100644 --- a/package/winuni/mpkg_win_uni.nsi +++ b/package/winuni/mpkg_win_uni.nsi @@ -2,7 +2,7 @@ ; NSIS installer script for Harbour ; ; Copyright 2009 Viktor Szakats (vszakats.net/harbour) -; See COPYING.txt for licensing terms. +; See LICENSE.txt for licensing terms. ; --------------------------------------------------------------- ; TODO: option: install .dlls to system paths @@ -67,7 +67,7 @@ InstallDir C:\hb$%HB_VS% ;-------------------------------- ; License Language String -LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_ABSROOT%COPYING.txt" +LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_ABSROOT%LICENSE.txt" ;-------------------------------- ; The stuff to install @@ -82,7 +82,7 @@ Section "Main components" hb_main File /nonfatal "$%HB_ABSROOT%RELNOTES.txt" File /nonfatal "$%HB_ABSROOT%README.md" - File /nonfatal "$%HB_ABSROOT%COPYING.txt" + File /nonfatal "$%HB_ABSROOT%LICENSE.txt" File /nonfatal "$%HB_ABSROOT%ChangeLog.txt*" SetOutPath $INSTDIR\bin