Import Debian version 4.24-2

debian/compat

@@ -1 +1 @@
-5
+6

debian/control

@@ -2,9 +2,11 @@ Source: file
 Section: utils
 Priority: standard
 Maintainer: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), dpatch, autotools-dev, libtool, python, python-all-dev, python-all-dbg, zlib1g-dev
+Build-Depends: debhelper (>= 6), dpatch, autotools-dev, libtool, python, python-all-dev, python-all-dbg, zlib1g-dev
 Standards-Version: 3.7.3
 Homepage: http://www.darwinsys.com/file/
+Vcs-Browser: http://git.debian.net/?p=file.git
+Vcs-Git: git://git.debian.net/git/file.git
 XS-Python-Version: all
 
 Package: file

debian/rules

@@ -107,18 +107,21 @@ install: build
 	mkdir -p debian/libmagic-dev/usr/include/file
 	cp src/file.h src/patchlevel.h debian/libmagic-dev/usr/include/file
 
+	# Build plain magic files for compatibility
+	install -D -m 0644 debian/legacy/magic.mime debian/libmagic1/usr/share/file/magic.mime
+	cp magic/Header debian/libmagic1/usr/share/file/magic
+	cat magic/Localstuff >> debian/libmagic1/usr/share/file/magic
+	set -e; for FILE in magic/Magdir/*; \
+	do \
+		grep -v "^!:" $$FILE >> debian/libmagic1/usr/share/file/magic; \
+	done
+
 	# Installing bug congtrols
 	install -D -m 0644 debian/bug/presubj debian/file/usr/share/bug/file/presubj
 	install -D -m 0644 debian/bug/control debian/libmagic1/usr/share/bug/libmagic1/control
 	install -D -m 0644 debian/bug/presubj-lib debian/libmagic1/usr/share/bug/libmagic1/presubj
 	install -D -m 0644 debian/bug/control debian/libmagic-dev/usr/share/bug/libmagic-dev/control
 
-	# Installing lintian overrides
-	set -e; for LINTIAN in debian/lintian/*; \
-	do \
-		install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN`; \
-	done
-
 binary-indep: build install
 
 binary-arch: build install
@@ -128,6 +131,7 @@ binary-arch: build install
 	dh_installdocs
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp
+	dh_lintian
 	dh_python
 	dh_link
 ifeq (,$(findstring -i, $(DH_OPTIONS)))

debian/watch

@@ -1,2 +0,0 @@
-version=3
-ftp://ftp.astron.com/pub/file/file-(.*)\.tar\.gz