Source: ezquake Version: 3.6.4-3 Severity: wishlist Tags: patch Hi,
Here is a patch to improve the packaging. It should close #1088891 and maybe #1079531 because the new version uses cmake so Helmut's patch in #1079531 is no longer applicable. But I haven't test a cross-build. Best, Patrice -- System Information: Debian Release: trixie/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 6.11.10-amd64 (SMP w/12 CPU threads; PREEMPT) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff --git a/debian/changelog b/debian/changelog index 4133fcf..80141d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +ezquake (3.6.5-1) UNRELEASED; urgency=medium + + * Update d/watch file + * New upstream version 3.6.5 + * Bump SV to 4.7.0 + * Update BD + * Improve d/scripts/ezquake + * Remove scripts/convert-keymaps and install + * Refresh d/patches + * Remove for now -Werror in d/rules + * Add d/patches/pcre2.patch (Closes: #1088891) + + -- Patrice Duroux <patrice.dur...@gmail.com> Wed, 04 Dec 2024 22:06:45 +0100 + ezquake (3.6.4-3) unstable; urgency=medium * Fix 32-bit pointer conversion warning. diff --git a/debian/control b/debian/control index 845a58b..9a5586a 100644 --- a/debian/control +++ b/debian/control @@ -5,21 +5,22 @@ Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Michael Gilbert <mgilb...@debian.org> Build-Depends: debhelper-compat (= 13), + cmake, + pkgconf, zlib1g-dev, libpng-dev, libsdl2-dev, libjpeg-dev, - liblzma-dev, libpcre2-dev, libexpat-dev, libspeex-dev, - libvorbis-dev, libjansson-dev, libminizip-dev, libsndfile1-dev, libspeexdsp-dev, libcurl4-gnutls-dev, -Standards-Version: 4.6.2 + libfreetype-dev, +Standards-Version: 4.7.0 Rules-Requires-Root: no Homepage: https://ezquake.com Vcs-Git: https://salsa.debian.org/games-team/ezquake.git diff --git a/debian/install b/debian/install index 1038e45..02cd181 100644 --- a/debian/install +++ b/debian/install @@ -3,7 +3,6 @@ ezquake usr/lib/games/ezquake debian/scripts/ezquake usr/games misc/cfg usr/share/games/ezquake -misc/keymaps usr/share/games/ezquake misc/fragfile usr/share/games/ezquake misc/sb/*.txt usr/share/games/ezquake/sb diff --git a/debian/patches/debianization/version.patch b/debian/patches/debianization/version.patch deleted file mode 100644 index fbccb3b..0000000 --- a/debian/patches/debianization/version.patch +++ /dev/null @@ -1,15 +0,0 @@ -description: include debian revision in the version string -forwarded: not-needed -author: Michael Gilbert <mgilb...@debian.org> - ---- a/version.sh -+++ b/version.sh -@@ -5,7 +5,7 @@ if [ -f VERSION ]; then - rev=$(sed -e 's/^r\([0-9]\+\).*$/\1/' VERSION) - elif [ -x "$(command -v git)" -a -d ".git" ]; then - rev=$(git rev-list HEAD | wc -l | tr -d -c 0-9) -- ver="r$rev~$(git rev-parse --short HEAD)" -+ ver="[debian $(dpkg-parsechangelog --show-field=version)]" - else - echo "WARNING: Couldn't detect ezQuake version." >&2 - ver="r666" diff --git a/debian/patches/fixes/spelling.patch b/debian/patches/fixes/spelling.patch deleted file mode 100644 index fe530f9..0000000 --- a/debian/patches/fixes/spelling.patch +++ /dev/null @@ -1,14 +0,0 @@ -description: correct spelling errors -author: Michael Gilbert <mgilb...@debian.org> - ---- a/src/cl_demo.c -+++ b/src/cl_demo.c -@@ -4121,7 +4121,7 @@ void CL_QTVPoll (void) - - if (strncmp(qtvrequestbuffer, QTVSV, QTVSVLEN)) - { -- Com_Printf("Server is not a QTV server (or is incompatable)\n"); -+ Com_Printf("Server is not a QTV server (or is incompatible)\n"); - QTV_CloseRequest(true); - return; - } diff --git a/debian/patches/series b/debian/patches/series index e7c0bb7..67fd4a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,8 @@ debianization/date.patch -debianization/version.patch warnings/macro-redefined.patch warnings/pointer-to-int-cast.patch -fixes/spelling.patch fixes/format-string.patch warnings/incompatible-pointer-types.patch +pcre2.patch diff --git a/debian/rules b/debian/rules index 8471a31..8a9ee90 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ export V=1 export DEB_BUILD_DATE="$(shell dpkg-parsechangelog --show-field=date)" -export DEB_CFLAGS_MAINT_APPEND=$(shell dpkg-buildflags --get CPPFLAGS) -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-format-truncation -Wno-unused-result -Wno-unused-function -Werror -DBUILD_DATE=\"$(DEB_BUILD_DATE)\" +export DEB_CFLAGS_MAINT_APPEND=$(shell dpkg-buildflags --get CPPFLAGS) -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-format-truncation -Wno-unused-result -Wno-unused-function -DBUILD_DATE=\"$(DEB_BUILD_DATE)\" export DEB_BUILD_MAINT_OPTIONS=hardening=+all @@ -16,7 +16,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all override_dh_install-arch: cp ezquake-* ezquake dh_install - ./debian/scripts/convert-keymaps override_dh_clean: rm -rf opengl minizip vstudio-libs mingw32-libs misc/vstudio misc/install diff --git a/debian/scripts/convert-keymaps b/debian/scripts/convert-keymaps deleted file mode 100755 index 03ddf00..0000000 --- a/debian/scripts/convert-keymaps +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e -# Copyright (C) 2024 Michael Gilbert <mgilb...@debian.org> -# License: GPL-2+ - -cd debian/ezquake/usr/share/games/ezquake/keymaps -for f in fi.kmap uk.kmap hungarian.kmap; do file -i $f; iconv $f -f ISO-8859-1 -t UTF-8 -o $f; done -for f in es.kmap fr.kmap se.kmap german.kmap; do file -i $f; iconv $f -f WINDOWS-1252 -t UTF-8 -o $f; done diff --git a/debian/scripts/ezquake b/debian/scripts/ezquake index b95cf48..f15ed5d 100755 --- a/debian/scripts/ezquake +++ b/debian/scripts/ezquake @@ -4,8 +4,8 @@ gamedir="$HOME/.config/ezquake" -test -d $gamedir || mkdir -p $gamedir -test -L $gamedir/id1 || ln -s /usr/share/games/quake/id1 $gamedir/id1 -test -L $gamedir/ezquake || ln -s /usr/share/games/ezquake $gamedir/ezquake +[ -d "$gamedir" ] || mkdir -p "$gamedir" +[ -d "$gamedir"/id1 ] || [ -L "$gamedir"/id1 ] || ln -s /usr/share/games/quake/id1 "$gamedir"/id1 +[ -L "$gamedir"/ezquake ] || ln -s /usr/share/games/ezquake "$gamedir"/ezquake -/usr/lib/games/ezquake/ezquake -basedir $gamedir $@ +/usr/lib/games/ezquake/ezquake -basedir "$gamedir" $@
