Merge branch 'debian'

Conflicts:
	debian/changelog

diff --cc courier_auth_config.h
Simple merge

diff --cc debian/changelog
index 5a098d2,1eda501..490a75a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,95 +1,107 @@@
- 
+ courier-authlib (0.63.0-6) unstable; urgency=low
+ 
+   [Martin Orr <martin@martinorr.name>]
+   
+   * Set SELinux context for runtime directories in init script 
+     (Closes: #668564) 
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 13 Apr 2012 08:53:02 +0200
+ 
+ courier-authlib (0.63.0-5) unstable; urgency=low
+ 
+   [ Moritz Muehlenhoff <jmm@debian.org> ]
+   
+   * Enable hardened build flags (Closes: #655168)
+   
+   [ Peter Eisentraut <petere@debian.org> ]
+   
+   * Add support for "status" action to authdaemon init script
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sat, 07 Apr 2012 16:48:52 +0200
+ 
+ courier-authlib (0.63.0-4) unstable; urgency=low
+ 
+   * Remove umask check from debian/rules (Closes: #634599, thanks to Lucas
+     Nussbaum <lucas@lucas-nussbaum.net> for the report)
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Wed, 31 Aug 2011 13:32:46 +0200
+ 
+ courier-authlib (0.63.0-3.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Empty dependency_libs (Closes: #621191).
+ 
+  -- Luk Claes <luk@debian.org>  Tue, 28 Jun 2011 07:23:00 +0200
+ 
+ courier-authlib (0.63.0-3) unstable; urgency=low
+ 
+   [ Simon McVittie <smcv@debian.org> ]
+   * Add a symbols file for libcourier*.so to work around the library name
+     being unsuitable for dpkg-shlibdeps (based on a suggestion from
+     Steve Langasek, Closes: #554788)
+   * Tell dh_makeshlibs and dh_shlibdeps to look in the non-standard library
+     directory
+   * Make distclean rather than clean to avoid garbage in the Debian diff when
+     building twice (patch from Peter Eisentraut, Closes: #527971)
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 11 Oct 2010 10:20:03 +0200
+ 
+ courier-authlib (0.63.0-2) unstable; urgency=low
+ 
+   * rebuild to really fix MySQL dependency (Closes: #574101)
+   * recreation of directories in /var/run uses correct
+     ownership/permissions now (Closes: #429866)
+   
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Fri, 19 Mar 2010 14:28:14 +0100
+ 
+ courier-authlib (0.63.0-1) unstable; urgency=low
+ 
+   * new upstream release
+   * fix deprecated dependency on libmysqlclient15off (Closes: #574101,
+     thanks to Dominik Röttsches <d-r@roettsches.de> for the report)
+ 
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Tue, 16 Mar 2010 16:14:44 +0100
+ 
+ courier-authlib (0.62.4-1) unstable; urgency=low
+ 
+   * new upstream release 
+     - satisfies courier-base reverse dependency (Closes: #558120,
+       thanks to Julien Pinon <jpinon@free.fr> for the report)
+   * fix incorrect handling of init.d reload action by removing it 
+     (Closes: #527972, thanks to Peter Eisentraut <petere@debian.org>)
+   * use upstream config.* files
+   * lintian fixes
+     - added ${misc:Depends} for all packages
+     - eliminated commands with absolute paths in maintainer scripts
+     - bumped up Standards-Version
+     - bumped up debhelper comptability level to 5
+   
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Thu, 26 Nov 2009 20:09:13 +0100
+ 
+ courier-authlib (0.62.2-1) unstable; urgency=low
+ 
+   * new upstream release
+   * create run directory with init script (Closes: #349830, thanks to Tim
+     Small <tim@buttersideup.com> for the help)
+   * lintian
+     - copyright notice added to copyright
+     - overrides for file permission of configuration files
+     - reorder debhelper commands
+   
+  -- Stefan Hornburg (Racke) <racke@linuxia.de>  Mon, 02 Mar 2009 16:09:05 +0100
+ 
 +courier-authlib (0.61.0-1+lenny1hcoop1) lenny; urgency=low
 +
 +  * Merge from Debian.  Remaining changes:
 +    + authpam.c:
 +      - Revert the disabling of pam_setcred so that IMAP works on AFS.
 +    + courier_auth_config.h:
 +      - Set the userdb path to be /etc/courier/userdb.
 +    + preauthuserdbcommon.c:
 +      - Get AFS tokens.
 +
 + -- Michael Olson (HCoop) <mwolson@hcoop.net>  Thu, 09 Apr 2009 23:43:21 -0400
++ 
  courier-authlib (0.61.0-1+lenny1) testing-security; urgency=high
  
    * Non-maintainer upload by the security team