Dear Maintainer,

Please consider the attached patch that should close this bug. I hope
this is the correct way of dealing with multiarch paths by the way

Cheers,

-- 
Mat <[email protected]>
From 58275bf8bee648e29ccbf636d62066ed42945a78 Mon Sep 17 00:00:00 2001
From: Mathieu Mirmont <[email protected]>
Date: Sun, 9 Oct 2016 16:48:05 +0200
Subject: [PATCH] Fix daemon path in notify-osd.desktop (#805527)

Closes: #805527

Since multiarch the daemon installs in /usr/lib/$(DEB_HOST_MULTIARCH)
rather than /usr/lib/notify-osd. The desktop file was pointing at the
old path.
---
 debian/notify-osd.desktop | 2 +-
 debian/rules              | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/notify-osd.desktop b/debian/notify-osd.desktop
index 9b61fb9..0bdf357 100644
--- a/debian/notify-osd.desktop
+++ b/debian/notify-osd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Notify OSD
 Comment=Display notifications
-Exec=/usr/lib/notify-osd/notify-osd
+Exec=/usr/lib/%DEB_HOST_MULTIARCH%/notify-osd
 Terminal=false
 Type=Application
 NotShowIn=KDE;
diff --git a/debian/rules b/debian/rules
index ee61920..c1bdc12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ override_dh_autoreconf:
 override_dh_auto_test:
 
 override_dh_install:
+	sed -i s/%DEB_HOST_MULTIARCH%/$(DEB_HOST_MULTIARCH)/g debian/notify-osd.desktop
 	dh_install --fail-missing
 	rm debian/notify-osd/usr/share/dbus-1/services/org.freedesktop.Notifications.service
 	rmdir debian/notify-osd/usr/share/dbus-1/services/
@@ -30,4 +31,4 @@ ifeq (,$(filter nochanges,$(DEB_BUILD_OPTIONS)))
 		nosmart+lp:notify-osd > debian/changelog.upstream
 endif
 
-.PHONY: pre-build
\ No newline at end of file
+.PHONY: pre-build
-- 
2.9.3

Reply via email to