Import Debian version 4.23-2

debian/control

@@ -51,7 +51,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Provides: ${python:Provides}
 Suggests: python-magic-dbg
 XB-Python-Version: ${python:Versions}
-Description: File type determination library using "magic" numbers (python bindings)
+Description: File type determination library using "magic" numbers (Python bindings)
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
  .
@@ -63,9 +63,9 @@ Section: python
 Architecture: any
 Priority: extra
 Depends: python-magic (= ${binary:Version}), python-dbg, ${shlibs:Depends}
-Description: File type determination library using "magic" numbers (python bindings/debug)
+Description: File type determination library using "magic" numbers (Python bindings/debug)
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
  .
- This package contains the python bindings to query /etc/magic information for a
- given file in Python, built for the python debug interpreter.
+ This package contains the Python bindings to query /etc/magic information for a
+ given file in Python, built for the Python debug interpreter.

debian/rules

@@ -10,6 +10,13 @@ include /usr/share/dpatch/dpatch.make
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+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
+else
+	CROSS= --build=$(DEB_BUILD_GNU_TYPE)
+endif
+
 # HOWMANY is the number of bytes looked at by file
 CFLAGS = -DHOWMANY=0x18000
 
@@ -29,7 +36,7 @@ config.status: configure patch
 	# Configuring package
 	mv config.sub config.sub.upstream && ln -s /usr/share/misc/config.sub
 	mv config.guess config.guess.upstream && ln -s /usr/share/misc/config.guess
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --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
 	rm config.sub && mv config.sub.upstream config.sub
 	rm config.guess && mv config.guess.upstream config.guess