On 2023-12-22 at 07:22, P. J. McDermott wrote:
> On 2023-12-18 at 11:52, P. J. McDermott wrote:
> > Markus and team,
> >
> > 7kaa 2.15.6+ds-1 is pushed to Salsa [1] and ready for review. If you
> > upload it, I'll push a debian/2.15.6+ds-1 tag.
>
> Seeing on upstream's forums the latest of a few user reports of known
> bugs in 7kaa 2.15.6 fixed in the upcoming 2.15.7, I realized I should
> probably cherry pick at least a couple patches from upstream. So I've
> asked upstream for advice on these and any other patches to consider
> cherry picking [1]. So I think an upload should maybe wait until I
> hear back from upstream. Changes are in my fork on Salsa for now, and
> I'll push to games-team/7kaa and follow up here when ready for upload,
> but any review in the meantime would be appreciated.
>
> [1]: https://www.7kfans.com/forums/viewtopic.php?f=20&t=1302&p=9803#p9803
Upstream responded and I cherry picked accordingly. 7kaa 2.15.6+ds-1 is
pushed to games-team/7kaa, build tested [1], and ready for review and
upload.
Sorry for the noise.
[1]: https://salsa.debian.org/pehjota/7kaa/-/pipelines/617263
Diffstat, dsc, and changes for commit 9165b1e8:
---
$ git diff --stat=72 "$(git tag --list 'debian/*' \
> --sort=-version:refname | head -n 1)..master" -- debian/
debian/.gitignore | 7 +
debian/7kaa-data.doc-base | 8 +
debian/7kaa-data.lintian-overrides | 2 +
debian/README.source | 168 +++++++
debian/changelog | 58 +++
debian/clean | 2 +
debian/control | 34 +-
debian/copyright | 96 ++--
debian/patches/game_file_patching.patch | 118 +++++
debian/patches/series | 1 +
debian/patches/use_system_libuuid.patch | 567 ++++--------------------
debian/rules | 21 +
debian/salsa-ci.yml | 10 +
debian/upstream/metadata | 10 +-
debian/watch | 6 +-
15 files changed, 594 insertions(+), 514 deletions(-)
---
Format: 3.0 (quilt)
Source: 7kaa
Binary: 7kaa, 7kaa-data
Architecture: any all
Version: 2.15.6+ds-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
136a6230b771968246383319ab5e463a04fb4eb0 16912 7kaa_2.15.6+ds-1.debian.tar.xz
Checksums-Sha256:
829e62a06f320ebbf7685ce13d1d9472de3323a1aee417d52b76e492efc214f8 47150404 7kaa_2.15.6+ds.orig.tar.xz
5c856498d98150381d63a36bd795d2abaaf947f65fd531c2c265f91f9621c2c9 16912 7kaa_2.15.6+ds-1.debian.tar.xz
Files:
6f1f310915c08e5df99b7c7cf444ee45 47150404 7kaa_2.15.6+ds.orig.tar.xz
e2083d1d908a2d6b18acc1d232221f1f 16912 7kaa_2.15.6+ds-1.debian.tar.xz
---
Format: 1.8
Date: Fri, 22 Dec 2023 12:04:00 -0500
Source: 7kaa
Binary: 7kaa 7kaa-data 7kaa-dbgsym
Architecture: all amd64
Version: 2.15.6+ds-1
Distribution: unstable
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) 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:
50f07a5ec15b7dcafe344c40bdf922320de68c55 43318916 7kaa-data_2.15.6+ds-1_all.deb
27f47c5c4a07c85fcc0c053e6fcb36ed95372582 3808116 7kaa-dbgsym_2.15.6+ds-1_amd64.deb
425ba43a5a44df45a1d122430da1141568b09084 12059 7kaa_2.15.6+ds-1_amd64.buildinfo
b7659c789c4e9bc36b3a3364c5d384f1820da1ad 761216 7kaa_2.15.6+ds-1_amd64.deb
Checksums-Sha256:
194dc694f0e70c880cf1e19ab9545bc350692fe158f6a00e6aab70ff744b00a4 43318916 7kaa-data_2.15.6+ds-1_all.deb
58c90b96ec596fc7327ff7f4e8cd0f1be169d7db87264e405161a3dae256e0bc 3808116 7kaa-dbgsym_2.15.6+ds-1_amd64.deb
dc0e23ef0eab36c879a18c863def74f7c51eac1850b6e2d27b5971141e2e0107 12059 7kaa_2.15.6+ds-1_amd64.buildinfo
1c0cea00fa252457df821f3925699668e995c6bc44f39f160872ca51f043a9a0 761216 7kaa_2.15.6+ds-1_amd64.deb
Files:
2b0f96518a3b3133fb2cc65d62198f97 43318916 games optional 7kaa-data_2.15.6+ds-1_all.deb
0bd0a212f4aa89a27fe03d93e0fdd52a 3808116 debug optional 7kaa-dbgsym_2.15.6+ds-1_amd64.deb
55b74c3dc82368ea0edc031a980d99ad 12059 games optional 7kaa_2.15.6+ds-1_amd64.buildinfo
3ac169e0bbf740df4c5faf8ce5b65717 761216 games optional 7kaa_2.15.6+ds-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:
pgp0f8z3TPdPg.pgp
Description: OpenPGP digital signature