debbugsconfig: move templates to /usr/share/debbugs/examples

diff --git a/Makefile b/Makefile
index 93ed796908934a6928f89293be526619ab5be14c..5cb29cff18149eeab2e6c6ccfdbe1caf2a0cf36a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ templates_dir := $(DESTDIR)/usr/share/debbugs/templates
 man_dir                := $(DESTDIR)/usr/share/man
 man8_dir       := $(man_dir)/man8
 examples_dir   := $(doc_dir)/examples
+config_dir     := $(DESTDIR)/usr/share/debbugs/examples
 
 scripts_in     = $(foreach script, $(filter-out scripts/config% scripts/errorlib scripts/text, $(wildcard scripts/*)),$(patsubst scripts/%,%,$(script)))
 htmls_in       := $(wildcard html/*.html.in)
@@ -54,7 +55,7 @@ install_mostfiles:
 $(var_dir)/indices $(var_dir)/www/cgi $(var_dir)/www/db $(var_dir)/www/txt \
 $(var_dir)/www/css \
 $(var_dir)/spool/lock $(var_dir)/spool/archive $(var_dir)/spool/incoming \
-$(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
+$(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(config_dir) $(man8_dir); \
           do test -d $$dir || $(install_exec) -d $$dir; done
 
        # install the scripts
@@ -65,6 +66,11 @@ $(var_dir)/spool/db-h $(scripts_dir) $(examples_dir) $(man8_dir); \
        $(install_data) examples/config $(examples_dir)/config
        $(install_data) examples/config.debian $(examples_dir)/config.debian
        $(install_data) scripts/text $(examples_dir)/text
+
+       $(install_data) examples/config scripts/text misc/Maintainers \
+         misc/Maintainers.override misc/pseudo-packages.description \
+         misc/sources misc/nextnumber $(config_dir)
+
        $(install_data) debian/crontab misc/nextnumber misc/Maintainers \
          misc/Maintainers.override misc/pseudo-packages.description \
          misc/sources $(examples_dir)

diff --git a/debian/debbugs-web.install b/debian/debbugs-web.install
index f33b23404203c7e91b050cfbfb0c022fe71253c0..3915eef06448f9ed38dd42ef4c42a05a7ec1086f 100644 (file)
--- a/debian/debbugs-web.install
+++ b/debian/debbugs-web.install
@@ -1,4 +1,5 @@
 var/lib/debbugs/www/*
 var/lib/debbugs/www/cgi/*
 etc/debbugs/html
+usr/share/debbugs/examples/*
 usr/share/debbugs/templates/*

diff --git a/debian/debbugsconfig b/debian/debbugsconfig
index 1e6bfa49bc882cb525db3c8062732a31882bf343..53af32e2debf0cd8132f0904a19176f07624521a 100755 (executable)
--- a/debian/debbugsconfig
+++ b/debian/debbugsconfig
@@ -23,6 +23,7 @@ EOF
 }
 
 $gConfigDir = "/etc/debbugs" if (!defined($gConfigDir));
+$config_dir="/usr/share/debbugs/examples";
 &template("config", $gConfigDir);
 require "$gConfigDir/config";
 unshift @INC, $gConfigDir;
@@ -83,7 +84,7 @@ sub template {
       File::Path::make_path($destdir, {'mode' => 0755 });
       print "created $destdir/.\n";
     }
-    system("cp /usr/share/doc/debbugs/examples/$name $destdir/$name") == 0 ||
+    system("cp $config_dir/$name $destdir/$name") == 0 ||
           die "$!";
     print "created $destdir/$name from template.\n";
   }