Package: nut
Version: 2.4.1-2
Severity: normal
Tags: patch
The *.sample files that are written to /etc/nut by the deb are marked
as conffiles even though the application does not read them.
I suggest to:
1. Remove the .sample suffix
2. Have the distributed files also in /usr/share/doc/nut/examples.
Having them in the examples dir allows the user to get a short
version in the CONF dir, while preserving the useful skeltons,
with the comments, in a known, namely examples, directory.
--- debian/nut-cgi.examples 1970-01-01 02:00:00.000000000 +0200
+++ debian/nut-cgi.examples 2009-05-14 04:11:53.000000000 +0300
@@ -0,0 +1,4 @@
+./debian/tmp/etc/nut/hosts.conf
+./debian/tmp/etc/nut/upsset.conf
+./debian/tmp/etc/nut/upsstats-single.html
+./debian/tmp/etc/nut/upsstats.html
--- debian/nut-cgi.install 2009-05-14 13:43:52.000000000 +0300
+++ debian/nut-cgi.install 2009-05-14 03:41:23.000000000 +0300
@@ -1,6 +1,6 @@
-debian/tmp/etc/nut/hosts.conf.sample
-debian/tmp/etc/nut/upsset.conf.sample
-debian/tmp/etc/nut/upsstats.html.sample
-debian/tmp/etc/nut/upsstats-single.html.sample
+debian/tmp/etc/nut/hosts.conf
+debian/tmp/etc/nut/upsset.conf
+debian/tmp/etc/nut/upsstats.html
+debian/tmp/etc/nut/upsstats-single.html
debian/tmp/usr/lib/cgi-bin/
debian/tmp/usr/share/nut/www
--- debian/nut.examples 1970-01-01 02:00:00.000000000 +0200
+++ debian/nut.examples 2009-05-14 04:12:10.000000000 +0300
@@ -0,0 +1,6 @@
+./debian/tmp/etc/nut/nut.conf
+./debian/tmp/etc/nut/ups.conf
+./debian/tmp/etc/nut/upsd.conf
+./debian/tmp/etc/nut/upsd.users
+./debian/tmp/etc/nut/upsmon.conf
+./debian/tmp/etc/nut/upssched.conf
--- debian/nut.install 2009-05-14 13:43:52.000000000 +0300
+++ debian/nut.install 2009-05-14 03:40:59.000000000 +0300
@@ -7,11 +7,11 @@
debian/tmp/usr/share/nut/driver.list
debian/tmp/*/udev/
debian/tmp/etc/nut/nut.conf
-debian/tmp/etc/nut/ups.conf.sample
-debian/tmp/etc/nut/upsd.conf.sample
-debian/tmp/etc/nut/upsd.users.sample
-debian/tmp/etc/nut/upsmon.conf.sample
-debian/tmp/etc/nut/upssched.conf.sample
+debian/tmp/etc/nut/ups.conf
+debian/tmp/etc/nut/upsd.conf
+debian/tmp/etc/nut/upsd.users
+debian/tmp/etc/nut/upsmon.conf
+debian/tmp/etc/nut/upssched.conf
debian/tmp/etc/bash_completion.d/nut
debian/tmp/lib/nut/genericups
debian/tmp/lib/nut/mge-shut
--- debian/rules 2009-05-14 13:43:52.000000000 +0300
+++ debian/rules 2009-05-14 03:55:31.000000000 +0300
@@ -93,14 +93,19 @@
# install the bash completion script
mkdir -p $(CURDIR)/debian/tmp/etc/bash_completion.d
- cp $(CURDIR)/scripts/misc/nut.bash_completion
$(CURDIR)/debian/tmp/et
c/bash_completion.d/nut
-
- # install the default configuration
- mv $(CURDIR)/debian/tmp/etc/nut/nut.conf.sample
$(CURDIR)/debian/tmp
/etc/nut/nut.conf
+ cp $(CURDIR)/scripts/misc/nut.bash_completion \
+ $(CURDIR)/debian/tmp/etc/bash_completion.d/nut
+ # install the default configuration
+ for f in $(CURDIR)/debian/tmp/etc/nut/*; do \
+ nf=`basename $${f} | sed 's/\(.*\).sample/\1/'`; \
+ mv $${f} $(CURDIR)/debian/tmp/etc/nut/$${nf}; \
+ done
+
dh_installchangelogs ChangeLog
dh_installinit -- start 50 2 3 4 5 . stop 50 0 1 6 .
dh_install
+ dh_installexamples
dh_installman
dh_installdocs -XMakefile
dh_link
--
[email protected]
SDF Public Access UNIX System - http://sdf.lonestar.org
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
