summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdebian/_buildscripts/local/10_others_01.sh1
-rwxr-xr-xdebian/_buildscripts/local/12_meta_packages.sh11
-rwxr-xr-xdebian/_buildscripts/local/build_module.sh20
3 files changed, 21 insertions, 11 deletions
diff --git a/debian/_buildscripts/local/10_others_01.sh b/debian/_buildscripts/local/10_others_01.sh
index febd66f57..4be92268e 100755
--- a/debian/_buildscripts/local/10_others_01.sh
+++ b/debian/_buildscripts/local/10_others_01.sh
@@ -9,7 +9,6 @@ build_module "applications/tdeio-sword"
build_module "applications/bibletime"
build_module "applications/desktop-effects-tde"
build_module "applications/fusion-icon"
-build_module "metapackages/sudo-trinity"
build_module "applications/kdpkg"
build_module "applications/kgtk-qt3"
build_module "applications/tdesudo"
diff --git a/debian/_buildscripts/local/12_meta_packages.sh b/debian/_buildscripts/local/12_meta_packages.sh
index 637eb8b40..37d1a670c 100755
--- a/debian/_buildscripts/local/12_meta_packages.sh
+++ b/debian/_buildscripts/local/12_meta_packages.sh
@@ -5,20 +5,21 @@
#----------------------------
set_log_start
-build_module "defaultsettings/desktop-base"
-build_module "defaultsettings/kubuntu-default-settings"
-build_module "defaultsettings/redmond-default-settings"
-build_module "defaultsettings/redmond-default-settings-ii"
+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/tde-ubuntu-integration"
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"
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index 94a5acee1..6799e2fa7 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -71,7 +71,7 @@ function search_module()
# Search in GIT repository
LOC_MATCH=`sed -n "s|^\[submodule \"main/\([^\"]*\)\"\]$|\1|p" <"$REPO_TDE/.gitmodules" | grep "$LOC_MOD_NAME$"`
if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then
- # Unique module found in GIT
+ # Unique module
MODULE_FOUND="y"
MOD_NAME=$LOC_MATCH
MOD_GIT_PATH="$REPO_TDE_MAIN/$MOD_NAME"
@@ -80,14 +80,26 @@ function search_module()
else
# Search in extra dependency folder
LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^${CFG_EXTRA_DEPS_DIR}/(debian/)?||"`
- LOC_MATCH=`ls "$REPO_EXTRA_DEPENDENCIES/debian" | grep "^$LOC_BASENAME"`
+ LOC_MATCH=`ls "$REPO_EXTRA_DEPENDENCIES/debian" | grep "^$LOC_BASENAME\$"`
if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then
- # Unique module found in extra dependency folder
+ # Unique module found
MODULE_FOUND="y"
bool_EXTRADEP_MOD="y"
MOD_NAME="$CFG_EXTRA_DEPS_DIR/$LOC_MATCH"
MOD_GIT_PATH="$REPO_EXTRA_DEPENDENCIES/debian/$LOC_BASENAME"
MOD_BUILD_PATH="$TDE_BUILD_DIR/$CFG_EXTRA_DEPS_DIR/$LOC_BASENAME"
+ else
+ # Search in metapackages folder
+ LOC_BASENAME=`echo "$LOC_MOD_NAME" | sed -r "s|^(metapackages/)?||"`
+ LOC_MATCH=`ls "$REPO_TDE_MAIN/metapackages" | grep "^$LOC_BASENAME\$"`
+ if [ "$LOC_MATCH" != "" -a "`echo $LOC_MATCH | wc -l`" = "1" ]; then
+ # Unique module found
+ MODULE_FOUND="y"
+ MOD_NAME="metapackages/$LOC_MATCH"
+ MOD_GIT_PATH="$REPO_TDE_MAIN/metapackages/$LOC_BASENAME"
+ MOD_GIT_PKGING_PATH="$REPO_TDE_PACKAGING/$MOD_NAME/debian"
+ MOD_BUILD_PATH="$TDE_BUILD_DIR/metapackages/$LOC_BASENAME"
+ fi
fi
fi
MOD_BUILD_PKGING_PATH="$MOD_BUILD_PATH/debian"
@@ -283,8 +295,6 @@ if [ "$bool_EXTRADEP_MOD" != "y" -a "$bool_COPY_PKGING_FILES" = "y" ]; then
fi
cp -R "$MOD_GIT_PKGING_PATH" "$MOD_BUILD_PKGING_PATH"
- # TODO metapackage support
-
# Default package name
# Calculate package version
cd $MOD_GIT_PATH