From: Peter Palfrader Date: Wed, 9 Sep 2009 17:21:30 +0000 (+0200) Subject: Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap X-Git-Tag: userdir-ldap-0.3.72~8 X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=5a150617472b541f4ff84e9bd55d702afe60ca39 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 --- 5a150617472b541f4ff84e9bd55d702afe60ca39 diff --cc debian/changelog index bd7673c,002573d..abffeea --- a/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 Wed, 09 Sep 2009 19:19:55 +0200 - -- Peter Palfrader Sat, 29 Aug 2009 14:45:29 +0200 ++ -- Peter Palfrader Wed, 09 Sep 2009 19:21:12 +0200 userdir-ldap (0.3.71) unstable; urgency=low