Package: lcms Version: 1.19.dfsg-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
Hi Oleksandr, Please find attached a patch to lcms to transition it to use of the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch has been tested and included in Ubuntu Oneiric. As a dependency of libmng1 (and therefore of Qt), liblcms1 is part of the stack packaged in ia32-libs / ia32-libs-gtk. Converting liblcms1 for multiarch use, and thus facilitating the direct installation of i386 qt packages on amd64 systems, will be a great step forward in getting rid of ia32-libs for wheezy - which is a release goal. So please consider including this patch in Debian sooner rather than later. Note that I have examined the -dev package and confirmed that it contains no architecture-specific headers, so I have marked this package Multi-Arch: same in addition to the runtime library package. Thanks, -- 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/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/control' --- debian/control 2011-07-18 17:26:55 +0000 +++ debian/control 2011-08-13 22:21:54 +0000 @@ -2,18 +2,20 @@ Section: libs Priority: optional Maintainer: Oleksandr Moskalenko <ma...@debian.org> -Build-Depends: debhelper (>> 5.0.38), libtiff4-dev, libjpeg-dev, zlib1g-dev, python-all-dev (>= 2.3.5-11), swig +Build-Depends: debhelper (>> 8.1.3), libtiff4-dev, libjpeg-dev, zlib1g-dev, python-all-dev (>= 2.3.5-11), swig Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/lcms/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/lcms/trunk/?op=log Package: liblcms1 Architecture: any +Multi-Arch: same Section: libs Replaces: liblcms Provides: liblcms Conflicts: liblcms Suggests: liblcms-utils +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends} Description: Little CMS color management library lcms is a standalone CMM engine, which deals with the color management. @@ -32,6 +35,7 @@ Package: liblcms1-dev Architecture: any +Multi-Arch: same Section: libdevel Replaces: liblcms-dev Provides: liblcms-dev === modified file 'debian/liblcms1-dev.install' --- debian/liblcms1-dev.install 2008-04-20 12:31:46 +0000 +++ debian/liblcms1-dev.install 2011-08-13 22:21:42 +0000 @@ -1,5 +1,5 @@ debian/tmp/usr/include/* usr/include/ -debian/tmp/usr/lib/*.a usr/lib/ -debian/tmp/usr/lib/*.la usr/lib/ -debian/tmp/usr/lib/*.so usr/lib/ -debian/tmp/usr/lib/pkgconfig usr/lib/ +debian/tmp/usr/lib/*/*.a +debian/tmp/usr/lib/*/*.la +debian/tmp/usr/lib/*/*.so +debian/tmp/usr/lib/*/pkgconfig === modified file 'debian/liblcms1.install' --- debian/liblcms1.install 2008-04-20 12:31:46 +0000 +++ debian/liblcms1.install 2011-08-13 22:21:42 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/liblcms.so.* usr/lib/ +debian/tmp/usr/lib/*/liblcms.so.* === modified file 'debian/rules' --- debian/rules 2011-07-18 17:26:55 +0000 +++ debian/rules 2011-08-13 22:21:42 +0000 @@ -4,6 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH) ifeq ($(ARCH),alpha) export CFLAGS="-O0 -mieee -fPIC -I../include -fno-exceptions -fomit-frame-pointer -Wall" @@ -31,7 +33,7 @@ ifeq ($(ARCH),powerpc) echo "#define USE_BIG_ENDIAN" >include/lcms-endian.h endif - CFLAGS=$(CFLAGS) ./configure --prefix=/usr --with-python + CFLAGS=$(CFLAGS) ./configure --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --with-python cd python && ./swig_lcms && cd .. make CFLAGS=$(CFLAGS) touch build-stamp
