5 files changed, 13 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index c65d389..2d6d20e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openldap (2.6.8+dfsg-1~exp2) experimental; urgency=medium
+
+  * Ship slapo-nestgroup files in the main slapd binary package.
+    - d/slapd-contrib.{install,manpages}: Move slapo-nestgroup files to...
+    - d/slapd.{install,manpages}: ...here.
+    Thanks to Ryan Tandy for letting me know about this mistake.
+
+ -- Sergio Durigan Junior <sergiodj@debian.org>  Fri, 31 May 2024 13:30:18 -0400
+
 openldap (2.6.8+dfsg-1~exp1) experimental; urgency=medium
 
   [ Sergio Durigan Junior ]
@@ -6,7 +15,7 @@ openldap (2.6.8+dfsg-1~exp1) experimental; urgency=medium
   * New upstream version 2.6.8+dfsg
   * d/p/smbk5pwd-implicit-declaration: Remove; fixed upstream.
   * d/control: B-D on pkgconf instead of pkg-config.
-  * d/p/slapd-contrib.{install,manpages}: Install new slapo-neogroup overlay.
+  * d/p/slapd-contrib.{install,manpages}: Install new slapo-nestgroup overlay.
 
   [ Steve Langasek ]
   * debian/patches/64-bit-time-t-compat:
diff --git a/debian/slapd-contrib.install b/debian/slapd-contrib.install
index 430db45..eb97734 100644
--- a/debian/slapd-contrib.install
+++ b/debian/slapd-contrib.install
@@ -7,4 +7,3 @@ usr/lib/ldap/pw-pbkdf2.so*
 usr/lib/ldap/pw-pbkdf2.la
 usr/lib/ldap/smbk5pwd.so*
 usr/lib/ldap/smbk5pwd.la
-usr/lib/ldap/nestgroup.so*
diff --git a/debian/slapd-contrib.manpages b/debian/slapd-contrib.manpages
index 09fb002..101257d 100644
--- a/debian/slapd-contrib.manpages
+++ b/debian/slapd-contrib.manpages
@@ -2,5 +2,3 @@ usr/share/man/man5/slapd-pw-pbkdf2.5
 usr/share/man/man5/slapd-pw-sha2.5
 usr/share/man/man5/slapm-ppm.5
 usr/share/man/man5/slapo-smbk5pwd.5
-usr/share/man/man5/slapo-autogroup.5
-usr/share/man/man5/slapo-nestgroup.5
diff --git a/debian/slapd.install b/debian/slapd.install
index a380094..3f7c63c 100644
--- a/debian/slapd.install
+++ b/debian/slapd.install
@@ -30,6 +30,7 @@ usr/lib/ldap/homedir*.so*
 usr/lib/ldap/homedir.la
 usr/lib/ldap/memberof*.so*
 usr/lib/ldap/memberof.la
+usr/lib/ldap/nestgroup.so*
 usr/lib/ldap/otp*.so*
 usr/lib/ldap/otp.la
 usr/lib/ldap/pcache*.so*
diff --git a/debian/slapd.manpages b/debian/slapd.manpages
index 9dcbaf8..530e026 100644
--- a/debian/slapd.manpages
+++ b/debian/slapd.manpages
@@ -18,6 +18,7 @@ usr/share/man/man5/slapd-sql.5
 
 usr/share/man/man5/slapo-accesslog.5
 usr/share/man/man5/slapo-auditlog.5
+usr/share/man/man5/slapo-autogroup.5
 usr/share/man/man5/slapo-chain.5
 usr/share/man/man5/slapo-collect.5
 usr/share/man/man5/slapo-constraint.5
@@ -27,6 +28,7 @@ usr/share/man/man5/slapo-dyngroup.5
 usr/share/man/man5/slapo-dynlist.5
 usr/share/man/man5/slapo-homedir.5
 usr/share/man/man5/slapo-memberof.5
+usr/share/man/man5/slapo-nestgroup.5
 usr/share/man/man5/slapo-otp.5
 usr/share/man/man5/slapo-pbind.5
 usr/share/man/man5/slapo-pcache.5