Merge branch 'debian'

diff --combined courier_auth_config.h
index ed3b7f8,494558e..ba9e007
--- 1/courier_auth_config.h
--- 2/courier_auth_config.h
+++ b/courier_auth_config.h
@@@ -1,4 -1,4 +1,4 @@@
- /* courier_auth_config.h.  Generated by configure.  */
+ /* courier_auth_config.h.  Generated from courier_auth_config.h.in by configure.  */
  /* courier_auth_config.h.in.  Generated from configure.in by autoheader.  */
  
  /* Whether we have the crypt() function */
@@@ -155,7 -155,7 +155,7 @@@
  #define STDC_HEADERS 1
  
  /* Location of the userdb database */
 -#define USERDB "/usr/local/etc/authlib/userdb"
 +#define USERDB "/etc/courier/userdb"
  
  /* Version number of package */
  /* #undef VERSION */

diff --combined debian/changelog
index 90051cd,acb6a1d..e22db6c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,31 @@@
+ courier-authlib (0.60.1-1) unstable; urgency=low
+ 
+   * new upstream release
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 15 Oct 2007 10:56:16 +0200
+ 
+ courier-authlib (0.60.0-1) unstable; urgency=low
+ 
+   * new upstream release, now under GPL version 3
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun, 30 Sep 2007 21:58:35 +0200
+ 
+ courier-authlib (0.59.3-2) unstable; urgency=low
+ 
+   * dropped alternative build dependency on postgresql-dev 
+     (Closes: #429964, thanks to Lior Kaplan <kaplan@debian.org> for the report
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 21 Jun 2007 20:26:38 +0200
+ 
 +courier-authlib (0.59.3-1hcoop1) unstable; urgency=low
 +
 +  [Adam Megacz]
 +  * Revert the disabling of pam_setcred so that IMAP works as expected.
 +  * Set the userdb path to be /etc/courier/userdb.
 +  * userdb: Allow "+", ":", and "_" in usernames.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Fri, 25 Jan 2008 17:46:10 -0500
 +
  courier-authlib (0.59.3-1) unstable; urgency=low
  
    * new upstream release