[Pkg-openldap-devel] r1369 - openldap/trunk/debian
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Mon Aug 15 06:14:59 UTC 2011
Author: vorlon
Date: 2011-08-15 06:14:59 +0000 (Mon, 15 Aug 2011)
New Revision: 1369
Added:
openldap/trunk/debian/libldap-2.4-2.links.in
openldap/trunk/debian/libldap2-dev.links.in
Removed:
openldap/trunk/debian/libldap-2.4-2.links
openldap/trunk/debian/libldap2-dev.links
Modified:
openldap/trunk/debian/changelog
openldap/trunk/debian/control
openldap/trunk/debian/libldap-2.4-2.install
openldap/trunk/debian/libldap2-dev.dirs
openldap/trunk/debian/libldap2-dev.install
openldap/trunk/debian/rules
openldap/trunk/debian/slapd-smbk5pwd.install
openldap/trunk/debian/slapd.install
openldap/trunk/debian/slapi-dev.install
Log:
Build for multiarch.
Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/changelog 2011-08-15 06:14:59 UTC (rev 1369)
@@ -9,6 +9,7 @@
* Acknowledge NMU for bug #596343; thanks to Thijs Kinkhorst for the fix!
* Bump to compat level 7, so we don't have to spell out debian/tmp in
every single .install file
+ * Build for multiarch.
-- Matthijs Möhlmann <matthijs at cacholong.nl> Sat, 16 Apr 2011 14:40:51 +0200
Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/control 2011-08-15 06:14:59 UTC (rev 1369)
@@ -8,7 +8,7 @@
Torsten Landschoff <torsten at debian.org>,
Matthijs Möhlmann <matthijs at cacholong.nl>,
Russ Allbery <rra at debian.org>
-Build-Depends: debhelper (>= 6.0.7), libdb5.1-dev, libgcrypt-dev,
+Build-Depends: debhelper (>= 8.1.3), libdb5.1-dev, libgcrypt-dev,
libgnutls-dev (>= 1.7), unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40),
@@ -67,7 +67,9 @@
Section: libs
Priority: standard
Architecture: any
+Multi-Arch: same
Conflicts: ldap-utils (<= 2.1.23-1)
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libldap2, libldap-2.3-0
Description: OpenLDAP libraries
@@ -78,6 +80,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: libldap-2.4-2 (= ${binary:Version}), ${misc:Depends}
Description: Debugging information for OpenLDAP libraries
This package provides detached debugging information for the OpenLDAP
@@ -90,6 +93,7 @@
Section: libdevel
Priority: extra
Architecture: any
+Multi-Arch: same
Conflicts: libldap-dev, libopenldap-dev
Replaces: libopenldap-dev
Provides: libldap-dev
Modified: openldap/trunk/debian/libldap-2.4-2.install
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.install 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/libldap-2.4-2.install 2011-08-15 06:14:59 UTC (rev 1369)
@@ -1,5 +1,5 @@
-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_r-2.4.so.2 usr/lib
-debian/tmp/usr/lib/libldap_r-2.4.so.2.*.* usr/lib
-debian/tmp/etc/ldap/ldap.conf etc/ldap
+usr/lib/*/liblber-2.4.so.2
+usr/lib/*/liblber-2.4.so.2.*.*
+usr/lib/*/libldap_r-2.4.so.2
+usr/lib/*/libldap_r-2.4.so.2.*.*
+etc/ldap/ldap.conf
Deleted: openldap/trunk/debian/libldap-2.4-2.links
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.links 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/libldap-2.4-2.links 2011-08-15 06:14:59 UTC (rev 1369)
@@ -1 +0,0 @@
-usr/lib/libldap_r-2.4.so.2 usr/lib/libldap-2.4.so.2
Copied: openldap/trunk/debian/libldap-2.4-2.links.in (from rev 1366, openldap/trunk/debian/libldap-2.4-2.links)
===================================================================
--- openldap/trunk/debian/libldap-2.4-2.links.in (rev 0)
+++ openldap/trunk/debian/libldap-2.4-2.links.in 2011-08-15 06:14:59 UTC (rev 1369)
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libldap_r-2.4.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libldap-2.4.so.2
Modified: openldap/trunk/debian/libldap2-dev.dirs
===================================================================
--- openldap/trunk/debian/libldap2-dev.dirs 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/libldap2-dev.dirs 2011-08-15 06:14:59 UTC (rev 1369)
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share/man
Modified: openldap/trunk/debian/libldap2-dev.install
===================================================================
--- openldap/trunk/debian/libldap2-dev.install 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/libldap2-dev.install 2011-08-15 06:14:59 UTC (rev 1369)
@@ -1,11 +1,11 @@
-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/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
+usr/include/lber.h
+usr/include/lber_types.h
+usr/include/ldap_cdefs.h
+usr/include/ldap_features.h
+usr/include/ldap.h
+usr/include/ldap_schema.h
+usr/include/ldap_utf8.h
+usr/lib/*/liblber.a
+usr/lib/*/liblber.so
+usr/lib/*/libldap_r.a
+usr/lib/*/libldap_r.so
Deleted: openldap/trunk/debian/libldap2-dev.links
===================================================================
--- openldap/trunk/debian/libldap2-dev.links 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/libldap2-dev.links 2011-08-15 06:14:59 UTC (rev 1369)
@@ -1,12 +0,0 @@
-usr/share/man/man3/lber-encode.3 usr/share/man/man3/ber_put_bitstring.3
-usr/share/man/man3/lber-encode.3 usr/share/man/man3/ber_put_boolean.3
-usr/share/man/man3/lber-encode.3 usr/share/man/man3/ber_start_seq.3
-usr/share/man/man3/lber-memory.3 usr/share/man/man3/ber_memalloc.3
-usr/share/man/man3/lber-memory.3 usr/share/man/man3/ber_memcalloc.3
-usr/share/man/man3/lber-memory.3 usr/share/man/man3/ber_memfree.3
-usr/share/man/man3/lber-memory.3 usr/share/man/man3/ber_memrealloc.3
-usr/share/man/man3/lber-types.3 usr/share/man/man3/ber_int_t.3
-usr/share/man/man3/lber-types.3 usr/share/man/man3/ber_len_t.3
-usr/share/man/man3/lber-types.3 usr/share/man/man3/ber_tag_t.3
-usr/lib/libldap_r.so usr/lib/libldap.so
-usr/lib/libldap_r.a usr/lib/libldap.a
Copied: openldap/trunk/debian/libldap2-dev.links.in (from rev 1366, openldap/trunk/debian/libldap2-dev.links)
===================================================================
--- openldap/trunk/debian/libldap2-dev.links.in (rev 0)
+++ openldap/trunk/debian/libldap2-dev.links.in 2011-08-15 06:14:59 UTC (rev 1369)
@@ -0,0 +1,12 @@
+usr/share/man/man3/lber-encode.3 usr/share/man/man3/ber_put_bitstring.3
+usr/share/man/man3/lber-encode.3 usr/share/man/man3/ber_put_boolean.3
+usr/share/man/man3/lber-encode.3 usr/share/man/man3/ber_start_seq.3
+usr/share/man/man3/lber-memory.3 usr/share/man/man3/ber_memalloc.3
+usr/share/man/man3/lber-memory.3 usr/share/man/man3/ber_memcalloc.3
+usr/share/man/man3/lber-memory.3 usr/share/man/man3/ber_memfree.3
+usr/share/man/man3/lber-memory.3 usr/share/man/man3/ber_memrealloc.3
+usr/share/man/man3/lber-types.3 usr/share/man/man3/ber_int_t.3
+usr/share/man/man3/lber-types.3 usr/share/man/man3/ber_len_t.3
+usr/share/man/man3/lber-types.3 usr/share/man/man3/ber_tag_t.3
+usr/lib/${DEB_HOST_MULTIARCH}/libldap_r.so usr/lib/${DEB_HOST_MULTIARCH}/libldap.so
+usr/lib/${DEB_HOST_MULTIARCH}/libldap_r.a usr/lib/${DEB_HOST_MULTIARCH}/libldap.a
Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/rules 2011-08-15 06:14:59 UTC (rev 1369)
@@ -28,6 +28,9 @@
SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+SYSTEM += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
CONFIG = $(shell grep -v "^\#" debian/configure.options)
installdir := $(CURDIR)/debian/install
@@ -124,11 +127,11 @@
sed -i "s/^dependency_libs=.*/dependency_libs=''/" $$F; \
done
- for F in $(installdir)/usr/lib/*.so.*.*.*; do \
+ for F in $(installdir)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*.*.*; do \
if echo "$$F" | grep -q libslapi ; then \
continue; \
fi; \
- if LD_LIBRARY_PATH=$(installdir)/usr/lib ldd -d -r $$F 2>&1 | grep '^undefined symbol:'; then \
+ if LD_LIBRARY_PATH=$(installdir)/usr/lib/$(DEB_HOST_MULTIARCH) ldd -d -r $$F 2>&1 | grep '^undefined symbol:'; then \
echo; \
echo "library $$F has undefined references. Please fix this before continuing."; \
exit 1; \
@@ -166,6 +169,9 @@
dh_strip -pslapd --dbg-package=slapd-dbg
dh_strip -pldap-utils
dh_strip -pslapd-smbk5pwd
+ for pkg in libldap2-dev libldap-2.4-2; do \
+ sed -e"s/\${DEB_HOST_MULTIARCH}/$(DEB_HOST_MULTIARCH)/g" < debian/$$pkg.links.in > debian/$$pkg.links; \
+ done
dh_link -a
# hardlink these so not confined by apparmor
@@ -179,14 +185,14 @@
# at all, but that requires adjusting the build scripts first to
# link against libldap_r, otherwise dh_shlibdeps fails
#dh_makeshlibs -plibldap-2.4-2 -V 'libldap-2.4-2 (>= 2.4.7)'
- echo "slapd:Provides=$$(objdump -p debian/slapd/usr/lib/libslapi-*.so.* \
+ echo "slapd:Provides=$$(objdump -p debian/slapd/usr/lib/$(DEB_HOST_MULTIARCH)/libslapi-*.so.* \
| sed -ne '/SONAME/ { s/[[:space:]]*SONAME[[:space:]]*//; \
s/\.so\./-/; p; q }' \
)" >> debian/slapd.substvars
dh_makeshlibs -pslapd -X/usr/lib/ldap/ -V "$$(sed -ne's/slapd:Provides=//p' debian/slapd.substvars)"
dh_installdeb -a
perl -w debian/dh_installscripts-common -p slapd
- dh_shlibdeps -a -L libldap-2.4-2 -l $(installdir)/usr/lib
+ dh_shlibdeps -a -L libldap-2.4-2 -l $(installdir)/usr/lib/$(DEB_HOST_MULTIARCH)
# Strip duplicate dependency out of substvars.
sed -i -e 's/ libldap-2.4-2,//' debian/*.substvars
dh_gencontrol -a
@@ -210,6 +216,9 @@
rm -f contrib/ldapc++/config.sub contrib/ldapc++/config.guess
rm -rf $(builddir) $(builddir_notls) $(installdir)
rm -rf build/ltmain.sh autom4te.cache configure aclocal.m4
+
+ # Remove autogenerated links files
+ rm -f debian/libldap-2.4-2.links debian/libldap2-dev.links
# Clean the contrib directory
rm -rf contrib/slapd-modules/smbk5pwd/.libs \
Modified: openldap/trunk/debian/slapd-smbk5pwd.install
===================================================================
--- openldap/trunk/debian/slapd-smbk5pwd.install 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/slapd-smbk5pwd.install 2011-08-15 06:14:59 UTC (rev 1369)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/ldap/smbk5pwd.so* usr/lib/ldap
-debian/tmp/usr/lib/ldap/smbk5pwd.la usr/lib/ldap
+usr/lib/ldap/smbk5pwd.so*
+usr/lib/ldap/smbk5pwd.la
Modified: openldap/trunk/debian/slapd.install
===================================================================
--- openldap/trunk/debian/slapd.install 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/slapd.install 2011-08-15 06:14:59 UTC (rev 1369)
@@ -1,8 +1,8 @@
-debian/tmp/etc/ldap/schema etc/ldap
-debian/tmp/usr/lib/slapd usr/sbin
-debian/tmp/usr/lib/ldap/*.so* usr/lib/ldap
-debian/tmp/usr/lib/ldap/*.la usr/lib/ldap
-debian/tmp/usr/lib/libslapi-*.so.* usr/lib
+etc/ldap/schema
+usr/lib/slapd usr/sbin
+usr/lib/ldap/*.so*
+usr/lib/ldap/*.la
+usr/lib/*/libslapi-*.so.*
debian/ldiftopasswd usr/share/slapd
debian/DB_CONFIG usr/share/slapd
debian/slapd.conf usr/share/slapd
Modified: openldap/trunk/debian/slapi-dev.install
===================================================================
--- openldap/trunk/debian/slapi-dev.install 2011-08-15 05:47:35 UTC (rev 1368)
+++ openldap/trunk/debian/slapi-dev.install 2011-08-15 06:14:59 UTC (rev 1369)
@@ -1,2 +1,2 @@
-debian/tmp/usr/include/slapi-plugin.h usr/include
-debian/tmp/usr/lib/libslapi.so usr/lib
+usr/include/slapi-plugin.h
+usr/lib/*/libslapi.so
More information about the Pkg-openldap-devel
mailing list