[Pkg-openldap-devel] [openldap] 01/01: Merge branch 'jessie' into wheezy-backports

[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 f05142b33609c8a7b169dbed37f2b15e045690b5
Merge: 230d55b 77837f3
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sat Apr 18 09:48:41 2015 -0700

    Merge branch 'jessie' into wheezy-backports

 debian/changelog                                   | 15 +++++-
 .../patches/ITS7975-fix-mdb-onelevel-search.patch  | 24 +++++++++
 debian/patches/series                              |  1 +
 .../slapd => debian}/schema/inetorgperson.schema   | 62 ++++------------------
 debian/watch                                       |  1 +
 5 files changed, 49 insertions(+), 54 deletions(-)

diff --cc debian/changelog
index b3bbffb,beed355..3eb9445
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,22 @@@
- openldap (2.4.31+really2.4.40-4~bpo70+1) wheezy-backports; urgency=medium
++openldap (2.4.31+really2.4.40+dfsg-1~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.
 +
-  -- Ryan Tandy <ryan at nardis.ca>  Mon, 09 Feb 2015 16:58:59 -0800
++ -- Ryan Tandy <ryan at nardis.ca>  Sat, 18 Apr 2015 09:49:14 -0700
++
+ openldap (2.4.40+dfsg-1) unstable; urgency=medium
+ 
+   * Remove inetorgperson.schema from the upstream source. Replace it with a
+     copy stripped of RFC text. (Closes: #780283)
+   * Adjust debian/watch for +dfsg versioning.
+   * debian/patches/ITS7975-fix-mdb-onelevel-search.patch: Import upstream
+     patch to fix scope=onelevel searches wrongly including the search base in
+     results under the MDB backend. (ITS#7975) (Closes: #782212)
+ 
+  -- Ryan Tandy <ryan at nardis.ca>  Thu, 09 Apr 2015 08:38:38 -0700
  
  openldap (2.4.40-4) unstable; urgency=medium
  

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