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

This commit is contained in:
Laurent Bigonville 2019-08-02 08:41:28 +02:00
parent e15be88231
commit d07de5b2ba
3 changed files with 16 additions and 13 deletions

5
debian/changelog vendored
View File

@ -48,8 +48,11 @@ nut (2.7.4-9) UNRELEASED; urgency=medium
* debian/rules, debian/control: Override --with-systemdshutdowndir passed to * debian/rules, debian/control: Override --with-systemdshutdowndir passed to
configure to fix FTBFS on non-linux architectures and do not build-depend configure to fix FTBFS on non-linux architectures and do not build-depend
against systemd 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 <bigon@debian.org> Thu, 01 Aug 2019 14:59:17 +0200 -- Laurent Bigonville <bigon@debian.org> Fri, 02 Aug 2019 08:40:44 +0200
nut (2.7.4-8) unstable; urgency=medium nut (2.7.4-8) unstable; urgency=medium

View File

@ -9,15 +9,15 @@ debian/tmp/etc/nut/upssched.conf
debian/tmp/lib/nut/upsmon debian/tmp/lib/nut/upsmon
debian/tmp/sbin/upsmon debian/tmp/sbin/upsmon
debian/tmp/sbin/upssched debian/tmp/sbin/upssched
debian/tmp/usr/share/augeas/lenses/dist/nuthostsconf.aug debian/tmp/usr/share/augeas/lenses/nuthostsconf.aug
debian/tmp/usr/share/augeas/lenses/dist/nutnutconf.aug debian/tmp/usr/share/augeas/lenses/nutnutconf.aug
debian/tmp/usr/share/augeas/lenses/dist/nutupsconf.aug debian/tmp/usr/share/augeas/lenses/nutupsconf.aug
debian/tmp/usr/share/augeas/lenses/dist/nutupsdconf.aug debian/tmp/usr/share/augeas/lenses/nutupsdconf.aug
debian/tmp/usr/share/augeas/lenses/dist/nutupsdusers.aug debian/tmp/usr/share/augeas/lenses/nutupsdusers.aug
debian/tmp/usr/share/augeas/lenses/dist/nutupsmonconf.aug debian/tmp/usr/share/augeas/lenses/nutupsmonconf.aug
debian/tmp/usr/share/augeas/lenses/dist/nutupsschedconf.aug debian/tmp/usr/share/augeas/lenses/nutupsschedconf.aug
debian/tmp/usr/share/augeas/lenses/dist/nutupssetconf.aug debian/tmp/usr/share/augeas/lenses/nutupssetconf.aug
debian/tmp/usr/share/augeas/lenses/dist/tests/test_nut.aug debian/tmp/usr/share/augeas/lenses/tests/test_nut.aug
debian/tmp/usr/share/bash-completion/completions/nut debian/tmp/usr/share/bash-completion/completions/nut
debian/tmp/lib/systemd/system/nut-monitor.service debian/tmp/lib/systemd/system/nut-monitor.service
debian/tmp/lib/systemd/system/nut-client.service debian/tmp/lib/systemd/system/nut-client.service

6
debian/rules vendored
View File

@ -55,11 +55,11 @@ override_dh_auto_install-arch:
$(CURDIR)/debian/tmp/etc/avahi/services $(CURDIR)/debian/tmp/etc/avahi/services
# install Augeas lenses # 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 \ 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 \ 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 # install the default configuration
for f in $(CURDIR)/debian/tmp/etc/nut/*; do \ for f in $(CURDIR)/debian/tmp/etc/nut/*; do \