summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdebian/_buildscripts/local/00_extradeps.sh1
-rwxr-xr-xdebian/_buildscripts/local/05_applications_02.sh1
-rw-r--r--debian/_buildscripts/local/README.txt9
-rwxr-xr-xdebian/_buildscripts/local/internals/_build_common.sh18
-rw-r--r--debian/_buildscripts/local/internals/distro_list.txt6
-rwxr-xr-xdebian/_buildscripts/local/update_repositories.sh9
6 files changed, 12 insertions, 32 deletions
diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index c3a7cc1de..591438fef 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -18,6 +18,7 @@ else
build_module "edeps/wv2"
build_module "edeps/jasper"
build_module "edeps/openslp-dfsg"
+ build_module "edeps/mp4v2"
fi
set_log_end
diff --git a/debian/_buildscripts/local/05_applications_02.sh b/debian/_buildscripts/local/05_applications_02.sh
index 489f832d4..ae18cba5c 100755
--- a/debian/_buildscripts/local/05_applications_02.sh
+++ b/debian/_buildscripts/local/05_applications_02.sh
@@ -20,7 +20,6 @@ build_module "applications/kbookreader"
build_module "applications/kchmviewer"
build_module "applications/kcmautostart"
# LDAP packages
-build_module "libraries/libtdeldap"
build_module "applications/kcmldap"
build_module "applications/kcmldapcontroller"
build_module "applications/kcmldapmanager"
diff --git a/debian/_buildscripts/local/README.txt b/debian/_buildscripts/local/README.txt
index 650d515bd..a72dc43e7 100644
--- a/debian/_buildscripts/local/README.txt
+++ b/debian/_buildscripts/local/README.txt
@@ -40,9 +40,6 @@ A) Environment preparation
git submodule init -- scripts
git submodule update -- scripts
./scripts/switch_all_submodules_to_head_and_clean anonymous
- - TDE packaging repo
- cd "$TDE_DIR/1_git"
- git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
5) Add your user to the sudo group (not required if you are root)
su -c "adduser <username> sudo"
@@ -52,7 +49,7 @@ A) Environment preparation
To do this, type "sudo visudo" and then add "Defaults timestamp_timeout=<new timeout>", where the value is in
minutes. Use a value of -1 to set an infinite timeout.
-6) Copy the files from "TDE_DIR/1_git/tde-packaging/debian/_buildscripts/local/additional_files" folder
+6) Copy the files from "TDE_DIR/1_git/tde/packaging/debian/_buildscripts/local/additional_files" folder
to the respectivily named folders.
7) Create pbuilder base package with the command:
@@ -61,7 +58,7 @@ A) Environment preparation
sudo DISTRO_NAME=<target distro> ARCHITECTURE=<target architecture> pbuilder create
8) Setup the build scripts locally:
- - copy build scripts from "TDE_DIR/1_git/tde-packaging/debian/_buildscripts/local" to "TDE_DIR/buildscripts"
+ - copy build scripts from "TDE_DIR/1_git/tde/packaging/debian/_buildscripts/local" to "TDE_DIR/buildscripts"
and make sure all shell scripts are executable
- cd "TDE_DIR/buildscripts"
- cp ./internals/_config_template.sh _config.sh
@@ -115,6 +112,8 @@ A) Environment preparation
deb [trusted=yes] file:TDE_DIR/3_repo <YOUR DISTRO> main
For example:
deb [trusted=yes] file:/home/tde_src/3_repo buster main
+
+
----------------------
B) Notes about scripts
diff --git a/debian/_buildscripts/local/internals/_build_common.sh b/debian/_buildscripts/local/internals/_build_common.sh
index 28f3fb2bf..76c27e142 100755
--- a/debian/_buildscripts/local/internals/_build_common.sh
+++ b/debian/_buildscripts/local/internals/_build_common.sh
@@ -63,7 +63,7 @@ function _set_path_variables()
REPO_DIR="$TDE_DIR/$CFG_GIT_DIR"
REPO_TDE="$TDE_DIR/$CFG_GIT_DIR/tde"
REPO_TDE_MAIN="$REPO_TDE/main"
- REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde-packaging/$DISTRO/$DISTRO_NAME"
+ REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde/packaging/$DISTRO/$DISTRO_NAME"
REPO_EXTRA_DEPENDENCIES="$TDE_DIR/$CFG_GIT_DIR/$CFG_EXTRA_DEPS_DIR"
BUILD_DIR="$TDE_DIR/$CFG_BUILD_DIR"
@@ -86,7 +86,7 @@ function init_common()
# Prevent the script to be run from TDE packaging repo
REPO_URL=$(git config --get remote.origin.url 2>/dev/null)
- if [ ! -z "$REPO_URL" ] && [ -z "${REPO_URL##*tde-packaging}" ]; then
+ if [ ! -z "$REPO_URL" ] && [ -z "${REPO_URL##*tde/packaging}" ]; then
echo -e "${CLightRed} --- ERROR ---${CNone}"
echo "This script cannot be run from the TDE packaging repository."
echo "Please follow the instructions provided, then rerun this script."
@@ -126,7 +126,7 @@ function init_common()
export DISTRO_VERSION="$l_version"
export REL_SUFFIX="$l_rel_suffix"
if [[ ! -z "$l_packaging_path" ]]; then
- REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde-packaging/$l_packaging_path"
+ REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde/packaging/$l_packaging_path"
fi
break
fi
@@ -162,18 +162,6 @@ function init_common()
exit 6
fi
- # Search for TDE packaging repo
- CURR_DIR=""
- [ -d "$REPO_TDE_PACKAGING" ] && cd "$REPO_TDE_PACKAGING" &>/dev/null && \
- CURR_DIR=$(git rev-parse --show-toplevel 2>/dev/null)
- if [ -z "$CURR_DIR" ]; then
- echo -e "${CLightRed} --- ERROR ---${CNone}"
- echo "The TDE packaging repo could not be located. Something is wrong with your configuration"
- echo -e "in the config file ${CLightPurple}$CFG_FILE${CNone}"
- echo -e "Please check and modify the ${CLightCyan}TDE_DIR${CNone} variable as required, then rerun this script."
- exit 7
- fi
-
# Check branch configuration
# - branch existance
UPDATE_BRANCHES="${OVERRIDE_UPDATE_BRANCHES:-$UPDATE_BRANCHES}"
diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt
index 3d6eb05ef..a9a4a9785 100644
--- a/debian/_buildscripts/local/internals/distro_list.txt
+++ b/debian/_buildscripts/local/internals/distro_list.txt
@@ -7,7 +7,7 @@
# distro version number
# distro version name
# package suffix if required
-# tde-packaging corresponding path if required
+# tde/packaging corresponding path if required
#
DISTROS="
# -- debian --
@@ -42,5 +42,7 @@ DISTROS="
ubuntu 16.10 yakkety '' ''
ubuntu 17.04 zesty '' ''
ubuntu 17.10 artful '' ''
- ubuntu 18.04 bionic ~a ''
+ ubuntu 18.04 bionic '' ''
+ ubuntu 18.10 cosmic '' ''
+ ubuntu 19.04 disco ~a ''
"
diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh
index b07220085..5f0b5758f 100755
--- a/debian/_buildscripts/local/update_repositories.sh
+++ b/debian/_buildscripts/local/update_repositories.sh
@@ -211,9 +211,6 @@ if [[ "$flag_SWITCH_ONLY" != "y" ]]; then
# Fetch TDE main repository
_update_module "$REPO_TDE" "fetch"
- # Fetch TDE packaging repository
- _update_module "$TDE_DIR/$CFG_GIT_DIR/tde-packaging" "fetch"
-
echo -e "\033[2K"
echo "" >> "$LOG_UPDATE_REPO_FILENAME"
@@ -227,9 +224,6 @@ if [[ "$flag_SWITCH_ONLY" != "y" ]]; then
# Update TDE main repository
_update_module "$REPO_TDE" "update" "$branch"
- # Update TDE packaging repository
- _update_module "$TDE_DIR/$CFG_GIT_DIR/tde-packaging" "update" "$branch"
-
echo -e "\033[2K"
echo "" >> "$LOG_UPDATE_REPO_FILENAME"
done
@@ -244,9 +238,6 @@ if [[ "$DEFAULT_REPO_BRANCH" != "$_LAST_BRANCH" ]]; then
# Switch TDE main repository
_update_module "$REPO_TDE" "switch-to" "$DEFAULT_REPO_BRANCH"
- # Switch TDE packaging repository
- _update_module "$TDE_DIR/$CFG_GIT_DIR/tde-packaging" "switch-to" "$DEFAULT_REPO_BRANCH"
-
echo -e "\033[2K"
echo "" >> "$LOG_UPDATE_REPO_FILENAME"
fi