This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository openarena.
commit 7ccd3b18d8e7fa5b70fb493df5e637dce9d00bcf Author: Simon McVittie <[email protected]> Date: Wed Jul 5 09:15:35 2017 +0100 Remove maintainer script handling for upgrades from versions prior to 0.8.8-10 That version is older than current Debian stable and Ubuntu LTS. Upgrades that skip a stable release are not supported. - START_DAEMON=0 in /etc/default/openarena-server is no longer migrated to update-rc.d openarena-server disabled. Use update-rc.d if you want to disable the OpenArena server. - /var/games/openarena-server/.openarena is no longer migrated to /var/games/openarena-server/server.oa. --- debian/changelog | 8 ++++ debian/openarena-server.postinst | 5 --- debian/openarena-server.preinst | 97 ---------------------------------------- 3 files changed, 8 insertions(+), 102 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4e9d4c1..65de769 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,14 @@ openarena (0.8.8-20) UNRELEASED; urgency=medium * Mark all forwarded patches as having been applied upstream + * Remove maintainer script handling for upgrades from versions prior + to 0.8.8-10, which is older than current Debian stable and + Ubuntu LTS. Upgrades that skip a stable release are not supported. + - START_DAEMON=0 in /etc/default/openarena-server is no longer migrated + to update-rc.d openarena-server disabled. Use update-rc.d if you want + to disable the OpenArena server. + - /var/games/openarena-server/.openarena is no longer migrated to + /var/games/openarena-server/server.oa. -- Simon McVittie <[email protected]> Wed, 28 Jun 2017 11:14:29 +0100 diff --git a/debian/openarena-server.postinst b/debian/openarena-server.postinst index d32c7fe..0535040 100644 --- a/debian/openarena-server.postinst +++ b/debian/openarena-server.postinst @@ -19,11 +19,6 @@ case "$1" in install -d /var/games install -d /var/games/openarena-server chown Debian-openarena:games /var/games/openarena-server - if [ -d /var/games/openarena-server/.openarena ] && ! [ -e /var/games/openarena-server/server.oa ]; then - # we use com_homepath to redirect server stuff to a non-hidden - # directory and be ready for multi-instance; migrate old configuration - ln -s .openarena /var/games/openarena-server/server.oa - fi ;; abort-upgrade|abort-remove|abort-deconfigure) ;; diff --git a/debian/openarena-server.preinst b/debian/openarena-server.preinst deleted file mode 100644 index 2ed645f..0000000 --- a/debian/openarena-server.preinst +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh -# vim:set sw=2 sts=2 et: - -set -e - -quake_atomic_write () { - ## quake_atomic_write DIR FILE CONTENTS - ## Create DIR/FILE with contents (CONTENTS + '\n'). - install -d "$1" - echo "$3" > "$1/$2.$$.tmp" - chmod 0644 "$1/$2.$$.tmp" - mv "$1/$2.$$.tmp" "$1/$2" -} - -quake_disable () { - update-rc.d openarena-server disable - - # Make deb-systemd-helper think the systemd unit was already installed - # and disabled, so that the disabledness sticks. Strictly speaking this - # is internal state, but it replicates what init-system-helpers/1.22 - # would have done, so it should work as long as upgrades from jessie - # are supported. - quake_atomic_write /var/lib/systemd/deb-systemd-helper-enabled \ - openarena-server.service.dsh-also \ - /etc/systemd/system/multi-user.target.wants/openarena-server.service - if [ -L /etc/systemd/system/multi-user.target.wants/openarena-server.service ]; then - rm /etc/systemd/system/multi-user.target.wants/openarena-server.service - fi -} - -quake_migrate_disabledness () { - echo "openarena-server.preinst: migrating from START_DAEMON to init script enable/disable status..." >&2 - - e=0 - # Do this in a subshell just in case /etc/default/openarena-server has been - # patched by the sysadmin to exit the init script. - ( - set +e - START_DAEMON=1 - [ -r /etc/default/openarena-server ] && . /etc/default/openarena-server - - case "$START_DAEMON" in - (1) - echo "Preserving current status of openarena-server init script (START_DAEMON=1 in /etc/default/openarena-server)" >&2 - exit 104 - ;; - (unless-disabled-by-upgrade) - if [ -e /var/games/openarena-server/init-script-disabled-by-upgrade ]; then - echo "Disabling openarena-server init script to preserve default from openarena-server (<< 0.8.8)" >&2 - exit 101 - else - echo "Preserving current status of openarena-server init script" >&2 - exit 104 - fi - ;; - (*) - # 0 or unknown - echo "Disabling openarena-server init script (previously disabled by START_DAEMON=$START_DAEMON in /etc/default/openarena-server)" >&2 - exit 101 - ;; - esac - ) || e="$?" - - case "$e" in - (101) - # we already printed a message - quake_disable - ;; - (104) - # nothing to do and we already printed a message - ;; - (*) - # maybe the sysadmin stubbed it out with "exit 0" or "exit 1"? - echo "Sourcing /etc/default/openarena-server returned unexpected code, disabling init script" >&2 - quake_disable - ;; - esac - - # we have done the migration, so remove this to avoid confusion - rm -f /var/games/openarena-server/init-script-disabled-by-upgrade -} - -case "$1" in - (upgrade) - if dpkg --compare-versions "$2" lt 0.8.8-10~; then - quake_migrate_disabledness "$@" - fi - ;; - (install|abort-upgrade) - ;; - *) - echo "preinst called with unknown argument '$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
