Source: krb5
Version: 1.9.1+dfsg-1
Tags: patch
User: [email protected]
Usertags: ubuntu-patch oneiric origin-ubuntu

Hi gents,

Please find attached a patch to krb5 to transition it to use of the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.  This patch has been
applied and is being used successfully in Ubuntu 11.04, and should be safe
to apply in Debian now that multiarch has been bootstrapped there.

Note that this involves a change to the krb5 plugin path
(/usr/lib/krb5/plugins -> /usr/lib/$(DEB_HOST_MULTIARCH)/krb5/plugins),
which means that either external packages using this path need to transition
in tandem, or backwards-compatibility support for the previous path needs to
be provided.  Since I only found one other package in the archive (sssd)
that ships such a plugin, I think it's best to just do a coordinated rebuild
of sssd.  The patch assumes this will be done in the next NMU of sssd.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
[email protected]                                     [email protected]
diff -uNr --exclude .bzr debian/debian/clean trunk/debian/clean
--- debian/debian/clean	1969-12-31 16:00:00.000000000 -0800
+++ trunk/debian/clean	2011-03-19 03:05:13.000000000 -0700
@@ -0,0 +1,7 @@
+debian/krb5-kdc.dirs   
+debian/krb5-multidev.dirs   
+debian/krb5-multidev.links
+debian/krb5-multidev.install
+debian/libkrb5-3.dirs   
+debian/libkrb5-dev.dirs   
+
diff -uNr --exclude .bzr debian/debian/control trunk/debian/control
--- debian/debian/control	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/control	2011-06-20 16:08:46.000000000 -0700
@@ -1,7 +1,8 @@
 Source: krb5
 Section: net
 Priority: standard
-Build-Depends: debhelper (>= 7), byacc | bison, comerr-dev, docbook-to-man,
+Build-Depends: debhelper (>= 8.1.3), byacc | bison,
+ comerr-dev, docbook-to-man,
  libkeyutils-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libldap2-dev,
  libncurses5-dev, libssl-dev, ss-dev, texinfo
 Standards-Version: 3.9.1
@@ -140,6 +141,7 @@
  | libkrb5support0 (= ${binary:Version})
 Priority: extra
 Section: debug
+Multi-Arch: same
 Description: Debugging files for MIT Kerberos
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -158,6 +160,7 @@
 Suggests: opensc
 Replaces: libkrb53 (<= 1.6.dfsg.3~beta1-1)
 Priority: extra
+Multi-Arch: same
 Description: PKINIT plugin for MIT Kerberos
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -192,7 +195,8 @@
 Package: libkrb5-3
 Section: libs
 Replaces: libkrb53 (<<1.6.dfsg.4~beta1-7)
-Breaks: libkrb53 (<< 1.6.dfsg.4~beta1-9 )
+Breaks: libkrb53 (<< 1.6.dfsg.4~beta1-9 ),
+ sssd (<= 1.2.1-4.3)
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
  libkrb5support0 (= ${binary:Version})
@@ -200,6 +204,8 @@
 Conflicts: ssh-krb5 (<< 3.8.1p1-10),
  libapache-mod-auth-kerb (<= 4.996-5.0-rc6-2),
  libapache2-mod-auth-kerb (<= 4.996-5.0-rc6-2)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -218,6 +224,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libkrb5-3 (= ${binary:Version})
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - krb5 GSS-API Mechanism
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -236,6 +244,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - GSS enabled ONCRPC
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -252,6 +262,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - KDC and Admin Server
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -268,6 +280,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - Administration Clients
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -286,6 +300,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - Crypto Library
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -303,6 +319,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - Kerberos database
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
@@ -320,6 +338,8 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: krb5-doc, krb5-user
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: MIT Kerberos runtime libraries - Support library
  Kerberos is a system for authenticating users and services on a network.
  Kerberos is a trusted third-party service.  That means that there is a
