2008-06-03 17:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/make_deb.sh
    ! added fixes by Guy Roussin - many thanks

harbour/ChangeLog

@@ -8,6 +8,10 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-03 17:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/make_deb.sh
+    ! added fixes by Guy Roussin - many thanks
+
 2008-06-03 17:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbw32/w32_regc.c
     ! fixed typo hb_free() => hb_xfree()

harbour/make_deb.sh

@@ -12,7 +12,7 @@
 
 test_reqpkg()
 {
-    dpkg -s "$1" &> /dev/null
+    dpkg -l "$1" 2> /dev/null | grep '^ii' &> /dev/null
 }
 
 TOINST_LST=""
@@ -30,7 +30,7 @@ else
     then
         export HB_GPM_MOUSE=yes
     fi
-    if [ -z "$HB_WITHOUT_GTSLN" ] && test_reqpkg libslang2-dev
+    if [ -z "$HB_WITHOUT_GTSLN" ] && ! test_reqpkg libslang2-dev
     then
         export HB_WITHOUT_GTSLN=yes
     fi
@@ -52,8 +52,8 @@ then
 fi
 
 if [ -z "$HB_WITHOUT_ADS" ] && \
-   ! /usr/local/ads/acesdk/ace.h && \
-   ! $(HOME)/ads/acesdk/ace.h
+   [ ! -f "/usr/local/ads/acesdk/ace.h" ] && \
+   [ ! -f "${HOME}/ads/acesdk/ace.h" ]
 then
     export HB_WITHOUT_ADS=yes
 fi
@@ -68,6 +68,12 @@ then
     export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbmysql"
 fi
 
+if test_reqpkg libgd-xpm-dev || \
+   test_reqpkg libgd2-xpm-dev 
+then
+    export HB_CONTRIBLIBS="${HB_CONTRIBLIBS} hbgd"
+fi
+
 if [ -z "${TOINST_LST}" ] || [ "$1" = "--force" ]
 then
     . ./bin/pack_src.sh