From b3af4903caf9c6453ffcdeb7ef3719fbcfa06d55 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 21 Aug 2021 15:11:12 +0900
Subject: DEB build scripts: updated to new layout after application folder
 rearrangement.

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/04_applications_01.sh   | 24 ----------------
 debian/_buildscripts/local/04_base_04.sh           | 10 +++++++
 debian/_buildscripts/local/05_applications_02.sh   | 28 -------------------
 debian/_buildscripts/local/05_apps_system.sh       | 28 +++++++++++++++++++
 debian/_buildscripts/local/06_applications_03.sh   | 29 --------------------
 debian/_buildscripts/local/06_apps_utilities.sh    | 22 +++++++++++++++
 debian/_buildscripts/local/07_applications_04.sh   | 20 --------------
 debian/_buildscripts/local/07_apps_settings.sh     | 20 ++++++++++++++
 debian/_buildscripts/local/08_applications_05.sh   | 32 ----------------------
 debian/_buildscripts/local/08_apps_graphics.sh     | 20 ++++++++++++++
 debian/_buildscripts/local/09_applications_06.sh   | 30 --------------------
 debian/_buildscripts/local/09_apps_development.sh  | 17 ++++++++++++
 debian/_buildscripts/local/10_apps_games.sh        | 11 ++++++++
 debian/_buildscripts/local/10_others_01.sh         | 27 ------------------
 debian/_buildscripts/local/11_apps_internet.sh     | 22 +++++++++++++++
 debian/_buildscripts/local/11_others_02.sh         | 21 --------------
 debian/_buildscripts/local/12_apps_office.sh       | 24 ++++++++++++++++
 debian/_buildscripts/local/12_meta_packages.sh     | 26 ------------------
 debian/_buildscripts/local/13_apps_multimedia.sh   | 22 +++++++++++++++
 debian/_buildscripts/local/14_apps_tdeio.sh        | 15 ++++++++++
 debian/_buildscripts/local/15_apps_themes.sh       | 22 +++++++++++++++
 debian/_buildscripts/local/16_apps_misc.sh         | 27 ++++++++++++++++++
 debian/_buildscripts/local/17_meta_packages.sh     | 26 ++++++++++++++++++
 debian/_buildscripts/local/91_build_base.sh        |  1 +
 .../_buildscripts/local/92_build_applications.sh   | 19 ++++++++-----
 debian/_buildscripts/local/93_build_others.sh      |  5 ----
 debian/_buildscripts/local/99_build_TDE.sh         |  5 ++--
 29 files changed, 306 insertions(+), 252 deletions(-)
 delete mode 100755 debian/_buildscripts/local/04_applications_01.sh
 create mode 100755 debian/_buildscripts/local/04_base_04.sh
 delete mode 100755 debian/_buildscripts/local/05_applications_02.sh
 create mode 100755 debian/_buildscripts/local/05_apps_system.sh
 delete mode 100755 debian/_buildscripts/local/06_applications_03.sh
 create mode 100755 debian/_buildscripts/local/06_apps_utilities.sh
 delete mode 100755 debian/_buildscripts/local/07_applications_04.sh
 create mode 100755 debian/_buildscripts/local/07_apps_settings.sh
 delete mode 100755 debian/_buildscripts/local/08_applications_05.sh
 create mode 100755 debian/_buildscripts/local/08_apps_graphics.sh
 delete mode 100755 debian/_buildscripts/local/09_applications_06.sh
 create mode 100755 debian/_buildscripts/local/09_apps_development.sh
 create mode 100755 debian/_buildscripts/local/10_apps_games.sh
 delete mode 100755 debian/_buildscripts/local/10_others_01.sh
 create mode 100755 debian/_buildscripts/local/11_apps_internet.sh
 delete mode 100755 debian/_buildscripts/local/11_others_02.sh
 create mode 100755 debian/_buildscripts/local/12_apps_office.sh
 delete mode 100755 debian/_buildscripts/local/12_meta_packages.sh
 create mode 100755 debian/_buildscripts/local/13_apps_multimedia.sh
 create mode 100755 debian/_buildscripts/local/14_apps_tdeio.sh
 create mode 100755 debian/_buildscripts/local/15_apps_themes.sh
 create mode 100755 debian/_buildscripts/local/16_apps_misc.sh
 create mode 100755 debian/_buildscripts/local/17_meta_packages.sh
 delete mode 100755 debian/_buildscripts/local/93_build_others.sh

