diff -Nru gcc-defaults-1.145/debian/changelog gcc-defaults-1.145+rpi2/debian/changelog --- gcc-defaults-1.145/debian/changelog 2015-08-03 08:33:32.000000000 +0000 +++ gcc-defaults-1.145+rpi2/debian/changelog 2015-09-07 09:45:39.000000000 +0000 @@ -1,3 +1,17 @@ +gcc-defaults (1.145+rpi2) stretch-staging; urgency=medium + + * Fix a copy/paste screwup that made gdc uninstallable. + + -- Peter Michael Green Mon, 07 Sep 2015 09:45:15 +0000 + +gcc-defaults (1.145+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 1.138+rpi1 by Peter Michael Green at Sun, 31 May 2015 11:25:58 +0000] + * Revert gdc to 4.9.x since 5.x gdc won't build in raspbian. + and gdc pakcage is hence uninstallable. + + -- Peter Michael Green Sun, 06 Sep 2015 22:58:20 +0000 + gcc-defaults (1.145) unstable; urgency=medium [ Aurelien Jarno ] diff -Nru gcc-defaults-1.145/debian/rules gcc-defaults-1.145+rpi2/debian/rules --- gcc-defaults-1.145/debian/rules 2015-08-01 18:45:32.000000000 +0000 +++ gcc-defaults-1.145+rpi2/debian/rules 2015-09-07 09:45:07.000000000 +0000 @@ -189,7 +189,7 @@ CV_GCJ := 5.2.1-$(REL_NO_52) CV_GIJ := 5.2.1-$(REL_NO_52) CV_LIBGCJBC := 5.2.1-$(REL_NO_52) -CV_GDC := 5.2.1-$(REL_NO_52) +CV_GDC := 5.2.1-$(REL_NO_52)~really4.9.2 CV_LIBGCJCOMMON := 1:4.9.3-$(REL_NO_493) ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc49_archs))) @@ -217,7 +217,7 @@ REQV_GGO = $(REQV_5) REQV_GCJ = $(REQV_5) REQV_GIJ = $(REQV_5) -REQV_GDC = $(REQV_5) +REQV_GDC = $(REQV_49) ifneq (,$(filter $(DEB_HOST_ARCH),$(gcc49_archs))) REQV_CPP = $(REQV_49) @@ -332,12 +332,13 @@ V_GCJ := $(shell echo $(CV_GCJ_HACKED) | sed 's/-[^-]*$$//') V_GIJ := $(shell echo $(CV_GIJ_HACKED) | sed 's/-[^-]*$$//') endif -V_GDC := $(shell echo $(CV_GDC) | sed 's/-[^-]*$$//') +#V_GDC := $(shell echo $(CV_GDC) | sed 's/-[^-]*$$//') +V_GDC := 4.9.2 # number for the package name PV_CPP := $(shell echo $(V_CPP) | awk -F. '{printf "%d", $$1}') PV_GCC := $(shell echo $(V_GCC) | awk -F. '{printf "%d", $$1}') -PV_GDC := $(shell echo $(V_GDC) | awk -F. '{printf "%d", $$1}') +PV_GDC := $(shell echo $(V_GDC) | awk -F. '{printf "%d.%d", $$1, $$2}') PV_GPP := $(shell echo $(V_GPP) | awk -F. '{printf "%d", $$1}') PV_GOBJC:= $(shell echo $(V_GOBJC) | awk -F. '{printf "%d", $$1}') PV_GOBJCXX:= $(shell echo $(V_GOBJCXX) | awk -F. '{printf "%d", $$1}')