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

Steve Langasek vorlon at alioth.debian.org
Sat Dec 15 11:11:13 UTC 2007


Author: vorlon
Date: 2007-12-15 11:11:13 +0000 (Sat, 15 Dec 2007)
New Revision: 898

Added:
   openldap/trunk/debian/libldap-2.4-2.README.Debian
   openldap/trunk/debian/libldap-2.4-2.install
   openldap/trunk/debian/libldap-2.4-2.manpages
   openldap/trunk/debian/libldap2-dev.dirs
   openldap/trunk/debian/libldap2-dev.install
   openldap/trunk/debian/libldap2-dev.links
   openldap/trunk/debian/libldap2-dev.manpages
Removed:
   openldap/trunk/debian/libldap-2.3-0.README.Debian
   openldap/trunk/debian/libldap-2.3-0.install
   openldap/trunk/debian/libldap-2.3-0.manpages
   openldap/trunk/debian/libldap2.3-dev.dirs
   openldap/trunk/debian/libldap2.3-dev.install
   openldap/trunk/debian/libldap2.3-dev.links
   openldap/trunk/debian/libldap2.3-dev.manpages
Modified:
   openldap/trunk/debian/control
   openldap/trunk/debian/rules
Log:
bump the libldap package name for the upstream soname change, and start
building libldap2-dev from the main package again, taking the package name
over from the now-obsolete openldap2 source package.



Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/control	2007-12-15 11:11:13 UTC (rev 898)
@@ -15,7 +15,7 @@
 Priority: optional
 Architecture: any
 Pre-Depends: debconf (>= 0.5) | debconf-2.0
-Depends: ${shlibs:Depends}, libldap-2.3-0 (= ${binary:Version}), coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl, adduser
+Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version}), coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl, adduser
 Recommends: libsasl2-modules
 Suggests: ldap-utils
 Conflicts: umich-ldapd, ldap-server, libltdl3 (= 1.5.4-1)
@@ -30,7 +30,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libldap-2.3-0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version})
 Recommends: libsasl2-modules
 Conflicts: umich-ldap-utils, openldap-utils, ldap-client
 Replaces: openldap-utils, slapd (<< 2.2.23-0.pre6), openldapd
@@ -40,28 +40,41 @@
  package. These utilities can access a local or remote LDAP server
  and contain all the client programs required to access LDAP servers.
 
-Package: libldap-2.3-0
+Package: libldap-2.4-2
 Section: libs
 Priority: optional
 Architecture: any
 Conflicts: ldap-utils (<= 2.1.23-1)
 Depends: ${shlibs:Depends}, libldap2
-Replaces: libldap2
+Replaces: libldap2, libldap-2.3-0
 Description: OpenLDAP libraries 
  These are the run-time libraries for the OpenLDAP (Lightweight Directory
  Access Protocol) servers and clients.
 
-Package: libldap-2.3-0-dbg
+Package: libldap-2.4-2-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libldap-2.3-0 (= ${binary:Version})
+Depends: libldap-2.4-2 (= ${binary:Version})
 Description: Debugging information for OpenLDAP libraries
  Detached debugging information for the OpenLDAP (Lightweight Directory
  Access Protocol) libraries.  It is useful primarily to permit better
  backtraces and crash dump analysis after problems with the libraries.
  GDB will find this debug information automatically.
 
+Package: libldap2-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Conflicts: libldap-dev, libopenldap-dev
+Replaces: libopenldap-dev
+Provides: libldap-dev
+Depends: libldap-2.4-2 (= ${binary:Version})
+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
+ dynamic linking.
+
 Package: slapd-dbg
 Section: net
 Priority: extra

Deleted: openldap/trunk/debian/libldap-2.3-0.README.Debian
===================================================================
--- openldap/trunk/debian/libldap-2.3-0.README.Debian	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/libldap-2.3-0.README.Debian	2007-12-15 11:11:13 UTC (rev 898)
@@ -1,22 +0,0 @@
-Notes about Debian's libldap2 package
--------------------------------------
-
-It has been reported that using libnss-ldap can cause a failure to 
-unmount /usr on system shutdown. The reason is that the nss module
-uses libldap from /usr and is used by the shell in the system 
-scripts executed on shutdown/reboot. 
-
-More precisely bash uses the getpwuid function to get the data of
-the current user which pulls in the nss modules which includes
-the ldap libraries if you are using that module. 
-
-Possible solutions to this problem are:
-
-a) use another shell that does not utilize getpwuid for getting info
-   about the current user (take dash for example).
-b) make sure that the nsswitch.conf is replaced by a version which does
-   not mention ldap before the system is shut down (and have a startup
-   script that installs the "full" version of that file).
-c) move the libraries to /lib (not recommended).
-
- -- Torsten Landschoff <torsten at debian.org>  Mon, 30 Sep 2002 11:06:22 +0200

