Due to a security upload, the patch had to be refreshed.
reverted: --- openjpeg-1.3+dfsg/debian/libopenjpeg2.links +++ openjpeg-1.3+dfsg.orig/debian/libopenjpeg2.links @@ -1 +0,0 @@ -/usr/lib/libopenjpeg-2.1.3.0.so /usr/lib/libopenjpeg.so.2 diff -u openjpeg-1.3+dfsg/debian/rules openjpeg-1.3+dfsg/debian/rules --- openjpeg-1.3+dfsg/debian/rules +++ openjpeg-1.3+dfsg/debian/rules @@ -4,6 +4,7 @@ # used as trailer in the generated manpages UVERSION = $(shell dpkg-parsechangelog | perl -ne 'print "$$1\n" if (/^Version: (.*?)(?:\.dfsg)?\-.*?$$/)') +DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) EXTRA_CFLAGS += -O0 @@ -72,6 +73,19 @@ binary-arch: build install dh_testdir dh_testroot + + # install libopenjpeg2 files into multiarch paths + mkdir -p debian/libopenjpeg2/usr/lib/$(DEB_HOST_MULTIARCH) + cp lib*.so* debian/libopenjpeg2/usr/lib/$(DEB_HOST_MULTIARCH) + cd debian/libopenjpeg2/usr/lib/$(DEB_HOST_MULTIARCH) \ + && ln -s libopenjpeg-*.so libopenjpeg.so.2 + + # install libopenjpeg-dev files into multiarch paths + mkdir -p debian/libopenjpeg-dev/usr/lib/$(DEB_HOST_MULTIARCH) + cp lib*.a debian/libopenjpeg-dev/usr/lib/$(DEB_HOST_MULTIARCH) + cd debian/libopenjpeg-dev/usr/lib/$(DEB_HOST_MULTIARCH) \ + && ln -s libopenjpeg.so.2 libopenjpeg.so + dh_installchangelogs ChangeLog dh_installdocs dh_installexamples reverted: --- openjpeg-1.3+dfsg/debian/libopenjpeg2.install +++ openjpeg-1.3+dfsg.orig/debian/libopenjpeg2.install @@ -1 +0,0 @@ -lib*.so* usr/lib/ reverted: --- openjpeg-1.3+dfsg/debian/libopenjpeg-dev.links +++ openjpeg-1.3+dfsg.orig/debian/libopenjpeg-dev.links @@ -1 +0,0 @@ -/usr/lib/libopenjpeg.so.2 /usr/lib/libopenjpeg.so diff -u openjpeg-1.3+dfsg/debian/libopenjpeg-dev.install openjpeg-1.3+dfsg/debian/libopenjpeg-dev.install --- openjpeg-1.3+dfsg/debian/libopenjpeg-dev.install +++ openjpeg-1.3+dfsg/debian/libopenjpeg-dev.install @@ -2 +1,0 @@ -lib*.a usr/lib diff -u openjpeg-1.3+dfsg/debian/control openjpeg-1.3+dfsg/debian/control --- openjpeg-1.3+dfsg/debian/control +++ openjpeg-1.3+dfsg/debian/control @@ -3,7 +3,7 @@ Maintainer: Debian PhotoTools Maintainers <pkg-phototools-de...@lists.alioth.debian.org> Uploaders: Robin Cornelius <robin.cornel...@gmail.com>, Cyril Brulebois <k...@debian.org> Homepage: http://www.openjpeg.org -Build-Depends: debhelper (>= 5), dpatch (>= 2), libtiff4-dev +Build-Depends: debhelper (>= 9), dpatch (>= 2), libtiff4-dev Standards-Version: 3.7.3 Section: libs Vcs-Browser: http://git.debian.org/?p=pkg-phototools/openjpeg.git @@ -12,6 +12,7 @@ Package: libopenjpeg-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libopenjpeg2 (= ${binary:Version}) Description: development files for libopenjpeg2, a JPEG 2000 image library Libopenjpeg2 is a library for handling the JPEG 2000 image compression format. @@ -23,6 +24,8 @@ Package: libopenjpeg2 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends} Description: JPEG 2000 image compression/decompression library Libopenjpeg2 is a library for handling the JPEG 2000 image compression format. @@ -30,6 +33,7 @@ Package: libopenjpeg2-dbg Section: libdevel Architecture: any +Multi-Arch: same Depends: libopenjpeg2 (= ${binary:Version}) Description: debug symbols for libopenjpeg2, a JPEG 2000 image library This package contains the debug symbols to match the runtime component of the @@ -39,7 +43,8 @@ Package: openjpeg-tools Section: graphics Architecture: any -Depends: ${shlibs:Depends} +Multi-Arch: foreign +Depends: libopenjpeg2, ${shlibs:Depends} Description: command-line tools using the JPEG 2000 library This package provides with command-line tools allowing for conversions between several formats: diff -u openjpeg-1.3+dfsg/debian/changelog openjpeg-1.3+dfsg/debian/changelog --- openjpeg-1.3+dfsg/debian/changelog +++ openjpeg-1.3+dfsg/debian/changelog @@ -1,3 +1,10 @@ +openjpeg (1.3+dfsg-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Enable multiarch (closes: #675773). + + -- Michael Gilbert <mgilb...@debian.org> Sat, 16 Jun 2012 14:32:19 -0400 + openjpeg (1.3+dfsg-4.1) unstable; urgency=high
* Non-maintainer upload by the Security Team.
