Here's a debdiff between the current version of the openMSX package and
a proposed new version that fixes this bug. **Note**: It is necessary to
also delete the Contrib/codec/Win32/zmbv.dll file in the source package
tree (debdiffs don't seem to communicate deleted binary files very well).
----------
Binary files /tmp/phkMJNskDj/openmsx-19.1/Contrib/codec/Win32/zmbv.dll
and /tmp/Cd74GNmEnl/openmsx-19.1+dfsg/Contrib/codec/Win32/zmbv.dll differ
diff -Nru openmsx-19.1/debian/changelog openmsx-19.1+dfsg/debian/changelog
--- openmsx-19.1/debian/changelog 2023-09-01 01:39:39.000000000 -0500
+++ openmsx-19.1+dfsg/debian/changelog 2023-11-24 13:47:59.000000000
-0600
@@ -1,3 +1,25 @@
+openmsx (19.1+dfsg-2) unstable; urgency=medium
+
+ * Override spurious source-is-missing Lintian errors.
+ * Don't build-depend on dpkg-dev, it's guaranteed to be installed in a
+ Debian build environment.
+ * Repack the upstream tarball to remove a prebuilt Windows binary.
+ (Closes: #1056780)
+ * Set 'DEB_BUILD_MAINT_OPTIONS = hardening=+all' in debian/rules.
+ * Remove debian/source/include-binaries, every file listed in it doesn't
+ exist.
+ * Make debian/copyright point to more specific license files in
+ /usr/share/common-licenses.
+ * Set 'Rules-Requires-Root: no' in debian/control.
+ * Use debhelper 13 rather than debhelper 10.
+ * Override spurious package-contains-documentation-outside-usr-share-doc
+ Lintian gripes.
+ * Created debian/upstream/metadata file.
+ * Switch back to using vendored catch2, the catch2 Debian package now
ships
+ catch2 v3 whereas openMSX uses catch2 v2.
+
+ -- Aaron Rainbolt <arraybo...@ubuntu.com> Fri, 24 Nov 2023 13:47:59 -0600
+
openmsx (19.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru openmsx-19.1/debian/compat openmsx-19.1+dfsg/debian/compat
--- openmsx-19.1/debian/compat 2017-08-06 07:57:22.000000000 -0500
+++ openmsx-19.1+dfsg/debian/compat 1969-12-31 18:00:00.000000000 -0600
@@ -1 +0,0 @@
-10
diff -Nru openmsx-19.1/debian/control openmsx-19.1+dfsg/debian/control
--- openmsx-19.1/debian/control 2023-08-03 02:11:39.000000000 -0500
+++ openmsx-19.1+dfsg/debian/control 2023-11-24 13:47:59.000000000 -0600
@@ -2,9 +2,10 @@
Section: otherosfs
Priority: optional
Maintainer: Bas Wijnen <wij...@debian.org>
-Build-Depends: debhelper (>= 10), dpkg-dev, docbook-to-man,
libsdl2-dev, libpng-dev, tcl-dev, libgl-dev, libglew-dev,
libsdl2-ttf-dev, python3, libvorbis-dev, libtheora-dev, libogg-dev,
libao-dev, libfreetype-dev, catch2
+Build-Depends: debhelper-compat (= 13), docbook-to-man, libsdl2-dev,
libpng-dev, tcl-dev, libgl-dev, libglew-dev, libsdl2-ttf-dev, python3,
libvorbis-dev, libtheora-dev, libogg-dev, libao-dev, libfreetype-dev
Standards-Version: 4.6.2
Homepage: https://openmsx.org
+Rules-Requires-Root: no
Package: openmsx
Architecture: any
diff -Nru openmsx-19.1/debian/copyright openmsx-19.1+dfsg/debian/copyright
--- openmsx-19.1/debian/copyright 2021-06-17 06:21:11.000000000 -0500
+++ openmsx-19.1+dfsg/debian/copyright 2023-11-24 13:47:59.000000000
-0600
@@ -2,29 +2,31 @@
Upstream-Name: openMSX
Upstream-Contact: https://web.libera.chat/#openMSX
Source: https://github.com/openMSX/openMSX/
+Files-Excluded: Contrib/codec/Win32/zmbv.dll
Files: *
Copyright: copyright © 2001-2021 by the openMSX developers.
-License: GPL
+License: GPL-2
This program is free software: you can redistribute it and/or modify
it under the terms of any version of the GNU General Public License as
published by the Free Software Foundation.
.
- The latest version of the GPL can be found in
- /usr/share/common-licenses/GPL.
+ Version 2 of the GPL can be found in
+ /usr/share/common-licenses/GPL-2.
Files: debian/*
Copyright:
© 2004-2009, Joost Yervante Damad <and...@debian.org>
Copyright 2012-2021, Bas Wijnen <wij...@debian.org>
+ Copyright 2023, Aaron Rainbolt <arraybo...@ubuntu.com>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
- The latest version of the GPL can be found in
- /usr/share/common-licenses/GPL.
+ On Debian systems, the GPL version 3 can be found in
+ /usr/share/common-licenses/GPL-3.
Files: src/serial/Midi_w32.*
diff -Nru openmsx-19.1/debian/openmsx-data.lintian-overrides
openmsx-19.1+dfsg/debian/openmsx-data.lintian-overrides
--- openmsx-19.1/debian/openmsx-data.lintian-overrides 1969-12-31
18:00:00.000000000 -0600
+++ openmsx-19.1+dfsg/debian/openmsx-data.lintian-overrides 2023-11-24
13:47:59.000000000 -0600
@@ -0,0 +1,22 @@
+# All of these are either false positives or they describe what should
go in the directories they are in.
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/extensions/README]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/machines/Boosted_MSX2+_JP.txt]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/machines/Boosted_MSX2_EN.txt]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/machines/Boosted_MSXturboR_with_IDE.txt]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/machines/README]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/nettou_yakyuu/README]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/playball/README]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/software/README]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/systemroms/README]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVID.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDAE.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDAR.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDBG.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDBH.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDBR.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDJP.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDKR.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDPL.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/MSXVIDRU.TXT]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/ReadMe.txt]
+openmsx-data: package-contains-documentation-outside-usr-share-doc
[usr/share/openmsx/unicodemaps/character_set_mappings/SVI328.TXT]
diff -Nru openmsx-19.1/debian/patches/series
openmsx-19.1+dfsg/debian/patches/series
--- openmsx-19.1/debian/patches/series 2023-08-02 03:59:47.000000000
-0500
+++ openmsx-19.1+dfsg/debian/patches/series 2023-11-24
13:47:59.000000000 -0600
@@ -3,4 +3,3 @@
no-mips-optimization.patch
use-packaged-font.diff
dmk-build-rules.diff
-use-packaged-catch2.diff
diff -Nru openmsx-19.1/debian/patches/use-packaged-catch2.diff
openmsx-19.1+dfsg/debian/patches/use-packaged-catch2.diff
--- openmsx-19.1/debian/patches/use-packaged-catch2.diff 2023-08-02
03:26:34.000000000 -0500
+++ openmsx-19.1+dfsg/debian/patches/use-packaged-catch2.diff 1969-12-31
18:00:00.000000000 -0600
@@ -1,21 +0,0 @@
-Description: Use catch2 package instead of bundled version
- This patch ignores the bundled version of catch2 and instead uses the
Debian
- package that contains it.
-Author: Bas Wijnen <wij...@debian.org>
-Bug-Debian: https://bugs.debian.org/993512
-Forwarded: not-needed
-Last-Update: 2022-04-22
-
-Index: openmsx-19.0/build/flavour-unittest.mk
-===================================================================
---- openmsx-19.0.orig/build/flavour-unittest.mk
-+++ openmsx-19.0/build/flavour-unittest.mk
-@@ -2,7 +2,7 @@
- # Build executable that runs unit tests.
-
- # Debug flags.
--CXXFLAGS+=-O3 -g -DUNITTEST -IContrib/catch2 -fsanitize=address
-+CXXFLAGS+=-O3 -g -DUNITTEST -I/usr/include/catch2 -fsanitize=address
-
- # Strip executable?
- OPENMSX_STRIP:=false
diff -Nru openmsx-19.1/debian/rules openmsx-19.1+dfsg/debian/rules
--- openmsx-19.1/debian/rules 2023-08-03 07:36:16.000000000 -0500
+++ openmsx-19.1+dfsg/debian/rules 2023-11-24 13:47:59.000000000 -0600
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
%:
dh $@
diff -Nru openmsx-19.1/debian/source/include-binaries
openmsx-19.1+dfsg/debian/source/include-binaries
--- openmsx-19.1/debian/source/include-binaries 2023-07-20
02:13:00.000000000 -0500
+++ openmsx-19.1+dfsg/debian/source/include-binaries 1969-12-31
18:00:00.000000000 -0600
@@ -1,115 +0,0 @@
-build/__pycache__/compilers.cpython-311.pyc
-build/__pycache__/components.cpython-311.pyc
-build/__pycache__/configurations.cpython-311.pyc
-build/__pycache__/cpu.cpython-311.pyc
-build/__pycache__/executils.cpython-311.pyc
-build/__pycache__/libraries.cpython-311.pyc
-build/__pycache__/makeutils.cpython-311.pyc
-build/__pycache__/msysutils.cpython-311.pyc
-build/__pycache__/outpututils.cpython-311.pyc
-build/__pycache__/packages.cpython-311.pyc
-build/__pycache__/systemfuncs.cpython-311.pyc
-build/__pycache__/systemfuncs2code.cpython-311.pyc
-build/__pycache__/version.cpython-311.pyc
-derived/x86_64-linux-debian/obj/Autofire.cc.o
-derived/x86_64-linux-debian/obj/CLIOption.cc.o
-derived/x86_64-linux-debian/obj/CartridgeSlotManager.cc.o
-derived/x86_64-linux-debian/obj/ChakkariCopy.cc.o
-derived/x86_64-linux-debian/obj/CliExtension.cc.o
-derived/x86_64-linux-debian/obj/CommandLineParser.cc.o
-derived/x86_64-linux-debian/obj/Connector.cc.o
-derived/x86_64-linux-debian/obj/DebugDevice.cc.o
-derived/x86_64-linux-debian/obj/DeviceFactory.cc.o
-derived/x86_64-linux-debian/obj/DummyDevice.cc.o
-derived/x86_64-linux-debian/obj/DummyPrinterPortDevice.cc.o
-derived/x86_64-linux-debian/obj/DynamicClock.cc.o
-derived/x86_64-linux-debian/obj/EmptyPatch.cc.o
-derived/x86_64-linux-debian/obj/EmuTime.cc.o
-derived/x86_64-linux-debian/obj/FirmwareSwitch.cc.o
-derived/x86_64-linux-debian/obj/GlobalSettings.cc.o
-derived/x86_64-linux-debian/obj/I8255.cc.o
-derived/x86_64-linux-debian/obj/IPSPatch.cc.o
-derived/x86_64-linux-debian/obj/LedStatus.cc.o
-derived/x86_64-linux-debian/obj/MSXBunsetsu.cc.o
-derived/x86_64-linux-debian/obj/MSXCielTurbo.cc.o
-derived/x86_64-linux-debian/obj/MSXDevice.cc.o
-derived/x86_64-linux-debian/obj/MSXDeviceSwitch.cc.o
-derived/x86_64-linux-debian/obj/MSXE6Timer.cc.o
-derived/x86_64-linux-debian/obj/MSXHiResTimer.cc.o
-derived/x86_64-linux-debian/obj/MSXKanji.cc.o
-derived/x86_64-linux-debian/obj/MSXKanji12.cc.o
-derived/x86_64-linux-debian/obj/MSXMatsushita.cc.o
-derived/x86_64-linux-debian/obj/MSXMotherBoard.cc.o
-derived/x86_64-linux-debian/obj/MSXPPI.cc.o
-derived/x86_64-linux-debian/obj/MSXPrinterPort.cc.o
-derived/x86_64-linux-debian/obj/MSXRTC.cc.o
-derived/x86_64-linux-debian/obj/MSXResetStatusRegister.cc.o
-derived/x86_64-linux-debian/obj/MSXS1985.cc.o
-derived/x86_64-linux-debian/obj/MSXS1990.cc.o
-derived/x86_64-linux-debian/obj/MSXSwitchedDevice.cc.o
-derived/x86_64-linux-debian/obj/MSXToshibaTcx200x.cc.o
-derived/x86_64-linux-debian/obj/MSXTurboRPause.cc.o
-derived/x86_64-linux-debian/obj/MSXVictorHC9xSystemControl.cc.o
-derived/x86_64-linux-debian/obj/PasswordCart.cc.o
-derived/x86_64-linux-debian/obj/Pluggable.cc.o
-derived/x86_64-linux-debian/obj/PluggableFactory.cc.o
-derived/x86_64-linux-debian/obj/PluggingController.cc.o
-derived/x86_64-linux-debian/obj/Printer.cc.o
-derived/x86_64-linux-debian/obj/PrinterPortDevice.cc.o
-derived/x86_64-linux-debian/obj/PrinterPortLogger.cc.o
-derived/x86_64-linux-debian/obj/PrinterPortSimpl.cc.o
-derived/x86_64-linux-debian/obj/RP5C01.cc.o
-derived/x86_64-linux-debian/obj/RTSchedulable.cc.o
-derived/x86_64-linux-debian/obj/RTScheduler.cc.o
-derived/x86_64-linux-debian/obj/Reactor.cc.o
-derived/x86_64-linux-debian/obj/RealTime.cc.o
-derived/x86_64-linux-debian/obj/RenShaTurbo.cc.o
-derived/x86_64-linux-debian/obj/ReplayCLI.cc.o
-derived/x86_64-linux-debian/obj/ReverseManager.cc.o
-derived/x86_64-linux-debian/obj/SC3000PPI.cc.o
-derived/x86_64-linux-debian/obj/SG1000Pause.cc.o
-derived/x86_64-linux-debian/obj/SVIPPI.cc.o
-derived/x86_64-linux-debian/obj/SVIPrinterPort.cc.o
-derived/x86_64-linux-debian/obj/SaveStateCLI.cc.o
-derived/x86_64-linux-debian/obj/Schedulable.cc.o
-derived/x86_64-linux-debian/obj/Scheduler.cc.o
-derived/x86_64-linux-debian/obj/SensorKid.cc.o
-derived/x86_64-linux-debian/obj/SpeedManager.cc.o
-derived/x86_64-linux-debian/obj/ThrottleManager.cc.o
-derived/x86_64-linux-debian/obj/Version.cc.o
-derived/x86_64-linux-debian/obj/YamahaSKW01.cc.o
-derived/x86_64-linux-debian/obj/cassette/CasImage.cc.o
-derived/x86_64-linux-debian/obj/cassette/CassetteDevice.cc.o
-derived/x86_64-linux-debian/obj/cassette/CassetteImage.cc.o
-derived/x86_64-linux-debian/obj/cassette/CassettePlayer.cc.o
-derived/x86_64-linux-debian/obj/cassette/CassettePlayerCLI.cc.o
-derived/x86_64-linux-debian/obj/cassette/CassettePort.cc.o
-derived/x86_64-linux-debian/obj/cassette/DummyCassetteDevice.cc.o
-derived/x86_64-linux-debian/obj/cassette/WavImage.cc.o
-derived/x86_64-linux-debian/obj/commands/Command.cc.o
-derived/x86_64-linux-debian/obj/commands/CommandException.cc.o
-derived/x86_64-linux-debian/obj/commands/Completer.cc.o
-derived/x86_64-linux-debian/obj/commands/GlobalCommandController.cc.o
-derived/x86_64-linux-debian/obj/commands/InfoCommand.cc.o
-derived/x86_64-linux-debian/obj/commands/InfoTopic.cc.o
-derived/x86_64-linux-debian/obj/commands/Interpreter.cc.o
-derived/x86_64-linux-debian/obj/commands/MSXCommandController.cc.o
-derived/x86_64-linux-debian/obj/commands/ProxyCommand.cc.o
-derived/x86_64-linux-debian/obj/commands/TclArgParser.cc.o
-derived/x86_64-linux-debian/obj/commands/TclCallback.cc.o
-derived/x86_64-linux-debian/obj/commands/TclObject.cc.o
-derived/x86_64-linux-debian/obj/commands/TclParser.cc.o
-derived/x86_64-linux-debian/obj/config/DeviceConfig.cc.o
-derived/x86_64-linux-debian/obj/config/HardwareConfig.cc.o
-derived/x86_64-linux-debian/obj/config/SettingsConfig.cc.o
-derived/x86_64-linux-debian/obj/config/XMLElement.cc.o
-derived/x86_64-linux-debian/obj/console/CommandConsole.cc.o
-derived/x86_64-linux-debian/obj/console/OSDConsoleRenderer.cc.o
-derived/x86_64-linux-debian/obj/console/OSDGUI.cc.o
-derived/x86_64-linux-debian/obj/console/OSDGUILayer.cc.o
-derived/x86_64-linux-debian/obj/console/OSDImageBasedWidget.cc.o
-derived/x86_64-linux-debian/obj/console/OSDRectangle.cc.o
-derived/x86_64-linux-debian/obj/main.cc.o
-derived/x86_64-linux-debian/obj/serialize.cc.o
-derived/x86_64-linux-debian/obj/serialize_core.cc.o
-derived/x86_64-linux-debian/obj/serialize_meta.cc.o
diff -Nru openmsx-19.1/debian/source/lintian-overrides
openmsx-19.1+dfsg/debian/source/lintian-overrides
--- openmsx-19.1/debian/source/lintian-overrides 1969-12-31
18:00:00.000000000 -0600
+++ openmsx-19.1+dfsg/debian/source/lintian-overrides 2023-11-24
13:47:03.000000000 -0600
@@ -0,0 +1,7 @@
+# these appear to be handwritten HTML files, meaning that they most
likely *are* source code
+openmsx source: source-is-missing [doc/manual/commands.html]
+openmsx source: source-is-missing [doc/manual/compile.html]
+openmsx source: source-is-missing [doc/manual/diskmanipulator.html]
+openmsx source: source-is-missing [doc/manual/faq.html]
+openmsx source: source-is-missing [doc/manual/user.html]
+openmsx source: source-is-missing [doc/msxinfo-article.html]
diff -Nru openmsx-19.1/debian/tests/unit openmsx-19.1+dfsg/debian/tests/unit
--- openmsx-19.1/debian/tests/unit 2023-08-03 07:24:34.000000000 -0500
+++ openmsx-19.1+dfsg/debian/tests/unit 2023-11-24 13:47:59.000000000
-0600
@@ -1,5 +1,4 @@
#!/bin/sh -e
-ln -s /usr/include/catch2/catch.hpp src/unittest/ 2>&1 || :
make V=2 OPENMSX_FLAVOUR=unittest 2>&1
derived/openmsx
diff -Nru openmsx-19.1/debian/upstream/metadata
openmsx-19.1+dfsg/debian/upstream/metadata
--- openmsx-19.1/debian/upstream/metadata 1969-12-31
18:00:00.000000000 -0600
+++ openmsx-19.1+dfsg/debian/upstream/metadata 2023-11-24
13:47:59.000000000 -0600
@@ -0,0 +1,6 @@
+Name: openMSX
+Bug-Database: https://github.com/openMSX/openMSX/issues
+Bug-Submit: https://github.com/openMSX/openMSX/issues/new
+Changelog:
https://github.com/openMSX/openMSX/blob/master/doc/release-history.txt
+Repository: https://github.com/openMSX/openMSX.git
+Repository-Browse: https://github.com/openMSX/openMSX
diff -Nru openmsx-19.1/debian/watch openmsx-19.1+dfsg/debian/watch
--- openmsx-19.1/debian/watch 2023-09-01 01:29:30.000000000 -0500
+++ openmsx-19.1+dfsg/debian/watch 2023-11-24 13:47:59.000000000 -0600
@@ -1,5 +1,7 @@
version=4
-opts="searchmode=plain,\
+opts="dversionmangle=auto,\
+repacksuffix=+dfsg,\
+searchmode=plain,\
filenamemangle=s%RELEASE_(\d+)_(\d+)%@PACKAGE@_$1.$2.orig.tar.gz%,\
uversionmangle=s%(\d+)_(\d+)%$1.$2%" \
https://api.github.com/repos/openMSX/openMSX/releases?per_page=50 \
----------
--
Aaron Rainbolt
Lubuntu Developer
Matrix: @arraybolt3:matrix.org
IRC: arraybolt3 on irc.libera.chat
GitHub: https://github.com/ArrayBolt3
