* Set the priorities of the *-dev-*-cross packages to extra.

  * Prepare to change the base dependency for *-cross packages.


git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8064 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

19 files changed, 51 insertions, 48 deletions

diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 6ec329e..c5b2af9 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -12,14 +12,17 @@ endif
 
 ifneq ($(DEB_CROSS),yes)
   p_gbase	= gnat-$(GNAT_VERSION)-base
+  p_glbase	= gnat-$(GNAT_VERSION)-base
   ifneq ($(with_separate_gnat),yes)
     p_gbase = gcc$(pkg_ver)-base
+    p_glbase = $(p_lbase)
   endif
 else
   p_gbase = gnat$(pkg_ver)$(cross_bin_arch)-base
   ifneq ($(with_separate_gnat),yes)
     p_gbase = gcc$(pkg_ver)$(cross_bin_arch)-base
   endif
+  p_glbase = $(p_gbase)
 endif
 
 p_gnat	= gnat-$(GNAT_VERSION)$(cross_bin_arch)
@@ -107,7 +110,7 @@ $(binary_stamp)-libgnat: $(install_stamp)
 	done
 	dh_movefiles -p$(p_lgnat) $(files_lgnat)
 
-	debian/dh_doclink -p$(p_lgnat) $(p_gbase)
+	debian/dh_doclink -p$(p_lgnat) $(p_glbase)
 
 	debian/dh_rmemptydirs -p$(p_lgnat)
 
@@ -143,7 +146,7 @@ endif
 	dh_builddeb -p$(p_lgnat)
 
 	: # $(p_lgnat_dbg)
-	debian/dh_doclink -p$(p_lgnat_dbg) $(p_gbase)
+	debian/dh_doclink -p$(p_lgnat_dbg) $(p_glbase)
 	dh_compress -p$(p_lgnat_dbg)
 	dh_fixperms -p$(p_lgnat_dbg)
 	$(cross_gencontrol) dh_gencontrol -p$(p_lgnat_dbg) \
diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk
index ffa943f..7abfc10 100644
--- a/debian/rules.d/binary-d.mk
+++ b/debian/rules.d/binary-d.mk
@@ -182,7 +182,7 @@ $(binary_stamp)-libphobos: $(install_stamp)
 ifeq ($(with_separate_gdc),yes)
 	debian/dh_doclink -p$(p_libphobos) $(p_gdc)
 else
-	debian/dh_doclink -p$(p_libphobos) $(p_base)
+	debian/dh_doclink -p$(p_libphobos) $(p_lbase)
 endif
 
 	dh_strip -p$(p_libphobos)
@@ -219,7 +219,7 @@ define __do_libphobos_dev
 	rm -f $(d_l)/$(gdc_include_dir)/object.di
 
 	debian/dh_doclink -p$(p_l) \
-		$(if $(filter yes,$(with_separate_gdc)),$(p_gdc),$(p_base))
+		$(if $(filter yes,$(with_separate_gdc)),$(p_gdc),$(p_lbase))
 
 	dh_compress -p$(p_l)
 	dh_fixperms -p$(p_l)
diff --git a/debian/rules.d/binary-fortran.mk b/debian/rules.d/binary-fortran.mk
index 6222278..456067b 100644
--- a/debian/rules.d/binary-fortran.mk
+++ b/debian/rules.d/binary-fortran.mk
@@ -89,8 +89,8 @@ define __do_fortran
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libgfortran.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	if [ -f debian/$(p_l).overrides ]; then \
 		mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \
@@ -134,7 +134,7 @@ define __do_libgfortran_dev
 		$(gcc_lib_dir$(2))/libcaf_single.a
 	$(call install_gcc_lib,libgfortran,$(FORTRAN_SONAME),$(2),$(p_l))
 
-	debian/dh_doclink -p$(p_l) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
 	debian/dh_rmemptydirs -p$(p_l)
 
 	dh_strip -p$(p_l)
diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk
index b62e48a..54158df 100644
--- a/debian/rules.d/binary-go.mk
+++ b/debian/rules.d/binary-go.mk
@@ -112,8 +112,8 @@ define __do_gccgo
 	DH_COMPAT=2 dh_movefiles -p$(p_l) \
 		$(usr_lib$(2))/libgo.so.* $(usr_lib$(2))/go
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	: # don't strip: https://gcc.gnu.org/ml/gcc-patches/2015-02/msg01722.html
 	: # dh_strip -p$(p_l) --dbg-package=$(p_d)
