[Pkg-openldap-devel] [openldap] 04/17: install DB_CONFIG in /usr/share/slapd/ instead of /usr/share/doc/slapd/examples/; this simplifies the code, and ensures users who don't install /usr/share/doc aren't penalized. Create links for the DB_CONFIG and slapd.confg templates to /usr/share/doc/slapd/examples, since these are worthwhile examples as well.

[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 c44bd014bd5b0b5b8fc53430cc08ea3d942e33c3
Author: Steve Langasek <vorlon at debian.org>
Date:   Sun Apr 17 02:49:29 2005 +0000

    install DB_CONFIG in /usr/share/slapd/ instead of
    /usr/share/doc/slapd/examples/; this simplifies the code, and ensures users
    who don't install /usr/share/doc aren't penalized.  Create links for the
    DB_CONFIG and slapd.confg templates to /usr/share/doc/slapd/examples, since
    these are worthwhile examples as well.
---
 debian/changelog            |   11 +++++++++--
 debian/move_files           |    1 +
 debian/slapd.examples       |    1 -
 debian/slapd.links          |    2 ++
 debian/slapd.scripts-common |   12 +++---------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23d021a..c2d6726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,15 @@ openldap2.2 (2.2.23-3) unstable; urgency=low
   * debian/slapd.scripts-common: don't use merge_logical_lines for
     functions that will be writing back to the config; the code is not
     as pretty now, but the output is much less ugly.
-
- -- Steve Langasek <vorlon at debian.org>  Sat, 16 Apr 2005 19:01:19 -0700
+  * debian/slapd.examples, debian/slapd.scripts-common,
+    debian/slapd.links, debian/move_files: install DB_CONFIG in
+    /usr/share/slapd/ instead of /usr/share/doc/slapd/examples/; this
+    simplifies the code, and ensures users who don't install
+    /usr/share/doc aren't penalized.  Create links for the DB_CONFIG and
+    slapd.confg templates to /usr/share/doc/slapd/examples, since these
+    are worthwhile examples as well.
+
+ -- Steve Langasek <vorlon at debian.org>  Sat, 16 Apr 2005 19:27:30 -0700
 
 openldap2.2 (2.2.23-2) unstable; urgency=low
 
diff --git a/debian/move_files b/debian/move_files
index ab25da8..b0fa13d 100644
--- a/debian/move_files
+++ b/debian/move_files
@@ -51,6 +51,7 @@ install_stuff usr/share/man/man8
 install_stuff etc/ldap/schema
 rm -f debian/tmp/etc/ldap/slapd.conf
 install -m644 debian/slapd.conf debian/slapd/usr/share/slapd/slapd.conf
+install -m644 debian/DB_CONFIG debian/slapd/usr/share/slapd/DB_CONFIG
 install -m755 debian/fix_ldif debian/slapd/usr/share/slapd/fix_ldif
 install -m755 debian/ldiftopasswd debian/slapd/usr/share/slapd/ldiftopasswd
 
diff --git a/debian/slapd.examples b/debian/slapd.examples
deleted file mode 100644
index 1e965f0..0000000
--- a/debian/slapd.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/DB_CONFIG
diff --git a/debian/slapd.links b/debian/slapd.links
index 502c430..40bff39 100644
--- a/debian/slapd.links
+++ b/debian/slapd.links
@@ -1,2 +1,4 @@
 usr/lib/slapd		usr/sbin/slapd
 usr/lib/slurpd		usr/sbin/slurpd
+usr/share/slapd/DB_CONFIG	usr/share/doc/slapd/examples/DB_CONFIG
+usr/share/slapd/slapd.conf	usr/share/doc/slapd/examples/slapd.conf
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index 59b7060..c5692c5 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -413,21 +413,15 @@ manual_configuration_wanted() {						# {{{
 }
 # }}}
 copy_example_DB_CONFIG() {						# {{{
-# Copy an example DB_CONFIG file, only if available
+# Copy an example DB_CONFIG file
 # copy_example_DB_CONFIG <directory>
 	local directory srcdir
 	
 	directory="$1"
-	srcdir="/usr/share/doc/slapd/examples"
+	srcdir="/usr/share/slapd"
 
 	if ! [ -f "${directory}/DB_CONFIG" ] && [ -d "$directory" ]; then
-		if [ -r "$srcdir/DB_CONFIG" ]; then
-		 	cp $srcdir/DB_CONFIG "${directory}/DB_CONFIG"
-		fi
-
-		if [ -r "$srcdir/DB_CONFIG.gz" ]; then
-			zcat $srcdir/DB_CONFIG.gz > "${directory}/DB_CONFIG"
-		fi
+		cp $srcdir/DB_CONFIG "${directory}/DB_CONFIG"
 	fi
 }
 

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