Package: libmng
Version: 1.0.10-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi Kartik,
Please find attached a patch to libmng 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 Qt, libmng1 is part of the stack packaged in ia32-libs /
ia32-libs-gtk. Converting libmng 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/
[email protected] [email protected]
=== modified file 'debian/control'
--- debian/control 2010-06-03 17:56:09 +0000
+++ debian/control 2011-08-13 22:35:15 +0000
@@ -1,7 +1,7 @@
Source: libmng
Section: libs
Priority: optional
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 8.1.3),
libjpeg62-dev | libjpeg-dev,
liblcms1-dev,
libtool,
@@ -12,7 +12,9 @@
Package: libmng1
Architecture: any
+Multi-Arch: same
Replaces: libmng-dev (<< 1.0.0-3), libmng
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Multiple-image Network Graphics library
The libmng library supports decoding, displaying, encoding, and various other
@@ -23,6 +26,7 @@
Package: libmng-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Replaces: libmng
Depends: ${misc:Depends},
=== modified file 'debian/libmng-dev.install'
--- debian/libmng-dev.install 2010-06-03 17:56:09 +0000
+++ debian/libmng-dev.install 2011-08-13 22:35:12 +0000
@@ -1,3 +1,3 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
=== modified file 'debian/libmng1.install'
--- debian/libmng1.install 2010-06-03 17:56:09 +0000
+++ debian/libmng1.install 2011-08-13 22:35:12 +0000
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
=== modified file 'debian/rules'
--- debian/rules 2010-06-03 17:56:09 +0000
+++ debian/rules 2011-08-13 22:35:12 +0000
@@ -12,6 +12,8 @@
COMPILER_FLAGS=CFLAGS="-Wall -O2 -funroll-loops -fno-exceptions -pipe"
CXXFLAGS="-Wall -O2 -funroll-loops -fno-exceptions -pipe"
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -35,8 +37,8 @@
dh_testroot
dh_prep
- mkdir -p $(CURDIR)/debian/tmp/usr
- $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib
+ $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
LIBPATH=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
# Remove empty dir
rm -rf $(CURDIR)/debian/libmng1/usr/include
