Package: release.debian.org Control: affects -1 + src:reportbug X-Debbugs-Cc: reportbug@packages.debian.org User: release.debian.org@packages.debian.org Usertags: pu Tags: bookworm X-Debbugs-Cc: byang@debian.org Severity: normal Dear Debian Stable Release Managers, I am looking for a stable-pu upload to fix Debian bug https://bugs.debian.org/1027272 . [ Reason ] For Debian 12, the installation path of notify-osd executable is /usr/lib/DEB_HOST_MULTIARCH/ . However, the Debian-specific debian/notify-osd.desktop is using /usr/lib/notify-osd/. Such mismatch should be fixed, otherwise the .desktop file will be broken. This problem has been fixed in Debian Testing/Unstable as part of the new upstream release. For this stable-pu, I am writing custom patch to dynamically generate debian/notify-osd.desktop from debian/notify-osd.desktop.in in debian/rules dh_auto_configure phase. [ Impact ] Debian Stable (Debian 12) users cannot have notify-osd set to autostart. [ Tests ] Manually tested. [ Risks ] Minimal risk. The worst case is that the autostart functionality is still broken, which will not make things worse. [ 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 (old)stable [X] the issue is verified as fixed in unstable [ Changes ] See the attached full debdiff. [ Other info ] Please let me know if you have any comments. Thanks, Boyuan Yang
diff -Nru notify-osd-0.9.35+15.04.20150126/debian/changelog notify-osd-0.9.35+15.04.20150126/debian/changelog
--- notify-osd-0.9.35+15.04.20150126/debian/changelog 2023-02-17 04:46:59.000000000 -0500
+++ notify-osd-0.9.35+15.04.20150126/debian/changelog 2024-09-22 19:04:29.000000000 -0400
@@ -1,3 +1,12 @@
+notify-osd (0.9.35+15.04.20150126-3+deb12u1) bookworm; urgency=medium
+
+ * debian/rules, debian/notify-osd.desktop{,in}: Dynamically generate
+ the Exec path in notify-osd.desktop with DEB_HOST_MULTIARCH to fix
+ the incorrect executable path in /etc/xdg/autostart/notify-osd.desktop.
+ (Closes: #1027272)
+
+ -- Boyuan Yang <byang@debian.org> Sun, 22 Sep 2024 19:04:29 -0400
+
notify-osd (0.9.35+15.04.20150126-3) unstable; urgency=medium
* QA upload.
diff -Nru notify-osd-0.9.35+15.04.20150126/debian/clean notify-osd-0.9.35+15.04.20150126/debian/clean
--- notify-osd-0.9.35+15.04.20150126/debian/clean 1969-12-31 19:00:00.000000000 -0500
+++ notify-osd-0.9.35+15.04.20150126/debian/clean 2024-09-22 19:04:29.000000000 -0400
@@ -0,0 +1 @@
+debian/notify-osd.desktop
diff -Nru notify-osd-0.9.35+15.04.20150126/debian/notify-osd.desktop notify-osd-0.9.35+15.04.20150126/debian/notify-osd.desktop
--- notify-osd-0.9.35+15.04.20150126/debian/notify-osd.desktop 2015-05-25 23:10:43.000000000 -0400
+++ notify-osd-0.9.35+15.04.20150126/debian/notify-osd.desktop 1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Notify OSD
-Comment=Display notifications
-Exec=/usr/lib/notify-osd/notify-osd
-Terminal=false
-Type=Application
-NotShowIn=KDE;
-X-GNOME-Autostart-enabled=false
diff -Nru notify-osd-0.9.35+15.04.20150126/debian/notify-osd.desktop.in notify-osd-0.9.35+15.04.20150126/debian/notify-osd.desktop.in
--- notify-osd-0.9.35+15.04.20150126/debian/notify-osd.desktop.in 1969-12-31 19:00:00.000000000 -0500
+++ notify-osd-0.9.35+15.04.20150126/debian/notify-osd.desktop.in 2024-09-22 19:04:29.000000000 -0400
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Notify OSD
+Comment=Display notifications
+Exec=/usr/lib/@DEB_HOST_MULTIARCH@/notify-osd
+Terminal=false
+Type=Application
+NotShowIn=KDE;
+X-GNOME-Autostart-enabled=false
diff -Nru notify-osd-0.9.35+15.04.20150126/debian/rules notify-osd-0.9.35+15.04.20150126/debian/rules
--- notify-osd-0.9.35+15.04.20150126/debian/rules 2015-05-25 23:10:43.000000000 -0400
+++ notify-osd-0.9.35+15.04.20150126/debian/rules 2024-09-22 19:04:29.000000000 -0400
@@ -2,12 +2,21 @@
export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+# For DEB_HOST_MULTIARCH
+include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/architecture.mk
+
%:
dh $@ --with autoreconf
override_dh_autoreconf:
NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+override_dh_auto_configure:
+ # https://bugs.debian.org/1027272
+ sed 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' debian/notify-osd.desktop.in > debian/notify-osd.desktop
+ dh_auto_configure
+
# tests require being run against a system install
override_dh_auto_test:
@@ -30,4 +39,4 @@
nosmart+lp:notify-osd > debian/changelog.upstream
endif
-.PHONY: pre-build
\ ??欢??熬娌℃??㈣?绗?+.PHONY: pre-build
Attachment:
signature.asc
Description: This is a digitally signed message part