[Pkg-openldap-devel] [openldap] 01/01: Backport 2.4.40-3 to wheezy.

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch wheezy-backports
in repository openldap.

commit 15f696a156f68c504cf30516b3bcbe1aaf27b2f9
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Tue Nov 25 07:21:28 2014 -0800

    Backport 2.4.40-3 to wheezy.
---
 debian/changelog            | 11 +++++++++++
 debian/control              |  2 +-
 debian/slapd.scripts-common |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fcc7f3..aa285ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openldap (2.4.31+really2.4.40-3~bpo70+1) wheezy-backports; urgency=medium
+
+  * Backport to wheezy.
+    - Use a +really version lower than 2.4.39-1 to ensure a database upgrade 
+      is still performed when upgrading to jessie later.
+    - Build against db5.1 instead of db5.3, and revert the database upgrade 
+      version check as well (reloading isn't necessary when upgrading from 
+      wheezy to wheezy-backports). This reverts commit a6fb397d.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Tue, 25 Nov 2014 20:06:37 -0800
+
 openldap (2.4.40-3) unstable; urgency=medium
 
   * Remove trailing spaces from slapd.templates.
diff --git a/debian/control b/debian/control
index 822a25c..62f7e0e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders: Roland Bauerschmidt <rb at debian.org>,
  Ryan Tandy <ryan at nardis.ca>
 Build-Depends: debhelper (>= 8.9.0~),
 	dpkg-dev (>= 1.16.1),
-	libdb5.3-dev, nettle-dev,
+	libdb5.1-dev, nettle-dev,
  libgnutls28-dev, unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
  libwrap0-dev, perl, po-debconf, quilt (>= 0.46-7),
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index f56b3b1..99bbfed 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -46,7 +46,7 @@ database_format_changed() {						# {{{
 # Return success if yes.
 # Usage: if database_format_changed; then
 
-	if dpkg --compare-versions "$OLD_VERSION" lt-nl 2.4.39-1; then
+	if dpkg --compare-versions "$OLD_VERSION" lt-nl 2.4.25-2; then
 		return 0
 	else
 		return 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git