clean up and expand delivery of example config files

diff --git a/debian/amanda-client.dirs b/debian/amanda-client.dirs
index 3f2a4c873f957cd19faed6b877e4ad5885b1a324..38c8e306c00a3e5d53d39de6b9e75ce942085026 100644 (file)
--- a/debian/amanda-client.dirs
+++ b/debian/amanda-client.dirs
@@ -1,3 +1,3 @@
-usr/share/doc/amanda-client
+usr/share/doc/amanda-client/examples
 usr/share/lintian/overrides
 var/lib/amanda/gnutar-lists

diff --git a/debian/amanda-client.examples b/debian/amanda-client.examples
new file mode 100644 (file)
index 0000000..e1dd7d1
--- /dev/null
+++ b/debian/amanda-client.examples
@@ -0,0 +1,4 @@
+example/amanda-client.conf
+example/amanda-client-postgresql.conf
+example/inetd.conf.amandaclient
+example/xinetd.amandaclient

diff --git a/debian/amanda-common.examples b/debian/amanda-common.examples
new file mode 100644 (file)
index 0000000..f3d6abf
--- /dev/null
+++ b/debian/amanda-common.examples
@@ -0,0 +1,7 @@
+example/DLT.ps
+example/EXB-8500.ps
+example/HP-DAT.ps
+example/8.5x11.ps
+example/3hole.ps
+example/DLT-A4.ps
+example/DIN-A4.ps

diff --git a/debian/amanda-server.examples b/debian/amanda-server.examples
index b2a0116880394fd0f744dc30bc6815ddb874afd3..baf3a88859c29c9b67d384805d82be6e4c02a6ce 100644 (file)
--- a/debian/amanda-server.examples
+++ b/debian/amanda-server.examples
@@ -1 +1,16 @@
 debian/crontab.amanda
+example/chg-multi.conf
+example/chg-scsi.conf
+example/disklist
+example/amanda.conf
+example/inetd.conf.amandaserver
+example/xinetd.amandaserver
+example/template.d/dumptypes
+example/template.d/tapetypes
+example/template.d/README
+example/template.d/chg-manual.conf
+example/template.d/advanced.conf
+example/template.d/amanda-harddisk.conf
+example/template.d/amanda-single-tape.conf
+example/template.d/amanda-tape-changer.conf
+example/template.d/amanda-S3.conf

diff --git a/debian/changelog b/debian/changelog
index b21e647eff51584236db7f44c3049cc13f49c38a..e6f55683ad0f2f4f64d8127625b547eff10c48ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ amanda (1:3.3.1-1) UNRELEASED; urgency=low
   * include Indonesian translation, closes: #658482
   * relax build-deps by having dump and xfsdump only required on linux-any, 
     to allow amanda to build on kFreeBSD, closes: #661702
+  * clean up and expand the delivery of examples, closes: #496286, #647550
 
- -- Bdale Garbee <bdale@gag.com>  Tue, 20 Mar 2012 12:10:18 +0100
+ -- Bdale Garbee <bdale@gag.com>  Tue, 20 Mar 2012 14:37:56 +0100
 
 amanda (1:3.3.0-1) unstable; urgency=low