[Dnsmasq-discuss] [PATCH] d/rules: Install D-Bus policy in /usr instead of /etc

[Geert Stappers]

On Sat, Oct 14, 2023 at 01:33:48PM +0200, Gioele Barabucci wrote:
> dnsmasq installs its D-Bus policy file in `/etc/dbus-1`.
> Since Debian 9 the standard directory for package-installed
> D-Bus policies is `/usr/share/dbus-1`.
> 
> See: https://bugs.debian.org/1006631

Closed 2023-01-17

 
> Fixes: lintian: dbus-policy-in-etc
> 
> Closes: #1040923

See: https://bugs.debian.org/1040923   (Opened 2023-07-12)
> ---
>  debian/dnsmasq-base.conffiles | 2 +-
>  debian/rules                  | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/debian/dnsmasq-base.conffiles b/debian/dnsmasq-base.conffiles
> index 2f19194..04ca726 100644
> --- a/debian/dnsmasq-base.conffiles
> +++ b/debian/dnsmasq-base.conffiles
> @@ -1 +1 @@
> -/etc/dbus-1/system.d/dnsmasq.conf
> +remove-on-upgrade /etc/dbus-1/system.d/dnsmasq.conf
> diff --git a/debian/rules b/debian/rules
> index 2354ea9..8d47449 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -112,7 +112,7 @@ define build_tree
>  	rm -rf $1
>  	install -m 755 \
>  		-d $1/DEBIAN \
> -		-d $1/etc/dbus-1/system.d \
> +		-d $1/usr/share/dbus-1/system.d \
>  	        -d $1/usr/share/doc/$(package) \
>  		-d $1/usr/share/doc/$(package)/examples \
>  		-d $1/usr/share/$(package) \
> @@ -153,7 +153,7 @@ define add_files
>  	gzip -9n $1/usr/share/doc/$(package)/changelog.Debian
>  	install -m 644 debian/readme $1/usr/share/doc/$(package)/README.Debian
>  	install -m 644 debian/copyright $1/usr/share/doc/$(package)/copyright
> -	install -m 644 debian/dbus.conf $1/etc/dbus-1/system.d/dnsmasq.conf
> +	install -m 644 debian/dbus.conf $1/usr/share/dbus-1/system.d/dnsmasq.conf
>  endef
>  
>  clean:


I have an idea to save that patch.  It is probably thursday
when I have time to "materialize" the idea.




Groeten
Geert Stappers
-- 
Silence is hard to parse