Deleted: openldap/trunk/debian/libldap-2.3-0.install
===================================================================
--- openldap/trunk/debian/libldap-2.3-0.install	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/libldap-2.3-0.install	2007-12-15 11:11:13 UTC (rev 898)
@@ -1,8 +0,0 @@
-debian/tmp/usr/lib/liblber-2.3.so.0 usr/lib
-debian/tmp/usr/lib/liblber-2.3.so.0.*.* usr/lib
-debian/tmp/usr/lib/libldap-2.3.so.0 usr/lib
-debian/tmp/usr/lib/libldap-2.3.so.0.*.* usr/lib
-debian/tmp/usr/lib/libldap_r-2.3.so.0 usr/lib
-debian/tmp/usr/lib/libldap_r-2.3.so.0.*.* usr/lib
-debian/tmp/usr/lib/libslapi-2.3.so.0 usr/lib
-debian/tmp/usr/lib/libslapi-2.3.so.0.*.* usr/lib

Deleted: openldap/trunk/debian/libldap-2.3-0.manpages
===================================================================
--- openldap/trunk/debian/libldap-2.3-0.manpages	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/libldap-2.3-0.manpages	2007-12-15 11:11:13 UTC (rev 898)
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man5/ldap.conf.5

Copied: openldap/trunk/debian/libldap-2.4-2.README.Debian (from rev 889, openldap/trunk/debian/libldap-2.3-0.README.Debian)
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.README.Debian	                        (rev 0)
+++ openldap/trunk/debian/libldap-2.4-2.README.Debian	2007-12-15 11:11:13 UTC (rev 898)
@@ -0,0 +1,22 @@
+Notes about Debian's libldap2 package
+-------------------------------------
+
+It has been reported that using libnss-ldap can cause a failure to 
+unmount /usr on system shutdown. The reason is that the nss module
+uses libldap from /usr and is used by the shell in the system 
+scripts executed on shutdown/reboot. 
+
+More precisely bash uses the getpwuid function to get the data of
+the current user which pulls in the nss modules which includes
+the ldap libraries if you are using that module. 
+
+Possible solutions to this problem are:
+
+a) use another shell that does not utilize getpwuid for getting info
+   about the current user (take dash for example).
+b) make sure that the nsswitch.conf is replaced by a version which does
+   not mention ldap before the system is shut down (and have a startup
+   script that installs the "full" version of that file).
+c) move the libraries to /lib (not recommended).
+
+ -- Torsten Landschoff <torsten at debian.org>  Mon, 30 Sep 2002 11:06:22 +0200

Copied: openldap/trunk/debian/libldap-2.4-2.install (from rev 889, openldap/trunk/debian/libldap-2.3-0.install)
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.install	                        (rev 0)
+++ openldap/trunk/debian/libldap-2.4-2.install	2007-12-15 11:11:13 UTC (rev 898)
@@ -0,0 +1,8 @@
+debian/tmp/usr/lib/liblber-2.4.so.2 usr/lib
+debian/tmp/usr/lib/liblber-2.4.so.2.*.* usr/lib
+debian/tmp/usr/lib/libldap-2.4.so.2 usr/lib
+debian/tmp/usr/lib/libldap-2.4.so.2.*.* usr/lib
+debian/tmp/usr/lib/libldap_r-2.4.so.2 usr/lib
+debian/tmp/usr/lib/libldap_r-2.4.so.2.*.* usr/lib
+debian/tmp/usr/lib/libslapi-2.4.so.2 usr/lib
+debian/tmp/usr/lib/libslapi-2.4.so.2.*.* usr/lib

Copied: openldap/trunk/debian/libldap-2.4-2.manpages (from rev 889, openldap/trunk/debian/libldap-2.3-0.manpages)
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.manpages	                        (rev 0)
+++ openldap/trunk/debian/libldap-2.4-2.manpages	2007-12-15 11:11:13 UTC (rev 898)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man5/ldap.conf.5

