diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-05-25 10:09:10 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-05-25 10:09:32 +0900 |
| commit | c748d29f30825e721a016a65243fdf8ab65b4165 (patch) | |
| tree | d788a2e48e73e025147ddb2d51ea9d508d82b526 | |
| parent | 66d2051b36105c0b14bc9003bee58cbde270d564 (diff) | |
| download | tde-packaging-c748d29f30825e721a016a65243fdf8ab65b4165.tar.gz tde-packaging-c748d29f30825e721a016a65243fdf8ab65b4165.zip | |
DEB build scripts: update to new package naming convention (~pre instead of ~s)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rwxr-xr-x | debian/_buildscripts/local/01_base_01.sh | 2 | ||||
| -rwxr-xr-x | debian/_buildscripts/local/16_apps_misc.sh | 1 | ||||
| -rw-r--r-- | debian/_buildscripts/local/additional_files/etc/pbuilderrc | 7 | ||||
| -rwxr-xr-x | debian/_buildscripts/local/build_module.sh | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh index 1dda656e2..68ad3186a 100755 --- a/debian/_buildscripts/local/01_base_01.sh +++ b/debian/_buildscripts/local/01_base_01.sh @@ -5,7 +5,7 @@ #---------------------------- set_log_start -build_module "common/cmake" +build_module "dependencies/tde-cmake" build_module "dependencies/libr" build_module "dependencies/akode" build_module "dependencies/tqt3" diff --git a/debian/_buildscripts/local/16_apps_misc.sh b/debian/_buildscripts/local/16_apps_misc.sh index 2ffd8277e..ee6061311 100755 --- a/debian/_buildscripts/local/16_apps_misc.sh +++ b/debian/_buildscripts/local/16_apps_misc.sh @@ -7,7 +7,6 @@ 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" diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc index e95cefafe..29a522b1e 100644 --- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc +++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc @@ -108,12 +108,7 @@ APTCACHE="/var/cache/pbuilder/aptcache/$DISTRO-$DISTRIBUTION/" if [ -n "$APTCACHE" ] && [ ! -d "$APTCACHE" ]; then mkdir $APTCACHE fi -if [ -z "$(stat -L --print "%d\n" $APTCACHE/. /var/cache/pbuilder/build/. | uniq -d)" ]; then - # apt cache for build on tmpfs is managed by hook scripts - BINDMOUNTS="${BINDMOUNTS} ${APTCACHE}" - APTCACHEHARDLINK=no - APTCACHE="" -fi +APTCACHEHARDLINK=no #-- extra options DEBBUILDOPTS="-b" diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh index c20661ad5..8a8457d87 100755 --- a/debian/_buildscripts/local/build_module.sh +++ b/debian/_buildscripts/local/build_module.sh @@ -380,8 +380,6 @@ if [ "$bool_EXTRADEP_MOD" != "y" -a "$bool_COPY_PKGING_FILES" = "y" ]; then REL=4:$TDE_RELEASE${package#*$TDE_RELEASE} REL=${REL%+*} REL=${REL/4:14.0.0/4:14.0.0-s} - REL=${REL/4:14.0.0-s~pre/4:14.0.0-s~} - REL=${REL/.0~pre/.0~s} # Get package name and packaging release PKG_NAME=$(head -n1 $MOD_BUILD_PKGING_PATH/changelog) PKG_NAME=${PKG_NAME%% *} |