From 231ef35d403338058525fd3d63b9fc9aedaf2533 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 27 Nov 2012 13:18:08 +0000 Subject: [PATCH] 2012-11-27 14:15 UTC+0100 Viktor Szakats (harbour syenar.net) - COPYING + COPYING.txt * config/global.mk * config/postinst.hb * ChangeLog * debian/copyright * doc/class_tp.txt * doc/cmdline.txt * doc/hdr_tpl.txt * doc/howtorep.txt * doc/oldnews.txt * package/mpkg_win.nsi * package/winuni/mpkg_win_uni.bat * package/winuni/mpkg_win_uni.nsi * README.txt * tests/hbdoctst.prg * utils/hbmk2/hbmk2.prg * website/faq/harbour3.html * website/license.html * renamed COPYING to COPYING.txt ; TODO: Update reference in all sources --- harbour/{COPYING => COPYING.txt} | 2 +- harbour/ChangeLog | 27 +++++++++++++++++++++++-- harbour/README.txt | 4 ++-- harbour/config/global.mk | 4 ++-- harbour/config/postinst.hb | 4 ++-- harbour/debian/copyright | 2 +- harbour/doc/class_tp.txt | 4 ++-- harbour/doc/cmdline.txt | 2 +- harbour/doc/hdr_tpl.txt | 4 ++-- harbour/doc/howtorep.txt | 4 ++-- harbour/doc/oldnews.txt | 4 ++-- harbour/package/mpkg_win.nsi | 6 +++--- harbour/package/winuni/mpkg_win_uni.bat | 4 ++-- harbour/package/winuni/mpkg_win_uni.nsi | 6 +++--- harbour/tests/hbdoctst.prg | 2 +- harbour/utils/hbmk2/hbmk2.prg | 2 +- harbour/website/faq/harbour3.html | 2 +- harbour/website/license.html | 2 +- 18 files changed, 54 insertions(+), 31 deletions(-) rename harbour/{COPYING => COPYING.txt} (99%) diff --git a/harbour/COPYING b/harbour/COPYING.txt similarity index 99% rename from harbour/COPYING rename to harbour/COPYING.txt index 09fc07711d..404c71f898 100644 --- a/harbour/COPYING +++ b/harbour/COPYING.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. If not, write to +along with this software; see the file COPYING.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 http://www.gnu.org/). diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 72750a051e..8c27109a98 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -10,6 +10,29 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-11-27 14:15 UTC+0100 Viktor Szakats (harbour syenar.net) + - COPYING + + COPYING.txt + * config/global.mk + * config/postinst.hb + * ChangeLog + * debian/copyright + * doc/class_tp.txt + * doc/cmdline.txt + * doc/hdr_tpl.txt + * doc/howtorep.txt + * doc/oldnews.txt + * package/mpkg_win.nsi + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + * README.txt + * tests/hbdoctst.prg + * utils/hbmk2/hbmk2.prg + * website/faq/harbour3.html + * website/license.html + * renamed COPYING to COPYING.txt + ; TODO: Update reference in all sources + 2012-11-27 14:06 UTC+0100 Viktor Szakats (harbour syenar.net) - README + README.txt @@ -244301,7 +244324,7 @@ June 1st. 1999 00:30 Ron Pinkas 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. If you wish to distribute some or all of this work - under different terms, please contact respective author(s). + in file: COPYING.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 newer than 2009-04-28. */ diff --git a/harbour/README.txt b/harbour/README.txt index af36db241f..92969a04a5 100644 --- a/harbour/README.txt +++ b/harbour/README.txt @@ -42,7 +42,7 @@ TABLE OF CONTENT 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. + Harbour in any ways. For more legal details, see COPYING.txt. If you think you can make Harbour better, start to contribute. See this section: 'HOW TO PARTICIPATE' @@ -1871,4 +1871,4 @@ TABLE OF CONTENT [ Copyright (c) 2009-2012 Viktor Szakats (harbour syenar.net) Licensed under Creative Commons Attribution-ShareAlike 3.0: http://creativecommons.org/licenses/by-sa/3.0/ - See COPYING. ] + See COPYING.txt. ] diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 25fd505edf..1a8e36b9de 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -4,7 +4,7 @@ # --------------------------------------------------------------- # Copyright 2009 Viktor Szakats (harbour syenar.net) -# See COPYING for licensing terms. +# See COPYING.txt for licensing terms. # --------------------------------------------------------------- # --------------------------------------------------------------- @@ -1886,7 +1886,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) are always + # so that obligatory supplement files (like COPYING.txt) are always # copied to install destination. ifneq ($(filter install,$(HB_MAKECMDGOALS)),) ifeq ($(HB_PLATFORM_UNIX),) diff --git a/harbour/config/postinst.hb b/harbour/config/postinst.hb index 4905539fae..b34e6402e7 100644 --- a/harbour/config/postinst.hb +++ b/harbour/config/postinst.hb @@ -8,7 +8,7 @@ * * Copyright 2009-2010 Viktor Szakats (harbour syenar.net) * Copyright 2003 Przemyslaw Czerpak (druzus/at/priv.onet.pl) (embedded autoinstall bash script) - * See COPYING for licensing terms. + * See COPYING.txt for licensing terms. */ #pragma warninglevel=3 @@ -68,7 +68,7 @@ PROCEDURE Main( ... ) mk_hb_FCopy( aFile[ F_NAME ], tmp + hb_ps() + iif( GetEnvC( "HB_PLATFORM" ) == "dos", "CHANGES", "" ) ) NEXT - mk_hb_FCopy( "COPYING", tmp + hb_ps() ) + mk_hb_FCopy( "COPYING.txt", tmp + hb_ps() ) mk_hb_FCopy( "README.txt", tmp + hb_ps() ) ELSE OutStd( hb_StrFormat( "! Error: Cannot create directory '%1$s'", tmp ) + hb_eol() ) diff --git a/harbour/debian/copyright b/harbour/debian/copyright index 09fc07711d..404c71f898 100644 --- a/harbour/debian/copyright +++ b/harbour/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. If not, write to +along with this software; see the file COPYING.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 http://www.gnu.org/). diff --git a/harbour/doc/class_tp.txt b/harbour/doc/class_tp.txt index be7b03af92..1925ea1bb8 100644 --- a/harbour/doc/class_tp.txt +++ b/harbour/doc/class_tp.txt @@ -27,7 +27,7 @@ FILE HEADER TEMPLATE * 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. If not, write to + * along with this software; see the file COPYING.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 http://www.gnu.org/). * @@ -67,7 +67,7 @@ FILE HEADER TEMPLATE (OPTIONAL ADDITION FOR PARTIAL COPYRIGHTS) * Copyright 2000 {name} <{e-mail address}> * {function or subsystem name} * - * See COPYING for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/doc/cmdline.txt b/harbour/doc/cmdline.txt index 43c46545bd..accce56a3a 100644 --- a/harbour/doc/cmdline.txt +++ b/harbour/doc/cmdline.txt @@ -99,4 +99,4 @@ Exceptions: [ Copyright (c) 1999-2009 Viktor Szakats (harbour syenar.net) Licensed under Creative Commons Attribution-ShareAlike 3.0: http://creativecommons.org/licenses/by-sa/3.0/ - See COPYING. ] + See COPYING.txt. ] diff --git a/harbour/doc/hdr_tpl.txt b/harbour/doc/hdr_tpl.txt index 43d3effddf..3e60c8c0d8 100644 --- a/harbour/doc/hdr_tpl.txt +++ b/harbour/doc/hdr_tpl.txt @@ -27,7 +27,7 @@ FILE HEADER TEMPLATE * 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. If not, write to + * along with this software; see the file COPYING.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 http://www.gnu.org/). * @@ -67,7 +67,7 @@ FILE HEADER TEMPLATE (OPTIONAL ADDITION FOR PARTIAL COPYRIGHTS) * Copyright 2010 {name} <{e-mail address}> * {function or subsystem name} * - * See COPYING for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/doc/howtorep.txt b/harbour/doc/howtorep.txt index 2d85c2f47a..eb8e195ffc 100644 --- a/harbour/doc/howtorep.txt +++ b/harbour/doc/howtorep.txt @@ -77,7 +77,7 @@ Important notes: Possibly consult other Developers about the new filename and file placement. Add the new filename to the related makefiles. - (*) There are some exceptions: ChangeLog.*, Makefile, COPYING. + (*) There are some exceptions: ChangeLog.*, Makefile. 1.3 Here's how to format your ChangeLog entries =============================================== @@ -197,4 +197,4 @@ IMPORTANT 3: Use operating system (or tool) specific quote [ Copyright (c) 1999-2012 Viktor Szakats (harbour syenar.net) Licensed under Creative Commons Attribution-ShareAlike 3.0: http://creativecommons.org/licenses/by-sa/3.0/ - See COPYING. ] + See COPYING.txt. ] diff --git a/harbour/doc/oldnews.txt b/harbour/doc/oldnews.txt index 70f02f4ee7..ddabb30c9d 100644 --- a/harbour/doc/oldnews.txt +++ b/harbour/doc/oldnews.txt @@ -7,8 +7,8 @@ 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. If you wish to distribute some or all of this work - under different terms, please contact respective author(s). + in file: COPYING.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/harbour/package/mpkg_win.nsi b/harbour/package/mpkg_win.nsi index e09f52a16b..b6fb371b3c 100644 --- a/harbour/package/mpkg_win.nsi +++ b/harbour/package/mpkg_win.nsi @@ -4,7 +4,7 @@ ; --------------------------------------------------------------- ; Copyright 2009 Viktor Szakats (harbour syenar.net) -; See COPYING for licensing terms. +; See COPYING.txt for licensing terms. ; ; Harbour Nullsoft installer script (for Windows/MS-DOS) ; [ Do not try to use this script directly. It won't work. ] @@ -65,7 +65,7 @@ InstallDir C:\$%HB_PKGNAMI% ;-------------------------------- ; License Language String -LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_INSTALL_PREFIX%\COPYING" +LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_INSTALL_PREFIX%\COPYING.txt" ;-------------------------------- ; The stuff to install @@ -77,7 +77,7 @@ Section "Main components" hb_main ; Set output path to the installation directory. SetOutPath $INSTDIR - File /nonfatal "$%HB_INSTALL_PREFIX%\COPYING" + File /nonfatal "$%HB_INSTALL_PREFIX%\COPYING.txt" File /nonfatal "$%HB_INSTALL_PREFIX%\README.txt" ; Let it work also for MS-DOS packages where short filename is used here File /nonfatal "$%HB_INSTALL_PREFIX%\Change*" diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat index 6f85529c8b..4bb52bd7f4 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -6,7 +6,7 @@ rem --------------------------------------------------------------- rem Copyright 2009-2011 Viktor Szakats (harbour syenar.net) -rem See COPYING for licensing terms. +rem See COPYING.txt for licensing terms. rem --------------------------------------------------------------- rem - Adjust target dir, mingw dirs, set HB_DIR_UPX, HB_DIR_7Z, HB_DIR_MINGW, @@ -102,7 +102,7 @@ rem ; Create unified archive echo.> _hbfiles echo "%HB_DR%RELNOTES.txt" >> _hbfiles echo "%HB_DR%README.txt" >> _hbfiles -echo "%HB_DR%COPYING" >> _hbfiles +echo "%HB_DR%COPYING.txt" >> _hbfiles echo "%HB_DR%ChangeLog*" >> _hbfiles echo "%HB_DR%bin\*-%HB_VS%.dll" >> _hbfiles echo "%HB_DR%bin\harbour.exe" >> _hbfiles diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi index bd7becddb2..e60bdb6b62 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -6,7 +6,7 @@ ; NSIS installer script for Harbour ; ; Copyright 2009 Viktor Szakats (harbour syenar.net) -; See COPYING for licensing terms. +; See COPYING.txt for licensing terms. ; --------------------------------------------------------------- ; TODO: option: install .dlls to system paths @@ -70,7 +70,7 @@ InstallDir C:\hb$%HB_VS% ;-------------------------------- ; License Language String -LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_ABSROOT%COPYING" +LicenseLangString MUILicense ${LANG_ENGLISH} "$%HB_ABSROOT%COPYING.txt" ;-------------------------------- ; The stuff to install @@ -85,7 +85,7 @@ Section "Main components" hb_main File /nonfatal "$%HB_ABSROOT%RELNOTES.txt" File /nonfatal "$%HB_ABSROOT%README.txt" - File /nonfatal "$%HB_ABSROOT%COPYING" + File /nonfatal "$%HB_ABSROOT%COPYING.txt" File /nonfatal "$%HB_ABSROOT%ChangeLog*" SetOutPath $INSTDIR\bin diff --git a/harbour/tests/hbdoctst.prg b/harbour/tests/hbdoctst.prg index 997f292c49..6d9f9d8790 100644 --- a/harbour/tests/hbdoctst.prg +++ b/harbour/tests/hbdoctst.prg @@ -32,7 +32,7 @@ PROCEDURE Main( cRoot ) cRoot := "." + hb_ps() DO WHILE hb_DirExists( cRoot + ".." ) IF hb_FileExists( cRoot + "README.txt" ) .AND. ; - hb_FileExists( cRoot + "COPYING" ) .AND. ; + hb_FileExists( cRoot + "COPYING.txt" ) .AND. ; hb_DirExists( cRoot + "config" ) EXIT ENDIF diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 54ca1c70fc..ff978b52f0 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -54,7 +54,7 @@ * optimized header time scan algorithm * runner core logic * - * See COPYING for licensing terms. + * See COPYING.txt for licensing terms. * */ diff --git a/harbour/website/faq/harbour3.html b/harbour/website/faq/harbour3.html index 7623f6adb0..3a757084f9 100644 --- a/harbour/website/faq/harbour3.html +++ b/harbour/website/faq/harbour3.html @@ -18,7 +18,7 @@

1.2. Licence

This document should be considered as free software, distributed under the terms of the GNU General Public Licence, version 2. For details see the file -COPYING.

+COPYING.txt.

Frequently Asked Questions about Harbour diff --git a/harbour/website/license.html b/harbour/website/license.html index a1cf8113fd..b7bc7de5b2 100644 --- a/harbour/website/license.html +++ b/harbour/website/license.html @@ -90,7 +90,7 @@ 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. If not, write to + along with this software; see the file COPYING.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 http://www.gnu.org/).