[Pkg-openldap-devel] r619 - in openldap/trunk-2.3/debian: . patches

Matthijs Mohlmann active2-guest at costa.debian.org
Sat Feb 18 15:48:55 UTC 2006


Author: active2-guest
Date: 2006-02-18 15:48:54 +0000 (Sat, 18 Feb 2006)
New Revision: 619

Added:
   openldap/trunk-2.3/debian/libldap-2.3-0.manpages
   openldap/trunk-2.3/debian/libldap2.3-dev.links
   openldap/trunk-2.3/debian/patches/fixmanpages
Removed:
   openldap/trunk-2.3/debian/libldap2-dev.links
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/fix_ldif
   openldap/trunk-2.3/debian/ldap-utils.manpages
   openldap/trunk-2.3/debian/ldiftopasswd
   openldap/trunk-2.3/debian/libldap-2.3-0.install
   openldap/trunk-2.3/debian/libldap2.3-dev.install
   openldap/trunk-2.3/debian/patches/series
   openldap/trunk-2.3/debian/rules
   openldap/trunk-2.3/debian/slapd.links
   openldap/trunk-2.3/debian/slapd.manpages
Log:
 * Move libldap2-dev.links to libldap2.3-dev.links
 * Added patch fixmanpages to add the proper location of the manpage
 * Update the *.install files for the right library names.
 * Added manpages
 * Make ldiftopasswd and fix_ldif executable to fix lintian warnings


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/changelog	2006-02-18 15:48:54 UTC (rev 619)
@@ -1,7 +1,6 @@
-openldap2.3 (2.3.11-1) UNRELEASED; urgency=low
+openldap2.3 (2.3.19-1) experimental; urgency=low
 
   [ Matthijs Mohlmann ]