(limited to 'debian/_buildscripts/local')

diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index 5e4aadc29..227c642f2 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -13,7 +13,6 @@ else
   build_module "$CFG_EXTRA_DEPS_DIR/fireflies"
   build_module "$CFG_EXTRA_DEPS_DIR/imlib"
 #  build_module "$CFG_EXTRA_DEPS_DIR/opensync"   # deprecated - no longer required in R14.1 series. To remove in R14.2.0
-  build_module "$CFG_EXTRA_DEPS_DIR/pcsc-lite-nodbus"
   build_module "$CFG_EXTRA_DEPS_DIR/lcms"
   build_module "$CFG_EXTRA_DEPS_DIR/wv2"
   build_module "$CFG_EXTRA_DEPS_DIR/jasper"
diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh
index d3aa01808..e291ed8e5 100755
--- a/debian/_buildscripts/local/01_base_01.sh
+++ b/debian/_buildscripts/local/01_base_01.sh
@@ -18,6 +18,10 @@ build_module "dependencies/libart-lgpl"
 build_module "dependencies/avahi-tqt"
 build_module "dependencies/libcaldav"
 build_module "dependencies/libcarddav"
+if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
+  # needs cmake-trinity so must be build after common/cmake module
+  build_module "$CFG_EXTRA_DEPS_DIR/pcsc-lite-nodbus"  
+fi
 build_module "core/tdelibs"
 build_module "libraries/libtdeldap"
 build_module "core/tdebase"
