Merge from alioth

diff --git a/debian/changelog b/debian/changelog
index ff11fb8..aea77b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,9 @@ userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
 
   [ Joerg Jaspert ]
   * Enhance copyright file a bit, also adding a pointer to our repository
+  * Add those utf8 headerlines to mail templates. Same "trick" as used in dak
+    to send utf8 mails for people that need them. Works there - should work
+    here too.
 
   [ Stephen Gran ]
   * ud-fingerserv: implement daemonize() for non-inetd mode.

diff --git a/templates/change-reply b/templates/change-reply
index 5233225..b210676 100644 (file)
--- a/templates/change-reply
+++ b/templates/change-reply
@@ -1,4 +1,7 @@
 From: __FROM__
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 Subject: DB Change Request
 
 Hello __EMAIL__!

diff --git a/templates/error-reply b/templates/error-reply
index 11ec0bf..0c26fa6 100644 (file)
--- a/templates/error-reply
+++ b/templates/error-reply
@@ -1,4 +1,7 @@
 From: __ADMIN__
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 Subject: Mail Gateway failed: __ERROR__
 
 Hello!

diff --git a/templates/passwd-changed b/templates/passwd-changed
index 892f2e9..03c1aab 100644 (file)
--- a/templates/passwd-changed
+++ b/templates/passwd-changed
@@ -1,4 +1,7 @@
 From: __FROM__
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 Subject: Password Changed!
 
 Hello __EMAIL__!

diff --git a/templates/ping-reply b/templates/ping-reply
index 69129cf..e836b13 100644 (file)
--- a/templates/ping-reply
+++ b/templates/ping-reply
@@ -1,4 +1,7 @@
 From: __FROM__
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 Subject: Ping Reply
 
 Hello __EMAIL__!

diff --git a/templates/welcome-message b/templates/welcome-message
index ea87686..6565c52 100644 (file)
--- a/templates/welcome-message
+++ b/templates/welcome-message
@@ -1,5 +1,8 @@
 To: "__REALNAME__" <__EMAIL__>
 From: __WHOAMI__
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 Subject: New Debian maintainer __REALNAME__
 Cc: new-maintainer@debian.org
 Reply-To: new-maintainer@debian.org

diff --git a/templates/welcome-message-60000 b/templates/welcome-message-60000
index 06d3e0e..5a0ab5d 100644 (file)
--- a/templates/welcome-message-60000
+++ b/templates/welcome-message-60000
@@ -1,4 +1,7 @@
 To: "__REALNAME__" <__EMAIL__>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 Subject: Debian Guest Account for __REALNAME__
 Cc: debian-admin@lists.debian.org
 Reply-To: debian-admin@lists.debian.org

diff --git a/templates/welcome-message-800 b/templates/welcome-message-800
index 2ce76af..6c0473e 100644 (file)
--- a/templates/welcome-message-800
+++ b/templates/welcome-message-800
@@ -1,5 +1,8 @@
 To: "__REALNAME__" <__EMAIL__>
 From: __WHOAMI__
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 Subject: New Debian maintainer __REALNAME__
 Cc: da-manager@debian.org
 Reply-To: da-manager@debian.org