Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
This is a pre-upload unblock request for the wine package.
[ Reason ]
The wine package currently has an RC bug (#1079184) because it always
regenerates debian/control during builds. I'm attaching the proposed
fix.
[ Impact ]
wine will be removed from Debian 13 if this isn't fixed (properly).
[ Tests ]
I've tested rebuilds in various scenarios, forcing debian/control
rebuilds and checking that regular package rebuilds don't result in a
debian/control rebuild.
[ Risks ]
When switching between wine and wine-development, there might be
scenarios I haven't envisioned resulting in a broken debian/control.
However wine-development has been removed from Debian entirely, and a
broken debian/control would result in an immediate failed build.
[ 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 wine/10.0~repack-4
Regards,
Stephen
diff -Nru wine-10.0~repack/debian/changelog wine-10.0~repack/debian/changelog
--- wine-10.0~repack/debian/changelog 2025-04-07 04:06:03.000000000 +0200
+++ wine-10.0~repack/debian/changelog 2025-05-28 08:46:37.000000000 +0200
@@ -1,3 +1,10 @@
+wine (10.0~repack-4) unstable; urgency=medium
+
+ * Only rebuild debian/control if debian/changelog or debian/control.in
+ are newer. Closes: #1079184.
+
+ -- Stephen Kitt <sk...@debian.org> Wed, 28 May 2025 08:46:37 +0200
+
wine (10.0~repack-3) unstable; urgency=medium
* Fix dh_strip errors on armhf.
diff -Nru wine-10.0~repack/debian/clean wine-10.0~repack/debian/clean
--- wine-10.0~repack/debian/clean 2025-04-05 08:01:18.000000000 +0200
+++ wine-10.0~repack/debian/clean 2025-05-28 08:42:55.000000000 +0200
@@ -1,6 +1,3 @@
-# control file is automatically generated
-debian/control
-
# build-related temporary files
wine
config.*
diff -Nru wine-10.0~repack/debian/rules wine-10.0~repack/debian/rules
--- wine-10.0~repack/debian/rules 2025-04-07 04:06:03.000000000 +0200
+++ wine-10.0~repack/debian/rules 2025-05-28 08:44:53.000000000 +0200
@@ -79,7 +79,7 @@
INSTALLS=$(shell ls debian/*VERSION* | sed s/VERSION/$(VERSION)/) \
debian/bug-control \
-debian/control: debian/control.in
+debian/control: debian/control.in debian/changelog
sed "s/VERSION/$(VERSION)/g;s/DEBSUFFIX/$(DEBSUFFIX)/g" < $< > $@
debian/wine$(VERSION)%: debian/wineVERSION%
@@ -246,12 +246,10 @@
override_dh_missing:
dh_missing -X elf.depends -X elf.recommends -X wine.desktop
-override_dh_clean:
+override_dh_clean: debian/control
dh_clean -- $(INSTALLS)
- make -f debian/rules debian/control
-override_dh_auto_clean:
- make -f debian/rules debian/control
+override_dh_auto_clean: debian/control
ifeq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
# remove zlib patch on non x86 architectures
QUILT_PATCHES=debian/patches quilt pop -af || true
