[Pkg-openldap-devel] [openldap] 04/29: Remove /etc/ldap/ldap*.conf from libldap2.2 to avoid clash with libldap2. Also add Replaces entry for libldap2 to allow overwriting for now. Needs fixing...

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to annotated tag 2.2.23-0.pre1
in repository openldap.

commit e20a5853c4f5bb1d366fba92279dcd9acdfe0bba
Author: Torsten Landschoff <torsten at debian.org>
Date:   Thu Nov 11 01:10:06 2004 +0000

    Remove /etc/ldap/ldap*.conf from libldap2.2 to avoid clash with
    libldap2. Also add Replaces entry for libldap2 to allow overwriting
    for now. Needs fixing...
---
 debian/changelog  |    3 +++
 debian/control    |    1 +
 debian/move_files |    5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d2b5c7c..5e8ddb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ openldap2 (2.2.18-1) experimental; urgency=low
   * debian/configure.options: Recreated and updated for new setup.
   * debian/rules: Move slapd, slurpd from /usr/lib to /usr/sbin.
   * Rename library packages to include the OpenLDAP version.
+  * Remove /etc/ldap/ldap*.conf from libldap2.2 to avoid clash with
+    libldap2. Also add Replaces entry for libldap2 to allow overwriting
+    for now. Needs fixing...
 
  -- Torsten Landschoff <torsten at debian.org>  Wed,  3 Nov 2004 09:57:14 +0100
 
diff --git a/debian/control b/debian/control
index 65e4602..1f8ceda 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Priority: important
 Architecture: any
 Conflicts: ldap-utils (<= 2.1.23-1)
 Depends: ${shlibs:Depends}
+Replaces: libldap2
 Description: OpenLDAP libraries 
  These are the run-time libraries for the OpenLDAP (Lightweight Directory
  Access Protocol) servers and clients.
diff --git a/debian/move_files b/debian/move_files
index 0df74b3..205e8f0 100644
--- a/debian/move_files
+++ b/debian/move_files
@@ -67,7 +67,10 @@ install_stuff usr/share/man/man5/ldif*
 
 target=libldap2.2
 echo -n " $target"
-install_stuff etc/ldap/ldap*.conf
+# Drop the config files for now since they clash with libldap2
+# TODO: Should get moved to libldap2.2 later on...
+# install_stuff etc/ldap/ldap*.conf
+rm debian/tmp/etc/ldap/ldap*.conf
 install_stuff usr/share/man/man5/ldap.conf*
 install_stuff usr/share/ldap/ucdata	# TODO: does this belong elsewhere?
 install_stuff usr/lib/*.so.*

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