diff -Nru gcc-defaults-1.135ubuntu1/debian/changelog gcc-defaults-1.135ubuntu2/debian/changelog --- gcc-defaults-1.135ubuntu1/debian/changelog 2014-11-04 15:58:59.000000000 +0000 +++ gcc-defaults-1.135ubuntu2/debian/changelog 2015-01-29 14:06:21.000000000 +0000 @@ -1,3 +1,9 @@ +gcc-defaults (1.135ubuntu2) vivid; urgency=medium + + * Default gccgo to 5. + + -- Matthias Klose Thu, 29 Jan 2015 15:05:34 +0100 + gcc-defaults (1.135ubuntu1) vivid; urgency=medium * Merge with Debian; remaining changes: diff -Nru gcc-defaults-1.135ubuntu1/debian/rules gcc-defaults-1.135ubuntu2/debian/rules --- gcc-defaults-1.135ubuntu1/debian/rules 2014-11-04 16:02:05.000000000 +0000 +++ gcc-defaults-1.135ubuntu2/debian/rules 2015-01-29 14:09:00.000000000 +0000 @@ -138,6 +138,8 @@ REL_NO_491 := $(shell expr $(VMINOR) - 129)$(REL_EXT) REL_NO_492 := $(shell expr $(VMINOR) - 134)$(REL_EXT) +REL_NO_50 := $(shell expr $(VMINOR) - 134)$(REL_EXT) + # minimum required gcc-X.Y versions REQV_295 := (>= 1:2.95.4-16) REQV_296 := @@ -158,6 +160,7 @@ REQV_47 := (>= 4.7.3-1~) REQV_48 := (>= 4.8.3-2~) REQV_49 := (>= 4.9.2-1~) +REQV_5 := (>= 5-20150127-0~) REQV_LIBGCJ_BC := (>= 4.9.2-1~) @@ -181,7 +184,7 @@ CV_GOBJC := 4.9.2-$(REL_NO_492) CV_GOBJCXX := 4.9.2-$(REL_NO_492) CV_GFORT := 4.9.2-$(REL_NO_492) -CV_GGO := 4.9.2-$(REL_NO_492) +CV_GGO := 5-$(REL_NO_50) CV_GCJ := 4.9.2-$(REL_NO_492) CV_GIJ := 4.9.2-$(REL_NO_492) CV_LIBGCJBC := 4.9.2-$(REL_NO_492) @@ -209,7 +212,7 @@ REQV_GOBJC = $(REQV_49) REQV_GOBJCXX = $(REQV_49) REQV_GFORT = $(REQV_49) -REQV_GGO = $(REQV_49) +REQV_GGO = $(REQV_5) REQV_GCJ = $(REQV_49) REQV_GIJ = $(REQV_49) REQV_GDC = $(REQV_49) @@ -337,7 +340,7 @@ PV_GOBJC:= $(shell echo $(V_GOBJC) | awk -F. '{printf "%d.%d", $$1, $$2}') PV_GOBJCXX:= $(shell echo $(V_GOBJCXX) | awk -F. '{printf "%d.%d", $$1, $$2}') PV_GFORT:= $(shell echo $(V_GFORT) | awk -F. '{printf "%d.%d", $$1, $$2}') -PV_GGO := $(shell echo $(V_GGO) | awk -F. '{printf "%d.%d", $$1, $$2}') +PV_GGO := $(shell echo $(V_GGO) | awk -F. '{printf "%d", $$1}') PV_GCJ := $(shell echo $(V_GCJ) | awk -F. '{printf "%d.%d", $$1, $$2}') PV_GIJ := $(shell echo $(V_GIJ) | awk -F. '{printf "%d.%d", $$1, $$2}')