Copied: openldap/trunk/debian/libldap2-dev.dirs (from rev 889, openldap/trunk/debian/libldap2.3-dev.dirs)
===================================================================
--- openldap/trunk/debian/libldap2-dev.dirs	                        (rev 0)
+++ openldap/trunk/debian/libldap2-dev.dirs	2007-12-15 11:11:13 UTC (rev 898)
@@ -0,0 +1,3 @@
+usr/lib
+usr/include
+usr/share/man

Copied: openldap/trunk/debian/libldap2-dev.install (from rev 889, openldap/trunk/debian/libldap2.3-dev.install)
===================================================================
--- openldap/trunk/debian/libldap2-dev.install	                        (rev 0)
+++ openldap/trunk/debian/libldap2-dev.install	2007-12-15 11:11:13 UTC (rev 898)
@@ -0,0 +1,16 @@
+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
+debian/tmp/usr/include/ldap_features.h usr/include
+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/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/libslapi.a usr/lib
+debian/tmp/usr/lib/libslapi.so usr/lib

Copied: openldap/trunk/debian/libldap2-dev.links (from rev 889, openldap/trunk/debian/libldap2.3-dev.links)
===================================================================
--- openldap/trunk/debian/libldap2-dev.links	                        (rev 0)
+++ openldap/trunk/debian/libldap2-dev.links	2007-12-15 11:11:13 UTC (rev 898)
@@ -0,0 +1,10 @@
+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

