Package: libcaca0 Version: 0.99.beta17-1 Severity: normal Hi,
The attached patch makes libcaca0 compatible with multiarch, as described at <http://wiki.debian.org/Multiarch/Implementation>. Thanks -- William Van Hevelingen blkp...@cat.pdx.edu github.com/~blkperl -- System Information: Debian Release: squeeze/sid APT prefers natty-updates APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty'), (100, 'natty-backports') Architecture: amd64 (x86_64) Kernel: Linux 2.6.38-11-generic (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages libcaca0 depends on: ii libc6 2.13-0ubuntu13 Embedded GNU C Library: Shared lib ii libgcc1 1:4.5.2-8ubuntu4 GCC support library ii libncursesw5 5.7+20101128-1 shared libraries for terminal hand ii libslang2 2.2.2-4ubuntu2 The S-Lang programming library - r ii libstdc++6 4.5.2-8ubuntu4 The GNU Standard C++ Library v3 ii zlib1g 1:1.2.3.4.dfsg-3ubuntu3 compression library - runtime libcaca0 recommends no packages. libcaca0 suggests no packages. -- no debconf information
diff -Nru libcaca-0.99.beta17/debian/changelog libcaca-0.99.beta17/debian/changelog --- libcaca-0.99.beta17/debian/changelog 2011-09-22 15:10:59.000000000 +0000 +++ libcaca-0.99.beta17/debian/changelog 2011-12-04 21:56:05.000000000 +0000 @@ -1,3 +1,10 @@ +libcaca (0.99.beta17-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Adding support for multiarch + + -- Build User <buil...@ip-10-176-166-169.us-west-1.compute.internal> Sun, 04 Dec 2011 21:55:54 +0000 + libcaca (0.99.beta17-2.1) unstable; urgency=low * Non-maintainer upload. diff -Nru libcaca-0.99.beta17/debian/control libcaca-0.99.beta17/debian/control --- libcaca-0.99.beta17/debian/control 2011-09-22 15:10:34.000000000 +0000 +++ libcaca-0.99.beta17/debian/control 2011-12-04 21:58:46.000000000 +0000 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Sam Hocevar <s...@debian.org> -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/ @@ -11,6 +11,7 @@ Package: libcaca-dev Section: libdevel Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: libcaca0 (= ${binary:Version}), ${misc:Depends}, libncurses5-dev, libslang2-dev Description: development files for libcaca libcaca is the Colour AsCii Art library. It provides high level functions diff -Nru libcaca-0.99.beta17/debian/libcaca0.install libcaca-0.99.beta17/debian/libcaca0.install --- libcaca-0.99.beta17/debian/libcaca0.install 2011-06-19 17:03:03.000000000 +0000 +++ libcaca-0.99.beta17/debian/libcaca0.install 2011-12-04 22:03:53.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/lib*.so.* -usr/lib/caca/*.so* +usr/lib/*/lib*.so.* +usr/lib/*/caca/*.so* diff -Nru libcaca-0.99.beta17/debian/libcaca-dev.install libcaca-0.99.beta17/debian/libcaca-dev.install --- libcaca-0.99.beta17/debian/libcaca-dev.install 2008-10-05 15:57:13.000000000 +0000 +++ libcaca-0.99.beta17/debian/libcaca-dev.install 2011-12-04 22:04:09.000000000 +0000 @@ -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 -Nru libcaca-0.99.beta17/debian/rules libcaca-0.99.beta17/debian/rules --- libcaca-0.99.beta17/debian/rules 2011-06-19 17:10:07.000000000 +0000 +++ libcaca-0.99.beta17/debian/rules 2011-12-04 22:02:54.000000000 +0000 @@ -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
