From fc33f10a4d1e22ff2f3a94a0f2187ca3880012ee Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 7 Apr 2010 08:38:22 +0000
Subject: [PATCH] 2010-04-07 10:37 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   - package/harbour.ico   + package/harb_win.ico   *
 package/mpkg_win.nsi   * package/winuni/mpkg_win_uni.nsi   *
 utils/hbrun/hbrun.rc   * utils/hbrun/hbrun.hbp     * Renamed .ico to make it
 obvious that it is a Windows icon file.

---
 harbour/ChangeLog                             |   9 +++++++++
 harbour/package/{harbour.ico => harb_win.ico} | Bin
 harbour/package/mpkg_win.nsi                  |   2 +-
 harbour/package/winuni/mpkg_win_uni.nsi       |   2 +-
 harbour/utils/hbrun/hbrun.hbp                 |   2 +-
 harbour/utils/hbrun/hbrun.rc                  |   4 ++--
 6 files changed, 14 insertions(+), 5 deletions(-)
 rename harbour/package/{harbour.ico => harb_win.ico} (100%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0c7acd0434..6990f5ed6f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-04-07 10:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - package/harbour.ico
+  + package/harb_win.ico
+  * package/mpkg_win.nsi
+  * package/winuni/mpkg_win_uni.nsi
+  * utils/hbrun/hbrun.rc
+  * utils/hbrun/hbrun.hbp
+    * Renamed .ico to make it obvious that it is a Windows icon file.
+
 2010-04-07 05:55 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/contrib/hbcairo/tests/hellow.c
     * HB_SETCODEPAGE() -> HB_CDPSELECT()
diff --git a/harbour/package/harbour.ico b/harbour/package/harb_win.ico
similarity index 100%
rename from harbour/package/harbour.ico
rename to harbour/package/harb_win.ico
diff --git a/harbour/package/mpkg_win.nsi b/harbour/package/mpkg_win.nsi
index dcb112500d..cb17371760 100644
--- a/harbour/package/mpkg_win.nsi
+++ b/harbour/package/mpkg_win.nsi
@@ -20,7 +20,7 @@
   !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\readme.txt"
-  !define MUI_ICON "harbour.ico"
+  !define MUI_ICON "harb_win.ico"
 
 SetDateSave on
 SetDatablockOptimize on
diff --git a/harbour/package/winuni/mpkg_win_uni.nsi b/harbour/package/winuni/mpkg_win_uni.nsi
index 6c61869d50..a8429942c1 100644
--- a/harbour/package/winuni/mpkg_win_uni.nsi
+++ b/harbour/package/winuni/mpkg_win_uni.nsi
@@ -19,7 +19,7 @@ SetCompressor /solid lzma
   !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\doc\readme.txt"
-  !define MUI_ICON "..\harbour.ico"
+  !define MUI_ICON "..\harb_win.ico"
 
 SetDateSave on
 SetDatablockOptimize on
diff --git a/harbour/utils/hbrun/hbrun.hbp b/harbour/utils/hbrun/hbrun.hbp
index 696562ed16..be802abde5 100644
--- a/harbour/utils/hbrun/hbrun.hbp
+++ b/harbour/utils/hbrun/hbrun.hbp
@@ -14,4 +14,4 @@ hbrun.prg
 -lhbpp
 -lhbcommon
 
--icon={allwin|os2}../../package/harbour.ico
+-icon={allwin}../../package/harb_win.ico
diff --git a/harbour/utils/hbrun/hbrun.rc b/harbour/utils/hbrun/hbrun.rc
index 040f114369..88dd367c92 100644
--- a/harbour/utils/hbrun/hbrun.rc
+++ b/harbour/utils/hbrun/hbrun.rc
@@ -3,7 +3,7 @@
  */
 
 #if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 )
-ICON 1 DISCARDABLE "../../../../../package/harbour.ico"
+ICON 1 DISCARDABLE "../../../../../package/harb_win.ico"
 #else
-ICON1 ICON DISCARDABLE "../../../../../package/harbour.ico"
+ICON1 ICON DISCARDABLE "../../../../../package/harb_win.ico"
 #endif