[Pkg-openldap-devel] [openldap] 12/17: * Move slappasswd to the slapd package, since it's now a symlink and isn't actually useful without the slapd binary (closes: #304339).

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

commit c000c102a02f56128958963f2564febe59462272
Author: Steve Langasek <vorlon at debian.org>
Date:   Wed Apr 20 08:02:16 2005 +0000

      * Move slappasswd to the slapd package, since it's now a symlink and
        isn't actually useful without the slapd binary (closes: #304339).
---
 debian/changelog  |    4 +++-
 debian/control    |    2 +-
 debian/move_files |    7 -------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b6f867..58f3e0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,10 @@ openldap2.2 (2.2.23-3) unstable; urgency=low
     are worthwhile examples as well.
   * Updated maintainer scripts to keep DB_CONFIG for LDAP databases over
     upgrades (closes: #265860).
+  * Move slappasswd to the slapd package, since it's now a symlink and
+    isn't actually useful without the slapd binary (closes: #304339).
 
- -- Steve Langasek <vorlon at debian.org>  Sun, 17 Apr 2005 01:24:12 -0700
+ -- Steve Langasek <vorlon at debian.org>  Sun, 17 Apr 2005 03:05:56 -0700
 
 openldap2.2 (2.2.23-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index eb773c1..ef107fa 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}, debconf (>= 0.5), coreutils (>= 4.5.1-1) | fileutils
 Recommends: db4.2-util, libsasl2-modules
 Suggests: ldap-utils
 Conflicts: umich-ldapd, ldap-server, libbind-dev, bind-dev, libltdl3 (= 1.5.4-1)
-Replaces: libldap2
+Replaces: libldap2, ldap-utils (<< 2.2.23-3)
 Provides: ldap-server
 Description: OpenLDAP server (slapd)
  This is the OpenLDAP (Lightweight Directory Access Protocol) standalone
diff --git a/debian/move_files b/debian/move_files
index b0fa13d..893f0cb 100644
--- a/debian/move_files
+++ b/debian/move_files
@@ -57,13 +57,6 @@ install -m755 debian/ldiftopasswd debian/slapd/usr/share/slapd/ldiftopasswd
 
 target=ldap-utils
 echo -n " $target"
-# slappasswd is useful even without the server
-install -m755 -d debian/$target/usr/sbin
-install -m755 -d debian/$target/usr/share/man/man8
-mv debian/slapd/usr/sbin/slappasswd debian/$target/usr/sbin/
-mv debian/slapd/usr/share/man/man8/slappasswd.* \
-	debian/$target/usr/share/man/man8/
-
 install_stuff usr/bin
 install_stuff usr/share/man/man1
 install_stuff usr/share/man/man5/ldif*

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