--- Begin Message ---
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: openttd-openmsx@packages.debian.org
Control: affects -1 + src:openttd-openmsx
User: release.debian.org@packages.debian.org
Usertags: unblock
Control: clone -1 -2
Control: retitle -2 unblock: openttd-opengfx/7.1-3
Control: affects -2 + src:openttd-opengfx
Please unblock packages openttd-openmsx and openttd-opengfx.
[ Reason ]
These packages FTBFS because the common-licenses/GPL-2 file in
base-files has changed.
These two packages ship a copy of the GPL (that needs to present in the
filesystem to be displayed in the openttd game UI). The debian/rules
file would replace that copy with a symlink to common-licenses/GPL-2. As
a sanity check, the build would fail if the linked copy was different
from the shipped copy, which has been the case since a base-files update
two weeks ago (which updated the license file with some editorial from
gnu.org).
To fix this, instead of failing when the licenses differ, the symlinking
is just skipped and the original file is shipped (causing some lintian
informational messages to reappear, which can be fixed again later).
[ Impact ]
If left unfixed, package will be unbuildable and removed from trixie.
[ Tests ]
No automated tests, built packages were manually tested by starting
the openttd game (from the openttd package) and verifying the graphics
and music from these packages is loaded and used correctly.
[ Risks ]
Nothing obvious, this is a trivial build system change.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock openttd-openmsx/0.4.2-1
unblock openttd-opengfx/7.1-3
Thanks,
Matthijs
diff -Nru openttd-opengfx-7.1/debian/changelog openttd-opengfx-7.1/debian/changelog
--- openttd-opengfx-7.1/debian/changelog 2025-03-31 13:09:16.000000000 +0200
+++ openttd-opengfx-7.1/debian/changelog 2025-05-25 20:47:16.000000000 +0200
@@ -1,3 +1,10 @@
+openttd-opengfx (7.1-3) unstable; urgency=medium
+
+ * [ebd9053] Do not fail if common-licenses/GPL-2 differs (Closes:
+ #1106433)
+
+ -- Matthijs Kooijman <matthijs@stdin.nl> Sun, 25 May 2025 20:47:16 +0200
+
openttd-opengfx (7.1-2) unstable; urgency=medium
* [8ab065c] Fix building source package after binary build. (Closes:
diff -Nru openttd-opengfx-7.1/debian/rules openttd-opengfx-7.1/debian/rules
--- openttd-opengfx-7.1/debian/rules 2025-03-31 13:09:16.000000000 +0200
+++ openttd-opengfx-7.1/debian/rules 2025-05-25 20:47:16.000000000 +0200
@@ -50,8 +50,11 @@
make install $(OPTIONS)
# Verify that the license.txt that was installed is equal to the
# GPL-2 common license and then just link to that one instead
- diff -q /usr/share/common-licenses/GPL-2 $(INSTALL_ROOT)/$(DATA_DIR)/license.txt
- dh_link usr/share/common-licenses/GPL-2 $(DATA_DIR)/license.txt
+ if diff -q /usr/share/common-licenses/GPL-2 $(INSTALL_ROOT)/$(DATA_DIR)/license.txt; then \
+ dh_link usr/share/common-licenses/GPL-2 $(DATA_DIR)/license.txt; \
+ else \
+ echo "/usr/share/common-licenses/GPL-2 differs from shipped license, not linking."; \
+ fi
override_dh_installdocs:
dh_installdocs README.md
diff -Nru openttd-openmsx-0.4.2/debian/changelog openttd-openmsx-0.4.2/debian/changelog
--- openttd-openmsx-0.4.2/debian/changelog 2021-11-23 16:48:25.000000000 +0100
+++ openttd-openmsx-0.4.2/debian/changelog 2025-05-25 20:31:29.000000000 +0200
@@ -1,3 +1,10 @@
+openttd-openmsx (0.4.2-2) unstable; urgency=medium
+
+ * [8da3dcb] Do not fail if common-licenses/GPL-2 differs (Closes:
+ #1106434)
+
+ -- Matthijs Kooijman <matthijs@stdin.nl> Sun, 25 May 2025 20:31:29 +0200
+
openttd-openmsx (0.4.2-1) unstable; urgency=medium
* [057b24f] Update watch file
diff -Nru openttd-openmsx-0.4.2/debian/rules openttd-openmsx-0.4.2/debian/rules
--- openttd-openmsx-0.4.2/debian/rules 2021-11-23 16:48:25.000000000 +0100
+++ openttd-openmsx-0.4.2/debian/rules 2025-05-25 20:31:29.000000000 +0200
@@ -43,8 +43,11 @@
dh_link $(DOC_DIR)/changelog $(DATA_DIR)/changelog.txt
# Verify that the license.txt that was installed is equal to the
# GPL-2 common license and then just link to that one instead
- diff -q /usr/share/common-licenses/GPL-2 $(INSTALL_ROOT)/$(DATA_DIR)/license.txt
- dh_link usr/share/common-licenses/GPL-2 $(DATA_DIR)/license.txt
+ if diff -q /usr/share/common-licenses/GPL-2 $(INSTALL_ROOT)/$(DATA_DIR)/license.txt; then \
+ dh_link usr/share/common-licenses/GPL-2 $(DATA_DIR)/license.txt; \
+ else \
+ echo "/usr/share/common-licenses/GPL-2 differs from shipped license, not linking."; \
+ fi
override_dh_installdocs:
dh_installdocs docs/readme.txt
--- End Message ---