make install of config files more straightforward.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/debian/rules b/debian/rules
index 31eecfc..f0e370e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,6 @@ install: build
        dh_clean -k
        dh_installdirs
        $(MAKE) install prefix=$(pkgdir)
-       mv $(pkgdir)/etc/xinetd.d/xinetd.conf $(pkgdir)/etc/
 
 binary-indep: build install
 

diff --git a/debian/conffiles/xinetd.conf b/debian/xinetd.conf
similarity index 100%
rename from debian/conffiles/xinetd.conf
rename to debian/xinetd.conf

diff --git a/debian/conffiles/chargen b/debian/xinetd.d/chargen
similarity index 100%
rename from debian/conffiles/chargen
rename to debian/xinetd.d/chargen

diff --git a/debian/conffiles/daytime b/debian/xinetd.d/daytime
similarity index 100%
rename from debian/conffiles/daytime
rename to debian/xinetd.d/daytime

diff --git a/debian/conffiles/discard b/debian/xinetd.d/discard
similarity index 100%
rename from debian/conffiles/discard
rename to debian/xinetd.d/discard

diff --git a/debian/conffiles/echo b/debian/xinetd.d/echo
similarity index 100%
rename from debian/conffiles/echo
rename to debian/xinetd.d/echo

diff --git a/debian/conffiles/time b/debian/xinetd.d/time
similarity index 100%
rename from debian/conffiles/time
rename to debian/xinetd.d/time

diff --git a/debian/xinetd.install b/debian/xinetd.install
index b436e37..b5d6f37 100644 (file)
--- a/debian/xinetd.install
+++ b/debian/xinetd.install
@@ -1 +1,2 @@
-debian/conffiles/*     etc/xinetd.d
+debian/xinetd.conf     etc/
+debian/xinetd.d        etc/