[Pkg-openldap-devel] r1231 - openldap/trunk/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-07-29 01:05:46 +0000 (Wed, 29 Jul 2009)
New Revision: 1231

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
   openldap/trunk/debian/slapd.scripts-common
Log:
* Fix up the lintian warnings:
  - add missing misc-depends on all packages

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2009-07-28 17:19:49 UTC (rev 1230)
+++ openldap/trunk/debian/changelog	2009-07-29 01:05:46 UTC (rev 1231)
@@ -1,3 +1,10 @@
+openldap (2.4.17-2) UNRELEASED; urgency=low
+
+  * Fix up the lintian warnings:
+    - add missing misc-depends on all packages
+
+ -- Steve Langasek <vorlon at debian.org>  Tue, 28 Jul 2009 18:03:26 -0700
+
 openldap (2.4.17-1) unstable; urgency=low
 
   * New upstream version.

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2009-07-28 17:19:49 UTC (rev 1230)
+++ openldap/trunk/debian/control	2009-07-29 01:05:46 UTC (rev 1231)
@@ -26,7 +26,7 @@
 Pre-Depends: debconf (>= 0.5) | debconf-2.0
 Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version}),
  coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl,
- adduser
+ adduser, ${misc:Depends}
 Recommends: libsasl2-modules
 Suggests: ldap-utils
 Conflicts: umich-ldapd, ldap-server, libltdl3 (= 1.5.4-1)
@@ -41,7 +41,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version}), ${misc:Depends}
 Recommends: libsasl2-modules
 Conflicts: umich-ldap-utils, openldap-utils, ldap-client
 Replaces: openldap-utils, slapd (<< 2.2.23-0.pre6), openldapd
@@ -57,7 +57,7 @@
 Priority: standard
 Architecture: any
 Conflicts: ldap-utils (<= 2.1.23-1)
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libldap2, libldap-2.3-0
 Description: OpenLDAP libraries 
  These are the run-time libraries for the OpenLDAP (Lightweight Directory
@@ -67,7 +67,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libldap-2.4-2 (= ${binary:Version})
+Depends: libldap-2.4-2 (= ${binary:Version}), ${misc:Depends}
 Description: Debugging information for OpenLDAP libraries
  This package provides detached debugging information for the OpenLDAP
  (Lightweight Directory Access Protocol) libraries. It is useful
@@ -82,7 +82,7 @@
 Conflicts: libldap-dev, libopenldap-dev
 Replaces: libopenldap-dev
 Provides: libldap-dev
-Depends: libldap-2.4-2 (= ${binary:Version})
+Depends: libldap-2.4-2 (= ${binary:Version}), ${misc:Depends}
 Description: OpenLDAP development libraries
  This package allows development of LDAP applications using the OpenLDAP
  libraries. It includes headers, libraries and links to allow static and
@@ -92,7 +92,7 @@
 Section: net
 Priority: extra
 Architecture: any
-Depends: slapd (= ${binary:Version})
+Depends: slapd (= ${binary:Version}), ${misc:Depends}
 Description: Debugging information for the OpenLDAP server (slapd)
  This package provides detached debugging information for the OpenLDAP
  (Lightweight Directory Access Protocol) server (slapd). It is useful

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2009-07-28 17:19:49 UTC (rev 1230)
+++ openldap/trunk/debian/slapd.scripts-common	2009-07-29 01:05:46 UTC (rev 1231)
@@ -160,7 +160,8 @@
 	for db in `get_database_list`; do
 		suffix=`get_suffix $db`
 		dbdir=`get_directory $db`
-		if ! is_empty_dir "$dbdir"; then
+		if ! is_empty_dir "$dbdir" &&
+		   ! dir_only_contains_DB_CONFIG "$dbdir"; then
 			echo >&2 \
 			  "  Directory $dbdir for $suffix not empty, aborting."
 			exit 1
@@ -169,13 +170,16 @@
 		file="$dir/$suffix.ldif"
 		echo -n "  - directory $suffix... " >&2
 
-		# If there is an old DB_CONFIG file, restore it before
-		# running slapadd
-		backupdir=`compute_backup_path -n "$dbdir" "$suffix"`
-		if [ -e "$backupdir"/DB_CONFIG ]; then
-			cp -a "$backupdir"/DB_CONFIG "$dbdir"/
-		else
-			copy_example_DB_CONFIG "$dbdir"/
+		# If there is no DB_CONFIG file in the database dir, but
+		# an old DB_CONFIG file in the backup dir,
+		# restore it before running slapadd
+		if [ ! -e "$dbdir"/DB_CONFIG ]; then
+			backupdir=`compute_backup_path -n "$dbdir" "$suffix"`
+			if [ -e "$backupdir"/DB_CONFIG ]; then
+				cp -a "$backupdir"/DB_CONFIG "$dbdir"/
+			else
+				copy_example_DB_CONFIG "$dbdir"/
+			fi
 		fi
 
 		capture_diagnostics slapadd -q -b "$suffix" -l "$file" \
@@ -1014,7 +1018,7 @@
 # Check if a path refers to an empty directory
 # Usage: if is_empty_dir "$dir"; then ... fi
 
-	output=`find "$1" -type d -maxdepth 0 -empty 2>/dev/null`
+	output=`find "$1" -maxdepth 0 -type d -empty 2>/dev/null`
   	if [ "$output" ]; then
     		return 0
   	else
@@ -1024,6 +1028,24 @@
 
 # }}}
 
+# }}}
+dir_only_contains_DB_CONFIG() {							# {{{
+# Check if a path refers to a directory
+# that is empty or contains only DB_CONFIG
+# Usage: if dir_only_contains_DB_CONFIG "$dir"; then ... fi
+
+	test -d "$1" || return 1
+
+	output=`find "$1" -mindepth 1 -maxdepth 1 2>/dev/null | grep -v /DB_CONFIG$`
+  	if [ "$output" ]; then
+    		return 1
+  	else
+    		return 0
+  	fi
+}
+
+# }}}
+
 # ===== Global variables ================================================ {{{
 #
 # At some points we need to know which version we are upgrading from if