Import Debian version 4.17-4

debian/control

@@ -2,8 +2,8 @@ Source: file
 Section: utils
 Priority: standard
 Maintainer: Michael Piefel <piefel@debian.org>
-Build-Depends: debhelper (>= 5.0.37.1), zlib1g-dev, autotools-dev, libtool, python (>= 2.3.5-7), python-all-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev, autotools-dev, libtool, python (>= 2.3.5-7), python-all-dev
+Standards-Version: 3.7.2
 XS-Python-Version: all
 
 Package: file
@@ -44,7 +44,7 @@ Package: python-magic
 Section: python
 Architecture: any
 Priority: extra
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
 Conflicts: python2.3-magic, python2.4-magic
 Replaces: python2.3-magic, python2.4-magic

debian/file.override

@@ -0,0 +1,2 @@
+# File and its library companion should always be updated together
+file: package-has-a-duplicate-relation

debian/pycompat

@@ -0,0 +1 @@
+2

debian/rules

@@ -82,6 +82,7 @@ install: build
 	install -m644 -p -D magic/magic.local debian/tmp/etc/magic
 	install -m644 -p -D magic/magic.local debian/tmp/etc/magic.mime
 
+	install -m644 -D debian/file.override debian/file/usr/share/lintian/overrides/file
 	install -m644 -D debian/bug.presubj debian/file/usr/share/bug/file/presubj
 	install -m644 -D debian/bug.control debian/libmagic1/usr/share/bug/libmagic1/control
 	install -m644 -D debian/bug.presubj-lib debian/libmagic1/usr/share/bug/libmagic1/presubj

src/Makefile.in

@@ -296,7 +296,7 @@ clean-binPROGRAMS:
 	done
 file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) 
 	@rm -f file$(EXEEXT)
-	$(LINK) $(file_LDFLAGS) $(file_OBJECTS) $(file_LDADD) $(LIBS)
+	$(LINK) $(file_LDFLAGS) $(file_OBJECTS) $(file_LDADD)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)