2012-05-08 17:29 UTC+0200 Viktor Szakats (harbour syenar.net)

- bin/hb3rdpat.hbs
  + bin/3rdpatch.hb
  * config/postinst.hbs
  * package/harbour.spec
  * package/winuni/mpkg_win_uni.nsi
    * renamed public script to use .hb extension.

  * utils/hbmk2/hbmk2.prg
    * formatting

harbour/ChangeLog

@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-05-08 17:29 UTC+0200 Viktor Szakats (harbour syenar.net)
+  - bin/hb3rdpat.hbs
+  + bin/3rdpatch.hb
+  * config/postinst.hbs
+  * package/harbour.spec
+  * package/winuni/mpkg_win_uni.nsi
+    * renamed public script to use .hb extension.
+
+  * utils/hbmk2/hbmk2.prg
+    * formatting
+
 2012-05-08 06:50 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/qtgui/qth/QWheelEvent.qth
     ! Fixed: ISNUM() => HB_ISNUM.

harbour/config/postinst.hbs

@@ -83,7 +83,7 @@ PROCEDURE Main( ... )
          OutStd( "! Copying Harbour script files..." + hb_eol() )
 
          /* public Harbour scripts */
-         FOR EACH tmp IN { "bin/hb3rdpat.hbs" }
+         FOR EACH tmp IN { "bin/3rdpatch.hb" }
             mk_hb_FCopy( tmp, GetEnvC( "HB_INSTALL_BIN" ) + hb_ps() )
          NEXT
       ENDIF

harbour/package/harbour.spec

@@ -461,7 +461,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hbi18n
 %{_bindir}/hbmk2
 %{_bindir}/hbmk2.*.hbl
-%{_bindir}/hb3rdpat.hbs
+%{_bindir}/3rdpatch.hb
 %{_mandir}/man1/*.1*
 %dir %{_includedir}/%{name}
 %attr(644,root,root) %{_includedir}/%{name}/*

harbour/package/winuni/mpkg_win_uni.nsi

@@ -102,7 +102,6 @@ Section "Main components" hb_main
   File "$%HB_ABSROOT%bin\hbrun.exe"
   File "$%HB_ABSROOT%bin\hbtest.exe"
   File /nonfatal "$%HB_ABSROOT%bin\*.hb"
-  File /nonfatal "$%HB_ABSROOT%bin\*.hbs"
   File /nonfatal "$%HB_ABSROOT%bin\hbmk.hbc"
   File "$%HB_ABSROOT%bin\upx*.*"
 

harbour/utils/hbmk2/hbmk2.prg

@@ -7585,7 +7585,7 @@ STATIC FUNCTION s_getIncludedFiles( hbmk, cFile, cParentDir, lCMode )
                                       NIL /* lNewLine */, NIL, ;
                                       NIL /* nGetMatch */, ;
                                       .T. /* lOnlyMatch */ )
-            cHeader := atail( tmp ) /* Last group in match marker */
+            cHeader := ATail( tmp ) /* Last group in match marker */
             lSystemHeader := ( Left( cHeader, 1 ) == "<" )
             cHeader := SubStr( cHeader, 2, Len( cHeader ) - 2 )
 
@@ -10234,7 +10234,7 @@ STATIC FUNCTION MacroGet( hbmk, cMacro, cFileName )
 
 #if 0
    /* Support for: ${@<filename>} to include on-disk file content of <filename>
-                   ${@@<envvar>} to include on-disk file content referenced 
+                   ${@@<envvar>} to include on-disk file content referenced
                                  from filename contained in <envvar> */
    IF Left( cMacro, 1 ) == "@"
       cMacro := SubStr( cMacro, 2 )