From: Richard Kettlewell <richard@fanticule>
Date: Sun, 25 May 2008 12:58:08 +0000 (+0100)
Subject: The Debian install scripts now uses the current locale's encoding as
X-Git-Tag: 4.0~62
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/23578599d2f7aba6edc0b16129a14a4f7ccbe43b

The Debian install scripts now uses the current locale's encoding as
the default character encoding.  This fixes defect #13, "Default
encoding for debian setup scripts".
---

diff --git a/CHANGES b/CHANGES
index d484c58..32d83b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -57,6 +57,7 @@ play as well as the local default sound device.
  #6 Schedule tracks for a particular time
 #10 Non-uniform track selection
 #11 Bias random selection to newly added tracks
+#13 Default encoding for debian setup scripts
 #16 Cookie expiry causes user to be silently logged out and not
     subsequently redirected to login page
 #20 Broken aliasing rules
diff --git a/debian/config.disorder-server b/debian/config.disorder-server
index 8b368e9..7afe207 100755
--- a/debian/config.disorder-server
+++ b/debian/config.disorder-server
@@ -22,6 +22,14 @@ set -e
 
 . /usr/share/debconf/confmodule
 
+# If we don't have any preconception about the local character encoding then
+# try to use the system one.
+db_get disorder/encoding || true
+if test "x$RET" = x; then
+  eval `locale -k charmap`
+  db_set disorder/encoding "$charmap"
+fi
+
 db_input high disorder/roots || true
 db_input high disorder/encoding || true
 db_input high disorder/port || true
diff --git a/debian/templates.disorder-server b/debian/templates.disorder-server
index 7694dd9..03e958b 100644
--- a/debian/templates.disorder-server
+++ b/debian/templates.disorder-server
@@ -7,7 +7,6 @@ Description: Audio directories
 
 Template: disorder/encoding
 Type: string
-Default: UTF-8
 Description: Filesystem encoding
  Enter your filesystem's character encoding.  Check rather than
  guessing if you are not sure.