From ec16778893081647b28271ce7311023b8ccfbb91 Mon Sep 17 00:00:00 2001
From: Julien Valroff <julien@kirya.net>
Date: Sat, 4 Sep 2010 15:09:50 +0200
Subject: Do not ship initial default file in /etc/default

---
 debian/default.conf       | 23 +++++++++++++++++++++++
 debian/mailgraph.default  | 23 -----------------------
 debian/mailgraph.install  |  6 +++---
 debian/mailgraph.postinst |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 debian/default.conf
 delete mode 100644 debian/mailgraph.default

diff --git a/debian/default.conf b/debian/default.conf
new file mode 100644
index 0000000..72d4649
--- /dev/null
+++ b/debian/default.conf
@@ -0,0 +1,23 @@
+# This file is sourced by /etc/init.d/mailgraph
+#
+# This is a POSIX shell fragment
+#
+
+# Should Mailgraph start on boot (true|false) (default: true)
+BOOT_START="true"
+
+# Logfile used by mailgraph (default: /var/log/mail.log)
+MAIL_LOG="/var/log/mail.log"
+
+# Ignore mails from localhost (true|false) (default: false)
+# When true, this will pass --ignore-localhost to mailgraph daemon
+IGNORE_LOCALHOST="false"
+
+# Extra options to be passed to mailgraph daemon
+# See mailgraph -h output (default: "")
+EXTRA_OPTIONS=""
+
+# User and group http daemon runs as (default: www-data for both options)
+# Restart mailgraph daemon so that these values are taken into account
+HTTP_USER="www-data"
+HTTP_GROUP="www-data"
diff --git a/debian/mailgraph.default b/debian/mailgraph.default
deleted file mode 100644
index 72d4649..0000000
--- a/debian/mailgraph.default
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file is sourced by /etc/init.d/mailgraph
-#
-# This is a POSIX shell fragment
-#
-
-# Should Mailgraph start on boot (true|false) (default: true)
-BOOT_START="true"
-
-# Logfile used by mailgraph (default: /var/log/mail.log)
-MAIL_LOG="/var/log/mail.log"
-
-# Ignore mails from localhost (true|false) (default: false)
-# When true, this will pass --ignore-localhost to mailgraph daemon
-IGNORE_LOCALHOST="false"
-
-# Extra options to be passed to mailgraph daemon
-# See mailgraph -h output (default: "")
-EXTRA_OPTIONS=""
-
-# User and group http daemon runs as (default: www-data for both options)
-# Restart mailgraph daemon so that these values are taken into account
-HTTP_USER="www-data"
-HTTP_GROUP="www-data"
diff --git a/debian/mailgraph.install b/debian/mailgraph.install
index c8632c1..55f668e 100644
--- a/debian/mailgraph.install
+++ b/debian/mailgraph.install
@@ -1,3 +1,3 @@
-mailgraph                   usr/sbin
-mailgraph.cgi               usr/lib/cgi-bin
-debian/mailgraph.default    usr/share/mailgraph
+mailgraph              usr/sbin
+mailgraph.cgi          usr/lib/cgi-bin
+debian/default.conf    usr/share/mailgraph
diff --git a/debian/mailgraph.postinst b/debian/mailgraph.postinst
index fa10193..e580d00 100644
--- a/debian/mailgraph.postinst
+++ b/debian/mailgraph.postinst
@@ -19,7 +19,7 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-DEFAULT="/usr/share/mailgraph/mailgraph.default"
+DEFAULT="/usr/share/mailgraph/default.conf"
 
 case "$1" in
     configure)
-- 
cgit v1.2.3