debian/changelog

@@ -10,11 +10,14 @@ openldap (2.4.46+dfsg-1) UNRELEASED; urgency=medium
   * Rebase patch no-AM_INIT_AUTOMAKE to apply cleanly.
   * Drop patch ITS8650-retry-gnutls_handshake-after-GNUTLS_E_AGAIN, applied
     upstream.
-  * Update Priority of libldap-2.4-2 and libldap-common to optional, matching
-    the archive override file.
   * Really fix upgrades when the config contains backslash-escaped special
     characters. The previous fix was incomplete and didn't fully fix upgrades
     involving a database reload. (Closes: #864719)
+  * Update Standards-Version to 4.1.4.
+    - Change the Priority of libldap-2.4-2 and libldap-common to optional.
+  * Change download URL in debian/watch to https. Fixes a Lintian info.
+  * Override the binary-or-shlib-defines-rpath Lintian tag for slapd-smbk5pwd.
+    The rpath is set by krb5-config.heimdal; see bug #868840.
 
  -- Ryan Tandy <ryan@nardis.ca>  Mon, 26 Mar 2018 02:47:39 +0000
 

debian/control

@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 10),
                po-debconf,
                unixodbc-dev <!stage1>
 Build-Conflicts: libbind-dev, bind-dev, libicu-dev, autoconf2.13
-Standards-Version: 4.0.0
+Standards-Version: 4.1.4
 Homepage: http://www.openldap.org/
 Vcs-Git: https://salsa.debian.org/openldap-team/openldap.git
 Vcs-Browser: https://salsa.debian.org/openldap-team/openldap

debian/slapd-smbk5pwd.lintian-overrides

 # #204975
 slapd-smbk5pwd: package-has-unnecessary-activation-of-ldconfig-trigger
+# rpath set by krb5-config.heimdal; #868840
+binary-or-shlib-defines-rpath usr/lib/ldap/smbk5pwd.so.0.0.0 /usr/lib/x86_64-linux-gnu/heimdal

debian/slapd.lintian-overrides

 # libslapi is a special case, used only for writing extension modules for
 # slapd, and is therefore shipped with slapd.
 slapd: package-name-doesnt-match-sonames libslapi-2.4-2
-# The only occurrence of olcAccess is in configuration examples.
-slapd: spelling-error-in-readme-debian olcAccess olcAccess (duplicate word) olcAccess

debian/source.lintian-overrides

-# these files list copyright notices applying to the schemas
-openldap source: license-problem-non-free-RFC debian/copyright
+# this file lists copyright notices applying to the schemas
 openldap source: license-problem-non-free-RFC servers/slapd/schema/README
 # RFC text removed, files contain functional interface definitions only
 # Copyright notices have been retained to preserve attribution

debian/watch

@@ -2,5 +2,5 @@
 
 version=3
 opts=dversionmangle=s/\+dfsg// \
-http://www.openldap.org/software/download/ \
+https://www.openldap.org/software/download/ \
     (?:.*/)?openldap-?_?([\d+\.]+)\.tgz