2009-09-19 10:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* debian/rules
    % Minor Makefile optimizations. I hope this is right.

  * INSTALL
    + Readded alternative package for curl on debian.

  + external/zlib/zlib.dif
  + external/sqlite3/sqlite3.dif
    + Added .dif files for local patches to locally hosted
      3rd party code. Pls update these when modifying original
      source locally.
    ; NOTE: I intentionally didn't add svn props to these files.

  * external/sqlite3/Makefile
    ! Typo in comment.

harbour/ChangeLog

@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-19 10:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * debian/rules
+    % Minor Makefile optimizations. I hope this is right.
+
+  * INSTALL
+    + Readded alternative package for curl on debian.
+
+  + external/zlib/zlib.dif
+  + external/sqlite3/sqlite3.dif
+    + Added .dif files for local patches to locally hosted
+      3rd party code. Pls update these when modifying original
+      source locally.
+    ; NOTE: I intentionally didn't add svn props to these files.
+
+  * external/sqlite3/Makefile
+    ! Typo in comment.
+
 2009-09-19 07:46 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/bin/hb-func.sh
     * updated for OpenBSD builds

harbour/INSTALL

@@ -276,7 +276,7 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
       for console mouse support: sudo apt-get install libgpm-dev OR libgpmg1-dev
       for contrib/gtalleg lib:   sudo apt-get install liballegro4.2-dev
       for contrib/hbodbc lib:    sudo apt-get install unixodbc-dev
-      for contrib/hbcurl lib:    sudo apt-get install libcurl4-openssl-dev
+      for contrib/hbcurl lib:    sudo apt-get install libcurl4-openssl-dev OR libcurl4-gnutls-dev
       for contrib/hbfbird lib:   sudo apt-get install firebird2.1-dev OR
                                  sudo apt-get install libfirebird2.0-dev
       for contrib/hbfimage lib:  sudo apt-get install libfreeimage-dev

harbour/debian/rules

@@ -4,20 +4,20 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+#export DH_VERBOSE := 1
 
-export _DEFAULT_BIN_DIR=/usr/bin
-export _DEFAULT_INC_DIR=/usr/include/harbour
-export _DEFAULT_LIB_DIR=/usr/lib/harbour
-export _DEFAULT_DOC_DIR=/usr/share/doc/harbour
-export INSTDIR=$(CURDIR)/debian/harbour
-export HB_BIN_INSTALL=$(INSTDIR)$(_DEFAULT_BIN_DIR)
-export HB_LIB_INSTALL=$(INSTDIR)$(_DEFAULT_LIB_DIR)
-export HB_INC_INSTALL=$(INSTDIR)$(_DEFAULT_INC_DIR)
-export HB_DOC_INSTALL=$(INSTDIR)$(_DEFAULT_DOC_DIR)
-export HB_ETC_DIR=$(INSTDIR)/etc
+export _DEFAULT_BIN_DIR := /usr/bin
+export _DEFAULT_INC_DIR := /usr/include/harbour
+export _DEFAULT_LIB_DIR := /usr/lib/harbour
+export _DEFAULT_DOC_DIR := /usr/share/doc/harbour
+export INSTDIR := $(CURDIR)/debian/harbour
+export HB_BIN_INSTALL := $(INSTDIR)$(_DEFAULT_BIN_DIR)
+export HB_LIB_INSTALL := $(INSTDIR)$(_DEFAULT_LIB_DIR)
+export HB_INC_INSTALL := $(INSTDIR)$(_DEFAULT_INC_DIR)
+export HB_DOC_INSTALL := $(INSTDIR)$(_DEFAULT_DOC_DIR)
+export HB_ETC_DIR := $(INSTDIR)/etc
 
-CFLAGS = -g
+CFLAGS := -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
    CFLAGS += -O0

harbour/external/sqlite3/Makefile

@@ -26,7 +26,7 @@ endif
 ifeq ($(HB_HOST_PLAT)-$(HB_COMPILER),dos-watcom)
    HB_SUPPORTED := no
 endif
-# NOTE: diable *nix builds on non-*nix platforms. [vszakats]
+# NOTE: disable *nix builds on non-*nix platforms. [vszakats]
 ifeq ($(HB_HOST_PLAT_UNIX),)
    ifneq ($(HB_PLATFORM_UNIX),)
       HB_SUPPORTED := no

harbour/external/sqlite3/sqlite3.dif

@@ -0,0 +1,12 @@
+diff -u ori\sqlite3.c .\sqlite3.c
+--- ori\sqlite3.c	Wed Aug 19 10:50:21 2009
++++ .\sqlite3.c	Sat Sep 19 07:47:14 2009
+@@ -25024,7 +25024,7 @@
+ ** error message.
+ */
+ static void unixDlError(sqlite3_vfs *NotUsed, int nBuf, char *zBufOut){
+-  char *zErr;
++  const char *zErr;
+   UNUSED_PARAMETER(NotUsed);
+   unixEnterMutex();
+   zErr = dlerror();