On Mon, May 14, 2012 at 12:41:12PM +0200, Bastian Blank wrote:
> Attached is the NMU diff for libnss-ldap/264-2.3.
Ups. Here it is.
Bastian
--
Men will always be men -- no matter where they are.
-- Harry Mudd, "Mudd's Women", stardate 1329.8
diff -u libnss-ldap-264/debian/changelog libnss-ldap-264/debian/changelog
--- libnss-ldap-264/debian/changelog
+++ libnss-ldap-264/debian/changelog
@@ -1,3 +1,14 @@
+libnss-ldap (264-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Support multi-arch: (closes: #653664)
+ - Mark libnss-ldap as same.
+ - Adjust build-dependencies.
+ * Add hack to find correct libc in a multi-arch environment.
+ * Fix symlink generation.
+
+ -- Bastian Blank <[email protected]> Mon, 14 May 2012 10:41:48 +0000
+
libnss-ldap (264-2.2) unstable; urgency=low
* Non-maintainer upload.
diff -u libnss-ldap-264/debian/control libnss-ldap-264/debian/control
--- libnss-ldap-264/debian/control
+++ libnss-ldap-264/debian/control
@@ -3,10 +3,12 @@
Priority: extra
Maintainer: Richard A Nelson (Rick) <[email protected]>
Standards-Version: 3.7.2
-Build-Depends: cdbs, quilt, patchutils, dh-buildinfo, debhelper (>= 5),
autotools-dev, libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0)
+Build-Depends: cdbs (>= 0.4.93~), quilt, patchutils, dh-buildinfo (>=
0.9+nmu1~), debhelper (>= 8.1.3~), autotools-dev, libkrb5-dev, libldap2-dev,
libsasl2-dev, po-debconf (>= 0.5.0)
Package: libnss-ldap
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: nscd, libpam-ldap
Description: NSS module for using LDAP as a naming service
diff -u libnss-ldap-264/debian/libnss-ldap.install
libnss-ldap-264/debian/libnss-ldap.install
--- libnss-ldap-264/debian/libnss-ldap.install
+++ libnss-ldap-264/debian/libnss-ldap.install
@@ -5,3 +5,4 @@
debian/LDAP-Permissions.txt usr/share/doc/libnss-ldap
-debian/tmp/usr/lib/* lib
+debian/tmp/lib/*/*
+debian/tmp/usr/lib/*/*
debian/examples usr/share/doc/libnss-ldap
reverted:
--- libnss-ldap-264/debian/libnss-ldap.links
+++ libnss-ldap-264.orig/debian/libnss-ldap.links
@@ -1 +0,0 @@
-/lib/libnss_ldap.so.2 usr/lib/libnss_ldap.so
diff -u libnss-ldap-264/debian/rules libnss-ldap-264/debian/rules
--- libnss-ldap-264/debian/rules
+++ libnss-ldap-264/debian/rules
@@ -13,6 +13,7 @@
DEB_DESTDIR = $(CURDIR)/debian/tmp
MY_INST_DIR = $(CURDIR)/debian/libnss-ldap/usr/share
DEB_CONFIGURE_EXTRA_FLAGS += \
+ --libdir=/lib/$(DEB_HOST_MULTIARCH) \
--enable-rfc2307bis \
--with-ldap-lib=openldap \
--with-ldap-conf-file=/etc/libnss-ldap.conf \
@@ -24,6 +25,9 @@
DEB_OPT_FLAG += -fPIC
export LIBS=-lpthread
+# Hack to pick up the soname of libc on the filesystem...
+DEB_MAKE_EXTRA_ARGS += MULTI_OS_DIRECTORY=$(DEB_HOST_MULTIARCH)
+
# Keep file autoconf list out of the diff
clean::
rm *.cdbs-config_list
diff -u libnss-ldap-264/debian/patches/series
libnss-ldap-264/debian/patches/series
--- libnss-ldap-264/debian/patches/series
+++ libnss-ldap-264/debian/patches/series
@@ -5,0 +6 @@
+link
only in patch2:
unchanged:
--- libnss-ldap-264.orig/debian/patches/link
+++ libnss-ldap-264/debian/patches/link
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -83,7 +83,7 @@
+ $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so
$(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED)
+ (cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED)
$(NSS_LDAP_NSS_VERSIONED))
+ $(mkinstalldirs) $(DESTDIR)/usr$(libdir)
+- (cd $(DESTDIR)/usr$(libdir); ln -sf
../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .)
++ (cd $(DESTDIR)/usr$(libdir); ln -sf $(libdir)/$(NSS_LDAP_NSS_VERSIONED)
libnss_ldap.so)
+ else
+ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ if HPUX
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -680,7 +680,7 @@
+ @AIX_FALSE@@GLIBC_TRUE@ $(INSTALL_PROGRAM) -o $(INST_UID) -g
$(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED)
+ @AIX_FALSE@@GLIBC_TRUE@ (cd $(DESTDIR)$(libdir); ln -sf
$(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED))
+ @AIX_FALSE@@GLIBC_TRUE@ $(mkinstalldirs) $(DESTDIR)/usr$(libdir)
+-@AIX_FALSE@@GLIBC_TRUE@ (cd $(DESTDIR)/usr$(libdir); ln -sf
../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .)
++@AIX_FALSE@@GLIBC_TRUE@ (cd $(DESTDIR)/usr$(libdir); ln -sf
$(libdir)/$(NSS_LDAP_NSS_VERSIONED) libnss_ldap.so)
+ @AIX_FALSE@@GLIBC_FALSE@ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @AIX_FALSE@@GLIBC_FALSE@@HPUX_TRUE@ $(INSTALL_PROGRAM) -o $(INST_UID) -g
$(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/libnss_ldap.1
+ @AIX_FALSE@@GLIBC_FALSE@@HPUX_FALSE@ $(INSTALL_PROGRAM) -o $(INST_UID) -g
$(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/nss_ldap.so.1