Copied: openldap/trunk/debian/libldap2-dev.manpages (from rev 889, openldap/trunk/debian/libldap2.3-dev.manpages)
===================================================================
--- openldap/trunk/debian/libldap2-dev.manpages	                        (rev 0)
+++ openldap/trunk/debian/libldap2-dev.manpages	2007-12-15 11:11:13 UTC (rev 898)
@@ -0,0 +1,146 @@
+debian/tmp/usr/share/man/man3/ber_alloc_t.3
+debian/tmp/usr/share/man/man3/ldap_explode_rdn.3
+debian/tmp/usr/share/man/man3/ber_bvarray_add.3
+debian/tmp/usr/share/man/man3/ldap_first_attribute.3
+debian/tmp/usr/share/man/man3/ber_bvarray_free.3
+debian/tmp/usr/share/man/man3/ldap_first_entry.3
+debian/tmp/usr/share/man/man3/ber_bvdup.3
+debian/tmp/usr/share/man/man3/ldap_first_message.3
+debian/tmp/usr/share/man/man3/ber_bvecadd.3
+debian/tmp/usr/share/man/man3/ldap_first_reference.3
+debian/tmp/usr/share/man/man3/ber_bvecfree.3
+debian/tmp/usr/share/man/man3/ldap_free_urldesc.3
+debian/tmp/usr/share/man/man3/ber_bvfree.3
+debian/tmp/usr/share/man/man3/ldap_get_dn.3
+debian/tmp/usr/share/man/man3/ber_bvstr.3
+debian/tmp/usr/share/man/man3/ldap_get_values.3
+debian/tmp/usr/share/man/man3/ber_bvstrdup.3
+debian/tmp/usr/share/man/man3/ldap_get_values_len.3
+debian/tmp/usr/share/man/man3/ber_dupbv.3
+debian/tmp/usr/share/man/man3/ldap_init.3
+debian/tmp/usr/share/man/man3/ber_first_element.3
+debian/tmp/usr/share/man/man3/ldap_is_ldap_url.3
+debian/tmp/usr/share/man/man3/ber_flush.3
+debian/tmp/usr/share/man/man3/ldap_matchingrule2name.3
+debian/tmp/usr/share/man/man3/ber_free.3
+debian/tmp/usr/share/man/man3/ldap_matchingrule2str.3
+debian/tmp/usr/share/man/man3/ber_get_bitstring.3
+debian/tmp/usr/share/man/man3/ldap_matchingrule_free.3
+debian/tmp/usr/share/man/man3/ber_get_boolean.3
+debian/tmp/usr/share/man/man3/ldap_modify.3
+debian/tmp/usr/share/man/man3/ber_get_enum.3
+debian/tmp/usr/share/man/man3/ldap_modify_ext.3
+debian/tmp/usr/share/man/man3/ber_get_int.3
+debian/tmp/usr/share/man/man3/ldap_modify_ext_s.3
+debian/tmp/usr/share/man/man3/ber_get_next.3
+debian/tmp/usr/share/man/man3/ldap_modify_s.3
+debian/tmp/usr/share/man/man3/ber_get_null.3
+debian/tmp/usr/share/man/man3/ldap_modrdn2.3
+debian/tmp/usr/share/man/man3/ber_get_stringa.3
+debian/tmp/usr/share/man/man3/ldap_modrdn2_s.3
+debian/tmp/usr/share/man/man3/ber_get_stringb.3
+debian/tmp/usr/share/man/man3/ldap_modrdn.3
+debian/tmp/usr/share/man/man3/ber_next_element.3
+debian/tmp/usr/share/man/man3/ldap_modrdn_s.3
+debian/tmp/usr/share/man/man3/ber_peek_tag.3
+debian/tmp/usr/share/man/man3/ldap_mods_free.3
+debian/tmp/usr/share/man/man3/ber_printf.3
+debian/tmp/usr/share/man/man3/ldap_msgfree.3
+debian/tmp/usr/share/man/man3/ber_put_enum.3
+debian/tmp/usr/share/man/man3/ldap_msgid.3
+debian/tmp/usr/share/man/man3/ber_put_int.3
+debian/tmp/usr/share/man/man3/ldap_msgtype.3
+debian/tmp/usr/share/man/man3/ber_put_null.3
+debian/tmp/usr/share/man/man3/ldap_next_attribute.3
+debian/tmp/usr/share/man/man3/ber_put_ostring.3
+debian/tmp/usr/share/man/man3/ldap_next_entry.3
+debian/tmp/usr/share/man/man3/ber_put_seq.3
+debian/tmp/usr/share/man/man3/ldap_next_message.3
+debian/tmp/usr/share/man/man3/ber_put_set.3
+debian/tmp/usr/share/man/man3/ldap_next_reference.3
+debian/tmp/usr/share/man/man3/ber_put_string.3
+debian/tmp/usr/share/man/man3/ldap_objectclass2name.3
+debian/tmp/usr/share/man/man3/ber_scanf.3
+debian/tmp/usr/share/man/man3/ldap_objectclass2str.3
+debian/tmp/usr/share/man/man3/ber_skip_tag.3
+debian/tmp/usr/share/man/man3/ldap_objectclass_free.3
+debian/tmp/usr/share/man/man3/ber_start_set.3
+debian/tmp/usr/share/man/man3/ldap_open.3
+debian/tmp/usr/share/man/man3/ber_str2bv.3
+debian/tmp/usr/share/man/man3/ldap_parse_extended_result.3
+debian/tmp/usr/share/man/man3/lber-decode.3
+debian/tmp/usr/share/man/man3/ldap_parse_reference.3
+debian/tmp/usr/share/man/man3/lber-encode.3
+debian/tmp/usr/share/man/man3/ldap_parse_result.3
+debian/tmp/usr/share/man/man3/lber-memory.3
+debian/tmp/usr/share/man/man3/ldap_parse_sasl_bind_result.3
+debian/tmp/usr/share/man/man3/lber-types.3
+debian/tmp/usr/share/man/man3/ldap_perror.3
+debian/tmp/usr/share/man/man3/ldap.3
+debian/tmp/usr/share/man/man3/ldap_result2error.3
+debian/tmp/usr/share/man/man3/ldap_abandon.3
+debian/tmp/usr/share/man/man3/ldap_result.3
+debian/tmp/usr/share/man/man3/ldap_abandon_ext.3
+debian/tmp/usr/share/man/man3/ldap_sasl_bind.3
+debian/tmp/usr/share/man/man3/ldap_add.3
+debian/tmp/usr/share/man/man3/ldap_sasl_bind_s.3
+debian/tmp/usr/share/man/man3/ldap_add_ext.3
+debian/tmp/usr/share/man/man3/ldap_schema.3
+debian/tmp/usr/share/man/man3/ldap_add_ext_s.3
+debian/tmp/usr/share/man/man3/ldap_scherr2str.3
+debian/tmp/usr/share/man/man3/ldap_add_s.3
+debian/tmp/usr/share/man/man3/ldap_search.3
+debian/tmp/usr/share/man/man3/ldap_attributetype2name.3
+debian/tmp/usr/share/man/man3/ldap_search_ext.3
+debian/tmp/usr/share/man/man3/ldap_attributetype2str.3
+debian/tmp/usr/share/man/man3/ldap_search_ext_s.3
+debian/tmp/usr/share/man/man3/ldap_attributetype_free.3
+debian/tmp/usr/share/man/man3/ldap_search_s.3
+debian/tmp/usr/share/man/man3/ldap_bind.3
+debian/tmp/usr/share/man/man3/ldap_search_st.3
+debian/tmp/usr/share/man/man3/ldap_bind_s.3
+debian/tmp/usr/share/man/man3/ldap_simple_bind.3
+debian/tmp/usr/share/man/man3/ldap_compare.3
+debian/tmp/usr/share/man/man3/ldap_simple_bind_s.3
+debian/tmp/usr/share/man/man3/ldap_compare_ext.3
+debian/tmp/usr/share/man/man3/ldap_sort.3
+debian/tmp/usr/share/man/man3/ldap_compare_ext_s.3
+debian/tmp/usr/share/man/man3/ldap_sort_entries.3
+debian/tmp/usr/share/man/man3/ldap_compare_s.3
+debian/tmp/usr/share/man/man3/ldap_sort_strcasecmp.3
+debian/tmp/usr/share/man/man3/ldap_count_entries.3
+debian/tmp/usr/share/man/man3/ldap_sort_values.3
+debian/tmp/usr/share/man/man3/ldap_count_messages.3
+debian/tmp/usr/share/man/man3/ldap_str2attributetype.3
+debian/tmp/usr/share/man/man3/ldap_count_references.3
+debian/tmp/usr/share/man/man3/ldap_str2dn.3
+debian/tmp/usr/share/man/man3/ldap_count_values.3
+debian/tmp/usr/share/man/man3/ldap_str2matchingrule.3
+debian/tmp/usr/share/man/man3/ldap_count_values_len.3
+debian/tmp/usr/share/man/man3/ldap_str2objectclass.3
+debian/tmp/usr/share/man/man3/ldap_dcedn2dn.3
+debian/tmp/usr/share/man/man3/ldap_str2syntax.3
+debian/tmp/usr/share/man/man3/ldap_delete.3
+debian/tmp/usr/share/man/man3/ldap_syntax2name.3
+debian/tmp/usr/share/man/man3/ldap_delete_ext.3
+debian/tmp/usr/share/man/man3/ldap_syntax2str.3
+debian/tmp/usr/share/man/man3/ldap_delete_ext_s.3
+debian/tmp/usr/share/man/man3/ldap_syntax_free.3
+debian/tmp/usr/share/man/man3/ldap_delete_s.3
+debian/tmp/usr/share/man/man3/ldap_unbind.3
+debian/tmp/usr/share/man/man3/ldap_dn2ad_canonical.3
+debian/tmp/usr/share/man/man3/ldap_unbind_ext.3
+debian/tmp/usr/share/man/man3/ldap_dn2dcedn.3
+debian/tmp/usr/share/man/man3/ldap_unbind_ext_s.3
+debian/tmp/usr/share/man/man3/ldap_dn2str.3
+debian/tmp/usr/share/man/man3/ldap_unbind_s.3
+debian/tmp/usr/share/man/man3/ldap_dn2ufn.3
+debian/tmp/usr/share/man/man3/ldap_url.3
+debian/tmp/usr/share/man/man3/ldap_err2string.3
+debian/tmp/usr/share/man/man3/ldap_url_parse.3
+debian/tmp/usr/share/man/man3/ldap_errlist.3
+debian/tmp/usr/share/man/man3/ldap_value_free.3
+debian/tmp/usr/share/man/man3/ldap_error.3
+debian/tmp/usr/share/man/man3/ldap_value_free_len.3
+debian/tmp/usr/share/man/man3/ldap_explode_dn.3
+debian/tmp/usr/share/man/man3/ld_errno.3

