From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Tue, 3 Jun 2008 17:09:20 +0000 (+0100)
Subject: Debian packaging changes:
X-Git-Tag: 4.0~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/e5bd70dcd50d4f142354892f1ff79f53b3f60b8e

Debian packaging changes:
   - disorder-server now depends on mail-transport-agent
   - disorder-server no longer asks for an SMTP server
     (instead uses local /usr/sbin/sendmail)
   - remove /etc/disorder/conf.debconf on purge
---

diff --git a/debian/config.disorder-server b/debian/config.disorder-server
index 7afe207..9dc03be 100755
--- a/debian/config.disorder-server
+++ b/debian/config.disorder-server
@@ -34,7 +34,6 @@ db_input high disorder/roots || true
 db_input high disorder/encoding || true
 db_input high disorder/port || true
 db_input medium disorder/scratches || true
-db_input high disorder/smtp_server || true
 db_input high disorder/mail_sender || true
 db_input high disorder/interface || true
 db_go || true
diff --git a/debian/control b/debian/control
index 0054b60..ead26ae 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Package: disorder-server
 Architecture: any
 Section: sound
 Priority: extra
-Depends: disorder,httpd-cgi,sox,debconf,${shlibs:Depends}
+Depends: disorder,httpd-cgi,sox,debconf,${shlibs:Depends},mail-transport-agent
 Suggests: disorder-playrtp,disobedience
 Description: Play random or selected digital audio files continuously
  DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,
diff --git a/debian/postinst.disorder-server b/debian/postinst.disorder-server
index b5bfaad..222d4f2 100755
--- a/debian/postinst.disorder-server
+++ b/debian/postinst.disorder-server
@@ -96,8 +96,6 @@ create_config() {
   encoding="$RET"
   db_get disorder/port || true
   port="$RET"
-  db_get disorder/smtp_server || true
-  smtp_server="$RET"
   db_get disorder/mail_sender || true
   mail_sender="$RET"
   db_get disorder/interface || true
@@ -128,12 +126,6 @@ EOF
     echo "scratch $s" >> /etc/disorder/conf.debconf.new
   done
 
-  if test "$mail_sender" != ""; then
-    echo "" >> /etc/disorder/conf.debconf.new
-    echo "# SMTP server" >> /etc/disorder/conf.debconf.new
-    echo "smtp_server $smtp_server" >> /etc/disorder/conf.debconf.new
-  fi
-
   if test "$mail_sender" != ""; then
     echo "" >> /etc/disorder/conf.debconf.new
     echo "# Source mail address" >> /etc/disorder/conf.debconf.new
diff --git a/debian/postrm.disorder-server b/debian/postrm.disorder-server
index c2084d6..97ed6c4 100755
--- a/debian/postrm.disorder-server
+++ b/debian/postrm.disorder-server
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # This file is part of DisOrder
-# Copyright (C) 2004, 2007 Richard Kettlewell
+# Copyright (C) 2004, 2007, 2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,5 +27,7 @@ purge )
     db_purge
   fi
   update-rc.d disorder remove
+  rm -f /etc/disorder/conf.debconf
+  # TODO - should we delete none/some/all of the contents of /var/lib/disorder?
   ;;
 esac
diff --git a/debian/templates.disorder-server b/debian/templates.disorder-server
index 03e958b..f62e404 100644
--- a/debian/templates.disorder-server
+++ b/debian/templates.disorder-server
@@ -52,14 +52,6 @@ Type: string
 Description: Destination port for network sound transmission
  Sound data will be sent to this UDP port using the RTP protocol.
 
-Template: disorder/smtp_server
-Type: string
-Default: localhost
-Description: SMTP server for web interface
- The web interface requires an SMTP server in order to send messages to
- newly registered users, and to send password reminders.  Enter the hostname
- or IP address to use.
-
 Template: disorder/mail_sender
 Type: string
 Default: