summaryrefslogtreecommitdiffstats
path: root/debian/_buildscripts
diff options
context:
space:
mode:
Diffstat (limited to 'debian/_buildscripts')
-rwxr-xr-xdebian/_buildscripts/local/01_base_01.sh9
-rw-r--r--debian/_buildscripts/local/additional_files/etc/pbuilderrc34
-rw-r--r--debian/_buildscripts/local/internals/distro_list.txt17
-rw-r--r--debian/_buildscripts/local/internals/extra_deps.txt2
4 files changed, 22 insertions, 40 deletions
diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh
index 68ad3186a..46b04d832 100755
--- a/debian/_buildscripts/local/01_base_01.sh
+++ b/debian/_buildscripts/local/01_base_01.sh
@@ -8,20 +8,19 @@ set_log_start
build_module "dependencies/tde-cmake"
build_module "dependencies/libr"
build_module "dependencies/akode"
+build_module "dependencies/libart-lgpl"
+build_module "dependencies/libcaldav"
+build_module "dependencies/libcarddav"
build_module "dependencies/tqt3"
build_module "dependencies/tqtinterface"
build_module "dependencies/arts"
build_module "dependencies/dbus-tqt"
build_module "dependencies/dbus-1-tqt"
build_module "dependencies/tqca"
-build_module "dependencies/libart-lgpl"
build_module "dependencies/avahi-tqt"
-build_module "dependencies/libcaldav"
-build_module "dependencies/libcarddav"
build_module "dependencies/polkit-tqt"
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"
+ build_module "$CFG_EXTRA_DEPS_DIR/pcsc-lite-nodbus"
fi
build_module "core/tdelibs"
build_module "libraries/libtdeldap"
diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
index 29a522b1e..cecf04991 100644
--- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc
+++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc
@@ -45,25 +45,25 @@ BASETGZ="/var/cache/pbuilder/base-$DISTRIBUTION@$ARCHITECTURE.tgz"
#-- select apt components
case "$DISTRIBUTION" in
# debian
- sid|bookwork|bullseye|buster|stretch)
+ sid|trixie|bookwork|bullseye|buster)
COMPONENTS="main contrib non-free"
;;
# devuan
- ceres|daedalus|chimaera|beowulf|ascii)
+ ceres|daedalus|chimaera|beowulf)
COMPONENTS="main"
DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
EXTRAPACKAGES="$EXTRAPACKAGES devuan-keyring"
;;
# ubuntu
- kinetic|jammy|impish|hirsute|focal|bionic|xenial)
+ mantic|lunar|kinetic|jammy|focal|bionic)
COMPONENTS="main restricted universe multiverse"
DEBOOTSTRAPOPTS=(--variant=buildd)
;;
# raspbian
- raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch)
+ raspbian-bookworm|raspbian-bullseye|raspbian-buster)
COMPONENTS="main contrib non-free"
DEBOOTSTRAPOPTS=(--variant=buildd --no-check-gpg)
;;
@@ -73,17 +73,17 @@ EXTRAPACKAGES="$EXTRAPACKAGES fakeroot apt-transport-https ca-certificates"
#-- select base apt sources
case "$DISTRIBUTION" in
# debian
- sid|bookwork|bullseye|buster|stretch)
+ sid|trixie|bookwork|bullseye|buster)
MIRRORSITE=http://deb.debian.org/debian
;;
# devuan
- ceres|daedalus|chimaera|beowulf|ascii)
+ ceres|daedalus|chimaera|beowulf)
MIRRORSITE=http://auto.mirror.devuan.org/merged
;;
# ubuntu
- kinetic|jammy|impish|hirsute|focal|bionic|xenial)
+ mantic|lunar|kinetic|jammy|focal|bionic)
if [ "$ARCHITECTURE" = "amd64" ] || [ "$ARCHITECTURE" = "i386" ]; then
MIRRORSITE=http://archive.ubuntu.com/ubuntu
else
@@ -92,7 +92,7 @@ case "$DISTRIBUTION" in
;;
# raspbian
- raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch)
+ raspbian-bookworm|raspbian-bullseye|raspbian-buster)
MIRRORSITE=http://ftp.fi.muni.cz/pub/linux/raspbian/raspbian
;;
esac
@@ -117,19 +117,5 @@ if [ -z "$DEB_SIGN_KEYID" ]; then
AUTO_DEBSIGN=${AUTO_DEBSIGN:-no}
fi
-#-- choose dependency solver
-#-- apt is better if target distribution contains apt >= 1.4~beta3
-#-- aptitude is better if target distribution contains apt < 1.4~beta3
-case "$DISTRIBUTION" in
- sid|bookwork|bullseye|buster|stretch|\
- ceres|daedalus|chimaera|beowulf|ascii|\
- raspbian-bookworm|raspbian-bullseye|raspbian-buster|raspbian-stretch|\
- kinetic|jammy|impish|hirsute|focal|bionic)
- PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
- ;;
-
- xenial)
- PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-aptitude"
- ;;
-esac
-
+#-- dependency solver
+PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"
diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt
index 0bcb3fe81..ba1dab204 100644
--- a/debian/_buildscripts/local/internals/distro_list.txt
+++ b/debian/_buildscripts/local/internals/distro_list.txt
@@ -10,30 +10,27 @@
#
# debian
-debian 9.0 stretch - -
debian 10.0 buster - -
debian 11.0 bullseye - -
-debian 12.0 bookworm ~a -
-debian 13.0 sid ~b -
+debian 12.0 bookworm - -
+debian 13.0 trixie ~a -
+debian 14.0 sid ~b -
# devuan
-devuan 2.0 ascii - debian/stretch
devuan 3.0 beowulf - debian/buster
devuan 4.0 chimaera - debian/bullseye
devuan 5.0 daedalus ~a debian/bookwork
devuan 6.0 ceres ~b debian/sid
# raspbian
-raspbian 9.0 raspbian-stretch - -
raspbian 10.0 raspbian-buster - -
raspbian 11.0 raspbian-bullseye - -
raspbian 12.0 raspbian-bookworm ~a -
# ubuntu
-ubuntu 16.04 xenial - -
ubuntu 18.04 bionic - -
ubuntu 20.04 focal - -
-ubuntu 20.10 groovy - -
-ubuntu 21.04 hirsute - -
-ubuntu 21.10 impish - -
-ubuntu 22.04 jammy ~a -
+ubuntu 22.04 jammy - -
+ubuntu 22.10 kinetic - -
+ubuntu 23.04 lunar - -
+ubuntu 23.10 mantic ~a -
diff --git a/debian/_buildscripts/local/internals/extra_deps.txt b/debian/_buildscripts/local/internals/extra_deps.txt
index b19514d84..521b16d0c 100644
--- a/debian/_buildscripts/local/internals/extra_deps.txt
+++ b/debian/_buildscripts/local/internals/extra_deps.txt
@@ -5,5 +5,5 @@
EDEPS_REPO="
default http://mirror.ppa.trinitydesktop.org/trinity-testing deps
master http://mirror.ppa.trinitydesktop.org/trinity-testing deps
- r14.0.x http://mirror.ppa.trinitydesktop.org/trinity-sb deps-r14
+ r14.1.x http://mirror.ppa.trinitydesktop.org/trinity-sb deps-r14
"