From 447262e101ea630688bcfb6255e6face639555a7 Mon Sep 17 00:00:00 2001
From: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun, 2 Oct 2011 09:47:07 +0000
Subject: get files ready for 0.7.15 release

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-0.7@1549 ef36b2f9-881f-0410-afb5-c4e39611909c
---
 ChangeLog            | 11 +++++++++++
 NEWS                 |  6 ++++++
 configure.ac         |  4 ++--
 debian/changelog     |  7 +++++++
 man/nslcd.8.xml      |  4 ++--
 man/nslcd.conf.5.xml |  4 ++--
 man/pam_ldap.8.xml   |  4 ++--
 7 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bea5c19..d573aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-10-02 09:09  arthur
+
+	* [r1548] ., debian/nslcd.config: treat the "hard" value for
+	  tls_reqcert as if it was "demand" (r1546 from trunk)
+
+2011-09-18 18:24  arthur
+
+	* [r1544] ChangeLog, NEWS, configure.ac, debian/changelog,
+	  debian/copyright, man/nslcd.8.xml, man/nslcd.conf.5.xml,
+	  man/pam_ldap.8.xml: get files ready for 0.7.14 release
+
 2011-08-24 20:45  arthur
 
 	* [r1516] ., nslcd/cfg.c: fix a problem with uninitialised memory
diff --git a/NEWS b/NEWS
index a5e25cc..561feff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+changes from 0.7.14 to 0.7.15
+-----------------------------
+
+* Debian packaging improvement
+
+
 changes from 0.7.13 to 0.7.14
 -----------------------------
 
diff --git a/configure.ac b/configure.ac
index c829ca3..2062647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@ version 2.1 of the License, or (at your option) any later version. See the
 configure.ac file for more details.])
 
 # initialize and set version and bugreport address
-AC_INIT([nss-pam-ldapd],[0.7.14],[nss-pam-ldapd-users@lists.arthurdejong.org])
-RELEASE_MONTH="Sep 2011"
+AC_INIT([nss-pam-ldapd],[0.7.15],[nss-pam-ldapd-users@lists.arthurdejong.org])
+RELEASE_MONTH="Oct 2011"
 AC_SUBST(RELEASE_MONTH)
 AC_CONFIG_SRCDIR([nslcd.h])
 
diff --git a/debian/changelog b/debian/changelog
index 3b033fa..fdaa28c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nss-pam-ldapd (0.7.15) stable; urgency=low
+
+  * in debconf, treat the "hard" value for tls_reqcert as if it was "demand"
+    (closes: #642347)
+
+ -- Arthur de Jong <adejong@debian.org>  Sun, 02 Oct 2011 11:15:00 +0200
+
 nss-pam-ldapd (0.7.14) stable; urgency=low
 
   * log correct error from ldap_abandon()
diff --git a/man/nslcd.8.xml b/man/nslcd.8.xml
index 446dfbc..1c3a52e 100644
--- a/man/nslcd.8.xml
+++ b/man/nslcd.8.xml
@@ -36,9 +36,9 @@
  <refmeta>
   <refentrytitle>nslcd</refentrytitle>
   <manvolnum>8</manvolnum>
-  <refmiscinfo class="version">Version 0.7.14</refmiscinfo>
+  <refmiscinfo class="version">Version 0.7.15</refmiscinfo>
   <refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
-  <refmiscinfo class="date">Sep 2011</refmiscinfo>
+  <refmiscinfo class="date">Oct 2011</refmiscinfo>
  </refmeta>
 
  <refnamediv id="name">
diff --git a/man/nslcd.conf.5.xml b/man/nslcd.conf.5.xml
index a6fc300..76a3855 100644
--- a/man/nslcd.conf.5.xml
+++ b/man/nslcd.conf.5.xml
@@ -36,9 +36,9 @@
  <refmeta>
   <refentrytitle>nslcd.conf</refentrytitle>
   <manvolnum>5</manvolnum>
-  <refmiscinfo class="version">Version 0.7.14</refmiscinfo>
+  <refmiscinfo class="version">Version 0.7.15</refmiscinfo>
   <refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
-  <refmiscinfo class="date">Sep 2011</refmiscinfo>
+  <refmiscinfo class="date">Oct 2011</refmiscinfo>
  </refmeta>
 
  <refnamediv id="name">
diff --git a/man/pam_ldap.8.xml b/man/pam_ldap.8.xml
index de6741c..930d1e2 100644
--- a/man/pam_ldap.8.xml
+++ b/man/pam_ldap.8.xml
@@ -35,9 +35,9 @@
  <refmeta>
   <refentrytitle>pam_ldap</refentrytitle>
   <manvolnum>8</manvolnum>
-  <refmiscinfo class="version">Version 0.7.14</refmiscinfo>
+  <refmiscinfo class="version">Version 0.7.15</refmiscinfo>
   <refmiscinfo class="manual">System Manager's Manual</refmiscinfo>
-  <refmiscinfo class="date">Sep 2011</refmiscinfo>
+  <refmiscinfo class="date">Oct 2011</refmiscinfo>
  </refmeta>
 
  <refnamediv id="name">
-- 
cgit v1.2.3