diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2ea7a3a1c5..449d42131f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-03 19:28 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/debian/changelog + * harbour/make_deb.sh + * added modifications by Guy Roussin - thanks + + * harbour/contrib/gtwvg/gtwvg.c + ! fixed pointer comparison - C uses different precedence for ! + operator then Clipper/xbase + I thought that I've already fixed it once :-o + 2008-07-03 18:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbbmcdx/bmdbfcdx.c * contrib/hbbtree/hb_btree.c diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 2454dfeed3..3062601202 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -212,11 +212,11 @@ static void hb_gt_wvt_FreeAll( void ) { if( s_wvtCount > 0 ) { - int iPos, iIndex; + int iPos; for ( iPos = 1; iPos < WVT_MAX_WINDOWS; iPos++ ) { - if( !s_wvtWindows[ iPos ] == NULL ) + if( s_wvtWindows[ iPos ] != NULL ) { hb_gt_wvt_Free( s_wvtWindows[ iPos ] ); HB_GTSUPER_EXIT( s_wvtWindows[ iPos ]->pGT ); diff --git a/harbour/debian/changelog b/harbour/debian/changelog index e479b84882..f6b683f3e0 100644 --- a/harbour/debian/changelog +++ b/harbour/debian/changelog @@ -1,3 +1,9 @@ +harbour (1.0.0.RC2) unstable; urgency=low + + * Lot of new stuff see changelog + + -- guy.roussin Thu, 03 Jul 2008 14:57:48 +0200 + harbour (0.45.0-0.1) unstable; urgency=low * NMU diff --git a/harbour/make_deb.sh b/harbour/make_deb.sh index a98b120f0b..c5a1d187b9 100755 --- a/harbour/make_deb.sh +++ b/harbour/make_deb.sh @@ -46,7 +46,7 @@ then export HB_WITHOUT_X11=yes fi -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm hbnf" +export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm hbnf hbtpathy hbmsql hbsqlit2 hbsqlit3" if [ -z "$HB_WITHOUT_ADS" ] && \ [ ! -f "/usr/local/ads/acesdk/ace.h" ] && \ @@ -55,7 +55,7 @@ then export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} rddads" fi -if [ -z "$HB_WITHOUT_ODBC" ] && ! test_reqpkg unixodbc-dev +if [ -z "$HB_WITHOUT_ODBC" ] && test_reqpkg unixodbc-dev then export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbodbc" fi @@ -76,6 +76,22 @@ then export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbgd" fi +if test_reqpkg libcurl4-gnutls-dev || \ + test_reqpkg libcurl4-openssl-dev +then + export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbcurl" +fi + +if test_reqpkg libgtk2.0-dev +then + export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbgf" +fi + +if test_reqpkg firebird2.0-dev +then + export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbfbird" +fi + if [ -z "${TOINST_LST}" ] || [ "$1" = "--force" ] then . ./bin/pack_src.sh