diff -uNr --exclude .bzr debian/debian/krb5-kdc.dirs trunk/debian/krb5-kdc.dirs
--- debian/debian/krb5-kdc.dirs	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/krb5-kdc.dirs	1969-12-31 16:00:00.000000000 -0800
@@ -1,5 +0,0 @@
-usr/lib/krb5/plugins/kdb
-var/lib/krb5kdc
-etc/krb5kdc
-usr/share/doc/krb5-kdc/examples
-usr/share/krb5-kdc
diff -uNr --exclude .bzr debian/debian/krb5-kdc.dirs.in trunk/debian/krb5-kdc.dirs.in
--- debian/debian/krb5-kdc.dirs.in	1969-12-31 16:00:00.000000000 -0800
+++ trunk/debian/krb5-kdc.dirs.in	2011-03-19 03:05:13.000000000 -0700
@@ -0,0 +1,5 @@
+usr/lib/${DEB_HOST_MULTIARCH}/krb5/plugins/kdb
+var/lib/krb5kdc
+etc/krb5kdc
+usr/share/doc/krb5-kdc/examples
+usr/share/krb5-kdc
diff -uNr --exclude .bzr debian/debian/krb5-kdc.install trunk/debian/krb5-kdc.install
--- debian/debian/krb5-kdc.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/krb5-kdc.install	2011-03-19 03:05:13.000000000 -0700
@@ -7,4 +7,4 @@
 usr/sbin/krb5kdc
 usr/share/man/man8/krb5kdc.8
 usr/share/man/man5/kdc.conf.5
-usr/lib/krb5/plugins/kdb/db2.so
+usr/lib/*/krb5/plugins/kdb/db2.so
diff -uNr --exclude .bzr debian/debian/krb5-kdc-ldap.install trunk/debian/krb5-kdc-ldap.install
--- debian/debian/krb5-kdc-ldap.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/krb5-kdc-ldap.install	2011-03-19 03:05:13.000000000 -0700
@@ -1,5 +1,5 @@
 usr/sbin/kdb5_ldap_util
 usr/share/man/man8/kdb5_ldap_util.8
-usr/lib/krb5/*.so*
-usr/lib/krb5/plugins/kdb/kldap.so
+usr/lib/*/krb5/*.so*
+usr/lib/*/krb5/plugins/kdb/kldap.so
 etc/insserv/overrides
diff -uNr --exclude .bzr debian/debian/krb5-multidev.dirs trunk/debian/krb5-multidev.dirs
--- debian/debian/krb5-multidev.dirs	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/krb5-multidev.dirs	1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-usr/include/mit-krb5
-usr/lib/mit-krb5
diff -uNr --exclude .bzr debian/debian/krb5-multidev.dirs.in trunk/debian/krb5-multidev.dirs.in
--- debian/debian/krb5-multidev.dirs.in	1969-12-31 16:00:00.000000000 -0800
+++ trunk/debian/krb5-multidev.dirs.in	2011-03-19 03:05:13.000000000 -0700
@@ -0,0 +1,2 @@
+usr/include/mit-krb5
+usr/lib/${DEB_HOST_MULTIARCH}/mit-krb5
diff -uNr --exclude .bzr debian/debian/krb5-multidev.install trunk/debian/krb5-multidev.install
--- debian/debian/krb5-multidev.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/krb5-multidev.install	1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-usr/lib/lib*.so usr/lib/mit-krb5
-usr/include/* usr/include/mit-krb5
diff -uNr --exclude .bzr debian/debian/krb5-multidev.install.in trunk/debian/krb5-multidev.install.in
--- debian/debian/krb5-multidev.install.in	1969-12-31 16:00:00.000000000 -0800
+++ trunk/debian/krb5-multidev.install.in	2011-03-19 03:05:13.000000000 -0700
@@ -0,0 +1,2 @@
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.so usr/lib/${DEB_HOST_MULTIARCH}/mit-krb5
+usr/include/* usr/include/mit-krb5
diff -uNr --exclude .bzr debian/debian/krb5-multidev.links trunk/debian/krb5-multidev.links
--- debian/debian/krb5-multidev.links	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/krb5-multidev.links	1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-usr/lib/mit-krb5/libkadm5clnt_mit.so usr/lib/mit-krb5/libkadm5clnt.so
-usr/lib/mit-krb5/libkadm5srv_mit.so usr/lib/mit-krb5/libkadm5srv.so
diff -uNr --exclude .bzr debian/debian/krb5-multidev.links.in trunk/debian/krb5-multidev.links.in
--- debian/debian/krb5-multidev.links.in	1969-12-31 16:00:00.000000000 -0800
+++ trunk/debian/krb5-multidev.links.in	2011-03-19 03:05:13.000000000 -0700
@@ -0,0 +1,2 @@
+usr/lib/${DEB_HOST_MULTIARCH}/mit-krb5/libkadm5clnt_mit.so usr/lib/${DEB_HOST_MULTIARCH}/mit-krb5/libkadm5clnt.so
+usr/lib/${DEB_HOST_MULTIARCH}/mit-krb5/libkadm5srv_mit.so usr/lib/${DEB_HOST_MULTIARCH}/mit-krb5/libkadm5srv.so
diff -uNr --exclude .bzr debian/debian/krb5-pkinit.install trunk/debian/krb5-pkinit.install
--- debian/debian/krb5-pkinit.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/krb5-pkinit.install	2011-03-19 03:05:13.000000000 -0700
@@ -1,2 +1,2 @@
-usr/lib/krb5/plugins/preauth/pkinit.so
+usr/lib/*/krb5/plugins/preauth/pkinit.so
 
