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 d484c58a7e5c18b988cc9bcf05cb28042abe7cf5..32d83b701eedc79b3fd73c1bb15fa4cf46355d7b 100644 (file)
--- 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 8b368e9ba5fc81768624aaf38845e6024cbc6083..7afe207f34e3d5ebb05b795840a64da5b2540a3d 100755 (executable)
--- 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 7694dd96c6a12bcd8c8fde11319d64cb9621f29b..03e958bc1e949fa3a68d9353e7e65a7ddbcce29d 100644 (file)
--- 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.