From 790a0671d8b9670f0919dfaa17d470876c6338fa Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sun, 11 Oct 2009 23:15:09 +0000 Subject: [PATCH] 2009-10-12 01:14 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/debian/rules ! fixed typo: HB_INC_INSTALL<->HB_LIB_INSTALL * harbour/debian/changelog * updated version number * harbour/mpkg_deb.sh * do not create unnecessary source code archive --- harbour/ChangeLog | 10 ++++++++++ harbour/debian/changelog | 6 ++++++ harbour/debian/rules | 4 ++-- harbour/mpkg_deb.sh | 18 +----------------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6f6431c55c..28f78277c4 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-12 01:14 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/debian/rules + ! fixed typo: HB_INC_INSTALL<->HB_LIB_INSTALL + + * harbour/debian/changelog + * updated version number + + * harbour/mpkg_deb.sh + * do not create unnecessary source code archive + 2009-10-12 00:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/debian/copyright * harbour/debian/rules diff --git a/harbour/debian/changelog b/harbour/debian/changelog index a1f0d0ec21..34dacbcc79 100644 --- a/harbour/debian/changelog +++ b/harbour/debian/changelog @@ -1,3 +1,9 @@ +harbour (2.0.0beta3-1) unstable; urgency=low + + * 2.0.0beta3-1 + + -- Przemyslaw Czerpak Mon, 12 Oct 2009 01:02:03 +0200 + harbour (2.0.0beta1-1) unstable; urgency=low * 2.0.0beta1-1 diff --git a/harbour/debian/rules b/harbour/debian/rules index 808a4ab879..943bfb4271 100755 --- a/harbour/debian/rules +++ b/harbour/debian/rules @@ -7,8 +7,8 @@ #export DH_VERBOSE := 1 export HB_BIN_INSTALL := /usr/bin -export HB_LIB_INSTALL := /usr/include/harbour -export HB_INC_INSTALL := /usr/lib/harbour +export HB_LIB_INSTALL := /usr/lib/harbour +export HB_INC_INSTALL := /usr/include/harbour export HB_DOC_INSTALL := /usr/share/doc/harbour export HB_ETC_INSTALL := /etc/harbour export HB_INST_PKGPREF := $(CURDIR)/debian/harbour diff --git a/harbour/mpkg_deb.sh b/harbour/mpkg_deb.sh index 8a8a5d63a8..506b0a8ff2 100755 --- a/harbour/mpkg_deb.sh +++ b/harbour/mpkg_deb.sh @@ -31,23 +31,7 @@ done if [ -z "${TOINST_LST}" ] || [ "$1" = "--force" ] then - . ./mpkg_src.sh - stat="$?" - if [ -z "${hb_filename}" ] - then - echo "The script ./mpkg_src.sh doesn't set archive name to \${hb_filename}" - exit 1 - elif [ "${stat}" != 0 ] - then - echo "Error during packing the sources in ./mpkg_src.sh" - exit 1 - elif [ -f ${hb_filename} ] - then - dpkg-buildpackage -b - else - echo "Cannot find archive file: ${hb_filename}" - exit 1 - fi + dpkg-buildpackage -b else echo "If you want to build Harbour compiler" echo "you have to install the folowing packages:"