From 833ed74e7f80dc473bb9827ba170d94bc8712167 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Wed, 6 May 2026 00:47:38 +0200 Subject: [PATCH] modernize docker/build/context/debian --- .../debian/armagetronad-dedicated.postrm | 10 -- .../debian/armagetronad-dedicated.purge | 1 + .../debian/armagetronad-dedicated.sysusers | 1 + .../debian/armagetronad-dedicated.tmpfiles | 1 + .../build/context/debian/armagetronad.install | 5 +- docker/build/context/debian/changelog | 109 +++++++++++++++++- docker/build/context/debian/compat | 1 - docker/build/context/debian/control | 20 ++-- docker/build/context/debian/copyright | 6 +- docker/build/context/debian/rules | 19 +-- docker/build/context/debian/watch | 13 +-- 11 files changed, 140 insertions(+), 46 deletions(-) delete mode 100644 docker/build/context/debian/armagetronad-dedicated.postrm create mode 100644 docker/build/context/debian/armagetronad-dedicated.purge create mode 100644 docker/build/context/debian/armagetronad-dedicated.sysusers create mode 100644 docker/build/context/debian/armagetronad-dedicated.tmpfiles delete mode 100644 docker/build/context/debian/compat diff --git a/docker/build/context/debian/armagetronad-dedicated.postrm b/docker/build/context/debian/armagetronad-dedicated.postrm deleted file mode 100644 index 2a2e724df..000000000 --- a/docker/build/context/debian/armagetronad-dedicated.postrm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "purge" ]; then - rm -r /var/games/armagetronad - rmdir --ignore-fail-on-non-empty /var/games -fi - -#DEBHELPER# diff --git a/docker/build/context/debian/armagetronad-dedicated.purge b/docker/build/context/debian/armagetronad-dedicated.purge new file mode 100644 index 000000000..cbae4671e --- /dev/null +++ b/docker/build/context/debian/armagetronad-dedicated.purge @@ -0,0 +1 @@ +/var/games/armagetronad diff --git a/docker/build/context/debian/armagetronad-dedicated.sysusers b/docker/build/context/debian/armagetronad-dedicated.sysusers new file mode 100644 index 000000000..5b824ee5f --- /dev/null +++ b/docker/build/context/debian/armagetronad-dedicated.sysusers @@ -0,0 +1 @@ +u! armagetronad -:games - /var/games/armagetronad diff --git a/docker/build/context/debian/armagetronad-dedicated.tmpfiles b/docker/build/context/debian/armagetronad-dedicated.tmpfiles new file mode 100644 index 000000000..e8cb4aecd --- /dev/null +++ b/docker/build/context/debian/armagetronad-dedicated.tmpfiles @@ -0,0 +1 @@ +d /var/games/armagetronad 0755 armagetronad games diff --git a/docker/build/context/debian/armagetronad.install b/docker/build/context/debian/armagetronad.install index 7e864c2aa..dd52570a2 100644 --- a/docker/build/context/debian/armagetronad.install +++ b/docker/build/context/debian/armagetronad.install @@ -3,5 +3,8 @@ usr/games/armagetronad.real usr/share/games/armagetronad/models usr/share/games/armagetronad/sound usr/share/games/armagetronad/textures -usr/share/icons/hicolor +usr/share/icons/hicolor/128x128/apps +usr/share/armagetronad/desktop/icons/16x16/armagetronad.png usr/share/icons/hicolor/16x16/apps +usr/share/armagetronad/desktop/icons/32x32/armagetronad.png usr/share/icons/hicolor/32x32/apps +usr/share/armagetronad/desktop/icons/48x48/armagetronad.png usr/share/icons/hicolor/48x48/apps usr/share/applications diff --git a/docker/build/context/debian/changelog b/docker/build/context/debian/changelog index 9881969ae..af28c1adf 100644 --- a/docker/build/context/debian/changelog +++ b/docker/build/context/debian/changelog @@ -1,8 +1,109 @@ -armagetronad (0.2.9.2.6) unstable; urgency=medium +armagetronad (0.2.9.3.0-1) unstable; urgency=medium - * Add libcurl dependency + * Team Upload - -- Manuel Moos Sun, 08 Mar 2026 19:08:00 +0100 + [ Patrice Duroux ] + * Enable music (none is provided yet) + + [ Luca Boccassi ] + * Install and use sysusers.d/tmpfiles.d config files + + [ Alexandre Detiste ] + * Use dh-cruft to register & purge /var/games/armagetronad + * Add build-dep on libcurl4-openssl-dev + * Add debian/salsa-ci.yml + * Bump Standards-Version to 4.7.4, drop Priority: tag + * Rewrite d/watch in v5 format + + -- Alexandre Detiste Sat, 02 May 2026 22:59:19 +0200 + +armagetronad (0.2.9.2.3-1) unstable; urgency=medium + + * Team Upload + + [ Patrice Duroux ] + * Update d/watch. + * New upstream version 0.2.9.2.3 + * Declare compliance with Debian Policy 4.7.0. + * Refresh d/control dependencies. + + -- Alexandre Detiste Sat, 28 Sep 2024 16:54:26 +0200 + +armagetronad (0.2.9.1.1-1) unstable; urgency=medium + + * New upstream version 0.2.9.1.1. + + -- Markus Koschany Fri, 15 Sep 2023 15:19:39 +0200 + +armagetronad (0.2.9.1.0-3) unstable; urgency=medium + + * Declare compliance with Debian Policy 4.6.2. + * Use https for homepage and source field. + + -- Markus Koschany Wed, 22 Feb 2023 23:47:03 +0100 + +armagetronad (0.2.9.1.0-2) unstable; urgency=medium + + * Update reproducible_build.patch and really make the build reproducible. + Thanks to Vagrant Cascadian for the patches. (Closes: #983147) + + -- Markus Koschany Sat, 20 Feb 2021 22:11:10 +0100 + +armagetronad (0.2.9.1.0-1) unstable; urgency=medium + + * New upstream version 0.2.9.1.0. + * Declare compliance with Debian Policy 4.5.1. + * Make the build reproducible. + Thanks to Chris Lamb for the patch. (Closes: #974904) + + -- Markus Koschany Fri, 04 Dec 2020 21:26:24 +0100 + +armagetronad (0.2.9.0.1-1) unstable; urgency=medium + + * New upstream version 0.2.9.0.1. (Closes: #971899) + - Does not use xml2-config to detect and use libxml2 anymore. + (Closes: #949052) + * Switch to debhelper-compat = 13. + * Mark armagetronad-common Multi-Arch: foreign. + * Update the watch file and track new gitlab releases. + * Drop all patches. Fixed upstream. + * Build with autoreconf. + * d/rules: remove -Wl,--as-needed line, now the default. + * Install NEWS file as upstream changelog. + * Install flexban.sh into the doc directory of armagetronad-common. Useful + for server admins. + + -- Markus Koschany Sun, 15 Nov 2020 00:14:43 +0100 + +armagetronad (0.2.8.3.5-1) unstable; urgency=medium + + * New upstream version 0.2.8.3.5. + * Declare compliance with Debian Policy 4.5.0. + + -- Markus Koschany Sun, 23 Feb 2020 01:00:48 +0100 + +armagetronad (0.2.8.3.4-4) unstable; urgency=high + + * Fix relocation error due to changes in GCC 9 which prevents armagetronad + from starting. Thanks to boffi and Bernhard Übelacker for the report. + (Closes: #945115) + + -- Markus Koschany Fri, 22 Nov 2019 14:36:48 +0100 + +armagetronad (0.2.8.3.4-3) unstable; urgency=medium + + * Switch to debhelper-compat = 12. + * Declare compliance with Debian Policy 4.4.1. + * Use canonical VCS URI. + * Remove with autotools_dev build option because it is performed + automatically by dh now. + * armagetronad-dedicated: Use rm -rf in postrm script. + Thanks to Ralf Treinen for the report. (Closes: #944549) + * Remove --with systemd build option. It is obsolete now. + * Remove recursive chown -R argument in postinst script. + * armagetronad-dedicated: Add Pre-Depends: ${misc:Pre-Depends}. + + -- Markus Koschany Sun, 17 Nov 2019 13:38:57 +0100 armagetronad (0.2.8.3.4-2) unstable; urgency=medium @@ -617,5 +718,3 @@ armagetron (0.1.3-0) unstable; urgency=low * Initial Release. -- Marcelo E. Magallon Sun, 30 Jul 2000 21:46:08 +0200 - - diff --git a/docker/build/context/debian/compat b/docker/build/context/debian/compat deleted file mode 100644 index f599e28b8..000000000 --- a/docker/build/context/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/docker/build/context/debian/control b/docker/build/context/debian/control index 64d0f7852..014880df8 100644 --- a/docker/build/context/debian/control +++ b/docker/build/context/debian/control @@ -5,9 +5,10 @@ Maintainer: Debian Games Team Uploaders: Markus Koschany Build-Depends: - autotools-dev, - debhelper (>= 9), - libgl1-mesa-dev, + debhelper-compat (= 13), + dh-sequence-cruft, + dh-sequence-installsysusers, + libgl-mesa-dev, libglu1-mesa-dev, libpng-dev, libsdl2-dev, @@ -23,15 +24,16 @@ Build-Depends: protobuf-compiler, libxml2-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev, - pkg-config, + pkgconf, libzthread-dev, zlib1g-dev -Standards-Version: 4.0.0 -Homepage: http://armagetronad.org -Vcs-Git: https://anonscm.debian.org/git/pkg-games/armagetronad.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/armagetronad.git +Standards-Version: 4.7.4 +Homepage: https://armagetronad.org +Vcs-Git: https://salsa.debian.org/games-team/armagetronad.git +Vcs-Browser: https://salsa.debian.org/games-team/armagetronad Package: armagetronad-common +Multi-Arch: foreign Recommends: armagetronad | armagetronad-dedicated Depends: @@ -70,9 +72,7 @@ Description: 3D Tron-like high speed game Package: armagetronad-dedicated Architecture: any Depends: - adduser, armagetronad-common (= ${source:Version}), - lsb-base (>= 3.0-6), ${misc:Depends}, ${shlibs:Depends} Description: dedicated game server for Armagetron Advanced diff --git a/docker/build/context/debian/copyright b/docker/build/context/debian/copyright index 97c4062cc..e1f16c022 100644 --- a/docker/build/context/debian/copyright +++ b/docker/build/context/debian/copyright @@ -1,11 +1,11 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Armagetron Advanced -Source: http://sourceforge.net/projects/armagetronad/ +Source: https://sourceforge.net/projects/armagetronad/ Files: * Copyright: 1998, David K. McAllister 2000-2008, Manuel Moos - 2000-2015, Armagetron Advanced development team + 2000-2023, Armagetron Advanced development team License: GPL-2+ Files: src/thirdparty/binreloc/* @@ -20,7 +20,7 @@ Copyright: 2000-2002, Marcelo E. Magallon 2002-2004, Andreas Bombe 2005. Petter Reinholdtsen 2007-2011, Christine Spang - 2014-2017, Markus Koschany + 2014-2023, Markus Koschany License: GPL-2+ diff --git a/docker/build/context/debian/rules b/docker/build/context/debian/rules index 339136e79..3874df762 100755 --- a/docker/build/context/debian/rules +++ b/docker/build/context/debian/rules @@ -2,12 +2,10 @@ # export DH_VERBOSE=1 include /usr/share/dpkg/pkg-info.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +include /usr/share/dpkg/architecture.mk # I'm going to assume that this is still true - armagetron relies on # arithmetics with denormals. @@ -22,10 +20,17 @@ SHARED_OPTS += --mandir=\$${prefix}/share/man --sysconfdir=/etc --disable-etc SHARED_OPTS += --datadir=/usr/share --disable-games --bindir=/usr/games SHARED_OPTS += --enable-binreloc SERVER_OPTS := --disable-glout --disable-useradd --disable-init --enable-authentication -CLIENT_OPTS := --enable-glout +CLIENT_OPTS := --enable-glout --enable-music %: - dh $@ --without autoreconf --with autotools_dev,systemd + dh $@ + +override_dh_installchangelogs: + dh_installchangelogs NEWS + +override_dh_autoreconf: + ./bootstrap.sh + dh_autoreconf override_dh_auto_configure: mkdir -p client @@ -65,7 +70,3 @@ override_dh_install: $(RM) debian/armagetronad-common/etc/armagetronad/rc.config # There's no reason to ship this script. $(RM) debian/armagetronad-common/usr/share/games/armagetronad/language/update.py - -get-orig-source: - # Uncomment the second debian/watch file paragraph - uscan --verbose --download-current-version --force-download diff --git a/docker/build/context/debian/watch b/docker/build/context/debian/watch index c2eb05524..9fb4e9643 100644 --- a/docker/build/context/debian/watch +++ b/docker/build/context/debian/watch @@ -1,8 +1,7 @@ -version=4 -opts=uversionmangle=s/(\db?)[_\-\.](src)$/$1/ \ -http://armagetronad.org/downloads.php \ -(?:.*/|.*=|)armagetronad[\-\._]?(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)(?:/\S*)? +Version: 5 -#Use this for downloading the original source tarball -#version=4 -#http://sf.net/armagetronad/armagetronad-(\d\S*)\.src\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +Template: GitHub +Owner: armagetronad +Project: armagetronad +Dversionmangle: s/\+(debian|dfsg|ds|deb)\d*$// +Uversionmangle: s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/