diff -Nru gcc-defaults-1.138/debian/changelog gcc-defaults-1.138+rpi1/debian/changelog --- gcc-defaults-1.138/debian/changelog 2015-01-27 20:56:17.000000000 +0000 +++ gcc-defaults-1.138+rpi1/debian/changelog 2015-05-31 11:27:06.000000000 +0000 @@ -1,8 +1,45 @@ -gcc-defaults (1.138) experimental; urgency=medium +gcc-defaults (1.138+rpi1) stretch-staging; urgency=medium - * Bump GCC version to 5. + * Revert gdc to 4.9.x since 5.x gdc won't build in raspbian. + and gdc pakcage is hence uninstallable. - -- Matthias Klose Tue, 27 Jan 2015 21:18:46 +0100 + -- Peter Michael Green Sun, 31 May 2015 11:25:58 +0000 + +gcc-defaults (1.138) unstable; urgency=medium + + * Default gdc and gccgo to GCC 5. + * cpp: Remove the conflict with the cpp-5-powerpc-linux-gnu, + cpp-5-arm-linux-gnueabi, cpp-5-aarch64-linux-gnu, + cpp-5-arm-linux-gnueabihf, cpp-5-powerpc64-linux-gnu, + cpp-5-powerpc64le-linux-gnu packages. The packages built from + the gcc-5-cross source are buildable and installable without + any need on foreign architectures. Closes: #783908. + + -- Matthias Klose Wed, 20 May 2015 00:18:19 +0200 + +gcc-defaults (1.137) unstable; urgency=medium + + * cpp: Conflict with cpp-5-powerpc-linux-gnu, cpp-5-arm-linux-gnueabi, + cpp-5-aarch64-linux-gnu, cpp-5-arm-linux-gnueabihf, + cpp-5-powerpc64-linux-gnu, cpp-5-powerpc64le-linux-gnu, + cpp-5-mips-linux-gnu, cpp-5-mipsel-linux-gnu. + There are open issues, for the Debian CTTE, and for the source + packages mentioned above, which were downgraded from RC critcal + to normal issues without letting the GCC maintainers know. It's + a pity that such packages were accepted for GCC 4.9, but trying + to sneak in packages for GCC 5 without any discussion is a mess. + + -- Matthias Klose Fri, 01 May 2015 01:12:08 +0200 + +gcc-defaults (1.136) unstable; urgency=medium + + * Bump GCC 4.8 version to 4.8.4. + * Build multilib and gccgo packages for mips64* (James Cowgill). + Closes: #773177. + * gcc-multilib: Break gcc-4.9-mips-linux-gnu. + * gcj-jdk: Fix libgcj.pc symlink (Victor Seva). Closes: #778376. + + -- Matthias Klose Wed, 25 Feb 2015 13:07:51 +0100 gcc-defaults (1.135) unstable; urgency=medium @@ -14,7 +51,7 @@ gcc-defaults (1.134) unstable; urgency=medium [ Aurelien Jarno ] - * Don't build libphobos-dev on kfreebsd-amd64 and kfreebsd-i386 as + * Don't build libphobos-dev on kfreebsd-amd64 and kfreebsd-i386 as libphobos-4.9-dev is not built on these architectures. Closes: #761277. [ Matthias Klose ] diff -Nru gcc-defaults-1.138/debian/control gcc-defaults-1.138+rpi1/debian/control --- gcc-defaults-1.138/debian/control 2015-01-27 20:43:27.000000000 +0000 +++ gcc-defaults-1.138+rpi1/debian/control 2015-05-19 22:19:13.000000000 +0000 @@ -6,7 +6,7 @@ Standards-Version: 3.9.6 Build-Depends: m4, debhelper (>= 5), dpkg-dev (>= 1.17.11), - gcc-5-base (>= 5-20150127-1~), + gcc-5-base (>= 4.9.2-1~), lsb-release Build-Depends-Indep: ca-certificates, gcj-jdk, python (>= 2.6.6) @@ -21,7 +21,7 @@ Multi-Arch: allowed Depends: cpp-${pv:cpp} ${reqv:cpp}, ${misc:Depends} Suggests: cpp-doc -Conflicts: cpp-doc (<< 1:2.95.3) +Conflicts: cpp-doc (<< 1:2.95.3), cpp-5-mips-linux-gnu, cpp-5-mipsel-linux-gnu Description: GNU C preprocessor (cpp) The GNU C preprocessor is a macro processor that is used automatically by the GNU C compiler to transform programs before actual compilation. @@ -44,7 +44,7 @@ Package: g++-multilib Priority: optional -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), g++ (>= ${version:cpp}), g++-${pv:gpp}-multilib ${reqv:gpp}, ${misc:Depends} Description: GNU C++ compiler (multilib files) This is the GNU C++ compiler, a fairly portable optimizing compiler for C++. @@ -67,7 +67,7 @@ Package: gobjc-multilib Priority: optional -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gobjc (>= ${version:gcc}), gobjc-${pv:gobjc}-multilib ${reqv:gobjc}, ${misc:Depends} Description: GNU Objective-C compiler (multilib files) This is the GNU Objective-C compiler, which compiles Objective-C on @@ -92,7 +92,7 @@ Package: gobjc++-multilib Priority: optional -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 kfreebsd-amd64 mips mipsel mips64 mips64el powerpc ppc64 s390 s390x sparc sparc64 x32 Depends: cpp (>= ${version:cpp}), gobjc-multilib (>= ${version:cpp}), gobjc++ (>= ${version:gcc}), gobjc++-${pv:gobjcxx}-multilib ${reqv:gobjcxx}, ${misc:Depends} Description: GNU Objective-C++ compiler (multilib files) This is the GNU Objective-C++ compiler, which compiles Objective-C++ on @@ -116,7 +116,7 @@ Package: gfortran-multilib Priority: optional -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gfortran (>= ${version:gcc}), gfortran-${pv:gfort}-multilib ${reqv:gfort}, ${misc:Depends} Description: GNU Fortran 95 compiler (multilib files) This is the GNU Fortran compiler, which compiles Fortran 95 on platforms @@ -139,7 +139,7 @@ Package: gccgo-multilib Priority: optional -Architecture: amd64 i386 mips mipsel powerpc ppc64 s390 s390x x32 +Architecture: amd64 i386 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x x32 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 @@ -239,9 +239,9 @@ Package: gcc-multilib Priority: optional -Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x s390x sparc sparc64 x32 +Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x s390x sparc sparc64 x32 Depends: cpp (>= ${version:cpp}), gcc (>= ${version:gcc}), gcc-${pv:gcc}-multilib ${reqv:gcc}, ${misc:Depends}, linux-libc-dev (>= 3.0.0-2) [linux-any] -Breaks: gcc-4.9-arm-linux-gnueabihf, gcc-4.9-arm-linux-gnueabi, gcc-4.9-powerpc-linux-gnu, gcc-4.9-powerpc64el-linux-gnu, gcc-4.9-mipsel-linux-gnu +Breaks: gcc-4.9-arm-linux-gnueabihf, gcc-4.9-arm-linux-gnueabi, gcc-4.9-powerpc-linux-gnu, gcc-4.9-powerpc64el-linux-gnu, gcc-4.9-mipsel-linux-gnu, gcc-4.9-mips-linux-gnu Description: GNU C compiler (multilib files) This is the GNU C compiler, a fairly portable optimizing compiler for C. . diff -Nru gcc-defaults-1.138/debian/README.Debian gcc-defaults-1.138+rpi1/debian/README.Debian --- gcc-defaults-1.138/debian/README.Debian 2015-01-27 20:53:20.000000000 +0000 +++ gcc-defaults-1.138+rpi1/debian/README.Debian 2015-05-19 22:20:50.000000000 +0000 @@ -57,16 +57,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 + cpp : cpp-4.9 + gcc : gcc-4.9 + g++ : g++-4.9 + gfortran : gfortran-4.9 + gcj : gcj-4.9 + gij : gij-4.9 gccgo : gccgo-5 - gobjc : gobjc-5 - gobjc++ : gobjc++-5 - gdc : gdc-4.9 + gobjc : gobjc-4.9 + gobjc++ : gobjc++-4.9 + gdc : gdc-5 Most of the documentation for GCC including the manual pages is licensed under the GFDL and therefore not included in the main section. diff -Nru gcc-defaults-1.138/debian/rules gcc-defaults-1.138+rpi1/debian/rules --- gcc-defaults-1.138/debian/rules 2015-01-27 20:51:32.000000000 +0000 +++ gcc-defaults-1.138+rpi1/debian/rules 2015-05-31 11:25:21.000000000 +0000 @@ -133,12 +133,13 @@ REL_NO_481 := $(shell expr $(VMINOR) - 120)$(REL_EXT) REL_NO_482 := $(shell expr $(VMINOR) - 123)$(REL_EXT) REL_NO_483 := $(shell expr $(VMINOR) - 127)$(REL_EXT) +REL_NO_484 := $(shell expr $(VMINOR) - 135)$(REL_EXT) REL_NO_490 := $(shell expr $(VMINOR) - 125)$(REL_EXT) REL_NO_491 := $(shell expr $(VMINOR) - 129)$(REL_EXT) REL_NO_492 := $(shell expr $(VMINOR) - 134)$(REL_EXT) -REL_NO_50 := $(shell expr $(VMINOR) - 138)$(REL_EXT) +REL_NO_51 := $(shell expr $(VMINOR) - 137)$(REL_EXT) # minimum required gcc-X.Y versions REQV_295 := (>= 1:2.95.4-16) @@ -158,9 +159,9 @@ REQV_46 := (>= 4.6.4-1~) REQV_46_GDC := $(REQV_46) REQV_47 := (>= 4.7.3-1~) -REQV_48 := (>= 4.8.3-2~) +REQV_48 := (>= 4.8.4-1~) REQV_49 := (>= 4.9.2-1~) -REQV_5 := (>= 5-20150127-1~) +REQV_5 := (>= 5.1.1-4~) REQV_LIBGCJ_BC := (>= 4.9.2-1~) @@ -169,64 +170,66 @@ DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -gcc49_archs = hurd-i386 or1k sh4 sparc sparc64 -gcc5_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x x32 kfreebsd-amd64 kfreebsd-i386 +gcc47_archs = -gcj49_archs = hurd-i386 or1k sh4 sparc sparc64 -gcj5_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x x32 kfreebsd-amd64 kfreebsd-i386 +gcc48_archs = +gcc49_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 kfreebsd-amd64 kfreebsd-i386 hurd-i386 + +gcj48_archs = +gcj49_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 kfreebsd-amd64 kfreebsd-i386 hurd-i386 # CV_XXX is the complete version number, including the release, without epoch -CV_CPP := 5-$(REL_NO_50) -CV_GCC := 5-$(REL_NO_50) -CV_GPP := 5-$(REL_NO_50) -CV_GOBJC := 5-$(REL_NO_50) -CV_GOBJCXX := 5-$(REL_NO_50) -CV_GFORT := 5-$(REL_NO_50) -CV_GGO := 5-$(REL_NO_50) -CV_GCJ := 5-$(REL_NO_50) -CV_GIJ := 5-$(REL_NO_50) -CV_LIBGCJBC := 5-$(REL_NO_50) -CV_GDC := 4.9.2-$(REL_NO_492) -CV_LIBGCJCOMMON := 1:4.9.2-$(REL_NO_492) - -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc49_archs))) - CV_CPP := 4.9.2-$(REL_NO_492) - CV_GCC := 4.9.2-$(REL_NO_492) - CV_GPP := 4.9.2-$(REL_NO_492) - CV_GOBJC := 4.9.2-$(REL_NO_492) - CV_GOBJCXX := 4.9.2-$(REL_NO_492) - CV_GFORT := 4.9.2-$(REL_NO_492) -endif - -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj49_archs))) - CV_GCJ := 4.9.2-$(REL_NO_492) - CV_GIJ := 4.9.2-$(REL_NO_492) - CV_LIBGCJBC := 4.9.2-$(REL_NO_492) -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) +CV_CPP := 4.9.2-$(REL_NO_492) +CV_GCC := 4.9.2-$(REL_NO_492) +CV_GPP := 4.9.2-$(REL_NO_492) +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 := 5.1.1-$(REL_NO_51) +CV_GCJ := 4.9.2-$(REL_NO_492) +CV_GIJ := 4.9.2-$(REL_NO_492) +CV_LIBGCJBC := 4.9.2-$(REL_NO_492) +CV_GDC := 5.1.1-$(REL_NO_51)~really4.9.2 +CV_LIBGCJCOMMON := 1:4.9.1-$(REL_NO_491) + +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc48_archs))) + CV_CPP := 4.8.4-$(REL_NO_484) + CV_GCC := 4.8.4-$(REL_NO_484) + CV_GPP := 4.8.4-$(REL_NO_484) + CV_GOBJC := 4.8.4-$(REL_NO_484) + CV_GOBJCXX := 4.8.4-$(REL_NO_484) + CV_GFORT := 4.8.4-$(REL_NO_484) +endif + +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj48_archs))) + CV_GCJ := 4.8.4-$(REL_NO_484) + CV_GIJ := 4.8.4-$(REL_NO_484) + CV_LIBGCJBC := 4.8.4-$(REL_NO_484) +endif + +REQV_CPP = $(REQV_49) +REQV_GCC = $(REQV_49) +REQV_GPP = $(REQV_46) +REQV_GOBJC = $(REQV_49) +REQV_GOBJCXX = $(REQV_49) +REQV_GFORT = $(REQV_49) REQV_GGO = $(REQV_5) -REQV_GCJ = $(REQV_5) -REQV_GIJ = $(REQV_5) +REQV_GCJ = $(REQV_49) +REQV_GIJ = $(REQV_49) REQV_GDC = $(REQV_49) -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) +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcc48_archs))) + REQV_CPP = $(REQV_48) + REQV_GCC = $(REQV_48) + REQV_GPP = $(REQV_48) + REQV_GOBJC = $(REQV_48) + REQV_GOBJCXX = $(REQV_48) + REQV_GFORT = $(REQV_48) endif -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj49_archs))) - REQV_GCJ = $(REQV_49) - REQV_GIJ = $(REQV_49) +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj48_archs))) + REQV_GCJ = $(REQV_48) + REQV_GIJ = $(REQV_48) endif EPOCH=4 @@ -243,14 +246,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 = libgcj15 +LIBGCJ_PC = libgcj15.pc +LIBGCJ_SONAME = 15 + +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj48_archs))) + LIBGCJ = libgcj14 + LIBGCJ_PC = libgcj14.pc + LIBGCJ_SONAME = 14 endif gcj_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel \ @@ -260,10 +263,10 @@ powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 \ kfreebsd-amd64 kfreebsd-i386 hurd-i386 -multilib_archs = amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 \ - s390 s390x sparc sparc64 x32 +multilib_archs = amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel \ + powerpc ppc64 s390 s390x sparc sparc64 x32 -go_archs = amd64 arm64 armel armhf i386 ia64 mips mipsel \ +go_archs = amd64 arm64 armel armhf i386 ia64 mips mips64 mips64el mipsel \ powerpc ppc64 ppc64el s390 s390x x32 phobos_archs = amd64 armel armhf i386 x32 hppa @@ -327,35 +330,20 @@ 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_CPP := $(shell echo $(V_CPP) | awk -F. '{printf "%d.%d", $$1, $$2}') +PV_GCC := $(shell echo $(V_GCC) | awk -F. '{printf "%d.%d", $$1, $$2}') PV_GDC := $(shell echo $(V_GDC) | awk -F. '{printf "%d.%d", $$1, $$2}') -PV_GPP := $(shell echo $(V_GPP) | awk -F. '{printf "%d", $$1 $$2}') -PV_GOBJC:= $(shell echo $(V_GOBJC) | awk -F. '{printf "%d", $$1 $$2}') -PV_GOBJCXX:= $(shell echo $(V_GOBJCXX) | awk -F. '{printf "%d", $$1 $$2}') -PV_GFORT:= $(shell echo $(V_GFORT) | awk -F. '{printf "%d", $$1 $$2}') -PV_GGO := $(shell echo $(V_GGO) | awk -F. '{printf "%d", $$1 $$2}') -PV_GCJ := $(shell echo $(V_GCJ) | awk -F. '{printf "%d", $$1}') -PV_GIJ := $(shell echo $(V_GIJ) | awk -F. '{printf "%d", $$1 $$2}') - -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc49_archs))) - PV_CPP := $(shell echo $(V_CPP) | awk -F. '{printf "%d.%d", $$1, $$2}') - PV_GCC := $(shell echo $(V_GCC) | awk -F. '{printf "%d.%d", $$1, $$2}') - PV_GDC := $(shell echo $(V_GDC) | awk -F. '{printf "%d.%d", $$1, $$2}') - PV_GPP := $(shell echo $(V_GPP) | awk -F. '{printf "%d.%d", $$1, $$2}') - 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}') -endif - -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj49_archs))) - 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}') -endif +PV_GPP := $(shell echo $(V_GPP) | awk -F. '{printf "%d.%d", $$1, $$2}') +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", $$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}') MOD_VER := $(shell apt-cache show gfortran-$(PV_GFORT) \ | sed -n '/^Provides/s/.*\(gfortran-mod-[0-9]*\).*/\1/p' \ @@ -717,8 +705,8 @@ /usr/share/java/libgcj-$(PV_GCJ).jar /usr/share/java/libgcj.jar ifeq ($(with_multiarch_lib),yes) dh_link -pgcj-jdk \ - /usr/lib/pkgconfig/$(DEB_HOST_MULTIARCH)/$(LIBGCJ_PC) \ - /usr/lib/pkgconfig/$(DEB_HOST_MULTIARCH)/libgcj.pc + /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/$(LIBGCJ_PC) \ + /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libgcj.pc else dh_link -pgcj-jdk \ /usr/lib/pkgconfig/$(LIBGCJ_PC) /usr/lib/pkgconfig/libgcj.pc