Fix welcome-message to be like welcome-message-800 and 60000 wrt email headers

diff --git a/debian/changelog b/debian/changelog
index b111ef7..a73095c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ userdir-ldap (0.3.76xXx) unstable; urgency=low
   * ud-useradd: Only ask for private subscription if this installation
     has a debian-private like mailinglist whose membership is configured
     by ud-ldap.  (defaults to true.)
+  * Fix welcome-message to be like welcome-message-800 and 60000 wrt
+    email headers
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 09 Jan 2010 00:27:02 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sat, 09 Jan 2010 02:10:02 +0100
 
 userdir-ldap (0.3.75) unstable; urgency=low
 

diff --git a/templates/welcome-message b/templates/welcome-message
index 5f829a3..017528e 100644 (file)
--- a/templates/welcome-message
+++ b/templates/welcome-message
@@ -1,4 +1,4 @@
-To: "__HEADER_EMAIL__"
+To: "__REALNAME__" <__EMAIL__>
 From: __WHOAMI__
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
@@ -8,6 +8,9 @@ Cc: new-maintainer@debian.org
 Reply-To: new-maintainer@debian.org
 Date: __DATE__
 User-Agent: nm-create script run by __WHOAMI__
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 
 [ This is a long (automatically-generated) mail, but it contains
    important information, please read it all carefully. ]