Deleted: openldap/trunk/debian/libldap2.3-dev.dirs
===================================================================
--- openldap/trunk/debian/libldap2.3-dev.dirs	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/libldap2.3-dev.dirs	2007-12-15 11:11:13 UTC (rev 898)
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share/man

Deleted: openldap/trunk/debian/libldap2.3-dev.install
===================================================================
--- openldap/trunk/debian/libldap2.3-dev.install	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/libldap2.3-dev.install	2007-12-15 11:11:13 UTC (rev 898)
@@ -1,16 +0,0 @@
-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
-debian/tmp/usr/include/ldap_features.h usr/include
-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/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/libslapi.a usr/lib
-debian/tmp/usr/lib/libslapi.so usr/lib

Deleted: openldap/trunk/debian/libldap2.3-dev.links
===================================================================
--- openldap/trunk/debian/libldap2.3-dev.links	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/libldap2.3-dev.links	2007-12-15 11:11:13 UTC (rev 898)
@@ -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

Deleted: openldap/trunk/debian/libldap2.3-dev.manpages
===================================================================
--- openldap/trunk/debian/libldap2.3-dev.manpages	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/libldap2.3-dev.manpages	2007-12-15 11:11:13 UTC (rev 898)
@@ -1,146 +0,0 @@
-debian/tmp/usr/share/man/man3/ber_alloc_t.3
-debian/tmp/usr/share/man/man3/ldap_explode_rdn.3
-debian/tmp/usr/share/man/man3/ber_bvarray_add.3
-debian/tmp/usr/share/man/man3/ldap_first_attribute.3
-debian/tmp/usr/share/man/man3/ber_bvarray_free.3
-debian/tmp/usr/share/man/man3/ldap_first_entry.3
-debian/tmp/usr/share/man/man3/ber_bvdup.3
-debian/tmp/usr/share/man/man3/ldap_first_message.3
-debian/tmp/usr/share/man/man3/ber_bvecadd.3
-debian/tmp/usr/share/man/man3/ldap_first_reference.3
-debian/tmp/usr/share/man/man3/ber_bvecfree.3
-debian/tmp/usr/share/man/man3/ldap_free_urldesc.3
-debian/tmp/usr/share/man/man3/ber_bvfree.3
-debian/tmp/usr/share/man/man3/ldap_get_dn.3
-debian/tmp/usr/share/man/man3/ber_bvstr.3
-debian/tmp/usr/share/man/man3/ldap_get_values.3
-debian/tmp/usr/share/man/man3/ber_bvstrdup.3
-debian/tmp/usr/share/man/man3/ldap_get_values_len.3
-debian/tmp/usr/share/man/man3/ber_dupbv.3
-debian/tmp/usr/share/man/man3/ldap_init.3
-debian/tmp/usr/share/man/man3/ber_first_element.3
-debian/tmp/usr/share/man/man3/ldap_is_ldap_url.3
-debian/tmp/usr/share/man/man3/ber_flush.3
-debian/tmp/usr/share/man/man3/ldap_matchingrule2name.3
-debian/tmp/usr/share/man/man3/ber_free.3
-debian/tmp/usr/share/man/man3/ldap_matchingrule2str.3
-debian/tmp/usr/share/man/man3/ber_get_bitstring.3
-debian/tmp/usr/share/man/man3/ldap_matchingrule_free.3
-debian/tmp/usr/share/man/man3/ber_get_boolean.3
-debian/tmp/usr/share/man/man3/ldap_modify.3
-debian/tmp/usr/share/man/man3/ber_get_enum.3
-debian/tmp/usr/share/man/man3/ldap_modify_ext.3
-debian/tmp/usr/share/man/man3/ber_get_int.3
-debian/tmp/usr/share/man/man3/ldap_modify_ext_s.3
-debian/tmp/usr/share/man/man3/ber_get_next.3
-debian/tmp/usr/share/man/man3/ldap_modify_s.3
-debian/tmp/usr/share/man/man3/ber_get_null.3
-debian/tmp/usr/share/man/man3/ldap_modrdn2.3
-debian/tmp/usr/share/man/man3/ber_get_stringa.3
-debian/tmp/usr/share/man/man3/ldap_modrdn2_s.3
-debian/tmp/usr/share/man/man3/ber_get_stringb.3
-debian/tmp/usr/share/man/man3/ldap_modrdn.3
-debian/tmp/usr/share/man/man3/ber_next_element.3
-debian/tmp/usr/share/man/man3/ldap_modrdn_s.3
-debian/tmp/usr/share/man/man3/ber_peek_tag.3
-debian/tmp/usr/share/man/man3/ldap_mods_free.3
-debian/tmp/usr/share/man/man3/ber_printf.3
-debian/tmp/usr/share/man/man3/ldap_msgfree.3
-debian/tmp/usr/share/man/man3/ber_put_enum.3
-debian/tmp/usr/share/man/man3/ldap_msgid.3
-debian/tmp/usr/share/man/man3/ber_put_int.3
-debian/tmp/usr/share/man/man3/ldap_msgtype.3
-debian/tmp/usr/share/man/man3/ber_put_null.3
-debian/tmp/usr/share/man/man3/ldap_next_attribute.3
-debian/tmp/usr/share/man/man3/ber_put_ostring.3
-debian/tmp/usr/share/man/man3/ldap_next_entry.3
-debian/tmp/usr/share/man/man3/ber_put_seq.3
-debian/tmp/usr/share/man/man3/ldap_next_message.3
-debian/tmp/usr/share/man/man3/ber_put_set.3
-debian/tmp/usr/share/man/man3/ldap_next_reference.3
-debian/tmp/usr/share/man/man3/ber_put_string.3
-debian/tmp/usr/share/man/man3/ldap_objectclass2name.3
-debian/tmp/usr/share/man/man3/ber_scanf.3
-debian/tmp/usr/share/man/man3/ldap_objectclass2str.3
-debian/tmp/usr/share/man/man3/ber_skip_tag.3
-debian/tmp/usr/share/man/man3/ldap_objectclass_free.3
-debian/tmp/usr/share/man/man3/ber_start_set.3
-debian/tmp/usr/share/man/man3/ldap_open.3
-debian/tmp/usr/share/man/man3/ber_str2bv.3
-debian/tmp/usr/share/man/man3/ldap_parse_extended_result.3
-debian/tmp/usr/share/man/man3/lber-decode.3
-debian/tmp/usr/share/man/man3/ldap_parse_reference.3
-debian/tmp/usr/share/man/man3/lber-encode.3
-debian/tmp/usr/share/man/man3/ldap_parse_result.3
-debian/tmp/usr/share/man/man3/lber-memory.3
-debian/tmp/usr/share/man/man3/ldap_parse_sasl_bind_result.3
-debian/tmp/usr/share/man/man3/lber-types.3
-debian/tmp/usr/share/man/man3/ldap_perror.3
-debian/tmp/usr/share/man/man3/ldap.3
-debian/tmp/usr/share/man/man3/ldap_result2error.3
-debian/tmp/usr/share/man/man3/ldap_abandon.3
-debian/tmp/usr/share/man/man3/ldap_result.3
-debian/tmp/usr/share/man/man3/ldap_abandon_ext.3
-debian/tmp/usr/share/man/man3/ldap_sasl_bind.3
-debian/tmp/usr/share/man/man3/ldap_add.3
-debian/tmp/usr/share/man/man3/ldap_sasl_bind_s.3
-debian/tmp/usr/share/man/man3/ldap_add_ext.3
-debian/tmp/usr/share/man/man3/ldap_schema.3
-debian/tmp/usr/share/man/man3/ldap_add_ext_s.3
-debian/tmp/usr/share/man/man3/ldap_scherr2str.3
-debian/tmp/usr/share/man/man3/ldap_add_s.3
-debian/tmp/usr/share/man/man3/ldap_search.3
-debian/tmp/usr/share/man/man3/ldap_attributetype2name.3
-debian/tmp/usr/share/man/man3/ldap_search_ext.3
-debian/tmp/usr/share/man/man3/ldap_attributetype2str.3
-debian/tmp/usr/share/man/man3/ldap_search_ext_s.3
-debian/tmp/usr/share/man/man3/ldap_attributetype_free.3
-debian/tmp/usr/share/man/man3/ldap_search_s.3
-debian/tmp/usr/share/man/man3/ldap_bind.3
-debian/tmp/usr/share/man/man3/ldap_search_st.3
-debian/tmp/usr/share/man/man3/ldap_bind_s.3
-debian/tmp/usr/share/man/man3/ldap_simple_bind.3
-debian/tmp/usr/share/man/man3/ldap_compare.3
-debian/tmp/usr/share/man/man3/ldap_simple_bind_s.3
-debian/tmp/usr/share/man/man3/ldap_compare_ext.3
-debian/tmp/usr/share/man/man3/ldap_sort.3
-debian/tmp/usr/share/man/man3/ldap_compare_ext_s.3
-debian/tmp/usr/share/man/man3/ldap_sort_entries.3
-debian/tmp/usr/share/man/man3/ldap_compare_s.3
-debian/tmp/usr/share/man/man3/ldap_sort_strcasecmp.3
-debian/tmp/usr/share/man/man3/ldap_count_entries.3
-debian/tmp/usr/share/man/man3/ldap_sort_values.3
-debian/tmp/usr/share/man/man3/ldap_count_messages.3
-debian/tmp/usr/share/man/man3/ldap_str2attributetype.3
-debian/tmp/usr/share/man/man3/ldap_count_references.3
-debian/tmp/usr/share/man/man3/ldap_str2dn.3
-debian/tmp/usr/share/man/man3/ldap_count_values.3
-debian/tmp/usr/share/man/man3/ldap_str2matchingrule.3
-debian/tmp/usr/share/man/man3/ldap_count_values_len.3
-debian/tmp/usr/share/man/man3/ldap_str2objectclass.3
-debian/tmp/usr/share/man/man3/ldap_dcedn2dn.3
-debian/tmp/usr/share/man/man3/ldap_str2syntax.3
-debian/tmp/usr/share/man/man3/ldap_delete.3
-debian/tmp/usr/share/man/man3/ldap_syntax2name.3
-debian/tmp/usr/share/man/man3/ldap_delete_ext.3
-debian/tmp/usr/share/man/man3/ldap_syntax2str.3
-debian/tmp/usr/share/man/man3/ldap_delete_ext_s.3
-debian/tmp/usr/share/man/man3/ldap_syntax_free.3
-debian/tmp/usr/share/man/man3/ldap_delete_s.3
-debian/tmp/usr/share/man/man3/ldap_unbind.3
-debian/tmp/usr/share/man/man3/ldap_dn2ad_canonical.3
-debian/tmp/usr/share/man/man3/ldap_unbind_ext.3
-debian/tmp/usr/share/man/man3/ldap_dn2dcedn.3
-debian/tmp/usr/share/man/man3/ldap_unbind_ext_s.3
-debian/tmp/usr/share/man/man3/ldap_dn2str.3
-debian/tmp/usr/share/man/man3/ldap_unbind_s.3
-debian/tmp/usr/share/man/man3/ldap_dn2ufn.3
-debian/tmp/usr/share/man/man3/ldap_url.3
-debian/tmp/usr/share/man/man3/ldap_err2string.3
-debian/tmp/usr/share/man/man3/ldap_url_parse.3
-debian/tmp/usr/share/man/man3/ldap_errlist.3
-debian/tmp/usr/share/man/man3/ldap_value_free.3
-debian/tmp/usr/share/man/man3/ldap_error.3
-debian/tmp/usr/share/man/man3/ldap_value_free_len.3
-debian/tmp/usr/share/man/man3/ldap_explode_dn.3
-debian/tmp/usr/share/man/man3/ld_errno.3

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2007-12-15 10:58:32 UTC (rev 897)
+++ openldap/trunk/debian/rules	2007-12-15 11:11:13 UTC (rev 898)
@@ -113,8 +113,6 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	# XXX: remove after libldap2.3-dev is officially built
-	#rm -Rf debian/libldap2.3-dev
 
 	dh_installdirs -a
 	cp -al $(installdir) $(tmpdir)