diff --git a/debian/_buildscripts/local/04_applications_01.sh b/debian/_buildscripts/local/04_applications_01.sh
deleted file mode 100755
index b9e97d1e0..000000000
--- a/debian/_buildscripts/local/04_applications_01.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-build_module "libraries/libkipi"
-build_module "libraries/libkdcraw"
-build_module "libraries/libkexiv2"
-build_module "libraries/kipi-plugins"
-build_module "applications/abakus"
-build_module "applications/amarok"
-build_module "applications/basket"
-build_module "applications/codeine"
-build_module "applications/digikam"
-build_module "applications/dolphin"
-build_module "applications/filelight"
-build_module "applications/gtk3-tqt-engine"
-build_module "applications/gtk-qt-engine"
-build_module "applications/gwenview"
-build_module "applications/gwenview-i18n"
-
-set_log_end
diff --git a/debian/_buildscripts/local/04_base_04.sh b/debian/_buildscripts/local/04_base_04.sh
new file mode 100755
index 000000000..5dddf0aa8
--- /dev/null
+++ b/debian/_buildscripts/local/04_base_04.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "core/tde-i18n"
+
+set_log_end
diff --git a/debian/_buildscripts/local/05_applications_02.sh b/debian/_buildscripts/local/05_applications_02.sh
deleted file mode 100755
index ae18cba5c..000000000
--- a/debian/_buildscripts/local/05_applications_02.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-build_module "applications/k3b"
-build_module "applications/k3b-i18n"
-build_module "applications/k9copy"
-build_module "applications/kaffeine"
-build_module "applications/kaffeine-mozilla"
-build_module "applications/kasablanca"
-build_module "applications/katapult"
-build_module "applications/kbarcode"
-build_module "applications/kbfx"
-build_module "applications/kbibtex"
-build_module "applications/kbiff"
-build_module "applications/kbookreader"
-build_module "applications/kchmviewer"
-build_module "applications/kcmautostart"
-# LDAP packages
-build_module "applications/kcmldap"
-build_module "applications/kcmldapcontroller"
-build_module "applications/kcmldapmanager"
-build_module "applications/kerberostray"
-
-set_log_end
diff --git a/debian/_buildscripts/local/05_apps_system.sh b/debian/_buildscripts/local/05_apps_system.sh
new file mode 100755
index 000000000..fa3d861a6
--- /dev/null
+++ b/debian/_buildscripts/local/05_apps_system.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/system/dolphin"
+build_module "applications/system/katapult"
+build_module "applications/system/kbfx"
+build_module "applications/system/kcmautostart"
+build_module "applications/system/kdbusnotification"
+build_module "applications/system/klamav"
+build_module "applications/system/knemo"
+build_module "applications/system/knetload"
+build_module "applications/system/knetstats"
+build_module "applications/system/kooldock"
+build_module "applications/system/krusader"
+build_module "applications/system/kshutdown"
+build_module "applications/system/ksystemlog"
+build_module "applications/system/kvkbd"
+build_module "applications/system/smartcardauth"
+build_module "applications/system/tastymenu"
+build_module "applications/system/tdedocker"
+build_module "applications/system/tdepowersave"
+build_module "applications/system/yakuake"
+
+set_log_end
diff --git a/debian/_buildscripts/local/06_applications_03.sh b/debian/_buildscripts/local/06_applications_03.sh
deleted file mode 100755
index ad02c37d6..000000000
--- a/debian/_buildscripts/local/06_applications_03.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-build_module "applications/kcpuload"
-build_module "applications/kdbg"
-build_module "applications/kdbusnotification"
-build_module "applications/kdiff3"
-build_module "applications/kdirstat"
-build_module "applications/keep"    
-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"
-build_module "applications/knemo"
-build_module "applications/knetload"
-build_module "applications/knetstats"
-build_module "applications/knmap"
-build_module "applications/knowit"  
-build_module "applications/knutclient"
-
-set_log_end
diff --git a/debian/_buildscripts/local/06_apps_utilities.sh b/debian/_buildscripts/local/06_apps_utilities.sh
new file mode 100755
index 000000000..c90ff66cc
--- /dev/null
+++ b/debian/_buildscripts/local/06_apps_utilities.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/utilities/abakus"
+build_module "applications/utilities/filelight"
+build_module "applications/utilities/kbarcode"
+build_module "applications/utilities/kchmviewer"
+build_module "applications/utilities/kcpuload"
+build_module "applications/utilities/kdirstat"
+build_module "applications/utilities/keep"
+build_module "applications/utilities/knutclient"
+build_module "applications/utilities/kompose"
+build_module "applications/utilities/krename"
+build_module "applications/utilities/ksensors"
+build_module "applications/utilities/mathemagics"
+build_module "applications/utilities/qalculate-tde"
+
+set_log_end
diff --git a/debian/_buildscripts/local/07_applications_04.sh b/debian/_buildscripts/local/07_applications_04.sh
deleted file mode 100755
index c10a94ea2..000000000
--- a/debian/_buildscripts/local/07_applications_04.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-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"
-build_module "applications/kpicosim"
-build_module "applications/kplayer"
-
-set_log_end
-
diff --git a/debian/_buildscripts/local/07_apps_settings.sh b/debian/_buildscripts/local/07_apps_settings.sh
new file mode 100755
index 000000000..f20a83bc6
--- /dev/null
+++ b/debian/_buildscripts/local/07_apps_settings.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/settings/kdpkg"
+build_module "applications/settings/kima"
+build_module "applications/settings/kiosktool"
+build_module "applications/settings/kkbswitch"
+build_module "applications/settings/klcddimmer"
+build_module "applications/settings/kmyfirewall"
+build_module "applications/settings/tde-guidance"
+build_module "applications/settings/tdenetworkmanager"
+build_module "applications/settings/tdesudo"
+build_module "applications/settings/tde-systemsettings"
+build_module "applications/settings/wlassistant"
+
+set_log_end
diff --git a/debian/_buildscripts/local/08_applications_05.sh b/debian/_buildscripts/local/08_applications_05.sh
deleted file mode 100755
index 3a783d828..000000000
--- a/debian/_buildscripts/local/08_applications_05.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-build_module "applications/krecipes"
-build_module "applications/krename"
-build_module "applications/krusader"
-build_module "applications/kscope"
-build_module "applications/ksensors"
-build_module "applications/kshowmail"
-build_module "applications/kshutdown"
-build_module "applications/ksplash-engine-moodin"
-build_module "applications/kstreamripper"
-build_module "applications/ksystemlog"
-build_module "applications/ktechlab"
-build_module "applications/ktorrent"
-build_module "applications/kvirc"
-build_module "applications/kvkbd"
-build_module "applications/kvpnc"
-build_module "applications/kxmleditor"
-build_module "applications/mplayerthumbs"
-build_module "applications/qalculate-tde"
-build_module "applications/piklab"
-build_module "applications/potracegui"
-build_module "applications/soundkonverter"
-build_module "applications/tastymenu"
-build_module "applications/tdedocker"
-
-set_log_end
diff --git a/debian/_buildscripts/local/08_apps_graphics.sh b/debian/_buildscripts/local/08_apps_graphics.sh
new file mode 100755
index 000000000..32c61d575
--- /dev/null
+++ b/debian/_buildscripts/local/08_apps_graphics.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "libraries/libkipi"
+build_module "libraries/libkdcraw"
+build_module "libraries/libkexiv2"
+build_module "libraries/kipi-plugins"
+build_module "libraries/libksquirrel"
+
+build_module "applications/graphics/digikam"
+build_module "applications/graphics/gwenview"
+build_module "applications/graphics/gwenview-i18n"
+build_module "applications/graphics/ksquirrel"
+build_module "applications/graphics/potracegui"
+
+set_log_end
diff --git a/debian/_buildscripts/local/09_applications_06.sh b/debian/_buildscripts/local/09_applications_06.sh
deleted file mode 100755
index 46dc9239c..000000000
--- a/debian/_buildscripts/local/09_applications_06.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-build_module "applications/tdeio-apt"
-build_module "applications/tdeio-ftps"
-build_module "applications/tdeio-gopher"
-build_module "applications/tdeio-locate"
-build_module "applications/tdeio-umountwrapper"
-build_module "applications/tdenetworkmanager"
-build_module "applications/tdepacman"
-build_module "applications/tdepowersave"
-build_module "applications/tderadio"
-build_module "applications/tde-guidance"
-build_module "applications/tde-style-baghira"
-build_module "applications/tde-style-domino"
-build_module "applications/tde-style-ia-ora"
-build_module "applications/tde-style-lipstik"
-build_module "applications/tde-style-qtcurve"
-build_module "applications/tde-systemsettings"
-build_module "applications/tdmtheme"
-build_module "applications/tork"
-build_module "applications/twin-style-crystal"
-build_module "applications/wlassistant"
-build_module "applications/yakuake"
-
-set_log_end
diff --git a/debian/_buildscripts/local/09_apps_development.sh b/debian/_buildscripts/local/09_apps_development.sh
new file mode 100755
index 000000000..f5e41d1bf
--- /dev/null
+++ b/debian/_buildscripts/local/09_apps_development.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/development/kdbg"
+build_module "applications/development/kdiff3"
+build_module "applications/development/kpicosim"
+build_module "applications/development/kscope"
+build_module "applications/development/ktechlab"
+build_module "applications/development/kxmleditor"
+build_module "applications/development/piklab"
+build_module "applications/development/tdesvn"
+
+set_log_end
diff --git a/debian/_buildscripts/local/10_apps_games.sh b/debian/_buildscripts/local/10_apps_games.sh
new file mode 100755
index 000000000..09290d0c0
--- /dev/null
+++ b/debian/_buildscripts/local/10_apps_games.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/games/knights"
+build_module "applications/games/tdepacman"
+
+set_log_end
diff --git a/debian/_buildscripts/local/10_others_01.sh b/debian/_buildscripts/local/10_others_01.sh
deleted file mode 100755
index 4be92268e..000000000
--- a/debian/_buildscripts/local/10_others_01.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-build_module "applications/tdeio-sword"
-build_module "applications/bibletime"
-build_module "applications/desktop-effects-tde"
-build_module "applications/fusion-icon"
-build_module "applications/kdpkg"
-build_module "applications/kgtk-qt3"
-build_module "applications/tdesudo"
-build_module "applications/kiosktool"
-build_module "applications/knights"         
-build_module "libraries/libksquirrel"
-build_module "applications/ksquirrel"
-#build_module "applications/qt4-tqt-theme-engine"
-build_module "applications/rosegarden"
-build_module "applications/mathemagics"
-build_module "applications/smartcardauth"
-build_module "applications/smb4k"
-build_module "applications/tdesvn"
-build_module "applications/tellico"
-
-set_log_end
diff --git a/debian/_buildscripts/local/11_apps_internet.sh b/debian/_buildscripts/local/11_apps_internet.sh
new file mode 100755
index 000000000..79b6c681d
--- /dev/null
+++ b/debian/_buildscripts/local/11_apps_internet.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/internet/kasablanca"
+build_module "applications/internet/kbiff"
+build_module "applications/internet/kftpgrabber"
+build_module "applications/internet/knmap"
+build_module "applications/internet/konversation"
+build_module "applications/internet/kopete-otr"
+build_module "applications/internet/kshowmail"
+build_module "applications/internet/kstreamripper"
+build_module "applications/internet/ktorrent"
+build_module "applications/internet/kvirc"
+build_module "applications/internet/kvpnc"
+build_module "applications/internet/smb4k"
+build_module "applications/internet/tork"
+
+set_log_end
diff --git a/debian/_buildscripts/local/11_others_02.sh b/debian/_buildscripts/local/11_others_02.sh
deleted file mode 100755
index b5aef0ec6..000000000
--- a/debian/_buildscripts/local/11_others_02.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-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"
-  build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-bcop-trinity"
-  build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-main-trinity"
-  build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-extra-trinity"
-  build_module "$CFG_EXTRA_DEPS_DIR/compizconfig-python-trinity"
-  build_module "$CFG_EXTRA_DEPS_DIR/pilot-link"
-fi
-build_module "applications/compizconfig-backend-tdeconfig"
-build_module "applications/kpilot"
-
-set_log_end
diff --git a/debian/_buildscripts/local/12_apps_office.sh b/debian/_buildscripts/local/12_apps_office.sh
new file mode 100755
index 000000000..c9baaecd1
--- /dev/null
+++ b/debian/_buildscripts/local/12_apps_office.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/office/basket"
+build_module "applications/office/kbibtex"
+build_module "applications/office/kbookreader"
+build_module "applications/office/kile"
+build_module "applications/office/kmymoney"
+build_module "applications/office/knowit"
+build_module "applications/office/koffice"
+build_module "applications/office/koffice-i18n"
+build_module "applications/office/keximdb"
+build_module "applications/office/tellico"
+
+if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
+  build_module "$CFG_EXTRA_DEPS_DIR/pilot-link"
+fi
+build_module "applications/office/kpilot"
+
+set_log_end
diff --git a/debian/_buildscripts/local/12_meta_packages.sh b/debian/_buildscripts/local/12_meta_packages.sh
deleted file mode 100755
index 37d1a670c..000000000
--- a/debian/_buildscripts/local/12_meta_packages.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. ./internals/_build_set_common.sh
-
-#----------------------------
-set_log_start
-
-build_module "metapackages/desktop-base"
-build_module "metapackages/meta-tde"
-build_module "metapackages/redmond-default-settings"
-build_module "metapackages/redmond-default-settings-ii"
-build_module "metapackages/sudo-trinity"
-build_module "metapackages/synaptic-trinity"
-build_module "metapackages/trinity-apt-archive"
-build_module "metapackages/trinity-keyring"
-build_module "metapackages/trinity-slax"
-
-# Ubuntu only - uncomment if necessary - untested
-#build_module "metapackages/casper-trinity"
-#build_module "metapackages/kubuntu-default-settings"
-#build_module "metapackages/kubuntu-meta"
-#build_module "metapackages/tde-ubuntu-integration"
-#build_module "metapackages/trinity-livecd"
-#build_module "metapackages/ubiquity-trinity"
-
-set_log_end
diff --git a/debian/_buildscripts/local/13_apps_multimedia.sh b/debian/_buildscripts/local/13_apps_multimedia.sh
new file mode 100755
index 000000000..3c3dc30d4
--- /dev/null
+++ b/debian/_buildscripts/local/13_apps_multimedia.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/multimedia/amarok"
+build_module "applications/multimedia/codeine"
+build_module "applications/multimedia/k3b"
+build_module "applications/multimedia/k3b-i18n"
+build_module "applications/multimedia/k9copy"
+build_module "applications/multimedia/kaffeine"
+build_module "applications/multimedia/kaffeine-mozilla"
+build_module "applications/multimedia/kmplayer" # depends on koffice-trinity-dev
+build_module "applications/multimedia/kplayer"
+build_module "applications/multimedia/mplayerthumbs"
+build_module "applications/multimedia/rosegarden"
+build_module "applications/multimedia/soundkonverter"
+build_module "applications/multimedia/tderadio"
+
+set_log_end
diff --git a/debian/_buildscripts/local/14_apps_tdeio.sh b/debian/_buildscripts/local/14_apps_tdeio.sh
new file mode 100755
index 000000000..ad588b66d
--- /dev/null
+++ b/debian/_buildscripts/local/14_apps_tdeio.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/tdeio/tdeio-apt"
+build_module "applications/tdeio/tdeio-ftps"
+build_module "applications/tdeio/tdeio-gopher"
+build_module "applications/tdeio/tdeio-locate"
+build_module "applications/tdeio/tdeio-sword"
+build_module "applications/tdeio/tdeio-umountwrapper"
+
+set_log_end
diff --git a/debian/_buildscripts/local/15_apps_themes.sh b/debian/_buildscripts/local/15_apps_themes.sh
new file mode 100755
index 000000000..5e4cc2cc6
--- /dev/null
+++ b/debian/_buildscripts/local/15_apps_themes.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/themes/gtk3-tqt-engine"
+build_module "applications/themes/gtk-qt-engine"
+build_module "applications/themes/kgtk-qt3"
+build_module "applications/themes/ksplash-engine-moodin"
+# build_module "applications/themes/qt4-tqt-theme-engine"
+build_module "applications/themes/tde-style-baghira"
+build_module "applications/themes/tde-style-domino"
+build_module "applications/themes/tde-style-ia-ora"
+build_module "applications/themes/tde-style-lipstik"
+build_module "applications/themes/tde-style-qtcurve"
+build_module "applications/themes/tdmtheme"
+build_module "applications/themes/twin-style-crystal"
+build_module "applications/themes/twin-style-suse2"
+
+set_log_end
diff --git a/debian/_buildscripts/local/16_apps_misc.sh b/debian/_buildscripts/local/16_apps_misc.sh
new file mode 100755
index 000000000..2ffd8277e
--- /dev/null
+++ b/debian/_buildscripts/local/16_apps_misc.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "applications/misc/bibletime"
+build_module "applications/misc/desktop-effects-tde"
+build_module "applications/misc/fusion-icon"
+build_module "applications/misc/kcmldap"
+build_module "applications/misc/kcmldapcontroller"
+build_module "applications/misc/kcmldapmanager"
+build_module "applications/misc/kerberostray"
+build_module "applications/misc/krecipes"
+
+if [[ "$USE_PREBUILD_EXTRA_DEPS" != "y" ]]; then
+  build_module "$CFG_EXTRA_DEPS_DIR/compiz-trinity"
+  build_module "$CFG_EXTRA_DEPS_DIR/libcompizconfig-trinity"
+  build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-bcop-trinity"
+  build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-main-trinity"
+  build_module "$CFG_EXTRA_DEPS_DIR/compiz-fusion-plugins-extra-trinity"
+  build_module "$CFG_EXTRA_DEPS_DIR/compizconfig-python-trinity"
+fi
+build_module "applications/misc/compizconfig-backend-tdeconfig"
+
+set_log_end
diff --git a/debian/_buildscripts/local/17_meta_packages.sh b/debian/_buildscripts/local/17_meta_packages.sh
new file mode 100755
index 000000000..37d1a670c
--- /dev/null
+++ b/debian/_buildscripts/local/17_meta_packages.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+. ./internals/_build_set_common.sh
+
+#----------------------------
+set_log_start
+
+build_module "metapackages/desktop-base"
+build_module "metapackages/meta-tde"
+build_module "metapackages/redmond-default-settings"
+build_module "metapackages/redmond-default-settings-ii"
+build_module "metapackages/sudo-trinity"
+build_module "metapackages/synaptic-trinity"
+build_module "metapackages/trinity-apt-archive"
+build_module "metapackages/trinity-keyring"
+build_module "metapackages/trinity-slax"
+
+# Ubuntu only - uncomment if necessary - untested
+#build_module "metapackages/casper-trinity"
+#build_module "metapackages/kubuntu-default-settings"
+#build_module "metapackages/kubuntu-meta"
+#build_module "metapackages/tde-ubuntu-integration"
+#build_module "metapackages/trinity-livecd"
+#build_module "metapackages/ubiquity-trinity"
+
+set_log_end
diff --git a/debian/_buildscripts/local/91_build_base.sh b/debian/_buildscripts/local/91_build_base.sh
index 7dbec8316..b53ba9048 100755
--- a/debian/_buildscripts/local/91_build_base.sh
+++ b/debian/_buildscripts/local/91_build_base.sh
@@ -6,3 +6,4 @@ fi
 ./01_base_01.sh
 ./02_base_02.sh
 ./03_base_03.sh
