diff --git a/harbour/COPYING b/harbour/COPYING index 15713aed04..09fc07711d 100644 --- a/harbour/COPYING +++ b/harbour/COPYING @@ -81,11 +81,8 @@ files, you need to investigate the license that applies to each file. THE HARBOUR PROJECT NON-SOURCE LICENSE ====================================== -Note: This license only applies to the following files: - - ChangeLog - README - NEWS +Note: This license applies to the files where the content + explicitly indicates so. These works are licensed under the Creative Commons Attribution-ShareAlike License. To view a copy of this license, visit diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 286aadb5f9..4f121269d9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,36 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-14 21:37 UTC+0100 Viktor Szakats (harbour syenar.net) + * COPYING + * debian/copyright + * changed explicit reference to certain CC licensed + files to generic wording. + + * TODO + * GTWVG -> GTWVT + + - NEWS + + doc/oldnews.txt + - TODO + + doc/todo.txt + * renamed these files. TODO is essentially static + since 10 years, not worth to keep in root and in + distro root. NEWS was not updated since 2008. + + * doc/Makefile + + updated with above files. (so they will still be + distributed, just not in root) + + * doc/howtorel.txt + * updated reference to NEWS doc + + * config/postinst.hb + * package/mpkg_win.nsi + * package/winuni/mpkg_win_uni.bat + * package/winuni/mpkg_win_uni.nsi + * deleted references to TODO and NEWS + 2012-11-14 21:11 UTC+0100 Viktor Szakats (harbour syenar.net) * COPYING * debian/copyright diff --git a/harbour/config/postinst.hb b/harbour/config/postinst.hb index ceffe90192..7936569b07 100644 --- a/harbour/config/postinst.hb +++ b/harbour/config/postinst.hb @@ -70,8 +70,6 @@ PROCEDURE Main( ... ) mk_hb_FCopy( "COPYING", tmp + hb_ps() ) mk_hb_FCopy( "README" , tmp + hb_ps() ) - mk_hb_FCopy( "NEWS" , tmp + hb_ps() ) - mk_hb_FCopy( "TODO" , tmp + hb_ps() ) ELSE OutStd( hb_StrFormat( "! Error: Cannot create directory '%1$s'", tmp ) + hb_eol() ) ENDIF diff --git a/harbour/debian/copyright b/harbour/debian/copyright index 15713aed04..09fc07711d 100644 --- a/harbour/debian/copyright +++ b/harbour/debian/copyright @@ -81,11 +81,8 @@ files, you need to investigate the license that applies to each file. THE HARBOUR PROJECT NON-SOURCE LICENSE ====================================== -Note: This license only applies to the following files: - - ChangeLog - README - NEWS +Note: This license applies to the files where the content + explicitly indicates so. These works are licensed under the Creative Commons Attribution-ShareAlike License. To view a copy of this license, visit diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile index 2f68bc9223..1514721eaa 100644 --- a/harbour/doc/Makefile +++ b/harbour/doc/Makefile @@ -21,11 +21,13 @@ DOC_FILES := \ howtorep.txt \ inet.txt \ locks.txt \ + oldnews.txt \ pcode.txt \ pp.txt \ pragma.txt \ readme.txt \ statics.txt \ + todo.txt \ tracing.txt \ transfrm.txt \ vm.txt \ diff --git a/harbour/doc/howtorel.txt b/harbour/doc/howtorel.txt index db17ea7ab1..a0480ae971 100644 --- a/harbour/doc/howtorel.txt +++ b/harbour/doc/howtorel.txt @@ -17,9 +17,9 @@ By Przemyslaw Czerpak (druzus/at/priv.onet.pl) 2. Update files which contain harbour release number. Now these are: harbour.spec include/hbver.h -3. Set proper release date in NEWS and if necessary update - release informations. Also add the exact tag name to this file, - for example "tag: build46". +3. Set proper release date in NEWS (found as doc/oldnews.txt) and + if necessary update release informations. Also add the exact + tag name to this file, for example "tag: build46". 4. Update ChangeLog file and commit your modifications. 5. Update hbver.h with ChangeLog file ID and your last entry ID. 6. Tag the CVS tree with the new release tag: diff --git a/harbour/NEWS b/harbour/doc/oldnews.txt similarity index 100% rename from harbour/NEWS rename to harbour/doc/oldnews.txt diff --git a/harbour/TODO b/harbour/doc/todo.txt similarity index 97% rename from harbour/TODO rename to harbour/doc/todo.txt index 1a63e873ae..8d5b2372c5 100644 --- a/harbour/TODO +++ b/harbour/doc/todo.txt @@ -39,7 +39,7 @@ Status...: Open. Assign to: Przemek Detail...: Define multi platform platform API for GTs which can mix graphics objects with standard text output. Now it's - possible in GTXWC, GTWVG and GTALLEG. This I will discuss + possible in GTXWC, GTWVT and GTALLEG. This I will discuss yet also with Harbour developers. Status...: Open. diff --git a/harbour/package/mpkg_win.nsi b/harbour/package/mpkg_win.nsi index 1e89434324..48baa6d534 100644 --- a/harbour/package/mpkg_win.nsi +++ b/harbour/package/mpkg_win.nsi @@ -79,8 +79,6 @@ Section "Main components" hb_main File /nonfatal "$%HB_INSTALL_PREFIX%\COPYING" File /nonfatal "$%HB_INSTALL_PREFIX%\README" - File /nonfatal "$%HB_INSTALL_PREFIX%\NEWS" - File /nonfatal "$%HB_INSTALL_PREFIX%\TODO" ; 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 091ea415c4..8a8f2ea9e6 100644 --- a/harbour/package/winuni/mpkg_win_uni.bat +++ b/harbour/package/winuni/mpkg_win_uni.bat @@ -103,8 +103,6 @@ echo.> _hbfiles echo "%HB_DR%RELNOTES" >> _hbfiles echo "%HB_DR%README" >> _hbfiles echo "%HB_DR%COPYING" >> _hbfiles -echo "%HB_DR%NEWS" >> _hbfiles -echo "%HB_DR%TODO" >> _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 eccba6ad19..c22400ec01 100644 --- a/harbour/package/winuni/mpkg_win_uni.nsi +++ b/harbour/package/winuni/mpkg_win_uni.nsi @@ -86,8 +86,6 @@ Section "Main components" hb_main File /nonfatal "$%HB_ABSROOT%README" File /nonfatal "$%HB_ABSROOT%COPYING" - File /nonfatal "$%HB_ABSROOT%NEWS" - File /nonfatal "$%HB_ABSROOT%TODO" File /nonfatal "$%HB_ABSROOT%ChangeLog*" SetOutPath $INSTDIR\bin