-  Matthijs Mohlmann <matthijs at cacholong.nl>
   * New upstream release. (Closes: #308906, #310282)
   * OpenLDAP checks database before starting up.
     (Closes: #190165, #195079, #294701, #308416)
@@ -9,13 +8,15 @@
     kill debconf interaction) (Closes: #299100)
   * BDB_CONFIG file will be installed on new installations (Closes: #301292)
   * Move to dh_install.
-  * Move to dpatch patch system.
+  * Move to quilt patch system.
+  * Fix manpage.
+  * Make ldiftopasswd and fix_ldif executable. (fixes lintian warnings)
 
   [ Steve Langasek ]
   * debian/slapd.templates: Fix typo durin -> during; re-run
     debconf-updatepo, fixing up the fuzzies (closes: #319596).
 
- -- Debian OpenLDAP Maintainers <pkg-openldap-devel at lists.alioth.debian.org>  Sat, 24 Dec 2005 13:23:25 +0100
+ -- Debian OpenLDAP Maintainers <pkg-openldap-devel at lists.alioth.debian.org>  Sat, 18 Feb 2006 16:46:10 +0100
 
 openldap2.2 (2.2.26-4) unstable; urgency=low
 


Property changes on: openldap/trunk-2.3/debian/fix_ldif
___________________________________________________________________
Name: svn:executable
   + *

Modified: openldap/trunk-2.3/debian/ldap-utils.manpages
===================================================================
--- openldap/trunk-2.3/debian/ldap-utils.manpages	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/ldap-utils.manpages	2006-02-18 15:48:54 UTC (rev 619)
@@ -6,3 +6,4 @@
 debian/tmp/usr/share/man/man1/ldapsearch.1
 debian/tmp/usr/share/man/man1/ldapwhoami.1
 debian/tmp/usr/share/man/man1/ldapadd.1
+debian/tmp/usr/share/man/man5/ldif.5


Property changes on: openldap/trunk-2.3/debian/ldiftopasswd
___________________________________________________________________
Name: svn:executable
   + *

Modified: openldap/trunk-2.3/debian/libldap-2.3-0.install
===================================================================
--- openldap/trunk-2.3/debian/libldap-2.3-0.install	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/libldap-2.3-0.install	2006-02-18 15:48:54 UTC (rev 619)
@@ -1,6 +1,6 @@
 debian/tmp/usr/lib/liblber-2.3.so.0 usr/lib
-debian/tmp/usr/lib/liblber-2.3.so.0.1.6 usr/lib
+debian/tmp/usr/lib/liblber-2.3.so.0.2.7 usr/lib
 debian/tmp/usr/lib/libldap-2.3.so.0 usr/lib
-debian/tmp/usr/lib/libldap-2.3.so.0.1.6 usr/lib
+debian/tmp/usr/lib/libldap-2.3.so.0.2.7 usr/lib
 debian/tmp/usr/lib/libldap_r-2.3.so.0 usr/lib
-debian/tmp/usr/lib/libldap_r-2.3.so.0.1.6 usr/lib
+debian/tmp/usr/lib/libldap_r-2.3.so.0.2.7 usr/lib

Added: openldap/trunk-2.3/debian/libldap-2.3-0.manpages
===================================================================
--- openldap/trunk-2.3/debian/libldap-2.3-0.manpages	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/libldap-2.3-0.manpages	2006-02-18 15:48:54 UTC (rev 619)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man5/ldap.conf.5

Deleted: openldap/trunk-2.3/debian/libldap2-dev.links
===================================================================
--- openldap/trunk-2.3/debian/libldap2-dev.links	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/libldap2-dev.links	2006-02-18 15:48:54 UTC (rev 619)
@@ -1,10 +0,0 @@
-lber-encode.3	usr/share/man/man3/ber_put_bitstring.3
-lber-encode.3	usr/share/man/man3/ber_put_boolean.3
-lber-encode.3	usr/share/man/man3/ber_start_seq.3
-lber-memory.3	usr/share/man/man3/ber_memalloc.3
-lber-memory.3	usr/share/man/man3/ber_memcalloc.3
-lber-memory.3	usr/share/man/man3/ber_memfree.3
-lber-memory.3	usr/share/man/man3/ber_memrealloc.3
-lber-types.3	usr/share/man/man3/ber_int_t.3
-lber-types.3	usr/share/man/man3/ber_len_t.3
-lber-types.3	usr/share/man/man3/ber_tag_t.3

Modified: openldap/trunk-2.3/debian/libldap2.3-dev.install
===================================================================
--- openldap/trunk-2.3/debian/libldap2.3-dev.install	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/libldap2.3-dev.install	2006-02-18 15:48:54 UTC (rev 619)
@@ -1,3 +1,4 @@
+debian/tmp/usr/include/slapi-plugin.h usr/include
 debian/tmp/usr/include/lber.h usr/include
 debian/tmp/usr/include/lber_types.h usr/include
 debian/tmp/usr/include/ldap_cdefs.h usr/include
@@ -5,7 +6,9 @@
 debian/tmp/usr/include/ldap.h usr/include
 debian/tmp/usr/include/ldap_schema.h usr/include
 debian/tmp/usr/include/ldap_utf8.h usr/include
+debian/tmp/usr/lib/libldap.a usr/lib
+debian/tmp/usr/lib/libldap.so usr/lib
 debian/tmp/usr/lib/liblber.a usr/lib
-debian/tmp/usr/lib/libldap.a usr/lib
+debian/tmp/usr/lib/liblber.so usr/lib
+debian/tmp/usr/lib/libldap_r.a usr/lib
 debian/tmp/usr/lib/libldap_r.so usr/lib
-debian/tmp/usr/lib/libldap.so usr/lib

Copied: openldap/trunk-2.3/debian/libldap2.3-dev.links (from rev 618, openldap/trunk-2.3/debian/libldap2-dev.links)

Added: openldap/trunk-2.3/debian/patches/fixmanpages
===================================================================
--- openldap/trunk-2.3/debian/patches/fixmanpages	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/patches/fixmanpages	2006-02-18 15:48:54 UTC (rev 619)
@@ -0,0 +1,10 @@
+Index: doc/man/man5/slapo-retcode.5
+===================================================================
+--- doc/man/man5/slapo-retcode.5.orig
++++ doc/man/man5/slapo-retcode.5
+@@ -1,4 +1,4 @@
+-.TH SLAPO-RETCODE5 "RELEASEDATE" "OpenLDAP LDVERSION"
++.TH SLAPO-RETCODE 5 "RELEASEDATE" "OpenLDAP LDVERSION"
+ .\" Copyright 1998-2006 The OpenLDAP Foundation, All Rights Reserved.
+ .\" Copying restrictions apply.  See the COPYRIGHT file.
+ .\" Copyright 2001, Pierangelo Masarati, All rights reserved. <ando at sys-net.it>

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/patches/series	2006-02-18 15:48:54 UTC (rev 619)
@@ -5,3 +5,4 @@
 ntlm_c
 libldap-makefile_in
 add-autogen-sh
+fixmanpages -p0

Modified: openldap/trunk-2.3/debian/rules
===================================================================
--- openldap/trunk-2.3/debian/rules	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/rules	2006-02-18 15:48:54 UTC (rev 619)
@@ -80,9 +80,9 @@
 	dh_compress -i
 	dh_gencontrol -i
 	dh_md5sums -i
-	# Don't build the libslapd2.2-dev package so nobody builds against
+	# Don't build the libslapd2.3-dev package so nobody builds against
 	# it. We'll support it after sarge release...
-	#dh_builddeb -i -Nlibslapd2.2-dev
+	#dh_builddeb -i -Nlibslapd2.3-dev
 	dh_builddeb -i
 
 binary-arch: install-stamp
@@ -114,9 +114,9 @@
 	dh_shlibdeps -a -l$(installdir)/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
-	# Don't build the libldap2.2-dev package until after sarge release
+	# Don't build the libldap2.3-dev package until after sarge release
 	# so nobody can build against it.
-	dh_builddeb -a -Nlibldap2.2-dev
+	dh_builddeb -a -Nlibldap2.3-dev
 
 clean: clean1 unpatch
 clean1:
@@ -135,7 +135,7 @@
 	rm -rf $(builddir) $(builddir_notls) $(installdir)
 	
 	dh_clean
-	# XXX: remove after libldap2.2-dev is officially built
-	rm -Rf debian/libldap2.2-dev
+	# XXX: remove after libldap2.3-dev is officially built
+	rm -Rf debian/libldap2.3-dev
 
 .PHONY: binary binary-arch binary-indep build clean

Modified: openldap/trunk-2.3/debian/slapd.links
===================================================================
--- openldap/trunk-2.3/debian/slapd.links	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/slapd.links	2006-02-18 15:48:54 UTC (rev 619)
@@ -1,4 +1,10 @@
 usr/share/doc/slapd/examples/DB_CONFIG usr/share/slapd/DB_CONFIG
 usr/share/doc/slapd/examples/slapd.conf usr/share/slapd/slapd.conf
+usr/sbin/slapd usr/sbin/slapacl
+usr/sbin/slapd usr/sbin/slapadd
+usr/sbin/slapd usr/sbin/slapauth
 usr/sbin/slapd usr/sbin/slapcat
-usr/sbin/slapd usr/sbin/slapadd
+usr/sbin/slapd usr/sbin/slapdn
+usr/sbin/slapd usr/sbin/slapindex
+usr/sbin/slapd usr/sbin/slappasswd
+usr/sbin/slapd usr/sbin/slaptest

Modified: openldap/trunk-2.3/debian/slapd.manpages
===================================================================
--- openldap/trunk-2.3/debian/slapd.manpages	2006-02-17 17:52:03 UTC (rev 618)
+++ openldap/trunk-2.3/debian/slapd.manpages	2006-02-18 15:48:54 UTC (rev 619)
@@ -1,10 +1,10 @@
 debian/tmp/usr/share/man/man5/slapd.access.5
-debian/tmp/usr/share/man/man5/slapd.access.5
 debian/tmp/usr/share/man/man5/slapd-hdb.5
 debian/tmp/usr/share/man/man5/slapd-meta.5
 debian/tmp/usr/share/man/man5/slapd-perl.5
 debian/tmp/usr/share/man/man5/slapd-shell.5
 debian/tmp/usr/share/man/man5/slapd-bdb.5
+debian/tmp/usr/share/man/man5/slapd-hdb.5
 debian/tmp/usr/share/man/man5/slapd-ldap.5
 debian/tmp/usr/share/man/man5/slapd-monitor.5
 debian/tmp/usr/share/man/man5/slapd.plugin.5
@@ -18,5 +18,25 @@
 debian/tmp/usr/share/man/man5/slapd-ldif.5
 debian/tmp/usr/share/man/man5/slapd-passwd.5
 debian/tmp/usr/share/man/man5/slapd.replog.5
+debian/tmp/usr/share/man/man5/slapo-chain.5
+debian/tmp/usr/share/man/man5/slapo-dynlist.5
+debian/tmp/usr/share/man/man5/slapo-lastmod.5
+debian/tmp/usr/share/man/man5/slapo-pcache.5
+debian/tmp/usr/share/man/man5/slapo-ppolicy.5
+debian/tmp/usr/share/man/man5/slapo-refint.5
+debian/tmp/usr/share/man/man5/slapo-retcode.5
+debian/tmp/usr/share/man/man5/slapo-rwm.5
+debian/tmp/usr/share/man/man5/slapo-syncprov.5
+debian/tmp/usr/share/man/man5/slapo-translucent.5
+debian/tmp/usr/share/man/man5/slapo-unique.5
+debian/tmp/usr/share/man/man5/slapo-valsort.5
 debian/tmp/usr/share/man/man8/slurpd.8
 debian/tmp/usr/share/man/man8/slapd.8
+debian/tmp/usr/share/man/man8/slapadd.8
+debian/tmp/usr/share/man/man8/slapcat.8
+debian/tmp/usr/share/man/man8/slapacl.8
+debian/tmp/usr/share/man/man8/slapauth.8
+debian/tmp/usr/share/man/man8/slapdn.8
+debian/tmp/usr/share/man/man8/slapindex.8
+debian/tmp/usr/share/man/man8/slappasswd.8
+debian/tmp/usr/share/man/man8/slaptest.8




More information about the Pkg-openldap-devel mailing list