Your message dated Sat, 05 Apr 2025 11:49:14 +0000
with message-id <[email protected]>
and subject line Bug#1089179: fixed in ezquake 3.6.6-1
has caused the Debian Bug report #1089179,
regarding ezquake: new upstream version 3.6.5
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1089179: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1089179
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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 <[email protected]> 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
<[email protected]>
Uploaders: Michael Gilbert <[email protected]>
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 <[email protected]>
-
---- 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 <[email protected]>
-
---- 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 <[email protected]>
-# 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" $@
--- End Message ---
--- Begin Message ---
Source: ezquake
Source-Version: 3.6.6-1
Done: Patrice Duroux <[email protected]>
We believe that the bug you reported is fixed in the latest version of
ezquake, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Patrice Duroux <[email protected]> (supplier of updated ezquake package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 05 Apr 2025 12:40:31 +0100
Source: ezquake
Architecture: source
Version: 3.6.6-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Games Team <[email protected]>
Changed-By: Patrice Duroux <[email protected]>
Closes: 1079531 1088891 1089179
Changes:
ezquake (3.6.6-1) unstable; urgency=medium
.
* Update d/watch file
* New upstream version 3.6.6 (Closes: #1089179, #1079531)
* Bump SV to 4.7.2
* 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)
* d/copyright: remove misc/keymaps/* statement
* Clean up d/rules
* d/rules: binary as moved.
* d/control: remove quake-data dep and reformat (depputy).
* Add a README.Debian.
Checksums-Sha1:
2863d79800b272973c82dd79752876e949bc2bf7 2096 ezquake_3.6.6-1.dsc
93a6202612e3bd69d612a622d73ab6069d478447 1965594 ezquake_3.6.6.orig.tar.gz
2f2bd1106eb4410f47b4cbd11230950f208fd288 6372 ezquake_3.6.6-1.debian.tar.xz
226ca29fbe67ae3b7108b614aae3a2e4e5646279 13559 ezquake_3.6.6-1_source.buildinfo
Checksums-Sha256:
2272e9054c017cc3ccc2fc64efa5d0e759979ba438b3799fd67921375b20f0d0 2096
ezquake_3.6.6-1.dsc
609a6ee4c9a9d3752122013d851ca852fc2ad44ca67fac599e8a78871484ec7f 1965594
ezquake_3.6.6.orig.tar.gz
fa5a12c7891c60f1ddc4eb927bb67f97d788ff13fee85def0fb135b876d71870 6372
ezquake_3.6.6-1.debian.tar.xz
24cd90f0b30a2924d8aed498546342e10de6c33b4c89d95c760de4af3c223d19 13559
ezquake_3.6.6-1_source.buildinfo
Files:
b096f5e9e8913548779ca9caf1b6392c 2096 games optional ezquake_3.6.6-1.dsc
df04fb9ca22fc734cdfb40775a2906be 1965594 games optional
ezquake_3.6.6.orig.tar.gz
8dbf748ab9b432b688fa39ed8fa7b7cb 6372 games optional
ezquake_3.6.6-1.debian.tar.xz
a3d55a373ea99bb0bd1e296cd350788c 13559 games optional
ezquake_3.6.6-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEj23hBDd/OxHnQXSHMfMURUShdBoFAmfxDG8ACgkQMfMURUSh
dBrfow/9E+SvMZ+kV19Z/Z54sGtOhpYVdTxXMNYStQQGSxJGMkPBoL2232yDV7RY
PO7Q9Hwt/4MlRVZk2ziMKNalr31qvx/pEWXq2juhLTQk3lYbZJhoOcqLCl5uaMBJ
zqCTIQWel+3c6n+LQlpNLulazsINVQ4y9qXis5mYYgrDk/aa5YfTYOQJebUOq2xp
Lmkiab+WEDNJm0dkFK3IuE1sXdep+NUeKoayJYuGiUxipIawE+aYH3OHitFk0z6T
wQHml6M3sGb7M9oya62rQT0CRHc2t/E1cT8rI0EMCxmK+QyK8aE+sSMsBNpD/cci
aZ+DMDaTACU24JFM2mi6flYw2cEGiXff/ZJ1y/9gytIyX4R7Zw8G9oY85ok47zjR
6UazH4NbgwDG3Ym8Hz/63QPqFpOuJOCz5Jfapn2lTSbLxa5HBovNxWlFFoj1nG88
TUpeXQC/WpS8OOJVCIoYhJ+C6hpusJcB0fj8JAaRh5d6wFJKD+QIIsgzCjR99R/c
ftUBX2wMWMqVMEKtlviJGVn6k73AOwQaW96Ny0dajFJ0j1bA7XgpkB7z8zhtkFcp
pyTwGVJ9xPPeEFaGgAndVsh9771VP6u+y+qqiRJNMkm6CI8ECaIhTHgmf4hQ3O0n
rY7x7KxAdR68+yR5fOitB96pz49Zo5fdIdCB5mbvlBPFlM2QPbs=
=W+w8
-----END PGP SIGNATURE-----
pgpbEzPtdLYMl.pgp
Description: PGP signature
--- End Message ---