@@ -131,23 +129,21 @@
 	dh_installdebconf -a
 	# when using OpenSSL, we do not need to add crontab entries
 	#dh_installcron -a
-	dh_strip -plibldap-2.3-0 --dbg-package=libldap-2.3-0-dbg
+	dh_strip -plibldap-2.4-2 --dbg-package=libldap-2.4-2-dbg
 	dh_strip -pslapd --dbg-package=slapd-dbg
 	dh_strip -pldap-utils
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -plibldap-2.3-0
+	dh_makeshlibs -plibldap-2.4-2
 	dh_installdeb -a
 	perl -w debian/dh_installscripts-common -p slapd
-	dh_shlibdeps -a -L libldap-2.3-0 -l $(installdir)/usr/lib
+	dh_shlibdeps -a -L libldap-2.4-2 -l $(installdir)/usr/lib
 	# Strip duplicate dependency out of substvars.
-	sed -i -e 's/ libldap-2.3-0,//' debian/*.substvars
+	sed -i -e 's/ libldap-2.4-2,//' debian/*.substvars
 	dh_gencontrol -a
 	dh_md5sums -a
-	# Don't build the libldap2.3-dev package until after sarge release
-	# so nobody can build against it.
-	dh_builddeb -a -Nlibldap2.3-dev
+	dh_builddeb -a
 
 clean: clean1 unpatch
 clean1:
@@ -168,7 +164,5 @@
 	rm -rf $(builddir) $(builddir_notls) $(installdir)
 
 	dh_clean
-	# XXX: remove after libldap2.3-dev is officially built
-	rm -Rf debian/libldap2.3-dev
 
 .PHONY: binary binary-arch binary-indep build clean




More information about the Pkg-openldap-devel mailing list