+./04_base_04.sh
diff --git a/debian/_buildscripts/local/92_build_applications.sh b/debian/_buildscripts/local/92_build_applications.sh
index 45b26a5f1..d16b5cc54 100755
--- a/debian/_buildscripts/local/92_build_applications.sh
+++ b/debian/_buildscripts/local/92_build_applications.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 
-./04_applications_01.sh
-./05_applications_02.sh
-./06_applications_03.sh
-./07_applications_04.sh
-./08_applications_05.sh
-./09_applications_06.sh
-
+./05_apps_system.sh
+./06_apps_utilities.sh
+./07_apps_settings.sh
+./08_apps_graphics.sh
+./09_apps_development.sh
+./10_apps_games.sh
+./11_apps_internet.sh
+./12_apps_office.sh
+./13_apps_multimedia.sh
+./14_apps_tdeio.sh
+./15_apps_themes.sh
+./16_apps_misc.sh
diff --git a/debian/_buildscripts/local/93_build_others.sh b/debian/_buildscripts/local/93_build_others.sh
deleted file mode 100755
index 0272604af..000000000
--- a/debian/_buildscripts/local/93_build_others.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-./10_others_01.sh
-./11_others_02.sh
-./12_meta_packages.sh
\ No newline at end of file
diff --git a/debian/_buildscripts/local/99_build_TDE.sh b/debian/_buildscripts/local/99_build_TDE.sh
index 99b72ce05..1a80862a6 100755
--- a/debian/_buildscripts/local/99_build_TDE.sh
+++ b/debian/_buildscripts/local/99_build_TDE.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Load common code and initialization
-. ./internals/_build_common.sh
+export SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+. ${SCRIPT_DIR}/internals/_build_common.sh
 init_common
 
 _BUILDALL_TIMER=2
@@ -49,6 +50,6 @@ set_log_start
 
 ./91_build_base.sh
 ./92_build_applications.sh
-./93_build_others.sh
+./17_meta_packages.sh
 
 set_log_end
-- 
cgit v1.2.1