Markus and team,
As planned, I have backported 7kaa 2.15.6+ds-1 to bookworm-backports and
bullseye-backports-sloppy, which will both go through BACKPORTS-NEW.
The former is a trivial backport, while the latter is slightly less so
(a patch and dependency change adapt to bullseye's libsdl2). Now that
7kaa 2.15.6+ds-1 is in testing [1], I am requesting sponsorship for the
backports.
This package is a useful backport because this game breaks multiplayer
compatibility between versions, so players will likely want to run the
newest upstream version. Also, version 2.15.6+ds-1~bpo11+1 works around
a bug in libsdl2 in bullseye (which can't simply be fixed in the version
of libsdl2 in bullseye, because other games like widelands work around
the bug by assuming that it affects certain SDL versions, and wesnoth-*
is actually broken in such a way that it works only if SDL is broken).
Both versions have been built locally and on Salsa [2][3] (I don't know
why the piuparts test fails, but I suspect it's a Salsa CI problem,
since I don't see an issue locally). Version 2.15.6+ds-1~bpo11+1 has
been tested to install, run, and fix the aforementioned bug on bullseye.
Please build for bookworm-backports with "-v2.15.5+dfsg-1" and for
bullseye-backports-sloppy with "-v2.15.4p1+dfsg-1". bookworm-backports
will need lintian's "bad-distribution-in-changes-file" tag suppressed,
because the lintian version in bookworm lacks the "bookworm"
distribution in its "data/changes-file/known-dists" file. For example,
this is how I build for bookworm-backports with sbuild:
$ git checkout bookworm-backports
$ gbp buildpackage --git-debian-branch="$(git symbolic-ref --quiet \
> --short HEAD)" --git-pristine-tar --git-builder="sbuild
> --dist='$(git symbolic-ref --quiet --short HEAD)'
> --build-dep-resolver=aptitude --debbuildopts=-v2.15.5+dfsg-1
> --lintian-opts --suppress-tags=bad-distribution-in-changes-file"
And for bullseye-backports-sloppy:
$ git checkout bullseye-backports-sloppy
$ gbp buildpackage --git-debian-branch="$(git symbolic-ref --quiet \
> --short HEAD)" --git-pristine-tar --git-builder="sbuild
> --dist='$(git symbolic-ref --quiet --short HEAD)'
> --build-dep-resolver=aptitude --debbuildopts=-v2.15.4p1+dfsg-1"
(Of course, you need "aliases=bookworm-backports" in your bookworm
schroot configuration and "aliases=bullseye-backports-sloppy" in
your bullseye schroot configuration. All this is documented near the
end of debian/README.source [4] in my fork's master branch.)
And please push version tags in the "debian/" namespace as usual once
uploaded. Thanks!
[1]: https://tracker.debian.org/news/1490482/7kaa-2156ds-1-migrated-to-testing/
[2]: https://salsa.debian.org/games-team/7kaa/-/pipelines/619068
[3]: https://salsa.debian.org/games-team/7kaa/-/pipelines/619069
[4]: https://salsa.debian.org/pehjota/7kaa/-/blob/master/debian/README.source
Diffstat (relative to master branch), dsc, and changes (relative to
bookworm) for branch bookworm-backports (commit ca3a20ce):
---
$ git diff --stat=72 "$(git tag --list 'debian/*' \
> --sort=-version:refname | head -n 1)..bookworm-backports" -- debian/
debian/changelog | 6 ++++++
debian/salsa-ci.yml | 5 +++++
2 files changed, 11 insertions(+)
---
Format: 3.0 (quilt)
Source: 7kaa
Binary: 7kaa, 7kaa-data
Architecture: any all
Version: 2.15.6+ds-1~bpo12+1
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Uploaders: Bertrand Marc <bmarc@debian.org>, Miriam Ruiz <little_miry@yahoo.es>, Barry deFreese <bdefreese@debian.org>, P. J. McDermott <pj@pehjota.net>,
Homepage: https://www.7kfans.com/
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/games-team/7kaa
Vcs-Git: https://salsa.debian.org/games-team/7kaa.git
Build-Depends: autoconf-archive, debhelper-compat (= 13), libcurl4-gnutls-dev, libopenal-dev, libenet-dev, libsdl2-dev (>= 2.24.0), uuid-dev, latexmk <!nodoc>, texlive-latex-recommended <!nodoc>, texlive-latex-extra <!nodoc>, texlive-fonts-extra <!nodoc>, fonts-adf-universalis <!nodoc>
Package-List:
7kaa deb games optional arch=any
7kaa-data deb games optional arch=all
Checksums-Sha1:
165f4b05332fdb284a06a651721f80f3604410d9 47150404 7kaa_2.15.6+ds.orig.tar.xz
eac09cfd8e79a547fbfbdf728c389d7e5cf417ea 16940 7kaa_2.15.6+ds-1~bpo12+1.debian.tar.xz
Checksums-Sha256:
829e62a06f320ebbf7685ce13d1d9472de3323a1aee417d52b76e492efc214f8 47150404 7kaa_2.15.6+ds.orig.tar.xz
31eccc523ead6e6b58e52d3fcf6cb5cd01672cb469b8c205f534fc34c2c8956e 16940 7kaa_2.15.6+ds-1~bpo12+1.debian.tar.xz
Files:
6f1f310915c08e5df99b7c7cf444ee45 47150404 7kaa_2.15.6+ds.orig.tar.xz
261f45839019bcd7b63a921c1cc25860 16940 7kaa_2.15.6+ds-1~bpo12+1.debian.tar.xz
---
Format: 1.8
Date: Mon, 25 Dec 2023 08:49:55 -0500
Source: 7kaa
Binary: 7kaa 7kaa-data 7kaa-dbgsym
Architecture: all amd64
Version: 2.15.6+ds-1~bpo12+1
Distribution: bookworm-backports
Urgency: medium
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Changed-By: P. J. McDermott <pj@pehjota.net>
Description:
7kaa - Seven Kingdoms: Ancient Adversaries - real-time strategy game
7kaa-data - Seven Kingdoms: Ancient Adversaries - game data
Closes: 1023221 1043868
Changes:
7kaa (2.15.6+ds-1~bpo12+1) bookworm-backports; urgency=medium
.
* Rebuild for bookworm-backports.
.
7kaa (2.15.6+ds-1) unstable; urgency=medium
.
[ Debian Janitor ]
* Apply multi-arch hints.
+ 7kaa-data: Add Multi-Arch: foreign.
Changes-By: apply-multiarch-hints
* Use secure URI in Homepage field.
Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
* Set upstream metadata fields: Bug-Database.
Changes-By: lintian-brush
Fixes: lintian: upstream-metadata-missing-bug-tracking
.
[ P. J. McDermott ]
* Simplify patch to use system libuuid:
+ Instead of replacing every use of the guuid_t type and Misc::uuid_*()
functions (a large invasive change that has to be refreshed with every
new upstream release), convert them into a thin layer wrapping around
libuuid.
+ Use libuuid compile and link flags in debian/rules.
+ Change repacksuffix in debian/watch to "+ds", since "+dfsg"
confusingly implies something non-free was removed when actually only
free code (copied from e2fsprogs) is removed. This follows convention
in Debian: <https://wiki.debian.org/Glossary#ds>.
* Add myself to Uploaders.
Thanks to Bertrand and everyone else for all your work so far!
* Update Git URI in debian/watch:
Upstream has moved (back) to SourceForge for future releases, so get
uscan ready to find them.
* Update URIs in debian/copyright and debian/upstream/metadata.
* New upstream version 2.15.6+ds:
+ Includes previously missing font files for the ISO 8859-3 character
set, used in the Esperanto locale (Closes: #1023221).
* Update build dependency on libsdl2-dev (>= 2.24.0) according to README.
+ In particular, SDL has inverted horizontal mouse wheel scrolling on
X11 in versions (<< 2.0.18) (fixed in SDL commit 515b7e93) and on
Wayland in versions (<< 2.0.20) (fixed in SDL commit 3e1b3bc3).
* debian/copyright: Update copyrights, add missing files, and realign.
* Standards-Version: 4.6.2, no changes needed.
* Rules-Requires-Root: no.
* Normalize punctuation and capitalization in Description fields.
* Build and install the game manual document into 7kaa-data if <!nodoc>.
* Clean po/*.gmo and po/stamp-po after build.
Fixes building a source package after a successful binary package build
(Closes: #1043868).
* Add debian/.gitignore.
* Add debian/README.source:
Document the Git commit message style, GitLab merge instructions, and
git-buildpackage workflow (including package-specific commands) to help
myself and other future maintainers.
* Add debian/salsa-ci.yml.
* Override false positive lintian tags about scenario config files.
* Cherry pick patch from upstream:
+ debian/patches/game_file_patching.patch: Fixes original scenarios
crashing when clicking on your market.
Checksums-Sha1:
c2d95c4c0c02624b5e1ee22d5f8eb9abf3b262f4 43323452 7kaa-data_2.15.6+ds-1~bpo12+1_all.deb
229c507d1c463d3835f0ff0e2ee19bdebed0ebee 3799972 7kaa-dbgsym_2.15.6+ds-1~bpo12+1_amd64.deb
5105dc8578925df55bc2de7401601a15066eb913 12375 7kaa_2.15.6+ds-1~bpo12+1_amd64.buildinfo
331a2779443e38edcba5d093ab2e7658b250a350 758228 7kaa_2.15.6+ds-1~bpo12+1_amd64.deb
Checksums-Sha256:
2a4bbd7fc332e14df00bd67a36a0864ddf9725a737ec142be09226288787db29 43323452 7kaa-data_2.15.6+ds-1~bpo12+1_all.deb
4c93a2ef5ef6872d288fe568d2305d7699a9e1897c081af796f3939ef1920ecd 3799972 7kaa-dbgsym_2.15.6+ds-1~bpo12+1_amd64.deb
770326ab6f741c05cb66f6ff639c1130d52c06fac3a776c7d41fcbdbed86f238 12375 7kaa_2.15.6+ds-1~bpo12+1_amd64.buildinfo
49f503865e5b821d2ff1d5e85fe5b82754ee0537d478a9f36da63999e2f57ea3 758228 7kaa_2.15.6+ds-1~bpo12+1_amd64.deb
Files:
a8085b0478da55f919ea8bea66d9e1a0 43323452 games optional 7kaa-data_2.15.6+ds-1~bpo12+1_all.deb
1993c9c64097cfc426ff348764769f9b 3799972 debug optional 7kaa-dbgsym_2.15.6+ds-1~bpo12+1_amd64.deb
9ed1e3f0a5129b40d1686efe5a6369d3 12375 games optional 7kaa_2.15.6+ds-1~bpo12+1_amd64.buildinfo
3cf79fd88e37822e93711a40111dcc9e 758228 games optional 7kaa_2.15.6+ds-1~bpo12+1_amd64.deb
---
Diffstat (relative to master branch), dsc, and changes (relative to
bullseye) for branch bullseye-backports-sloppy (commit f1ba73ba):
---
$ git diff --stat=72 "$(git tag --list 'debian/*' \
> --sort=-version:refname | head -n 1)..bullseye-backports-sloppy" -- \
> debian/
debian/changelog | 12 +++++
debian/control | 3 +-
debian/patches/horizontal_wheel_scroll.patch | 51 ++++++++++++++++++++
debian/patches/series | 1 +
debian/salsa-ci.yml | 4 ++
5 files changed, 70 insertions(+), 1 deletion(-)
---
Format: 3.0 (quilt)
Source: 7kaa
Binary: 7kaa, 7kaa-data
Architecture: any all
Version: 2.15.6+ds-1~bpo11+1
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Uploaders: Bertrand Marc <bmarc@debian.org>, Miriam Ruiz <little_miry@yahoo.es>, Barry deFreese <bdefreese@debian.org>, P. J. McDermott <pj@pehjota.net>,
Homepage: https://www.7kfans.com/
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/games-team/7kaa
Vcs-Git: https://salsa.debian.org/games-team/7kaa.git
Build-Depends: autoconf-archive, debhelper-compat (= 13), libcurl4-gnutls-dev, libopenal-dev, libenet-dev, libsdl2-dev (>= 2.0.8), uuid-dev, latexmk <!nodoc>, texlive-latex-recommended <!nodoc>, texlive-latex-extra <!nodoc>, texlive-fonts-extra <!nodoc>, fonts-adf-universalis <!nodoc>
Package-List:
7kaa deb games optional arch=any
7kaa-data deb games optional arch=all
Checksums-Sha1:
165f4b05332fdb284a06a651721f80f3604410d9 47150404 7kaa_2.15.6+ds.orig.tar.xz
8af52b321ca715187df3e368e1add272762b8eea 17672 7kaa_2.15.6+ds-1~bpo11+1.debian.tar.xz
Checksums-Sha256:
829e62a06f320ebbf7685ce13d1d9472de3323a1aee417d52b76e492efc214f8 47150404 7kaa_2.15.6+ds.orig.tar.xz
eb34265db1e731275f88c55e61d583a9d40c34ffe512521b95a0280f76741136 17672 7kaa_2.15.6+ds-1~bpo11+1.debian.tar.xz
Files:
6f1f310915c08e5df99b7c7cf444ee45 47150404 7kaa_2.15.6+ds.orig.tar.xz
78de71c160e3de5c92efb289299f0766 17672 7kaa_2.15.6+ds-1~bpo11+1.debian.tar.xz
---
Format: 1.8
Date: Mon, 25 Dec 2023 16:49:58 -0500
Source: 7kaa
Binary: 7kaa 7kaa-data 7kaa-dbgsym
Architecture: all amd64
Version: 2.15.6+ds-1~bpo11+1
Distribution: bullseye-backports-sloppy
Urgency: medium
Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Changed-By: P. J. McDermott <pj@pehjota.net>
Description:
7kaa - Seven Kingdoms: Ancient Adversaries - real-time strategy game
7kaa-data - Seven Kingdoms: Ancient Adversaries - game data
Closes: 1023221 1043868
Changes:
7kaa (2.15.6+ds-1~bpo11+1) bullseye-backports-sloppy; urgency=medium
.
* Rebuild for bullseye-backports-sloppy.
* debian/patches/horizontal_wheel_scroll.patch: Work around SDL bug:
Horizontal mouse wheel scrolling is inverted on X11 in SDL (<< 2.0.18)
and on Wayland in SDL (<< 2.0.20).
* Reduce SDL (>= 2.24.0) dependency to a run-time recommendation.
Debian bullseye only has 2.0.14, but the wheel scroll patch works makes
this old version more usable.
.
7kaa (2.15.6+ds-1) unstable; urgency=medium
.
[ Debian Janitor ]
* Apply multi-arch hints.
+ 7kaa-data: Add Multi-Arch: foreign.
Changes-By: apply-multiarch-hints
* Use secure URI in Homepage field.
Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
* Set upstream metadata fields: Bug-Database.
Changes-By: lintian-brush
Fixes: lintian: upstream-metadata-missing-bug-tracking
.
[ P. J. McDermott ]
* Simplify patch to use system libuuid:
+ Instead of replacing every use of the guuid_t type and Misc::uuid_*()
functions (a large invasive change that has to be refreshed with every
new upstream release), convert them into a thin layer wrapping around
libuuid.
+ Use libuuid compile and link flags in debian/rules.
+ Change repacksuffix in debian/watch to "+ds", since "+dfsg"
confusingly implies something non-free was removed when actually only
free code (copied from e2fsprogs) is removed. This follows convention
in Debian: <https://wiki.debian.org/Glossary#ds>.
* Add myself to Uploaders.
Thanks to Bertrand and everyone else for all your work so far!
* Update Git URI in debian/watch:
Upstream has moved (back) to SourceForge for future releases, so get
uscan ready to find them.
* Update URIs in debian/copyright and debian/upstream/metadata.
* New upstream version 2.15.6+ds:
+ Includes previously missing font files for the ISO 8859-3 character
set, used in the Esperanto locale (Closes: #1023221).
* Update build dependency on libsdl2-dev (>= 2.24.0) according to README.
+ In particular, SDL has inverted horizontal mouse wheel scrolling on
X11 in versions (<< 2.0.18) (fixed in SDL commit 515b7e93) and on
Wayland in versions (<< 2.0.20) (fixed in SDL commit 3e1b3bc3).
* debian/copyright: Update copyrights, add missing files, and realign.
* Standards-Version: 4.6.2, no changes needed.
* Rules-Requires-Root: no.
* Normalize punctuation and capitalization in Description fields.
* Build and install the game manual document into 7kaa-data if <!nodoc>.
* Clean po/*.gmo and po/stamp-po after build.
Fixes building a source package after a successful binary package build
(Closes: #1043868).
* Add debian/.gitignore.
* Add debian/README.source:
Document the Git commit message style, GitLab merge instructions, and
git-buildpackage workflow (including package-specific commands) to help
myself and other future maintainers.
* Add debian/salsa-ci.yml.
* Override false positive lintian tags about scenario config files.
* Cherry pick patch from upstream:
+ debian/patches/game_file_patching.patch: Fixes original scenarios
crashing when clicking on your market.
.
7kaa (2.15.5+dfsg-1) unstable; urgency=medium
.
* debian/watch: use mode=git since github changed the link to releases.
* New upstream version 2.15.5.
* Refresh debian/patches.
* Add a build-dep on autoconf-archive in order to use
AX_CXX_COMPILE_STDCXX.
* Standards-version: 4.6.1, no changes needed.
Checksums-Sha1:
6219d06ceba9a1d64796d5e3eccec5b72e566894 43317044 7kaa-data_2.15.6+ds-1~bpo11+1_all.deb
8614f98f162dfd50f6f652e3dad872ea619b2cfb 3401836 7kaa-dbgsym_2.15.6+ds-1~bpo11+1_amd64.deb
0bad1112417d6aa30b4a7a0a03a22aecef625a0e 12658 7kaa_2.15.6+ds-1~bpo11+1_amd64.buildinfo
b82b1521fbd5f81b0cafe1f20a678f6bd7d87438 759312 7kaa_2.15.6+ds-1~bpo11+1_amd64.deb
Checksums-Sha256:
65cb27584ebd572c2e6297cf47eec237b12cd1c801aca017f96077e765e1ebff 43317044 7kaa-data_2.15.6+ds-1~bpo11+1_all.deb
72fa96e7289ea848dfa1c265b381211f053cd96156cb27f6f4873fd804df0eed 3401836 7kaa-dbgsym_2.15.6+ds-1~bpo11+1_amd64.deb
3dcb4194a476577e0f14c7815be62bae8501442695aa7b275d50ea49b1393a32 12658 7kaa_2.15.6+ds-1~bpo11+1_amd64.buildinfo
0ab519695b886e5972021c969608fbd5792f54a8196ba1f90b26d109c09faee7 759312 7kaa_2.15.6+ds-1~bpo11+1_amd64.deb
Files:
7313b692fe30335d6500f98d90e1b95f 43317044 games optional 7kaa-data_2.15.6+ds-1~bpo11+1_all.deb
0e096aa9b0ca473de03a1c514eb466aa 3401836 debug optional 7kaa-dbgsym_2.15.6+ds-1~bpo11+1_amd64.deb
5bccceb846cbb103412ae4792071603e 12658 games optional 7kaa_2.15.6+ds-1~bpo11+1_amd64.buildinfo
c95d5c2734bb4a0ea6bd7e5a27a10a72 759312 games optional 7kaa_2.15.6+ds-1~bpo11+1_amd64.deb
--
Patrick "P. J." McDermott: http://www.pehjota.net/
Lead Developer, ProteanOS: http://www.proteanos.com/
Founder and CEO, Libiquity: http://www.libiquity.com/
Attachment:
pgpK0urUavrRH.pgp
Description: OpenPGP digital signature