Package: libmagic1 Version: 5.04-5 Severity: wishlist User: [email protected] Usertags: multiarch Tags: patch
Hi, file and libmagic1 are one of the bottom dependencies in debian, and thus need early multiarch conversion. Any reverse dependencies of libmagic1 cant be (usefully) multiarch until libmagic1 is converted. The attached patch converts the version of file in git repository to multiarch paths and adds the relevant Multi-Arch: fields to debian/control. For more information, see: http://wiki.debian.org/Multiarch/Implementation Riku
diff --git a/debian/control b/debian/control index 76bfd02..742e86d 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Daniel Baumann <[email protected]> Uploaders: Daniel Baumann <[email protected]>, Judit Foglszinger <[email protected]> Build-Depends: - debhelper (>= 7.4.3~), autotools-dev, python, python-all-dev, python-all-dbg, - python-support, quilt (>= 0.46-7), zlib1g-dev + debhelper (>= 8.1.3), autotools-dev, python, python-all-dev, python-all-dbg, + python-support, quilt (>= 0.46-7), zlib1g-dev, dpkg-dev (>= 1.16) Standards-Version: 3.9.0 Homepage: http://www.darwinsys.com/file/ Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/file.git @@ -18,6 +18,7 @@ Section: utils Priority: standard Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libmagic1 (= ${binary:Version}) +Multi-Arch: foreign Description: Determines file type using "magic" numbers File tests each argument in an attempt to classify it. There are three sets of tests, performed in this order: filesystem tests, magic number tests, and @@ -29,6 +30,8 @@ Section: libs Priority: standard Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Conflicts: file (<< 5.08-1) Suggests: file Description: File type determination library using "magic" numbers @@ -40,6 +43,7 @@ Section: libdevel Priority: optional Architecture: any Depends: ${misc:Depends}, libmagic1 (= ${binary:Version}) +Multi-Arch: same Suggests: file Description: File type determination library using "magic" numbers (development) This library can be used to classify files according to magic number tests. It diff --git a/debian/libmagic-dev.install b/debian/libmagic-dev.install index b2b06b3..8a0f33f 100644 --- a/debian/libmagic-dev.install +++ b/debian/libmagic-dev.install @@ -1,4 +1,4 @@ /usr/include -/usr/lib/*.a -/usr/lib/*.so +/usr/lib/*/*.a +/usr/lib/*/*.so /usr/share/man/man3 diff --git a/debian/libmagic1.install b/debian/libmagic1.install index 59fda7c..dd56ae3 100644 --- a/debian/libmagic1.install +++ b/debian/libmagic1.install @@ -1,4 +1,4 @@ /etc -/usr/lib/*.so.* +/usr/lib/*/*.so.* /usr/share/file /usr/share/man/man5 diff --git a/debian/rules b/debian/rules index e080767..5e1fc8d 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ include /usr/share/quilt/quilt.make DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CROSS= --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) CC=$(DEB_HOST_GNU_TYPE)-gcc LD=$(DEB_HOST_GNU_TYPE)-ld @@ -39,7 +40,7 @@ ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif - ./configure $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --mandir=\$${prefix}/share/man --enable-fsect-man5 CFLAGS="$(CFLAGS)" + ./configure $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --mandir=\$${prefix}/share/man --enable-fsect-man5 CFLAGS="$(CFLAGS)" --libdir=/\$${prefix}/lib/$(DEB_HOST_MULTIARCH) build: build-stamp build-stamp: config.status
