From d07de5b2ba3507be066d8f36007c87156cb7cd54 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Fri, 2 Aug 2019 08:41:28 +0200 Subject: [PATCH] debian/rules: Install augeas lenses in /usr/share/augeas/lenses/ instead of /usr/share/augeas/lenses/dist/, the later seems to be reserved for augeas own lenses, not 3rd party ones --- debian/changelog | 5 ++++- debian/nut-client.install | 18 +++++++++--------- debian/rules | 6 +++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3265515..7fc6909 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,8 +48,11 @@ nut (2.7.4-9) UNRELEASED; urgency=medium * debian/rules, debian/control: Override --with-systemdshutdowndir passed to configure to fix FTBFS on non-linux architectures and do not build-depend against systemd + * debian/rules: Install augeas lenses in /usr/share/augeas/lenses/ instead + of /usr/share/augeas/lenses/dist/, the later seems to be reserved for + augeas own lenses, not 3rd party ones - -- Laurent Bigonville Thu, 01 Aug 2019 14:59:17 +0200 + -- Laurent Bigonville Fri, 02 Aug 2019 08:40:44 +0200 nut (2.7.4-8) unstable; urgency=medium diff --git a/debian/nut-client.install b/debian/nut-client.install index fb77b23..318c1e8 100644 --- a/debian/nut-client.install +++ b/debian/nut-client.install @@ -9,15 +9,15 @@ debian/tmp/etc/nut/upssched.conf debian/tmp/lib/nut/upsmon debian/tmp/sbin/upsmon debian/tmp/sbin/upssched -debian/tmp/usr/share/augeas/lenses/dist/nuthostsconf.aug -debian/tmp/usr/share/augeas/lenses/dist/nutnutconf.aug -debian/tmp/usr/share/augeas/lenses/dist/nutupsconf.aug -debian/tmp/usr/share/augeas/lenses/dist/nutupsdconf.aug -debian/tmp/usr/share/augeas/lenses/dist/nutupsdusers.aug -debian/tmp/usr/share/augeas/lenses/dist/nutupsmonconf.aug -debian/tmp/usr/share/augeas/lenses/dist/nutupsschedconf.aug -debian/tmp/usr/share/augeas/lenses/dist/nutupssetconf.aug -debian/tmp/usr/share/augeas/lenses/dist/tests/test_nut.aug +debian/tmp/usr/share/augeas/lenses/nuthostsconf.aug +debian/tmp/usr/share/augeas/lenses/nutnutconf.aug +debian/tmp/usr/share/augeas/lenses/nutupsconf.aug +debian/tmp/usr/share/augeas/lenses/nutupsdconf.aug +debian/tmp/usr/share/augeas/lenses/nutupsdusers.aug +debian/tmp/usr/share/augeas/lenses/nutupsmonconf.aug +debian/tmp/usr/share/augeas/lenses/nutupsschedconf.aug +debian/tmp/usr/share/augeas/lenses/nutupssetconf.aug +debian/tmp/usr/share/augeas/lenses/tests/test_nut.aug debian/tmp/usr/share/bash-completion/completions/nut debian/tmp/lib/systemd/system/nut-monitor.service debian/tmp/lib/systemd/system/nut-client.service diff --git a/debian/rules b/debian/rules index 9969f74..07ba4e3 100755 --- a/debian/rules +++ b/debian/rules @@ -55,11 +55,11 @@ override_dh_auto_install-arch: $(CURDIR)/debian/tmp/etc/avahi/services # install Augeas lenses - mkdir -p $(CURDIR)/debian/tmp/usr/share/augeas/lenses/dist/tests + mkdir -p $(CURDIR)/debian/tmp/usr/share/augeas/lenses/tests cp $(CURDIR)/scripts/augeas/*.aug \ - $(CURDIR)/debian/tmp/usr/share/augeas/lenses/dist/ + $(CURDIR)/debian/tmp/usr/share/augeas/lenses/ cp $(CURDIR)/scripts/augeas/tests/test_nut.aug \ - $(CURDIR)/debian/tmp/usr/share/augeas/lenses/dist/tests/ + $(CURDIR)/debian/tmp/usr/share/augeas/lenses/tests/ # install the default configuration for f in $(CURDIR)/debian/tmp/etc/nut/*; do \