tags 637732 + pending
thanks
Dear maintainer,
I've prepared an NMU for lcms (versioned as 1.19.dfsg-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
--
Mark Hymers <mhy at debian dot org>
<h0lger> Ganneff: I'm confident in your ability to create a flamewar.
Extremedura QA/i18n meeting 2008
diff -u lcms-1.19.dfsg/debian/control lcms-1.19.dfsg/debian/control
--- lcms-1.19.dfsg/debian/control
+++ lcms-1.19.dfsg/debian/control
@@ -2,18 +2,20 @@
Section: libs
Priority: optional
Maintainer: Oleksandr Moskalenko <[email protected]>
-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 +34,7 @@
Package: liblcms1-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Replaces: liblcms-dev
Provides: liblcms-dev
diff -u lcms-1.19.dfsg/debian/liblcms1-dev.install lcms-1.19.dfsg/debian/liblcms1-dev.install
--- lcms-1.19.dfsg/debian/liblcms1-dev.install
+++ lcms-1.19.dfsg/debian/liblcms1-dev.install
@@ -2,4 +2,4 @@
-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
diff -u lcms-1.19.dfsg/debian/changelog lcms-1.19.dfsg/debian/changelog
--- lcms-1.19.dfsg/debian/changelog
+++ lcms-1.19.dfsg/debian/changelog
@@ -1,3 +1,10 @@
+lcms (1.19.dfsg-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply Multi-Arch patch. Closes: #637732.
+
+ -- Mark Hymers <[email protected]> Sun, 13 May 2012 17:05:05 +0000
+
lcms (1.19.dfsg-1) unstable; urgency=low
* Upstream legacy update to 1.19 (Closes: #593314).
diff -u lcms-1.19.dfsg/debian/rules lcms-1.19.dfsg/debian/rules
--- lcms-1.19.dfsg/debian/rules
+++ lcms-1.19.dfsg/debian/rules
@@ -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
diff -u lcms-1.19.dfsg/debian/liblcms1.install lcms-1.19.dfsg/debian/liblcms1.install
--- lcms-1.19.dfsg/debian/liblcms1.install
+++ lcms-1.19.dfsg/debian/liblcms1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liblcms.so.* usr/lib/
+debian/tmp/usr/lib/*/liblcms.so.*
