Import Debian version 5.10-1

debian/control

@@ -4,8 +4,8 @@ Priority: standard
 Maintainer: Daniel Baumann <daniel.baumann@progress-technologies.net>
 Uploaders: Judit Foglszinger <fgrfgr@freenet.de>
 Build-Depends:
- debhelper (>= 8), autotools-dev, python, python-all-dev, python-all-dbg,
- zlib1g-dev
+ debhelper (>= 8.1.3), dpkg-dev (>= 1.16), autotools-dev, python,
+ python-all-dev, python-all-dbg, zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://www.darwinsys.com/file/
 
@@ -13,6 +13,7 @@ Package: file
 Section: utils
 Priority: standard
 Architecture: any
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}, libmagic1 (= ${binary:Version})
 Description: Determines file type using "magic" numbers
  File tests each argument in an attempt to classify it. There are three sets of
@@ -24,6 +25,8 @@ Package: libmagic1
 Section: libs
 Priority: standard
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: file
 Description: File type determination library using "magic" numbers
@@ -34,6 +37,7 @@ Package: libmagic-dev
 Section: libdevel
 Priority: optional
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, libmagic1 (= ${binary:Version})
 Suggests: file
 Description: File type determination library using "magic" numbers (development)

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

debian/libmagic1.install

@@ -1,4 +1,4 @@
 /etc
-/usr/lib/*.so.*
+/usr/lib/*/*.so.*
 /usr/share/file
 /usr/share/man/man5

debian/rules

@@ -4,6 +4,7 @@
 
 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
@@ -38,7 +39,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 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --enable-fsect-man5 CFLAGS="$(CFLAGS)"
 
 build: build-arch build-indep
 build-arch: build-stamp