[Pkg-openldap-devel] [openldap] 01/01: Move ldap.conf and manpage to libldap-common (#330695)

[Ryan Tandy]

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

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

commit b1ad17aa73f29494c763e45f99a6fb5b7392bac2
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sat May 14 20:35:20 2016 +0000

    Move ldap.conf and manpage to libldap-common (#330695)
    
    Thanks to Helmut Grohne for the patch.
---
 debian/changelog                                           |  5 +++++
 debian/control                                             | 12 +++++++++++-
 debian/libldap-2.4-2.install                               |  1 -
 debian/libldap-common.install                              |  1 +
 debian/{libldap-2.4-2.manpages => libldap-common.manpages} |  0
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2f6b94..a5f30ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openldap (2.4.44+dfsg-1) UNRELEASED; urgency=medium
   * !!! DO NOT UPLOAD this until updating the ppolicy schema on upgrade is 
     dealt with, otherwise ppolicy users will be broken!
 
+  [ Ryan Tandy ]
   * New upstream release.
     - Fixed ppolicy not unlocking policy entry after initialization failure 
       (ITS#7537) (Closes: #702414)
@@ -22,6 +23,10 @@ openldap (2.4.44+dfsg-1) UNRELEASED; urgency=medium
     init script in other modes.
   * Remove support for enabling the obsolete LDAPv2 protocol via debconf.
 
+  [ Helmut Grohne ]
+  * Fix policy 8.2 violation (Closes: #330695)
+    + Move /etc/ldap/ldap.conf and manpage to new package libldap-common.
+
  -- Ryan Tandy <ryan at nardis.ca>  Tue, 15 Mar 2016 03:45:08 +0000
 
 openldap (2.4.42+dfsg-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index cd062e3..53fdee8 100644
--- a/debian/control
+++ b/debian/control
@@ -85,12 +85,22 @@ Architecture: any
 Multi-Arch: same
 Conflicts: ldap-utils (<= 2.1.23-1)
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libldap-common (= ${source:Version})
 Replaces: libldap2, libldap-2.3-0
 Description: OpenLDAP libraries 
  These are the run-time libraries for the OpenLDAP (Lightweight Directory
  Access Protocol) servers and clients.
 
+Package: libldap-common
+Section: libs
+Priority: standard
+Architecture: all
+Multi-Arch: foreign
+Replaces: libldap-2.4-2 (<< 2.4.44+dfsg-1)
+Description: OpenLDAP common files for libraries
+ These are common files for the run-time libraries for the OpenLDAP
+ (Lightweight Directory Access Protocol) servers and clients.
+
 Package: libldap-2.4-2-dbg
 Section: debug
 Priority: extra
diff --git a/debian/libldap-2.4-2.install b/debian/libldap-2.4-2.install
index 70e56c0..35b0d96 100644
--- a/debian/libldap-2.4-2.install
+++ b/debian/libldap-2.4-2.install
@@ -2,4 +2,3 @@ usr/lib/*/liblber-2.4.so.2
 usr/lib/*/liblber-2.4.so.2.*.*
 usr/lib/*/libldap_r-2.4.so.2
 usr/lib/*/libldap_r-2.4.so.2.*.*
-etc/ldap/ldap.conf
diff --git a/debian/libldap-common.install b/debian/libldap-common.install
new file mode 100644
index 0000000..b64373e
--- /dev/null
+++ b/debian/libldap-common.install
@@ -0,0 +1 @@
+etc/ldap/ldap.conf
diff --git a/debian/libldap-2.4-2.manpages b/debian/libldap-common.manpages
similarity index 100%
rename from debian/libldap-2.4-2.manpages
rename to debian/libldap-common.manpages

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