diff --git a/debian/rules.d/binary-libasan.mk b/debian/rules.d/binary-libasan.mk
index 8822034..df442dd 100644
--- a/debian/rules.d/binary-libasan.mk
+++ b/debian/rules.d/binary-libasan.mk
@@ -27,8 +27,8 @@ define __do_asan
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libasan.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	if [ -f debian/$(p_l).overrides ]; then \
 		mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \
diff --git a/debian/rules.d/binary-libatomic.mk b/debian/rules.d/binary-libatomic.mk
index 1077530..46a361f 100644
--- a/debian/rules.d/binary-libatomic.mk
+++ b/debian/rules.d/binary-libatomic.mk
@@ -27,8 +27,8 @@ define __do_atomic
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libatomic.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	dh_compress -p$(p_l) -p$(p_d)
diff --git a/debian/rules.d/binary-libcilkrts.mk b/debian/rules.d/binary-libcilkrts.mk
index 4371679..a704035 100644
--- a/debian/rules.d/binary-libcilkrts.mk
+++ b/debian/rules.d/binary-libcilkrts.mk
@@ -27,8 +27,8 @@ define __do_cilkrts
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libcilkrts.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	if [ -f debian/$(p_l).overrides ]; then \
 		mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \
diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk
index e353c85..d95de81 100644
--- a/debian/rules.d/binary-libgcc.mk
+++ b/debian/rules.d/binary-libgcc.mk
@@ -158,7 +158,7 @@ define __do_gcc_devels
 
 	$(call __do_gcc_devels2,$(1),$(2),$(3),$(4))
 
-	debian/dh_doclink -p$(2) $(p_base)
+	debian/dh_doclink -p$(2) $(p_lbase)
 	debian/dh_rmemptydirs -p$(2)
 
 	dh_strip -p$(2)
@@ -291,8 +291,8 @@ define __do_libgcc
 			$(d_l)/$(libgcc_dir$(2))/.
 	)
 
-	debian/dh_doclink -p$(p_l) $(if $(3),$(3),$(p_base))
-	debian/dh_doclink -p$(p_d) $(if $(3),$(3),$(p_base))
+	debian/dh_doclink -p$(p_l) $(if $(3),$(3),$(p_lbase))
+	debian/dh_doclink -p$(p_d) $(if $(3),$(3),$(p_lbase))
 	debian/dh_rmemptydirs -p$(p_l)
 	debian/dh_rmemptydirs -p$(p_d)
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
diff --git a/debian/rules.d/binary-libgomp.mk b/debian/rules.d/binary-libgomp.mk
index a366985..a549031 100644
--- a/debian/rules.d/binary-libgomp.mk
+++ b/debian/rules.d/binary-libgomp.mk
@@ -27,8 +27,8 @@ define __do_gomp
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libgomp.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	dh_compress -p$(p_l) -p$(p_d)
diff --git a/debian/rules.d/binary-libitm.mk b/debian/rules.d/binary-libitm.mk
index 534a0bd..5d16e4f 100644
--- a/debian/rules.d/binary-libitm.mk
+++ b/debian/rules.d/binary-libitm.mk
@@ -27,8 +27,8 @@ define __do_itm
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libitm.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	dh_compress -p$(p_l) -p$(p_d)
diff --git a/debian/rules.d/binary-liblsan.mk b/debian/rules.d/binary-liblsan.mk
index 3cdf7d8..3fed1c7 100644
--- a/debian/rules.d/binary-liblsan.mk
+++ b/debian/rules.d/binary-liblsan.mk
@@ -27,8 +27,8 @@ define __do_lsan
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/liblsan.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	if [ -f debian/$(p_l).overrides ]; then \
 		mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \
diff --git a/debian/rules.d/binary-libmpx.mk b/debian/rules.d/binary-libmpx.mk
index 9013e03..33c0883 100644
--- a/debian/rules.d/binary-libmpx.mk
+++ b/debian/rules.d/binary-libmpx.mk
@@ -29,8 +29,8 @@ define __do_mpx
 		$(usr_lib$(2))/libmpx.so.* \
 		$(usr_lib$(2))/libmpxwrappers.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	if [ -f debian/$(p_l).overrides ]; then \
 		mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \
diff --git a/debian/rules.d/binary-libobjc.mk b/debian/rules.d/binary-libobjc.mk
index 1f4ee3b..e3bb7fb 100644
--- a/debian/rules.d/binary-libobjc.mk
+++ b/debian/rules.d/binary-libobjc.mk
@@ -62,8 +62,8 @@ define __do_libobjc
 	DH_COMPAT=2 dh_movefiles -p$(p_l) \
 		$(files_lobjc)
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	dh_compress -p$(p_l) -p$(p_d)
@@ -102,7 +102,7 @@ define __do_libobjc_dev
 		  /$(gcc_lib_dir$(2))/libobjc_gc.so
 	)
 
-	debian/dh_doclink -p$(p_l) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
 
 	dh_compress -p$(p_l)
 	dh_fixperms -p$(p_l)
diff --git a/debian/rules.d/binary-libquadmath.mk b/debian/rules.d/binary-libquadmath.mk
index 308d591..a06ed9a 100644
--- a/debian/rules.d/binary-libquadmath.mk
+++ b/debian/rules.d/binary-libquadmath.mk
@@ -27,8 +27,8 @@ define __do_qmath
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libquadmath.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	dh_strip -p$(p_l) --dbg-package=$(p_d)
 	dh_compress -p$(p_l) -p$(p_d)
diff --git a/debian/rules.d/binary-libssp.mk b/debian/rules.d/binary-libssp.mk
index 9941b9f..72742b4 100644
--- a/debian/rules.d/binary-libssp.mk
+++ b/debian/rules.d/binary-libssp.mk
@@ -59,7 +59,7 @@ $(binary_stamp)-libssp: $(install_stamp)
 	dh_installdirs -p$(p_ssp)
 
 	DH_COMPAT=2 dh_movefiles -p$(p_ssp) $(files_ssp)
-	debian/dh_doclink -p$(p_ssp) $(p_base)
+	debian/dh_doclink -p$(p_ssp) $(p_lbase)
 
 	debian/dh_rmemptydirs -p$(p_ssp)
 
@@ -88,7 +88,7 @@ $(binary_stamp)-lib64ssp: $(install_stamp)
 	DH_COMPAT=2 dh_movefiles -p$(p_ssp64) \
 		$(PF)/lib64/libssp.so.*
 
-	debian/dh_doclink -p$(p_ssp64) $(p_base)
+	debian/dh_doclink -p$(p_ssp64) $(p_lbase)
 
 	dh_strip -p$(p_ssp64)
 	dh_compress -p$(p_ssp64)
@@ -114,7 +114,7 @@ $(binary_stamp)-lib32ssp: $(install_stamp)
 	DH_COMPAT=2 dh_movefiles -p$(p_ssp32) \
 		$(lib32)/libssp.so.*
 
-	debian/dh_doclink -p$(p_ssp32) $(p_base)
+	debian/dh_doclink -p$(p_ssp32) $(p_lbase)
 
 	dh_strip -p$(p_ssp32)
 	dh_compress -p$(p_ssp32)
@@ -140,7 +140,7 @@ $(binary_stamp)-libn32ssp: $(install_stamp)
 	DH_COMPAT=2 dh_movefiles -p$(p_sspn32) \
 		$(PF)/$(libn32)/libssp.so.*
 
-	debian/dh_doclink -p$(p_sspn32) $(p_base)
+	debian/dh_doclink -p$(p_sspn32) $(p_lbase)
 
 	dh_strip -p$(p_sspn32)
 	dh_compress -p$(p_sspn32)
@@ -166,7 +166,7 @@ $(binary_stamp)-libx32ssp: $(install_stamp)
 	DH_COMPAT=2 dh_movefiles -p$(p_sspx32) \
 		$(PF)/$(libx32)/libssp.so.*
 
-	debian/dh_doclink -p$(p_sspx32) $(p_base)
+	debian/dh_doclink -p$(p_sspx32) $(p_lbase)
 
 	dh_strip -p$(p_sspx32)
 	dh_compress -p$(p_sspx32)
diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk
index 502898a..aa4f610 100644
--- a/debian/rules.d/binary-libstdcxx.mk
+++ b/debian/rules.d/binary-libstdcxx.mk
@@ -199,7 +199,7 @@ define __do_libstdcxx
 	cp -a $(d)/$(usr_lib$(2))/libstdc++.so.*[0-9] \
 		$(d_l)/$(usr_lib$(2))/.
 
-	debian/dh_doclink -p$(p_l) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
 	debian/dh_rmemptydirs -p$(p_l)
 
 	dh_strip -p$(p_l) $(if $(filter rtlibs,$(DEB_STAGE)),,--dbg-package=$(1)-$(BASE_VERSION)-dbg$(cross_lib_arch))
@@ -258,7 +258,7 @@ define __do_libstdcxx_dbg
 		$(call shlibdirs_to_search,$(subst $(pkg_ver),,$(subst stdc++$(CXX_SONAME),gcc$(GCC_SONAME),$(p_l))),$(2))
 	$(call cross_mangle_substvars,$(p_d))
 
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 	debian/dh_rmemptydirs -p$(p_d)
 
 	dh_compress -p$(p_d)
@@ -290,7 +290,7 @@ define __do_libstdcxx_dev
 		$(if $(with_multiarch_cxxheaders),$(PF)/include/$(DEB_TARGET_MULTIARCH)/c++/$(BASE_VERSION)/$(2))
 	$(call install_gcc_lib,libstdc++,$(CXX_SONAME),$(2),$(p_l))
 
-	debian/dh_doclink -p$(p_l) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
 	debian/dh_rmemptydirs -p$(p_l)
 
 	dh_strip -p$(p_l)
@@ -419,9 +419,9 @@ ifeq ($(with_multiarch_cxxheaders),yes)
 		/$(PFL)/include/$(DEB_TARGET_MULTIARCH)/c++/$(GCC_VERSION)
 endif
 
-	debian/dh_doclink -p$(p_dev) $(p_base)
-	debian/dh_doclink -p$(p_pic) $(p_base)
-	debian/dh_doclink -p$(p_dbg) $(p_base)
+	debian/dh_doclink -p$(p_dev) $(p_lbase)
+	debian/dh_doclink -p$(p_pic) $(p_lbase)
+	debian/dh_doclink -p$(p_dbg) $(p_lbase)
 	cp -p $(srcdir)/libstdc++-v3/ChangeLog \
 		$(d_dev)/$(docdir)/$(p_base)/C++/changelog.libstdc++
 ifeq ($(with_check),yes)
diff --git a/debian/rules.d/binary-libtsan.mk b/debian/rules.d/binary-libtsan.mk
index 87d3ce5..6d825b6 100644
--- a/debian/rules.d/binary-libtsan.mk
+++ b/debian/rules.d/binary-libtsan.mk
@@ -29,8 +29,8 @@ define __do_tsan
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libtsan.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	if [ -f debian/$(p_l).overrides ]; then \
 		mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \
diff --git a/debian/rules.d/binary-libubsan.mk b/debian/rules.d/binary-libubsan.mk
index f6a2c49..94b7f58 100644
--- a/debian/rules.d/binary-libubsan.mk
+++ b/debian/rules.d/binary-libubsan.mk
@@ -27,8 +27,8 @@ define __do_ubsan
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libubsan.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	if [ -f debian/$(p_l).overrides ]; then \
 		mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \
diff --git a/debian/rules.d/binary-libvtv.mk b/debian/rules.d/binary-libvtv.mk
index 8994aa3..c6e3aba 100644
--- a/debian/rules.d/binary-libvtv.mk
+++ b/debian/rules.d/binary-libvtv.mk
@@ -27,8 +27,8 @@ define __do_vtv
 	dh_installdirs -p$(p_l) $(usr_lib$(2))
 	DH_COMPAT=2 dh_movefiles -p$(p_l) $(usr_lib$(2))/libvtv.so.*
 
-	debian/dh_doclink -p$(p_l) $(p_base)
-	debian/dh_doclink -p$(p_d) $(p_base)
+	debian/dh_doclink -p$(p_l) $(p_lbase)
+	debian/dh_doclink -p$(p_d) $(p_lbase)
 
 	if [ -f debian/$(p_l).overrides ]; then \
 		mkdir -p debian/$(p_l)/usr/share/lintian/overrides; \