Import Debian version 4.17-2

debian/compat

@@ -1 +1 @@
-4
+5

debian/control

@@ -2,8 +2,9 @@ Source: file
 Section: utils
 Priority: standard
 Maintainer: Michael Piefel <piefel@debian.org>
-Build-Depends: debhelper (>= 4), zlib1g-dev, autotools-dev, libtool, python, python2.3-dev, python2.4-dev
+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
+XS-Python-Version: all
 
 Package: file
 Architecture: any
@@ -39,33 +40,15 @@ Description: File type determination library (development)
  .
  This package contains the development files.
 
-Package: python2.3-magic
-Priority: extra
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Python binding for the magic library (2.3 version)
- This Python library can be use to query /etc/magic
- information for a given file in Python.
-
-Package: python2.4-magic
-Priority: extra
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Python binding for the magic library (2.4 version)
- This Python library can be use to query /etc/magic
- information for a given file in Python.
-
 Package: python-magic
 Section: python
-Architecture: all
+Architecture: any
 Priority: extra
 Depends: ${python:Depends}
-Description: Python binding for the magic library (dummy package)
+Provides: ${python:Provides}
+Conflicts: python2.3-magic, python2.4-magic
+Replaces: python2.3-magic, python2.4-magic
+XB-Python-Version: ${python:Versions}
+Description: Python binding for the magic library
  This Python library can be use to query /etc/magic
  information for a given file in Python.
- .
- This is a generic package, which always depends on the version
- specific to the default Python version.
- 

debian/rules

@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-PYTHON_VERSIONS=2.4 2.3
+PYTHON_VERSIONS=$(shell pyversions -r debian/control)
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -35,7 +35,7 @@ else
   CFLAGS += -O2
 endif
 
-build: build-stamp $(patsubst %,build-stamp-%,$(PYTHON_VERSIONS))
+build: build-stamp
 build-stamp:	
 	dh_testdir
 
@@ -49,12 +49,13 @@ build-stamp:
 	mv libtool libtool.upstream && cp /usr/bin/libtool libtool
 	make
 	rm libtool && mv libtool.upstream libtool
-	touch build-stamp
 
-build-stamp-%:
-	dh_testdir
-	cd python && python$* setup.py build_ext -L$(CURDIR)/src/.libs
-	touch $@
+	set -e; \
+	for python in $(PYTHON_VERSIONS); do \
+		(cd python && $$python setup.py build_ext -L$(CURDIR)/src/.libs); \
+	done
+
+	touch build-stamp
 
 clean:
 	dh_testdir
@@ -85,14 +86,13 @@ install: build
 	install -m644 -D debian/bug.presubj-lib debian/libmagic1/usr/share/bug/libmagic1/presubj
 	install -m644 -D debian/bug.control debian/libmagic-dev/usr/share/bug/libmagic-dev/control
 	dh_install --sourcedir=debian/tmp
-	$(MAKE) -f debian/rules $(patsubst %,install-%,$(PYTHON_VERSIONS))
 
-install-%:
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	cd python && python$* setup.py install --no-compile\
-		--prefix=$(CURDIR)/debian/python$*-magic/usr
+	set -e; \
+	for python in $(PYTHON_VERSIONS); do \
+		(cd python && $$python setup.py install --no-compile \
+			--prefix=$(CURDIR)/debian/python-magic/usr); \
+	done
+
 
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will

magic/Magdir/msdos

@@ -86,6 +86,7 @@
 >>>>(0x3c.l+4)	leshort		0x290	PA-RISC
 >>>>(0x3c.l+22)	leshort&0x0100	>0	32-bit
 >>>>(0x3c.l+22)	leshort&0x1000	>0	system file
+>>>>(0x3c.l+232)    lelong	>0	Mono/.Net assembly
 
 >>>>(0x3c.l+0xf8)	string		UPX0 \b, UPX compressed
 >>>>(0x3c.l+0xf8)	search/0x140	PEC2 \b, PECompact2 compressed