diff -uNr --exclude .bzr debian/debian/libgssapi-krb5-2.install trunk/debian/libgssapi-krb5-2.install
--- debian/debian/libgssapi-krb5-2.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libgssapi-krb5-2.install	2011-03-19 03:05:13.000000000 -0700
@@ -1 +1 @@
-usr/lib/libgssapi_krb5.so.2*
+usr/lib/*/libgssapi_krb5.so.2*
diff -uNr --exclude .bzr debian/debian/libgssrpc4.install trunk/debian/libgssrpc4.install
--- debian/debian/libgssrpc4.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libgssrpc4.install	2011-03-19 03:05:13.000000000 -0700
@@ -1 +1 @@
-usr/lib/libgssrpc.so.4*
+usr/lib/*/libgssrpc.so.4*
diff -uNr --exclude .bzr debian/debian/libk5crypto3.install trunk/debian/libk5crypto3.install
--- debian/debian/libk5crypto3.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libk5crypto3.install	2011-03-19 03:05:13.000000000 -0700
@@ -1 +1 @@
-usr/lib/libk5crypto.so.3*
+usr/lib/*/libk5crypto.so.3*
diff -uNr --exclude .bzr debian/debian/libkadm5clnt-mit8.install trunk/debian/libkadm5clnt-mit8.install
--- debian/debian/libkadm5clnt-mit8.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkadm5clnt-mit8.install	2011-06-20 16:08:46.000000000 -0700
@@ -1 +1 @@
-usr/lib/libkadm5clnt_mit.so.8*
+usr/lib/*/libkadm5clnt_mit.so.8*
diff -uNr --exclude .bzr debian/debian/libkadm5srv-mit7.install.UBUNTU trunk/debian/libkadm5srv-mit7.install.UBUNTU
--- debian/debian/libkadm5srv-mit7.install.UBUNTU	1969-12-31 16:00:00.000000000 -0800
+++ trunk/debian/libkadm5srv-mit7.install.UBUNTU	2011-06-20 16:08:46.000000000 -0700
@@ -0,0 +1 @@
+usr/lib/*/libkadm5srv_mit.so.7*
diff -uNr --exclude .bzr debian/debian/libkadm5srv-mit8.install trunk/debian/libkadm5srv-mit8.install
--- debian/debian/libkadm5srv-mit8.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkadm5srv-mit8.install	2011-06-20 16:08:46.000000000 -0700
@@ -1 +1 @@
-usr/lib/libkadm5srv_mit.so.8*
+usr/lib/*/libkadm5srv_mit.so.8*
diff -uNr --exclude .bzr debian/debian/libkdb5-5.install trunk/debian/libkdb5-5.install
--- debian/debian/libkdb5-5.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkdb5-5.install	2011-06-20 16:08:46.000000000 -0700
@@ -1 +1 @@
-usr/lib/libkdb5.so.5*
+usr/lib/*/libkdb5.so.5*
diff -uNr --exclude .bzr debian/debian/libkdb-ldap1.install trunk/debian/libkdb-ldap1.install
--- debian/debian/libkdb-ldap1.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkdb-ldap1.install	2011-03-19 03:05:13.000000000 -0700
@@ -1 +1 @@
-usr/lib/libkdb_ldap*so.*
+usr/lib/*/libkdb_ldap*so.*
diff -uNr --exclude .bzr debian/debian/libkrb5-3.dirs trunk/debian/libkrb5-3.dirs
--- debian/debian/libkrb5-3.dirs	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkrb5-3.dirs	1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-usr/lib/krb5/plugins/krb5
diff -uNr --exclude .bzr debian/debian/libkrb5-3.dirs.in trunk/debian/libkrb5-3.dirs.in
--- debian/debian/libkrb5-3.dirs.in	1969-12-31 16:00:00.000000000 -0800
+++ trunk/debian/libkrb5-3.dirs.in	2011-03-19 03:05:13.000000000 -0700
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/krb5/plugins/krb5
diff -uNr --exclude .bzr debian/debian/libkrb5-3.install trunk/debian/libkrb5-3.install
--- debian/debian/libkrb5-3.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkrb5-3.install	2011-03-19 03:05:13.000000000 -0700
@@ -1,2 +1,2 @@
-usr/lib/libkrb5.so.3*
-usr/lib/krb5/plugins/preauth/encrypted_challenge.so
+usr/lib/*/libkrb5.so.3*
+usr/lib/*/krb5/plugins/preauth/encrypted_challenge.so
diff -uNr --exclude .bzr debian/debian/libkrb5-3.lintian-overrides trunk/debian/libkrb5-3.lintian-overrides
--- debian/debian/libkrb5-3.lintian-overrides	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkrb5-3.lintian-overrides	2011-03-19 03:05:13.000000000 -0700
@@ -1 +1 @@
-libkrb5-3: package-contains-empty-directory usr/lib/krb5/plugins/krb5/
+libkrb5-3: package-contains-empty-directory */plugins/krb5/
diff -uNr --exclude .bzr debian/debian/libkrb5-dev.dirs trunk/debian/libkrb5-dev.dirs
--- debian/debian/libkrb5-dev.dirs	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkrb5-dev.dirs	1969-12-31 16:00:00.000000000 -0800
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/share/aclocal
diff -uNr --exclude .bzr debian/debian/libkrb5-dev.dirs.in trunk/debian/libkrb5-dev.dirs.in
--- debian/debian/libkrb5-dev.dirs.in	1969-12-31 16:00:00.000000000 -0800
+++ trunk/debian/libkrb5-dev.dirs.in	2011-03-19 03:05:13.000000000 -0700
@@ -0,0 +1,3 @@
+usr/lib/${DEB_HOST_MULTIARCH}
+usr/include
+usr/share/aclocal
diff -uNr --exclude .bzr debian/debian/libkrb5support0.install trunk/debian/libkrb5support0.install
--- debian/debian/libkrb5support0.install	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/libkrb5support0.install	2011-03-19 03:05:13.000000000 -0700
@@ -1 +1 @@
-usr/lib/libkrb5support.so.0*
+usr/lib/*/libkrb5support.so.0*
diff -uNr --exclude .bzr debian/debian/rules trunk/debian/rules
--- debian/debian/rules	2011-07-16 22:02:23.000000000 -0700
+++ trunk/debian/rules	2011-07-16 22:02:54.000000000 -0700
@@ -14,6 +14,7 @@
 # Tell Autoconf the correct system types.  Needed for cross builds.
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
     SYSTEM = --build $(DEB_HOST_GNU_TYPE)
     CACHE  =
@@ -22,6 +23,8 @@
     CACHE  = --cache-file=$(DEB_HOST_GNU_TYPE).cache
 endif
 
+export DEB_HOST_MULTIARCH
+
 CCOPTS=-g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     CCOPTS +=-O0
@@ -63,6 +66,7 @@
 		--prefix=/usr --localstatedir=/etc --mandir=/usr/share/man \
 		--with-system-et --with-system-ss --disable-rpath  \
 		--enable-shared --with-ldap --without-tcl \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		$(SYSTEM) $(CACHE)
 	touch configure-stamp
 
@@ -89,25 +93,31 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
+	set -e; for file in krb5-kdc.dirs krb5-multidev.dirs krb5-multidev.links \
+	            krb5-multidev.install libkrb5-3.dirs libkrb5-dev.dirs; \
+	do \
+		sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
+			debian/$${file}.in > debian/$$file; \
+	done
 	dh_installdirs
 
 	cd build && $(MAKE) install DESTDIR=`pwd`/../debian/tmp
-	install -d $(CURDIR)/debian/tmp/usr/lib/krb5 $(CURDIR)/debian/tmp/etc/insserv/overrides
+	install -d $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/krb5 $(CURDIR)/debian/tmp/etc/insserv/overrides
 	install -m644 debian/krb5-kdc-ldap.insserv-override debian/tmp/etc/insserv/overrides/krb5-kdc
-	mv $(CURDIR)/debian/tmp/usr/lib/libkdb_ldap* \
-	    $(CURDIR)/debian/tmp/usr/lib/krb5/
-	rm -f $(CURDIR)/debian/tmp/usr/lib/krb5/libkdb_ldap*.so
+	mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libkdb_ldap* \
+	    $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/krb5/
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/krb5/libkdb_ldap*.so
 
 	install -m644 src/util/ac_check_krb5.m4 \
 		debian/libkrb5-dev/usr/share/aclocal
 
 	dh_install --sourcedir=debian/tmp --fail-missing $(EXCLUDE)
-	set -e ; find debian/krb5-multidev/usr/lib/mit-krb5 -type l -name \*.so -print |\
+	set -e ; find debian/krb5-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5 -type l -name \*.so -print |\
 		while read linkname; do \
 		ln -s -f ../`readlink $$linkname` \
 		$$linkname; \
 	done
-		for dir in include lib; do \
+		for dir in include lib/$(DEB_HOST_MULTIARCH); do \
 		(cd debian/krb5-multidev/usr/$$dir/mit-krb5 && \
 		find . -type d -print ) | (cd debian/libkrb5-dev/usr/$$dir && \
 		xargs mkdir -p); \
@@ -116,7 +126,7 @@
 		done
 	# however we will handle libkadm5{srv,clnt.so} in dh_link
 # because they actually point to the current level not one level up
-	rm -f debian/krb5-multidev/usr/lib/mit-krb5/libkadm5{clnt,srv}.so
+	rm -f debian/krb5-multidev/usr/lib/$(DEB_HOST_MULTIARCH)/mit-krb5/libkadm5{clnt,srv}.so
 
 
 	docbook-to-man debian/krb5_newrealm.sgml \
@@ -163,7 +173,7 @@
 	dh_lintian
 	set -e ; for pkg in $(LIB_PACKAGES) ; do \
 		DH_OPTIONS="" dh_strip -p$$pkg --dbg-package=libkrb5-dbg; \
-		DH_OPTIONS="" dh_makeshlibs -p$$pkg -Xusr/lib/krb5/plugins -- -c4 ; \
+		DH_OPTIONS="" dh_makeshlibs -p$$pkg -Xusr/lib/$(DEB_HOST_MULTIARCH)/krb5/plugins -- -c4 ; \
 	done
 	dh_strip
 	dh_link

Attachment: signature.asc
Description: Digital signature

Reply via email to