DEB build scripts: update to new package naming convention (~pre instead of ~s)

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/231/head
Michele Calgaro 2 years ago
parent 66d2051b36
commit c748d29f30
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -5,7 +5,7 @@
#---------------------------- #----------------------------
set_log_start set_log_start
build_module "common/cmake" build_module "dependencies/tde-cmake"
build_module "dependencies/libr" build_module "dependencies/libr"
build_module "dependencies/akode" build_module "dependencies/akode"
build_module "dependencies/tqt3" build_module "dependencies/tqt3"

@ -7,7 +7,6 @@ set_log_start
build_module "applications/misc/bibletime" build_module "applications/misc/bibletime"
build_module "applications/misc/desktop-effects-tde" build_module "applications/misc/desktop-effects-tde"
build_module "applications/misc/fusion-icon"
build_module "applications/misc/kcmldap" build_module "applications/misc/kcmldap"
build_module "applications/misc/kcmldapcontroller" build_module "applications/misc/kcmldapcontroller"
build_module "applications/misc/kcmldapmanager" build_module "applications/misc/kcmldapmanager"

@ -108,12 +108,7 @@ APTCACHE="/var/cache/pbuilder/aptcache/$DISTRO-$DISTRIBUTION/"
if [ -n "$APTCACHE" ] && [ ! -d "$APTCACHE" ]; then if [ -n "$APTCACHE" ] && [ ! -d "$APTCACHE" ]; then
mkdir $APTCACHE mkdir $APTCACHE
fi 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 APTCACHEHARDLINK=no
APTCACHE=""
fi
#-- extra options #-- extra options
DEBBUILDOPTS="-b" DEBBUILDOPTS="-b"

@ -380,8 +380,6 @@ if [ "$bool_EXTRADEP_MOD" != "y" -a "$bool_COPY_PKGING_FILES" = "y" ]; then
REL=4:$TDE_RELEASE${package#*$TDE_RELEASE} REL=4:$TDE_RELEASE${package#*$TDE_RELEASE}
REL=${REL%+*} REL=${REL%+*}
REL=${REL/4:14.0.0/4:14.0.0-s} 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 # Get package name and packaging release
PKG_NAME=$(head -n1 $MOD_BUILD_PKGING_PATH/changelog) PKG_NAME=$(head -n1 $MOD_BUILD_PKGING_PATH/changelog)
PKG_NAME=${PKG_NAME%% *} PKG_NAME=${PKG_NAME%% *}

Loading…
Cancel
Save