[Pkg-openldap-devel] [openldap] 02/17: r445 at pulsar: torsten | 2005-02-28 09:57:03 +0100 * Checked the usage of the ucdata files shipped with libldap2 before. Actually they stem from liblunicode which is only linked to slapd. Therefore those files are shipped with slapd now. This change is relevant so that multiple libldap-2.2-x packages can coexist later. -- Torsten Landschoff <torsten at debian.org> Mon, 28 Feb 2005 08:34:47 +0100

[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.pre5
in repository openldap.

commit ec72b1c4e44af8d8ae6e809928d5599cb66c771c
Author: Torsten Landschoff <torsten at debian.org>
Date:   Mon Feb 28 14:15:54 2005 +0000

     r445 at pulsar:  torsten | 2005-02-28 09:57:03 +0100
      * Checked the usage of the ucdata files shipped with libldap2 before.
        Actually they stem from liblunicode which is only linked to slapd.
        Therefore those files are shipped with slapd now. This change is
        relevant so that multiple libldap-2.2-x packages can coexist later.
     -- Torsten Landschoff <torsten at debian.org>  Mon, 28 Feb 2005 08:34:47 +0100
---
 debian/changelog  |    6 +++++-
 debian/move_files |    2 +-
 debian/rules      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1011ccd..4e8d3cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ openldap2.2 (2.2.23-0.pre4) experimental; urgency=low
 
   * Rename libldap2.2 to libldap-2.2-7 to match soname. Updated 
     debian/{control,rules,...}.
+  * Checked the usage of the ucdata files shipped with libldap2 before. 
+    Actually they stem from liblunicode which is only linked to slapd. 
+    Therefore those files are shipped with slapd now. This change is 
+    relevant so that multiple libldap-2.2-x packages can coexist later.
 
- --
+ -- Torsten Landschoff <torsten at debian.org>  Mon, 28 Feb 2005 08:34:47 +0100
 
 openldap2.2 (2.2.23-0.pre3) experimental; urgency=low
 
diff --git a/debian/move_files b/debian/move_files
index 3938af3..48bb476 100644
--- a/debian/move_files
+++ b/debian/move_files
@@ -44,6 +44,7 @@ echo -n "Installing: slapd"
 target=slapd
 install_stuff usr/sbin
 install_stuff usr/lib/ldap
+install_stuff usr/share/ldap
 install_stuff usr/lib/slapd usr/lib/slurpd
 install_stuff usr/share/man/man5/slapd*
 install_stuff usr/share/man/man8
@@ -69,7 +70,6 @@ echo -n " $target"
 # install_stuff etc/ldap/ldap*.conf
 rm debian/tmp/etc/ldap/ldap*.conf
 rm debian/tmp/usr/share/man/man5/ldap.conf*
-install_stuff usr/share/libldap2.2	# TODO: does this belong elsewhere?
 install_stuff usr/lib/*.so.*
 
 target=libldap2.2-dev
diff --git a/debian/rules b/debian/rules
index d85d319..f695d54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ installdir	:= $(rootdir)/debian/install
 tmpdir		:= $(rootdir)/debian/tmp
 builddir	:= $(rootdir)/debian/build
 
-MAKEVARS	:= DESTDIR=$(installdir) datadir=/usr/share/libldap2.2
+MAKEVARS	:= DESTDIR=$(installdir)
 
 $(builddir)/Makefile:
 	mkdir -p $(builddir)

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