On lördagen den 16 juni 2012, Michael Gilbert wrote: > tag 675773 patch > thanks > > Hi, I've uploaded an nmu fixing this issue to delayed/5. See attached > patch.
Here's a slightly less intrusive patch. Also, I think Michaels patch added "Multi-Arch: same" to too many packages and added a dependency to openjpeg- tools for no apparent reason. I too think it would be nice to have this fixed. It's a relatively simple operation. -- Magnus Holmgren holmg...@debian.org Debian Developer
diff -u openjpeg-1.3+dfsg/debian/openjpeg-tools.install openjpeg-1.3+dfsg/debian/openjpeg-tools.install
--- openjpeg-1.3+dfsg/debian/openjpeg-tools.install
+++ openjpeg-1.3+dfsg/debian/openjpeg-tools.install
@@ -1,4 +1 @@
-j2k_to_image /usr/bin/
-image_to_j2k /usr/bin/
-index_create /usr/bin/
-jp2-thumbnailer /usr/bin/
+usr/bin
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
@@ -59,12 +60,13 @@
dh_clean -k
dh_installdirs
- $(MAKE) dist
+ $(MAKE) install DESTDIR=dist INSTALL_LIBDIR='$$(PREFIX)/lib/$(DEB_HOST_MULTIARCH)'
# The libraries and header file are in dist/
# So we'll dump the binaries there too
- cp codec/j2k_to_image codec/image_to_j2k dist/
- cp indexer_JPIP/index_create dist/
- cp debian/jp2-thumbnailer dist/
+ install -d -m 755 dist/usr/bin
+ install -m 755 codec/j2k_to_image codec/image_to_j2k dist/usr/bin
+ install -m 755 indexer_JPIP/index_create dist/usr/bin
+ install -m 755 debian/jp2-thumbnailer dist/usr/bin
binary-indep: build install
# We have nothing to do by default.
diff -u openjpeg-1.3+dfsg/debian/libopenjpeg2.install openjpeg-1.3+dfsg/debian/libopenjpeg2.install
--- openjpeg-1.3+dfsg/debian/libopenjpeg2.install
+++ openjpeg-1.3+dfsg/debian/libopenjpeg2.install
@@ -1 +1 @@
-lib*.so* usr/lib/
+usr/lib/*/lib*.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
@@ -1,2 +1,2 @@
-*.h usr/include/
-lib*.a usr/lib
+usr/include/
+usr/lib/*/lib*.a
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
@@ -23,6 +23,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.
@@ -38,6 +40,8 @@
Package: openjpeg-tools
Section: graphics
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
Architecture: any
Depends: ${shlibs:Depends}
Description: command-line tools using the JPEG 2000 library
diff -u openjpeg-1.3+dfsg/debian/changelog openjpeg-1.3+dfsg/debian/changelog
signature.asc
Description: This is a digitally signed message part.
