Fix missing GM2 versions as a result of merge screwup.

diff --git a/debian/README.Debian b/debian/README.Debian
index 04dcc82e0ce55bb49449b693cec1d03887e52bb6..a9518ed6e437f236699b430232c523ed3f580b57 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -50,14 +50,16 @@ similar.
 The default compiler versions for Debian GNU/Linux on armhf are
 (minor version numbers omitted):
 
-       cpp             : cpp-8
-       gcc             : gcc-8
-       g++             : g++-8
-       gfortran        : gfortran-8
-       gccgo           : gccgo-8
-       gobjc           : gobjc-8
-       gobjc++         : gobjc++-8
-       gdc             : gdc-8
+       cpp             : cpp-9
+       gcc             : gcc-9
+       g++             : g++-9
+       gfortran        : gfortran-9
+       gcj             : gcj-6
+       gij             : gij-6
+       gccgo           : gccgo-9
+       gobjc           : gobjc-9
+       gobjc++         : gobjc++-9
+       gdc             : gdc-9
 
 Most of the documentation for GCC including the manual pages is
 licensed under the GFDL and therefore not included in the main section.

diff --git a/debian/rules b/debian/rules
index 9f4964ebb92dcf72dbb108cfd398e1852374ff0e..883e71544b1c34716635b1de3a90bcdc13538f39 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -545,29 +545,29 @@ endif
 packages := $(filter-out $(no_packages), $(all_packages))
 
 # derived version number (without release, e.g. 4.9.3, 5.2.1)
-$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_BRIG V_OFFL, \
+$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_GM2 V_BRIG V_OFFL, \
   $(eval $(v) = $(patsubst %-$(lastword $(subst -, ,$(call C$(v)))),%,$(call C$(v)))) \
 )
 $(foreach a, $(all_archs), \
-  $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_BRIG V_OFFL, \
+  $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_GM2 V_BRIG V_OFFL, \
     $(eval $(v)_$(a) = $(patsubst %-$(lastword $(subst -, ,$(call C$(v)_$(a)))),%,$(call C$(v)_$(a)))) \
 ))
 
 # number for the package name (e.g. 4.9, 5, 6)
-$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_BRIG V_OFFL, \
+$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_GM2 V_BRIG V_OFFL, \
   $(eval P$(v) = $(firstword $(subst -, ,$(subst ., ,$(call $(v)))))) \
 )
 $(foreach a, $(all_archs), \
-  $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_BRIG V_OFFL, \
+  $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC V_GM2 V_BRIG V_OFFL, \
     $(eval P$(v)_$(a) = $(firstword $(subst -,  ,$(subst ., ,$(call $(v)_$(a)))))) \
 ))
 
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc49_archs)))
-  $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GDC V_BRIG V_OFFL, \
+  $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GDC V_GM2 V_BRIG V_OFFL, \
     $(eval P$(v) = $(subst $(SPACE),.,$(wordlist 1,2,$(subst ., ,$(call $(v)))))) \
   )
   $(foreach a, $(gcc49_archs), \
-    $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GDC V_BRIG V_OFFL, \
+    $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GDC V_GM2 V_BRIG V_OFFL, \
       $(eval P$(v)_$(a) = $(subst $(SPACE),.,$(wordlist 1,2,$(subst ., ,$(call $(v)_$(a)))))) \
   ))
 endif