This patch works for me, and allows me to upgrade ia32-libs:amd64 to
the sid version.
IMO, this bug is important enough to fix in wheezy, as it affects the
ability to upgrade ia32-libs. I'd be happy to NMU, if the maintainers
don't mind.
Peter
diff -u lesstif2-0.95.2/debian/rules lesstif2-0.95.2/debian/rules
--- lesstif2-0.95.2/debian/rules
+++ lesstif2-0.95.2/debian/rules
@@ -11,11 +11,16 @@
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
SHELL := sh -e
BUILD := build
+LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
+LIB_LIBDIR := debian/lesstif2/$(LIBDIR)
+DEV_LIBDIR := debian/lesstif2-dev/$(LIBDIR)
CARGS := \
+ --libdir=/$(LIBDIR) \
--with-gnu-ld --enable-static --prefix=/usr \
--disable-verbose \
--disable-build-12 --disable-build-20 --enable-build-21 \
@@ -70,15 +75,16 @@
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/lesstif2 -C build/lib/Xm-2.1 install
$(MAKE) DESTDIR=$(CURDIR)/debian/lesstif2 -C build/lib/Mrm-2.1 install
- mv debian/lesstif2/usr/lib/*.a debian/lesstif2-dev/usr/lib
- mv debian/lesstif2/usr/lib/*.so debian/lesstif2-dev/usr/lib
- rm -f debian/lesstif2/usr/lib/*.la
+ install -d $(DEV_LIBDIR)
+ mv $(LIB_LIBDIR)/*.a $(DEV_LIBDIR)
+ mv $(LIB_LIBDIR)/*.so $(DEV_LIBDIR)
+ rm -f $(LIB_LIBDIR)/*.la
# Work around libtool bug where make install will relink the libraries
# with the current system libraries.
find build/lib/Xm-2.1/.libs build/lib/Mrm-2.1/.libs \
-type f -name '*.so.*[^T]' | \
- xargs cp --target-directory debian/lesstif2/usr/lib
- chmod a-x debian/lesstif2/usr/lib/*
+ xargs cp --target-directory $(LIB_LIBDIR)
+ chmod a-x $(LIB_LIBDIR)/*
$(MAKE) DESTDIR=$(CURDIR)/debian/lesstif2-dev \
-C build/include/Motif-2.1 install
$(MAKE) DESTDIR=$(CURDIR)/debian/lesstif-doc \
@@ -101,10 +107,8 @@
{ \
cd debian/lesstif-bin; \
rm etc/X11/mwm/*; \
- mv usr/lib/X11/app-defaults etc/X11; \
- rmdir usr/lib/X11; \
- rmdir usr/lib; \
- cd ../..; \
+ mv $(LIBDIR)/X11/app-defaults etc/X11; \
+ rmdir $(LIBDIR)/X11 $(LIBDIR) usr/lib; \
}
for p in man1/uil.1 man1/ltversion.1 man1/mwm.1 man1/lesstif.1 \
man1/xmbind.1 man5/mwmrc.5 man5/VirtualBindings.5; do \
diff -u lesstif2-0.95.2/debian/control lesstif2-0.95.2/debian/control
--- lesstif2-0.95.2/debian/control
+++ lesstif2-0.95.2/debian/control
@@ -11,6 +11,8 @@
Package: lesstif2
Architecture: any
+Pre-Depends: multiarch-support
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmotif
Replaces: libmotif
@@ -22,6 +24,7 @@
Package: lesstif2-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Priority: extra
Depends: lesstif2 (= ${binary:Version}), ${misc:Depends}
