2010-06-03 18:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* package/winuni/RELNOTES
    * Updated.

  * harbour.spec
  * doc/dirstruc.txt
  * utils/hbmk2/examples/contribf.hbc
  * contrib/Makefile
  - contrib/hbbtree
  + examples/hbbtree
  - examples/hbbtree/Makefile
    * hbbtree move to example section as told in a recent
      changelog entry. This contrib has long time unfixed
      file-format portability problems, plus it's really
      more of a good example code than lib for end-users.

harbour/ChangeLog

@@ -17,6 +17,22 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-06-03 18:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * package/winuni/RELNOTES
+    * Updated.
+
+  * harbour.spec
+  * doc/dirstruc.txt
+  * utils/hbmk2/examples/contribf.hbc
+  * contrib/Makefile
+  - contrib/hbbtree
+  + examples/hbbtree
+  - examples/hbbtree/Makefile
+    * hbbtree move to example section as told in a recent
+      changelog entry. This contrib has long time unfixed
+      file-format portability problems, plus it's really
+      more of a good example code than lib for end-users.
+
 2010-06-03 16:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/lang/msghuiso.c
   * src/lang/msgskiso.c

harbour/contrib/Makefile

@@ -8,7 +8,6 @@ ROOT := ../
 DIRS := \
    gtwvg \
    hbblink \
-   hbbtree \
    hbbz2 \
    hbclipsm \
    hbcomm \

harbour/contrib/hbbtree/Makefile

@@ -1,22 +0,0 @@
-#
-# $Id$
-#
-
-ROOT := ../../
-
-C_SOURCES := \
-   hb_btree.c \
-
-C_HEADERS := \
-   hb_btree.h \
-
-PRG_SOURCES := \
-   tbtree.prg \
-
-PRG_HEADERS := \
-   hb_btree.ch \
-
-LIBNAME := hbbtree
-
-include $(TOP)$(ROOT)config/header.mk
-include $(TOP)$(ROOT)config/lib.mk

harbour/doc/dirstruc.txt

@@ -53,12 +53,6 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   +---hbbmcdx         - DBFCDX RDD with bitmap filters compatible with
 |   |                     CA-Cl*pper 5.3
 |   |
-|   +---hbbtree         - BTree library.
-|   |   |
-|   |   +---doc         - HB_BTree C and Harbour API documentation.
-|   |   |
-|   |   +---tests       - HB_BTree api test programs.
-|   |
 |   +---hbclipsm        - Miscellaneous contribution files.
 |   |   |
 |   |   +---tests       - Test programs.
@@ -219,6 +213,12 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |
 |   +---guestbk     - Harbour Guests Book.
 |   |
+|   +---hbbtree         - BTree library.
+|   |   |
+|   |   +---doc         - HB_BTree C and Harbour API documentation.
+|   |   |
+|   |   +---tests       - HB_BTree api test programs.
+|   |
 |   +---hbdoc           - Documentation generation tool.
 |   |
 |   +---hbdoc2          - Documentation generation tool.

harbour/harbour.spec

@@ -69,7 +69,7 @@
 %define hb_ldir   export HB_LIB_INSTALL=%{_libdir}/%{name}
 %define hb_edir   export HB_ETC_INSTALL=%{hb_etcdir}
 %define hb_cmrc   export HB_BUILD_NOGPLLIB=%{?_without_gpllib:yes}
-%define hb_ctrb   export HB_CONTRIBLIBS="hbblink hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbziparc hbfoxpro hbsms hbfship hbxpp xhb rddbmcdx rddsql sddsqlt3 hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_cups:hbcups} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird sddfb} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}"
+%define hb_ctrb   export HB_CONTRIBLIBS="hbblink hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbziparc hbfoxpro hbsms hbfship hbxpp xhb rddbmcdx rddsql sddsqlt3 hbnf %{?_with_allegro:gtalleg} %{?_with_cairo:hbcairo} %{?_with_cups:hbcups} %{?_with_curl:hbcurl} %{?_with_firebird:hbfbird sddfb} %{?_with_freeimage:hbfimage} %{?_with_gd:hbgd} %{?_with_mysql:hbmysql sddmy} %{?_with_odbc:hbodbc sddodbc} %{?_with_pgsql:hbpgsql sddpg} %{?_with_qt:hbqt hbxbp} %{?_with_ads:rddads}"
 %define hb_env    %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_dflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc}
 %define hb_host   harbour-project.org
 %define readme    README.RPM
@@ -636,7 +636,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libhbnf.a
 %{_libdir}/%{name}/libhbblink.a
-%{_libdir}/%{name}/libhbbtree.a
 %{_libdir}/%{name}/libhbmisc.a
 %{_libdir}/%{name}/libhbmzip.a
 %{_libdir}/%{name}/libhbnetio.a

harbour/package/winuni/RELNOTES

@@ -59,7 +59,7 @@ Tool/lib versions used to create this package:
    Blat 2.6.2
    Cairo 1.8.8
    libcurl 7.20.0
-   Firebird 2.5.0rc1
+   Firebird 2.5.0rc2
    FreeImage 3.13.1
    GD 2.0.35
    MySQL 5.1.41

harbour/utils/hbmk2/examples/contribf.hbc

@@ -6,7 +6,7 @@
 # [ This should be kept in sync with local Makefile information. ]
 
 # contribs portable, with no external dependencies:
-libs=hbblink hbbtree hbclipsm hbcomm hbct hbfoxpro hbfship hbgt hbmisc hbmzip minizip hbnf hbsms hbtpathy hbxpp hbziparc rddbmcdx rddsql xhb
+libs=hbblink hbclipsm hbcomm hbct hbfoxpro hbfship hbgt hbmisc hbmzip minizip hbnf hbsms hbtpathy hbxpp hbziparc rddbmcdx rddsql xhb
 
 # contribs portable, with external dependencies:
 libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt hbtip sddfb sddmy sddpg