Binary files /tmp/tmpRF8l4B/xDBqe9heE5/gcc-defaults-1.150ubuntu1/debian/cacerts and /tmp/tmpRF8l4B/e0Q0kqLXvl/gcc-defaults-1.163ubuntu1/debian/cacerts differ diff -Nru gcc-defaults-1.150ubuntu1/debian/changelog gcc-defaults-1.163ubuntu1/debian/changelog --- gcc-defaults-1.150ubuntu1/debian/changelog 2016-02-11 09:21:20.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/changelog 2016-08-03 18:05:26.000000000 +0000 @@ -1,3 +1,63 @@ +gcc-defaults (1.163ubuntu1) yakkety; urgency=medium + + * Merge with Debian; remaining changes: + - Build -multilib packages on armel and armhf (except for gccgo). + - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers. + - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages. + + -- Matthias Klose Wed, 03 Aug 2016 20:03:28 +0200 + +gcc-defaults (1.163) unstable; urgency=medium + + * Default to GCC 6, upload to unstable. + + -- Matthias Klose Wed, 03 Aug 2016 13:56:07 +0200 + +gcc-defaults (1.162) experimental; urgency=medium + + * Default the 32bit x86 architectures to i686, keep i585 symlinks. + See https://lists.debian.org/debian-devel/2015/09/msg00589.html + + -- Matthias Klose Tue, 10 May 2016 21:00:28 +0200 + +gcc-defaults (1.161) experimental; urgency=medium + + * Bump libgcj soname to 17. + + -- Matthias Klose Sat, 09 Jan 2016 12:35:14 +0100 + +gcc-defaults (1.160ubuntu8) yakkety; urgency=medium + + * Bump the libgcj soversion. + + -- Matthias Klose Fri, 08 Jan 2016 10:38:28 +0100 + +gcc-defaults (1.160ubuntu2) xenial; urgency=medium + + * Default to GCC 6. + + -- Matthias Klose Sat, 02 Jan 2016 13:54:29 +0100 + +gcc-defaults (1.160) experimental; urgency=medium + + * Default to GCC 6. + + -- Matthias Klose Sat, 02 Jan 2016 13:37:49 +0100 + +gcc-defaults (1.152) unstable; urgency=medium + + * Fix version in the libgcj-bc shlibs file. Closes: #825361. + + -- Matthias Klose Fri, 27 May 2016 03:37:44 +0200 + +gcc-defaults (1.151) unstable; urgency=medium + + * Default the 32bit x86 architectures to i686, keep i585 symlinks. + See https://lists.debian.org/debian-devel/2015/09/msg00589.html + * Build gdc-sh4-linux-gnu. + + -- Matthias Klose Mon, 02 May 2016 18:23:12 +0200 + gcc-defaults (1.150ubuntu1) xenial; urgency=medium * Merge with Debian; remaining changes: @@ -5,9 +65,8 @@ - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers. - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages. - Provide i686-linux-gnu prefixed symlinks on i386. - * Default gccgo to GCC 6. - -- Matthias Klose Thu, 11 Feb 2016 10:21:11 +0100 + -- Matthias Klose Sat, 02 Jan 2016 11:10:14 +0100 gcc-defaults (1.150) unstable; urgency=medium diff -Nru gcc-defaults-1.150ubuntu1/debian/compat gcc-defaults-1.163ubuntu1/debian/compat --- gcc-defaults-1.150ubuntu1/debian/compat 2007-03-04 11:41:42.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/compat 2016-08-03 12:07:58.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru gcc-defaults-1.150ubuntu1/debian/control gcc-defaults-1.163ubuntu1/debian/control --- gcc-defaults-1.150ubuntu1/debian/control 2016-02-11 09:35:22.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/control 2016-08-03 18:04:56.000000000 +0000 @@ -3,12 +3,12 @@ Priority: standard Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose -Standards-Version: 3.9.6 -Build-Depends: m4, debhelper (>= 5), +Standards-Version: 3.9.8 +Build-Depends: m4, debhelper (>= 9), dpkg-dev (>= 1.17.11), - gcc-5-base (>= 5.3.1-3), + gcc-6-base (>= 6.1.1-9), lsb-release -Build-Depends-Indep: ca-certificates, gcj-jdk, python (>= 2.6.6) +Build-Depends-Indep: ca-certificates, gcj-jdk, python, gcj-6-jdk Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-defaults XS-Python-Version: all @@ -204,7 +204,7 @@ Package: gccgo Priority: optional Architecture: any -Depends: cpp (>= ${version:cpp}), gcc (>= ${version:gcc}), gccgo-${pv:ggo6} ${reqv:ggo6}, ${misc:Depends} +Depends: cpp (>= ${version:cpp}), gcc (>= ${version:gcc}), gccgo-${pv:ggo} ${reqv:ggo}, ${misc:Depends} Suggests: ${pkgmulti:ggo} Provides: go-compiler Description: Go compiler, based on the GCC backend @@ -216,7 +216,7 @@ Package: gccgo-multilib Priority: optional Architecture: amd64 i386 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 -Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gccgo (>= ${version:ggo6}), gccgo-${pv:ggo6}-multilib ${reqv:ggo6}, ${misc:Depends} +Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gccgo (>= ${version:ggo}), gccgo-${pv:ggo}-multilib ${reqv:ggo}, ${misc:Depends} Description: Go compiler, based on the GCC backend (multilib files) This is the GNU Go compiler, which compiles Go on platforms supported by the gcc compiler. It uses the gcc backend to generate optimized code. @@ -1692,7 +1692,7 @@ Section: doc Architecture: any Priority: optional -Depends: gccgo-${pv:ggo6}-doc ${reqv:ggo6}, ${misc:Depends} +Depends: gccgo-${pv:ggo}-doc ${reqv:ggo}, ${misc:Depends} Suggests: gccgo (>= ${version:ggo}) Description: Documentation for the GNU Go compiler Documentation for the GNU Go compiler in info format (dependency package). diff -Nru gcc-defaults-1.150ubuntu1/debian/control.doc gcc-defaults-1.163ubuntu1/debian/control.doc --- gcc-defaults-1.150ubuntu1/debian/control.doc 2016-02-11 09:20:28.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/control.doc 2014-06-11 11:38:22.000000000 +0000 @@ -30,7 +30,7 @@ Section: doc Architecture: any Priority: optional -Depends: gccgo-${pv:ggo6}-doc ${reqv:ggo6}, ${misc:Depends} +Depends: gccgo-${pv:ggo}-doc ${reqv:ggo}, ${misc:Depends} Suggests: gccgo (>= ${version:ggo}) Description: Documentation for the GNU Go compiler Documentation for the GNU Go compiler in info format (dependency package). diff -Nru gcc-defaults-1.150ubuntu1/debian/control.native.in gcc-defaults-1.163ubuntu1/debian/control.native.in --- gcc-defaults-1.150ubuntu1/debian/control.native.in 2016-02-11 09:20:12.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/control.native.in 2016-01-02 10:17:07.000000000 +0000 @@ -190,7 +190,7 @@ Package: gccgo Priority: optional Architecture: any -Depends: cpp (>= ${version:cpp}), gcc (>= ${version:gcc}), gccgo-${pv:ggo6} ${reqv:ggo6}, ${misc:Depends} +Depends: cpp (>= ${version:cpp}), gcc (>= ${version:gcc}), gccgo-${pv:ggo} ${reqv:ggo}, ${misc:Depends} Suggests: ${pkgmulti:ggo} Provides: go-compiler Description: Go compiler, based on the GCC backend @@ -202,7 +202,7 @@ Package: gccgo-multilib Priority: optional Architecture: @go_multilib_archs@ -Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gccgo (>= ${version:ggo6}), gccgo-${pv:ggo6}-multilib ${reqv:ggo6}, ${misc:Depends} +Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gccgo (>= ${version:ggo}), gccgo-${pv:ggo}-multilib ${reqv:ggo}, ${misc:Depends} Description: Go compiler, based on the GCC backend (multilib files) This is the GNU Go compiler, which compiles Go on platforms supported by the gcc compiler. It uses the gcc backend to generate optimized code. diff -Nru gcc-defaults-1.150ubuntu1/debian/control.source gcc-defaults-1.163ubuntu1/debian/control.source --- gcc-defaults-1.150ubuntu1/debian/control.source 2016-01-02 10:17:07.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/control.source 2016-08-03 12:11:20.000000000 +0000 @@ -3,12 +3,12 @@ Priority: standard Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose -Standards-Version: 3.9.6 -Build-Depends: m4, debhelper (>= 5), +Standards-Version: 3.9.8 +Build-Depends: m4, debhelper (>= 9), dpkg-dev (>= 1.17.11), - gcc-5-base (>= 5.3.1-3), + gcc-6-base (>= 6.1.1-9), lsb-release -Build-Depends-Indep: ca-certificates, gcj-jdk, python (>= 2.6.6) +Build-Depends-Indep: ca-certificates, gcj-jdk, python, gcj-6-jdk Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-defaults XS-Python-Version: all diff -Nru gcc-defaults-1.150ubuntu1/debian/README.Debian gcc-defaults-1.163ubuntu1/debian/README.Debian --- gcc-defaults-1.150ubuntu1/debian/README.Debian 2015-12-02 00:50:44.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/README.Debian 2016-08-03 12:07:58.000000000 +0000 @@ -15,7 +15,7 @@ Versions of GCC present in Debian Stretch ----------------------------------------- -- GCC 5 is the default compiler for for all frontends on all architectures +- GCC 5 is the default compiler for all frontends on all architectures except for Ada. - GCC 4.9 is the default compiler for Ada. @@ -50,16 +50,16 @@ The default compiler versions for Debian GNU/Linux on amd64 are (minor version numbers omitted): - cpp : cpp-5 - gcc : gcc-5 - g++ : g++-5 - gfortran : gfortran-5 - gcj : gcj-5 - gij : gij-5 - gccgo : gccgo-5 - gobjc : gobjc-5 - gobjc++ : gobjc++-5 - gdc : gdc-5 + cpp : cpp-6 + gcc : gcc-6 + g++ : g++-6 + gfortran : gfortran-6 + gcj : gcj-6 + gij : gij-6 + gccgo : gccgo-6 + gobjc : gobjc-6 + gobjc++ : gobjc++-6 + gdc : gdc-6 Documentation for the default compilers can be found in diff -Nru gcc-defaults-1.150ubuntu1/debian/README.Debian.m4 gcc-defaults-1.163ubuntu1/debian/README.Debian.m4 --- gcc-defaults-1.150ubuntu1/debian/README.Debian.m4 2015-12-02 00:50:44.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/README.Debian.m4 2016-08-03 12:07:58.000000000 +0000 @@ -20,7 +20,7 @@ Versions of GCC present in Debian Stretch ----------------------------------------- -- GCC 5 is the default compiler for for all frontends on all architectures +- GCC 5 is the default compiler for all frontends on all architectures except for Ada. - GCC 4.9 is the default compiler for Ada. diff -Nru gcc-defaults-1.150ubuntu1/debian/rules gcc-defaults-1.163ubuntu1/debian/rules --- gcc-defaults-1.150ubuntu1/debian/rules 2016-02-11 09:35:10.000000000 +0000 +++ gcc-defaults-1.163ubuntu1/debian/rules 2016-08-03 13:06:59.000000000 +0000 @@ -145,8 +145,10 @@ REL_NO_50 := $(shell expr $(VMINOR) - 138)$(REL_EXT) REL_NO_52 := $(shell expr $(VMINOR) - 141)$(REL_EXT) REL_NO_53 := $(shell expr $(VMINOR) - 149)$(REL_EXT) +REL_NO_54 := $(shell expr $(VMINOR) - 162)$(REL_EXT) -REL_NO_6 := $(shell expr $(VMINOR) - 149)$(REL_EXT) +REL_NO_60 := $(shell expr $(VMINOR) - 159)$(REL_EXT) +REL_NO_61 := $(shell expr $(VMINOR) - 162)$(REL_EXT) # minimum required gcc-X.Y versions REQV_295 := (>= 1:2.95.4-16) @@ -168,123 +170,120 @@ REQV_47 := (>= 4.7.3-1~) REQV_48 := (>= 4.8.4-1~) REQV_49 := (>= 4.9.3-10~) -REQV_5 := (>= 5.3.1-3~) -REQV_6 := (>= 6) +REQV_5 := (>= 5.4.0-6~) +REQV_6 := (>= 6.1.1-9~) -REQV_LIBGCJ_BC := (>= 4.9.3-1~) +REQV_LIBGCJ_BC := (>= 5.4.0-6~) # architecture dependent variables DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +ifneq (,$(filter $(DEB_HOST_ARCH), i386 kfreebsd-i386 hurd-i386)) + DEB_HOST_GNU_TYPE := $(subst i586,i686,$(DEB_HOST_GNU_TYPE)) + i586_symlinks = yes +endif DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) all_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 -gcc49_archs = -gcc5_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 +gcc5_archs = +gcc6_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 -gcj49_archs = -gcj5_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 +gcj5_archs = +gcj6_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 gnat5_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 +gnat6_archs = # CV_XXX is the complete version number, including the release, without epoch -CV_CPP := 5.3.1-$(REL_NO_53) -CV_GCC := 5.3.1-$(REL_NO_53) -CV_GPP := 5.3.1-$(REL_NO_53) -CV_GOBJC := 5.3.1-$(REL_NO_53) -CV_GOBJCXX := 5.3.1-$(REL_NO_53) -CV_GFORT := 5.3.1-$(REL_NO_53) -CV_GGO := 5.3.1-$(REL_NO_53) -CV_GGO6 := 6-20160210-$(REL_NO_6) -CV_GNAT := 5.3.1-$(REL_NO_53) -CV_GCJ := 5.3.1-$(REL_NO_53) -CV_GIJ := 5.3.1-$(REL_NO_53) -CV_LIBGCJBC := 5.3.1-$(REL_NO_53) -CV_GDC := 5.3.1-$(REL_NO_53) -CV_LIBGCJCOMMON := 1:4.9.3-$(REL_NO_493) +CV_CPP := 6.1.1-$(REL_NO_61) +CV_GCC := 6.1.1-$(REL_NO_61) +CV_GPP := 6.1.1-$(REL_NO_61) +CV_GOBJC := 6.1.1-$(REL_NO_61) +CV_GOBJCXX := 6.1.1-$(REL_NO_61) +CV_GFORT := 6.1.1-$(REL_NO_61) +CV_GGO := 6.1.1-$(REL_NO_61) +CV_GNAT := 6.1.1-$(REL_NO_61) +CV_GCJ := 6.1.1-$(REL_NO_61) +CV_GIJ := 6.1.1-$(REL_NO_61) +CV_LIBGCJBC := 6.1.1-$(REL_NO_61) +CV_GDC := 6.1.1-$(REL_NO_61) +CV_LIBGCJCOMMON := 1:5.3-$(REL_NO_54) $(foreach a, $(all_archs), \ $(foreach v, CV_CPP CV_GCC CV_GPP CV_GOBJC CV_GOBJCXX CV_GFORT CV_GGO CV_GNAT CV_GCJ CV_GDC, \ $(eval $(v)_$(a) = $(call $(v))))) -$(foreach a, $(all_archs), \ - $(foreach v, CV_GGO6, \ - $(eval $(v)_$(a) = $(call $(v))))) -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc49_archs))) - CV_CPP := 4.9.3-$(REL_NO_493) - CV_GCC := 4.9.3-$(REL_NO_493) - CV_GPP := 4.9.3-$(REL_NO_493) - CV_GOBJC := 4.9.3-$(REL_NO_493) - CV_GOBJCXX := 4.9.3-$(REL_NO_493) - CV_GFORT := 4.9.3-$(REL_NO_493) - CV_GGO := 4.9.3-$(REL_NO_493) - CV_GDC := 4.9.3-$(REL_NO_493) - $(foreach a, $(gcc49_archs), \ +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc5_archs))) + CV_CPP := 5.3-$(REL_NO_54) + CV_GCC := 5.3-$(REL_NO_54) + CV_GPP := 5.3-$(REL_NO_54) + CV_GOBJC := 5.3-$(REL_NO_54) + CV_GOBJCXX := 5.3-$(REL_NO_54) + CV_GFORT := 5.3-$(REL_NO_54) + CV_GGO := 5.3-$(REL_NO_54) + CV_GDC := 5.3-$(REL_NO_54) + $(foreach a, $(gcc5_archs), \ $(foreach v, CV_CPP CV_GCC CV_GPP CV_GOBJC CV_GOBJCXX CV_GFORT CV_GGO CV_GDC, \ $(eval $(v)_$(a) = $(call $(v))))) endif -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj49_archs))) - CV_GCJ := 4.9.3-$(REL_NO_493) - CV_GIJ := 4.9.3-$(REL_NO_493) - CV_LIBGCJBC := 4.9.3-$(REL_NO_493) - $(foreach a, $(gcc49_archs), \ +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj5_archs))) + CV_GCJ := 5.3-$(REL_NO_54) + CV_GIJ := 5.3-$(REL_NO_54) + CV_LIBGCJBC := 5.3-$(REL_NO_54) + $(foreach a, $(gcc5_archs), \ $(foreach v, CV_GCJ, \ $(eval $(v)_$(a) = $(call $(v))))) endif -ifneq (,$(filter $(DEB_HOST_ARCH), $(gnat49_archs))) - CV_GNAT := 4.9.3-$(REL_NO_493) - $(foreach a, $(gnat49_archs), \ +ifneq (,$(filter $(DEB_HOST_ARCH), $(gnat5_archs))) + CV_GNAT := 5.3-$(REL_NO_54) + $(foreach a, $(gnat5_archs), \ $(foreach v, CV_GNAT, \ $(eval $(v)_$(a) = $(call $(v))))) endif -REQV_CPP = $(REQV_5) -REQV_GCC = $(REQV_5) -REQV_GPP = $(REQV_5) -REQV_GOBJC = $(REQV_5) -REQV_GOBJCXX = $(REQV_5) -REQV_GFORT = $(REQV_5) -REQV_GGO = $(REQV_5) -REQV_GGO6 = $(REQV_6) -REQV_GNAT = $(REQV_5) -REQV_GCJ = $(REQV_5) -REQV_GIJ = $(REQV_5) -REQV_GDC = $(REQV_5) +REQV_CPP = $(REQV_6) +REQV_GCC = $(REQV_6) +REQV_GPP = $(REQV_6) +REQV_GOBJC = $(REQV_6) +REQV_GOBJCXX = $(REQV_6) +REQV_GFORT = $(REQV_6) +REQV_GGO = $(REQV_6) +REQV_GNAT = $(REQV_6) +REQV_GCJ = $(REQV_6) +REQV_GIJ = $(REQV_6) +REQV_GDC = $(REQV_6) $(foreach a, $(all_archs), \ $(foreach v, REQV_CPP REQV_GCC REQV_GPP REQV_GOBJC REQV_GOBJCXX REQV_GFORT REQV_GGO REQV_GNAT REQV_GCJ REQV_GDC, \ $(eval $(v)_$(a) = $(call $(v))))) -$(foreach a, $(all_archs), \ - $(foreach v, REQV_GGO6, \ - $(eval $(v)_$(a) = $(call $(v))))) -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcc49_archs))) - REQV_CPP = $(REQV_49) - REQV_GCC = $(REQV_49) - REQV_GPP = $(REQV_49) - REQV_GOBJC = $(REQV_49) - REQV_GOBJCXX = $(REQV_49) - REQV_GFORT = $(REQV_49) - REQV_GGO = $(REQV_49) - REQV_GNAT = $(REQV_49) - REQV_GDC = $(REQV_49) - $(foreach a, $(gcc49_archs), \ +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcc5_archs))) + REQV_CPP = $(REQV_5) + REQV_GCC = $(REQV_5) + REQV_GPP = $(REQV_5) + REQV_GOBJC = $(REQV_5) + REQV_GOBJCXX = $(REQV_5) + REQV_GFORT = $(REQV_5) + REQV_GGO = $(REQV_5) + REQV_GNAT = $(REQV_5) + REQV_GDC = $(REQV_5) + $(foreach a, $(gcc5_archs), \ $(foreach v, REQV_CPP REQV_GCC REQV_GPP REQV_GOBJC REQV_GOBJCXX REQV_GFORT REQV_GGO REQV_GCJ REQV_GDC, \ $(eval $(v)_$(a) = $(call $(v))))) endif -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj49_archs))) - REQV_GCJ = $(REQV_49) - REQV_GIJ = $(REQV_49) - $(foreach a, $(gcj49_archs), \ +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj5_archs))) + REQV_GCJ = $(REQV_5) + REQV_GIJ = $(REQV_5) + $(foreach a, $(gcj5_archs), \ $(foreach v, REQV_GCJ, \ $(eval $(v)_$(a) = $(call $(v))))) endif -ifneq (,$(filter $(DEB_HOST_ARCH),$(gnat49_archs))) - REQV_GNAT = $(REQV_49) - $(foreach a, $(gnat49_archs), \ +ifneq (,$(filter $(DEB_HOST_ARCH),$(gnat5_archs))) + REQV_GNAT = $(REQV_5) + $(foreach a, $(gnat5_archs), \ $(foreach v, REQV_GNAT, \ $(eval $(v)_$(a) = $(call $(v))))) endif @@ -370,7 +369,7 @@ all_packages := ifeq ($(with_native),yes) # FIXME: not all packages ... - all_packages := g++ gfortran gcj-jdk gobjc gobjc++ gdc gccgo libphobos-dev + all_packages := cpp gcc g++ gfortran gcj-jdk gobjc gobjc++ gdc gccgo libphobos-dev ifneq (,$(filter $(DEB_HOST_ARCH), $(hppa64_archs))) all_packages += gcc-hppa64-linux-gnu endif @@ -385,14 +384,14 @@ with_multiarch_lib := yes endif -LIBGCJ = libgcj16 -LIBGCJ_PC = libgcj16.pc -LIBGCJ_SONAME = 16 - -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj49_archs))) - LIBGCJ = libgcj15 - LIBGCJ_PC = libgcj15.pc - LIBGCJ_SONAME = 15 +LIBGCJ = libgcj17 +LIBGCJ_PC = libgcj17.pc +LIBGCJ_SONAME = 17 + +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj5_archs))) + LIBGCJ = libgcj16 + LIBGCJ_PC = libgcj16.pc + LIBGCJ_SONAME = 16 endif ifneq (,$(filter $(DEB_HOST_ARCH), $(multilib_archs))) @@ -469,23 +468,22 @@ 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_GGO6 V_GNAT V_GCJ V_GIJ V_GDC, \ +$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ $(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_GGO6 V_GNAT V_GCJ V_GIJ V_GDC, \ + $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ $(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_GGO6 V_GNAT V_GCJ V_GIJ V_GDC, \ - $(eval P$(v) = $(firstword $(subst ., ,$(call $(v))))) \ +$(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ + $(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_GGO6 V_GNAT V_GCJ V_GIJ V_GDC, \ - $(eval P$(v)_$(a) = $(firstword $(subst ., ,$(call $(v)_$(a))))) \ + $(foreach v, V_CPP V_GCC V_GPP V_GOBJC V_GOBJCXX V_GFORT V_GGO V_GNAT V_GCJ V_GIJ V_GDC, \ + $(eval P$(v)_$(a) = $(firstword $(subst -, ,$(subst ., ,$(call $(v)_$(a)))))) \ )) -PV_GGO6 = 6 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, \ @@ -532,7 +530,6 @@ -DV_GOBJCXX=$(V_GOBJCXX) -DPV_GOBJCXX=$(PV_GOBJCXX) \ -DV_GFORT=$(V_GFORT) -DPV_GFORT=$(PV_GFORT) \ -DV_GGO=$(V_GGO) -DPV_GGO=$(PV_GGO) \ - -DV_GGO6=$(V_GGO6) -DPV_GGO6=$(PV_GGO6) \ -DV_GNAT=$(V_GNAT) -DPV_GNAT=$(PV_GNAT) \ -DV_GCJ=$(V_GCJ) -DPV_GCJ=$(PV_GCJ) \ -DV_GIJ=$(V_GIJ) -DPV_GIJ=$(PV_GIJ) \ @@ -558,7 +555,6 @@ echo 'version:gcj=$(EPOCH):$(CV_GCJ)'; \ echo 'version:gfort=$(EPOCH):$(CV_GFORT)'; \ echo 'version:ggo=$(EPOCH):$(CV_GGO)'; \ - echo 'version:ggo6=$(EPOCH):$(CV_GGO6)'; \ echo 'version:gnat=$(EPOCH):$(CV_GNAT)'; \ echo 'version:gdc=$(CV_GDC)'; \ echo 'version:libgcjcommon=$(CV_LIBGCJCOMMON)'; \ @@ -569,7 +565,6 @@ echo 'pv:gobjcxx=$(PV_GOBJCXX)'; \ echo 'pv:gfort=$(PV_GFORT)'; \ echo 'pv:ggo=$(PV_GGO)'; \ - echo 'pv:ggo6=$(PV_GGO6)'; \ echo 'pv:gnat=$(PV_GNAT)'; \ echo 'pv:gcj=$(PV_GCJ)'; \ echo 'pv:gij=$(PV_GIJ)'; \ @@ -581,7 +576,6 @@ echo 'reqv:gobjcxx=$(REQV_GOBJCXX)'; \ echo 'reqv:gfort=$(REQV_GFORT)'; \ echo 'reqv:ggo=$(REQV_GGO)'; \ - echo 'reqv:ggo6=$(REQV_GGO6)'; \ echo 'reqv:gnat=$(REQV_GNAT)'; \ echo 'reqv:gcj=$(REQV_GCJ)'; \ echo 'reqv:gij=$(REQV_GIJ)'; \ @@ -625,7 +619,6 @@ echo 'version:gcj=$(EPOCH):$(CV_GCJ_$(CROSS_ARCH))'; \ echo 'version:gfort=$(EPOCH):$(CV_GFORT_$(CROSS_ARCH))'; \ echo 'version:ggo=$(EPOCH):$(CV_GGO_$(CROSS_ARCH))'; \ - echo 'version:ggo6=$(EPOCH):$(CV_GGO6_$(CROSS_ARCH))'; \ echo 'version:gdc=$(CV_GDC_$(CROSS_ARCH))'; \ echo 'pv:cpp=$(PV_CPP_$(CROSS_ARCH))'; \ echo 'pv:gcc=$(PV_GCC_$(CROSS_ARCH))'; \ @@ -634,7 +627,6 @@ echo 'pv:gobjcxx=$(PV_GOBJCXX_$(CROSS_ARCH))'; \ echo 'pv:gfort=$(PV_GFORT_$(CROSS_ARCH))'; \ echo 'pv:ggo=$(PV_GGO_$(CROSS_ARCH))'; \ - echo 'pv:ggo6=$(PV_GGO6_$(CROSS_ARCH))'; \ echo 'pv:gcj=$(PV_GCJ_$(CROSS_ARCH))'; \ echo 'pv:gdc=$(PV_GDC_$(CROSS_ARCH))'; \ echo 'reqv:cpp=$(REQV_CPP_$(CROSS_ARCH))'; \ @@ -644,7 +636,6 @@ echo 'reqv:gobjcxx=$(REQV_GOBJCXX_$(CROSS_ARCH))'; \ echo 'reqv:gfort=$(REQV_GFORT_$(CROSS_ARCH))'; \ echo 'reqv:ggo=$(REQV_GGO_$(CROSS_ARCH))'; \ - echo 'reqv:ggo6=$(REQV_GGO6_$(CROSS_ARCH))'; \ echo 'reqv:gcj=$(REQV_GCJ_$(CROSS_ARCH))'; \ echo 'reqv:gdc=$(REQV_GDC_$(CROSS_ARCH))'; \ ) > debian/substvars.$* @@ -912,11 +903,11 @@ dh_installdirs -pgccgo usr/share/doc dh_link -pgccgo \ /usr/share/doc/cpp /usr/share/doc/gccgo \ - /usr/bin/gccgo-$(PV_GGO6) /usr/bin/gccgo \ - /usr/bin/gccgo-$(PV_GGO6) /usr/bin/$(DEB_HOST_GNU_TYPE)-gccgo \ + /usr/bin/gccgo-$(PV_GGO) /usr/bin/gccgo \ + /usr/bin/gccgo-$(PV_GGO) /usr/bin/$(DEB_HOST_GNU_TYPE)-gccgo \ $(if $(filter yes, $(with_gfdl_docs)), \ - /usr/share/man/man1/gccgo-$(PV_GGO6).1.gz /usr/share/man/man1/gccgo.1.gz \ - /usr/share/man/man1/gccgo-$(PV_GGO6).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gccgo.1.gz \ + /usr/share/man/man1/gccgo-$(PV_GGO).1.gz /usr/share/man/man1/gccgo.1.gz \ + /usr/share/man/man1/gccgo-$(PV_GGO).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gccgo.1.gz \ ) ifeq ($(with_gfdl_docs),yes) @@ -924,8 +915,8 @@ dh_installdirs -pgccgo-doc \ usr/share/doc usr/share/info dh_link -pgccgo-doc \ - /usr/share/doc/gcc-$(PV_GGO6)-base/gccgo.html /usr/share/doc/gccgo-doc/gccgo.html \ - /usr/share/info/gccgo-$(PV_GGO6).info.gz /usr/share/info/gccgo.info.gz + /usr/share/doc/gcc-$(PV_GGO)-base/gccgo.html /usr/share/doc/gccgo-doc/gccgo.html \ + /usr/share/info/gccgo-$(PV_GGO).info.gz /usr/share/info/gccgo.info.gz endif endif @@ -1100,6 +1091,15 @@ ) endif + ifeq ($(i586_symlinks),yes) + cd debian; \ + for x in $$(find $(filter-out $(cross_packages), $(all_packages)) -type l -name 'i686-*'); do \ + link=$$(echo $$x | sed 's/i686-/i586-/'); \ + tgt=$$(basename $$x); \ + echo "Adding symlink: $$link -> $$tgt"; \ + rm -f $$link; cp -a $$x $$link; \ + done + endif endif # with_native install.%: pre-install @@ -1395,7 +1395,7 @@ dh_gencontrol -pgccgo \ $(if $(filter yes,$(with_go_multilib)),-pgccgo-multilib) \ $(if $(filter yes, $(with_gfdl_docs)),-pgccgo-doc) \ - -u-v$(EPOCH):$(CV_GGO6) + -u-v$(EPOCH):$(CV_GGO) endif ifneq (,$(filter gcj-jdk, $(packages))) dh_gencontrol -plibgcj-bc -u-v$(CV_LIBGCJBC)