diff -Nru xalan-1.12/debian/changelog xalan-1.12/debian/changelog --- xalan-1.12/debian/changelog 2021-01-05 15:11:43.000000000 +0000 +++ xalan-1.12/debian/changelog 2021-01-06 13:30:26.000000000 +0000 @@ -1,3 +1,9 @@ +xalan (1.12-6) unstable; urgency=medium + + * Switch to using build dir to avoid arch naming issues. Closes: 979327 + + -- William Blough Wed, 06 Jan 2021 08:30:26 -0500 + xalan (1.12-5) unstable; urgency=medium * Use DEB_HOST_GNU_TYPE instead of DEB_HOST_MULTIARCH to fix i386/i686 diff -Nru xalan-1.12/debian/rules xalan-1.12/debian/rules --- xalan-1.12/debian/rules 2021-01-05 15:11:43.000000000 +0000 +++ xalan-1.12/debian/rules 2021-01-06 13:30:26.000000000 +0000 @@ -6,12 +6,13 @@ export DEB_CFLAGS_MAINT_APPEND=-DNDEBUG export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG +export BUILD_DIR=build %: - dh $@ + dh $@ --builddirectory=${BUILD_DIR} override_dh_auto_build-indep: - ( cd obj-${DEB_HOST_GNU_TYPE} && $(MAKE) doc-api) + ( cd ${BUILD_DIR} && $(MAKE) doc-api) # Don't run tests for arch-indep (doc) build