Source: libcaca Version: 0.99.beta17-2.1 Followup-For: Bug #651009 Hi,
I've build and tested an extended version of the multi-arch patch that fixes some problems with the patch given above (missing multi-arch stanzas etc.). See attached file.
diff -urN debian-old/changelog debian/changelog --- debian-old/changelog 2011-09-22 17:10:59.000000000 +0200 +++ debian/changelog 2012-03-15 20:15:31.000000000 +0100 @@ -1,3 +1,10 @@ +libcaca (0.99.beta17-2.2) karotte-local; urgency=low + + * Non-maintainer upload. + * Adding support for multiarch + + -- Build User <[email protected]> Sun, 04 Dec 2011 21:55:54 +0000 + libcaca (0.99.beta17-2.1) unstable; urgency=low * Non-maintainer upload. diff -urN debian-old/control debian/control --- debian-old/control 2011-09-22 17:10:34.000000000 +0200 +++ debian/control 2012-03-13 21:39:29.000000000 +0100 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Sam Hocevar <[email protected]> -Build-Depends: debhelper (>= 8.0), pkg-config, libncursesw5-dev, libslang2-dev, libx11-dev, libimlib2-dev, freeglut3-dev, texlive-fonts-recommended, doxygen-latex, ruby1.8-dev +Build-Depends: debhelper (>= 8.1.3~), pkg-config, libncursesw5-dev, libslang2-dev, libx11-dev, libimlib2-dev, freeglut3-dev, texlive-fonts-recommended, doxygen-latex, ruby1.8-dev Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/sam-hocevar/pkg-misc/unstable/libcaca Vcs-Browser: http://svn.debian.org/wsvn/sam-hocevar/pkg-misc/unstable/libcaca/ @@ -23,7 +23,9 @@ Package: libcaca0 Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: colour ASCII art library libcaca is the Colour AsCii Art library. It provides high level functions for colour text drawing, simple primitives for line, polygon and ellipse @@ -35,6 +37,7 @@ Section: utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: foreign Recommends: toilet Conflicts: libcaca-dev (<= 0.3-1) Replaces: libcaca-dev (<= 0.3-1) diff -urN debian-old/libcaca0.install debian/libcaca0.install --- debian-old/libcaca0.install 2011-06-19 19:03:03.000000000 +0200 +++ debian/libcaca0.install 2012-03-13 21:32:19.000000000 +0100 @@ -1,2 +1,2 @@ -usr/lib/lib*.so.* -usr/lib/caca/*.so* +usr/lib/*/lib*.so.* +usr/lib/*/caca/*.so* diff -urN debian-old/libcaca-dev.install debian/libcaca-dev.install --- debian-old/libcaca-dev.install 2008-10-05 17:57:13.000000000 +0200 +++ debian/libcaca-dev.install 2012-03-13 21:32:19.000000000 +0100 @@ -1,8 +1,8 @@ usr/include/*.h usr/bin/caca-config -usr/lib/lib*.so -usr/lib/lib*.a -usr/lib/pkgconfig/*.pc +usr/lib/*/lib*.so +usr/lib/*/lib*.a +usr/lib/*/pkgconfig/*.pc usr/share/man/man3/*.3caca usr/share/man/man1/caca-config.1 usr/share/doc/libcaca-dev diff -urN debian-old/rules debian/rules --- debian-old/rules 2011-06-19 19:10:07.000000000 +0200 +++ debian/rules 2012-03-13 21:32:19.000000000 +0100 @@ -3,6 +3,7 @@ #export DH_VERBOSE=1 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) # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) @@ -15,6 +16,7 @@ confflags += --enable-ncurses --enable-slang --enable-x11 --enable-gl \ --enable-imlib2 --enable-plugins --enable-cxx --enable-doc confflags += --disable-csharp --disable-java --disable-ruby +confflags += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) configure: configure-stamp configure-stamp: @@ -85,7 +87,7 @@ dh_makeshlibs -p libcaca0 -V 'libcaca0 (>= 0.99.beta17-1)' dh_installdeb # dh_perl - dh_shlibdeps -L libcaca0 -l debian/libcaca0/usr/lib -X /usr/lib/caca/ + dh_shlibdeps -L libcaca0 -l debian/libcaca0/usr/lib/$(DEB_HOST_MULTIARCH)/ -X /usr/lib/$(DEB_HOST_MULTIARCH)/caca/ dh_gencontrol dh_md5sums dh_builddeb
