The dpkg-cross package is slowly being absorbed into dpkg proper but is already no longer required here. We don't need to build depend on it and we don't need to include /usr/share/dpkg-cross in the PATH when stripping files anymore now, there is nothing in that directory anyhow. We probably do want a build-dep on binutils-multiarch instead though, since we need its strip to do this. The DPKG_BUILD_DEP var we can get rid of entirely. Nothing references it now. (The MAINTAINER and UPLOADERS vars just above it should either be removed or actually exported too -- all this is done in control.m4 at present) --- debian/control.m4 | 2 +- debian/rules.conf | 5 ----- debian/rules.d/binary-gcc-cross.mk | 2 +- debian/rules.d/binary-libgcc-cross.mk | 8 ++++---- debian/rules.d/binary-libobjc-cross.mk | 2 +- debian/rules.d/binary-libstdcxx-cross.mk | 10 +++++----- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/debian/control.m4 b/debian/control.m4 index 75408ba..4292291 100644 --- a/debian/control.m4 +++ b/debian/control.m4 @@ -46,7 +46,7 @@ Uploaders: Matthias Klose , Arthur Loiret ')dnl SRCNAME Standards-Version: 3.8.1 ifdef(`TARGET',`dnl cross -Build-Depends: dpkg-dev (>= 1.14.15), debhelper (>= 5.0.62), dpkg-cross (>= 1.25.99), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTOGEN_BUILD_DEP CLOOG_BUILD_DEP m4, libmpfr-dev (>= 2.3.0), autoconf (>= 2.50), autoconf2.59, automake1.9, libtool, gawk, lzma, patchutils, BINUTILS_BUILD_DEP, bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, make (>= 3.81), quilt +Build-Depends: dpkg-dev (>= 1.14.15), debhelper (>= 5.0.62), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTOGEN_BUILD_DEP CLOOG_BUILD_DEP m4, libmpfr-dev (>= 2.3.0), autoconf (>= 2.50), autoconf2.59, automake1.9, libtool, gawk, lzma, patchutils, BINUTILS_BUILD_DEP, bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, make (>= 3.81), quilt ',`dnl native Build-Depends: dpkg-dev (>= 1.14.15), debhelper (>= 5.0.62), gcc-multilib [amd64 i386 mips mipsel powerpc ppc64 s390 sparc kfreebsd-amd64], LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP AUTOGEN_BUILD_DEP libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf (>= 2.50), autoconf2.59, automake1.9, libtool, gawk, lzma, patchutils, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), libmpfr-dev (>= 2.3.0), FORTRAN_BUILD_DEP locales [locale_no_archs], procps, sharutils, PASCAL_BUILD_DEP JAVA_BUILD_DEP GNAT_BUILD_DEP SPU_BUILD_DEP CLOOG_BUILD_DEP CHECK_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP diff --git a/debian/rules.conf b/debian/rules.conf index e46b6a4..c2c71c5 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -102,11 +102,6 @@ ifneq (,$(findstring $(PKGSOURCE),gdc)) UPLOADERS = Arthur Loiret endif -DPKG_BUILD_DEP = dpkg-dev (>= 1.14.15) -ifeq ($(DEB_CROSS),yes) - DPKG_BUILD_DEP +=, dpkg-cross (>= 1.25.99) -endif - # The binutils version needed. # The oldest suitable versions for the various platforms can be found in # INSTALL/specific.html ; we take a tighter dependency if possible to be on diff --git a/debian/rules.d/binary-gcc-cross.mk b/debian/rules.d/binary-gcc-cross.mk index 9081656..3da770f 100644 --- a/debian/rules.d/binary-gcc-cross.mk +++ b/debian/rules.d/binary-gcc-cross.mk @@ -95,7 +95,7 @@ endif # dh_installdebconf debian/dh_doclink -p$(p_gcc) $(p_base) debian/dh_rmemptydirs -p$(p_gcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_gcc) + dh_strip -p$(p_gcc) dh_compress -p$(p_gcc) dh_fixperms -p$(p_gcc) dh_shlibdeps -p$(p_gcc) diff --git a/debian/rules.d/binary-libgcc-cross.mk b/debian/rules.d/binary-libgcc-cross.mk index b4de9e8..a1af793 100644 --- a/debian/rules.d/binary-libgcc-cross.mk +++ b/debian/rules.d/binary-libgcc-cross.mk @@ -42,7 +42,7 @@ endif dh_installchangelogs -p$(p_lgcc) debian/dh_rmemptydirs -p$(p_lgcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lgcc) + dh_strip -p$(p_lgcc) dh_compress -p$(p_lgcc) dh_fixperms -p$(p_lgcc) ifeq ($(with_shared_libgcc),yes) @@ -92,7 +92,7 @@ endif dh_installchangelogs -p$(p_l64gcc) debian/dh_rmemptydirs -p$(p_l64gcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_l64gcc) + dh_strip -p$(p_l64gcc) dh_compress -p$(p_l64gcc) dh_fixperms -p$(p_l64gcc) ifeq ($(with_shared_libgcc),yes) @@ -139,7 +139,7 @@ endif dh_installchangelogs -p$(p_l32gcc) debian/dh_rmemptydirs -p$(p_l32gcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_l32gcc) + dh_strip -p$(p_l32gcc) dh_compress -p$(p_l32gcc) dh_fixperms -p$(p_l32gcc) ifeq ($(with_shared_libgcc),yes) @@ -186,7 +186,7 @@ endif dh_installchangelogs -p$(p_ln32gcc) debian/dh_rmemptydirs -p$(p_ln32gcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_ln32gcc) + dh_strip -p$(p_ln32gcc) dh_compress -p$(p_ln32gcc) dh_fixperms -p$(p_ln32gcc) ifeq ($(with_shared_libgcc),yes) diff --git a/debian/rules.d/binary-libobjc-cross.mk b/debian/rules.d/binary-libobjc-cross.mk index 7602a1a..b486939 100644 --- a/debian/rules.d/binary-libobjc-cross.mk +++ b/debian/rules.d/binary-libobjc-cross.mk @@ -47,7 +47,7 @@ $(binary_stamp)-libobjc: $(install_stamp) debian/dh_rmemptydirs -p$(p_lobjc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lobjc) + dh_strip -p$(p_lobjc) dh_compress -p$(p_lobjc) dh_fixperms -p$(p_lobjc) diff --git a/debian/rules.d/binary-libstdcxx-cross.mk b/debian/rules.d/binary-libstdcxx-cross.mk index 7e96406..18ca49a 100644 --- a/debian/rules.d/binary-libstdcxx-cross.mk +++ b/debian/rules.d/binary-libstdcxx-cross.mk @@ -130,7 +130,7 @@ $(binary_stamp)-libstdcxx: $(install_stamp) debian/dh_rmemptydirs -p$(p_lib) mkdir -p $(d_dbg) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lib) --keep-debug + dh_strip -p$(p_lib) --keep-debug # The above line puts debugging information into some strange location # that is hardcoded into dh_strip. Move it from there. mkdir -p $(d_lib)/usr/$(DEB_TARGET_GNU_TYPE)/lib/debug @@ -175,7 +175,7 @@ $(binary_stamp)-lib64stdcxx: $(install_stamp) mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/debug $(d_dbg64)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/. mkdir -p $(d_dbg64) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lib64) --keep-debug + dh_strip -p$(p_lib64) --keep-debug # The above line puts debugging information into some strange location # that is hardcoded into dh_strip. Move it from there. mkdir -p $(d_lib64)/usr/$(DEB_TARGET_GNU_TYPE)/lib64/debug @@ -228,7 +228,7 @@ $(binary_stamp)-lib32stdcxx: $(install_stamp) mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/debug $(d_dbg32)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/. mkdir -p $(d_dbg32) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lib32) --keep-debug + dh_strip -p$(p_lib32) --keep-debug # The above line puts debugging information into some strange location # that is hardcoded into dh_strip. Move it from there. mkdir -p $(d_lib32)/usr/$(DEB_TARGET_GNU_TYPE)/lib32/debug @@ -351,8 +351,8 @@ ifeq ($(with_cxxdev),yes) debian/dh_rmemptydirs -p$(p_dbg) endif - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_dev) --dbg-package=$(p_lib) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_pic) + dh_strip -p$(p_dev) --dbg-package=$(p_lib) + dh_strip -p$(p_pic) dh_compress -p$(p_dev) -p$(p_pic) -p$(p_dbg) -X.txt dh_fixperms -p$(p_dev) -p$(p_pic) -p$(p_dbg) dh_gencontrol -p$(p_dev) -p$(p_pic) -p$(p_dbg) \ -- 1.6.3.3