Browse Source

Fix FTCBFS: Remove stage1 profile in favour of a proper arch/indep split. Closes: #841030

Christoph Biedl 7 years ago
parent
commit
980b5b8f8b
4 changed files with 21 additions and 51 deletions
  1. 6 5
      debian/control
  2. 1 0
      debian/python-magic.install
  3. 1 0
      debian/python3-magic.install
  4. 13 46
      debian/rules

+ 6 - 5
debian/control

@@ -3,14 +3,16 @@ Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: http://www.darwinsys.com/file/
 Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 9.20141010~),
+    dpkg-dev (>= 1.17.14~),
+Build-Depends-Arch:
     dh-autoreconf,
+    zlib1g-dev,
+Build-Depends-Indep:
     dh-python,
-    dpkg-dev (>= 1.17.14~),
     python-all,
     python-setuptools,
     python3-all,
     python3-setuptools,
-    zlib1g-dev,
 Priority: standard
 Section: utils
 
@@ -71,7 +73,8 @@ Description: Recognize the type of data in a file using "magic" numbers - develo
 
 Package: python-magic
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
+Depends: ${misc:Depends},
+    ${python:Depends},
     libmagic1 (>= ${binary:Version}),
     libmagic1 (<< ${binary:Version}.1~),
 Provides:
@@ -81,7 +84,6 @@ Priority: optional
 Description: Recognize the type of data in a file using "magic" numbers - Python bindings
  This package contains the Python bindings for the libmagic file type
  detection library.
-Build-Profiles: <!stage1>
 
 Package: python3-magic
 Architecture: all
@@ -93,4 +95,3 @@ Priority: optional
 Description: Recognize the type of data in a file using "magic" numbers - Python 3 bindings
  This package contains the Python 3 bindings for the libmagic file type
  detection library.
-Build-Profiles: <!stage1>

+ 1 - 0
debian/python-magic.install

@@ -0,0 +1 @@
+usr/lib/python2*

+ 1 - 0
debian/python3-magic.install

@@ -0,0 +1 @@
+usr/lib/python3*

+ 13 - 46
debian/rules

@@ -4,10 +4,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 SHELL := sh -e
 
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
--include /usr/share/python/python.mk
-endif
-
 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)
@@ -21,17 +17,11 @@ endif
 # HOWMANY is the number of bytes looked at by file
 CFLAGS += -DHOWMANY=0x18000
 
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-PYTHON_VERSIONS=$(shell pyversions -r debian/control)
-PYTHON3_VERSIONS=$(shell py3versions -r debian/control)
-endif
-
 %:
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-	dh ${@} --with autoreconf,python2,python3
-else
-	dh ${@} --with autoreconf
-endif
+	dh $@ $(DH_ADDONS)
+binary-arch build-arch install-arch: DH_ADDONS=--with autoreconf
+binary-indep build-indep install-indep: DH_ADDONS=--with python2,python3
+binary build install: DH_ADDONS=--with autoreconf,python2,python3
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -40,27 +30,18 @@ override_dh_auto_clean:
 	rm -rf python/__pycache__
 	rm -f python/*.pyc
 
-override_dh_auto_build:
-	dh_auto_build
-
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-	for python in $(PYTHON_VERSIONS); \
-	do \
-		(cd python && $$python setup.py build_ext \
-			-L$(CURDIR)/src/.libs); \
-	done
-
-	for python in $(PYTHON3_VERSIONS); \
-	do \
-		(cd python && $$python setup.py build_ext \
-			-L$(CURDIR)/src/.libs); \
-	done
-endif
+override_dh_auto_configure-indep:
+	dh_auto_configure --buildsystem=pybuild --sourcedirectory=python
+override_dh_auto_build-indep:
+	dh_auto_build --buildsystem=pybuild --sourcedirectory=python
+override_dh_auto_test-indep:
+override_dh_auto_install-indep:
+	dh_auto_install --buildsystem=pybuild --sourcedirectory=python
 
-override_dh_auto_configure:
+override_dh_auto_configure-arch:
 	dh_auto_configure -- $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --enable-fsect-man5 --enable-static --disable-silent-rules CFLAGS="$(CFLAGS)"
 
-override_dh_auto_install:
+override_dh_auto_install-arch:
 	dh_auto_install
 
 	mv debian/tmp/usr/share/misc debian/tmp/usr/share/file
@@ -68,20 +49,6 @@ override_dh_auto_install:
 	install -D -m 0644 magic/magic.local debian/tmp/etc/magic
 	install -D -m 0644 magic/magic.local debian/tmp/etc/magic.mime
 
-ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-	for python in $(PYTHON_VERSIONS); \
-	do \
-		(cd python && $$python setup.py install --no-compile \
-			--root=$(CURDIR)/debian/python-magic $(py_setup_install_args)); \
-	done
-
-	for python in $(PYTHON3_VERSIONS); \
-	do \
-		(cd python && $$python setup.py install --no-compile \
-			--root=$(CURDIR)/debian/python3-magic $(py_setup_install_args)); \
-	done
-endif
-
 	# Install additional headers
 	mkdir -p debian/libmagic-dev/usr/include/file
 	cp src/file.h debian/libmagic-dev/usr/include/file