From 51d0652d65fb3fe333ddea9ecc722e9fd8e501e0 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 15 Nov 2020 21:55:21 +0800
Subject: DEB build scripts: adapted to new 'core' folder for core modules.
 Added pinentry-tqt extra dependency package.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 debian/_buildscripts/local/00_extradeps.sh |  1 +
 debian/_buildscripts/local/01_base_01.sh   |  4 ++--
 debian/_buildscripts/local/02_base_02.sh   | 12 ++++++------
 debian/_buildscripts/local/03_base_03.sh   | 20 ++++++++++----------
 debian/_buildscripts/local/11_others_02.sh |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'debian/_buildscripts/local')

diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 3f0f0891d..a1b35d8e7 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -19,6 +19,7 @@ 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/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh
index 7f89ebf00..1c3231fd5 100755
--- a/debian/_buildscripts/local/01_base_01.sh
+++ b/debian/_buildscripts/local/01_base_01.sh
@@ -18,8 +18,8 @@ build_module "dependencies/libart-lgpl"
 build_module "dependencies/avahi-tqt"
 build_module "dependencies/libcaldav"
 build_module "dependencies/libcarddav"
-build_module "tdelibs"
+build_module "core/tdelibs"
 build_module "libraries/libtdeldap"
-build_module "tdebase"
+build_module "core/tdebase"
 
 set_log_end
diff --git a/debian/_buildscripts/local/02_base_02.sh b/debian/_buildscripts/local/02_base_02.sh
index 3bfbaa12c..61c500d36 100755
--- a/debian/_buildscripts/local/02_base_02.sh
+++ b/debian/_buildscripts/local/02_base_02.sh
@@ -10,12 +10,12 @@ build_module "dependencies/tqscintilla"
 build_module "dependencies/python-tqt"
 build_module "libraries/python-trinity"
 build_module "libraries/pytdeextensions"
-build_module "tdebindings"
+build_module "core/tdebindings"
 build_module "libraries/libtqt-perl"
-build_module "tdeutils"
-build_module "tdemultimedia"
-build_module "tdeaccessibility"
-build_module "tdenetwork"
-build_module "tdeadmin"
+build_module "core/tdeutils"
+build_module "core/tdemultimedia"
+build_module "core/tdeaccessibility"
+build_module "core/tdenetwork"
+build_module "core/tdeadmin"
 
 set_log_end
diff --git a/debian/_buildscripts/local/03_base_03.sh b/debian/_buildscripts/local/03_base_03.sh
index 11209ff55..eb7a6cecf 100755
--- a/debian/_buildscripts/local/03_base_03.sh
+++ b/debian/_buildscripts/local/03_base_03.sh
@@ -5,15 +5,15 @@
 #----------------------------
 set_log_start
 
-build_module "tdeartwork"
-build_module "tdegames"
-build_module "tdetoys"
-build_module "tdeedu"
-build_module "tdegraphics"
-build_module "tdepim"
-build_module "tdeaddons"
-build_module "tdesdk"
-build_module "tdevelop"
-build_module "tdewebdev"
+build_module "core/tdeartwork"
+build_module "core/tdegames"
+build_module "core/tdetoys"
+build_module "core/tdeedu"
+build_module "core/tdegraphics"
+build_module "core/tdepim"
+build_module "core/tdeaddons"
+build_module "core/tdesdk"
+build_module "core/tdevelop"
+build_module "core/tdewebdev"
 
 set_log_end
diff --git a/debian/_buildscripts/local/11_others_02.sh b/debian/_buildscripts/local/11_others_02.sh
index e8a900094..b5aef0ec6 100755
--- a/debian/_buildscripts/local/11_others_02.sh
+++ b/debian/_buildscripts/local/11_others_02.sh
@@ -5,7 +5,7 @@
 #----------------------------
 set_log_start
 
-build_module "tde-i18n"
+build_module "core/tde-i18n"
 if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
   build_module "$CFG_EXTRA_DEPS_DIR/compiz-trinity"
   build_module "$CFG_EXTRA_DEPS_DIR/libcompizconfig-trinity"
-- 
cgit v1.2.3