Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap

* 'master' of ssh://db.debian.org/git/userdir-ldap:
  Add debian-maintainers.gpg to keyrings and sync_keyrings.
  cast objects to strings (rt #1717)

Conflicts:

	debian/changelog

diff --combined debian/changelog
index bd7673c,002573d..abffeea
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,12 @@@
  userdir-ldap (0.3.72XX) Xnstable; urgency=low
  
    * ud-useradd: Allow unsetting of middle names by entering a space.
+   * userdir-ldap.conf: Add debian-maintainers.gpg to keyrings and
+     sync_keyrings.
 +  * ud-useradd: force gidNumber to be an int when we open the welcome
 +    template (it can be different when we read it from input using -n).
  
-  -- Peter Palfrader <weasel@debian.org>  Wed, 09 Sep 2009 19:19:55 +0200
 - -- Peter Palfrader <weasel@debian.org>  Sat, 29 Aug 2009 14:45:29 +0200
++ -- Peter Palfrader <weasel@debian.org>  Wed, 09 Sep 2009 19:21:12 +0200
  
  userdir-ldap (0.3.71) unstable; urgency=low
  

diff --combined ud-useradd
index 627cc14,2ff63a3..c183dca
--- 1/ud-useradd
--- 2/ud-useradd
+++ b/ud-useradd
@@@ -241,14 -241,14 +241,14 @@@ encto = '
  try:
    encto = FullName.decode('us-ascii')
  except UnicodeError:
-   encto = email.Header.Header(FullName, 'utf-8', 200) + " " + emailaddr
+   encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr
  
  subjstring = "New Debian Maintainer " + FullName
  encsubj = ''
  try:
    encsubj = subjstring.decode('us-ascii')
  except UnicodeError:
-   encsubj = email.Header.Header(subjstring, 'utf-8', 200)
+   encsubj = str(email.Header.Header(subjstring, 'utf-8', 200))
  
  Subst["__HEADER_SUBJ__"] = encsubj
  Subst["__HEADER_EMAIL"] = encto
@@@ -326,7 -326,7 +326,7 @@@ if Update == 1 and ForceMail == 0
  
  # Send the Welcome message
  print "Sending Welcome Email"
 -Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" % gidNumber, "r").read())
 +Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" % int(gidNumber), "r").read())
  Child = os.popen("/usr/sbin/sendmail -t","w");
  #Child = os.popen("cat","w");
  Child.write(Reply);