DEB build scripts: added klamav and komposé. Fixed bug with pbuilder building chain.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 6 insertions, 2 deletions

diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 804afe4ea..5e4aadc29 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -20,7 +20,6 @@ else
   build_module "$CFG_EXTRA_DEPS_DIR/openslp-dfsg"
   build_module "$CFG_EXTRA_DEPS_DIR/mp4v2"
   build_module "$CFG_EXTRA_DEPS_DIR/transcode"
-  build_module "$CFG_EXTRA_DEPS_DIR/pinentry-tqt"
 fi
 
 set_log_end
diff --git a/debian/_buildscripts/local/03_base_03.sh b/debian/_buildscripts/local/03_base_03.sh
index eb7a6cecf..c9f7e4745 100755
--- a/debian/_buildscripts/local/03_base_03.sh
+++ b/debian/_buildscripts/local/03_base_03.sh
@@ -10,6 +10,9 @@ build_module "core/tdegames"
 build_module "core/tdetoys"
 build_module "core/tdeedu"
 build_module "core/tdegraphics"
+if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
+  build_module "$CFG_EXTRA_DEPS_DIR/pinentry-tqt"
+fi
 build_module "core/tdepim"
 build_module "core/tdeaddons"
 build_module "core/tdesdk"
diff --git a/debian/_buildscripts/local/06_applications_03.sh b/debian/_buildscripts/local/06_applications_03.sh
index 07a1f3e90..ad02c37d6 100755
--- a/debian/_buildscripts/local/06_applications_03.sh
+++ b/debian/_buildscripts/local/06_applications_03.sh
@@ -15,6 +15,7 @@ build_module "applications/kftpgrabber"
 build_module "applications/kile"
 build_module "applications/kima"    
 build_module "applications/kkbswitch"
+build_module "applications/klamav"
 build_module "applications/klcddimmer"
 build_module "applications/kmyfirewall"
 build_module "applications/kmymoney"
diff --git a/debian/_buildscripts/local/07_applications_04.sh b/debian/_buildscripts/local/07_applications_04.sh
index e23b6226a..c10a94ea2 100755
--- a/debian/_buildscripts/local/07_applications_04.sh
+++ b/debian/_buildscripts/local/07_applications_04.sh
@@ -9,6 +9,7 @@ build_module "applications/koffice"
 build_module "applications/koffice-i18n"
 build_module "applications/kmplayer"  # depends on koffice-trinity-dev
 build_module "applications/keximdb"
+build_module "applications/kompose"
 build_module "applications/konversation"
 build_module "applications/kooldock"    
 build_module "applications/kopete-otr"
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index 30d0facd6..850651e42 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -429,7 +429,7 @@ if [ "$bool_BUILD_LOCALLY" = "y" ]; then
   build_retval=$?
 else
   ## Build module in a clean chroot environment using pbuilder
-  $SUDO_CMD "$SCRIPT_DIR/internals/_pbuilder.sh"
+  $SUDO_CMD . "$SCRIPT_DIR/internals/_pbuilder.sh"
   build_retval=$?
   if [ "`whoami`" != "root" ]; then
     cd "$MOD_DEB_PATH"