diff -Nru gcc-defaults-1.112ubuntu5/debian/changelog gcc-defaults-1.124ubuntu6~ppa1204+1/debian/changelog --- gcc-defaults-1.112ubuntu5/debian/changelog 2012-03-13 19:52:37.000000000 +0000 +++ gcc-defaults-1.124ubuntu6~ppa1204+1/debian/changelog 2018-04-02 15:40:31.000000000 +0000 @@ -1,3 +1,282 @@ +gcc-defaults (1.124ubuntu6~ppa1204+1) precise; urgency=medium + + [ Matthias Klose ] + * Stop building the gcj packages. Closes: #892536. + + [ Thorsten Glaser ] + * Upload to precise PPA + + -- Thorsten Glaser Mon, 02 Apr 2018 17:40:31 +0200 + +gcc-defaults (1.124ubuntu6) trusty; urgency=medium + + * Provide the gnu triplet prefixed gcov symlink. + * Add ppc64el as a native gcj architecture. + + -- Matthias Klose Mon, 07 Apr 2014 23:39:54 +0200 + +gcc-defaults (1.124ubuntu5) trusty; urgency=medium + + * Provide the gcc-{ar,nm,ranlib} symlinks again. + + -- Matthias Klose Fri, 04 Apr 2014 13:59:08 +0200 + +gcc-defaults (1.124ubuntu4) trusty; urgency=medium + + * Default gccgo to 4.9. + + -- Matthias Klose Fri, 14 Feb 2014 18:52:08 +0100 + +gcc-defaults (1.124ubuntu3) trusty; urgency=medium + + * Build gccgo for ppc64el. + * Build the gcj database for gcj-4.9. + + -- Matthias Klose Wed, 15 Jan 2014 20:33:25 +0100 + +gcc-defaults (1.124ubuntu2) trusty; urgency=low + + * Fix merge error. + + -- Matthias Klose Fri, 13 Dec 2013 10:12:56 +0100 + +gcc-defaults (1.124ubuntu1) trusty; urgency=low + + * 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. + * Build Go for AArch64. + + -- Matthias Klose Fri, 13 Dec 2013 09:43:48 +0100 + +gcc-defaults (1.124) unstable; urgency=low + + [ Matthias Klose ] + * Bump GCC 4.8 versions to 4.8.2. + * Default to 4.8 for hppa (John David Anglin). + * Default to 4.7 for powerpcspe (Roland Stigge). + * Default to 4.8 for alpha (Michael Cree). + * Default to 4.8 for ppc64. It is a primary release architecture + upstream, although there is no support from the Debian ppc64 + porters. + + [ Aurelien Jarno ] + * Default to 4.8 for s390x architecture. + + -- Matthias Klose Fri, 13 Dec 2013 02:12:54 +0100 + +gcc-defaults (1.123) unstable; urgency=low + + [ Aurelien Jarno ] + * Enable gcc-multilib on sparc64. + * Default to 4.8 for sparc64 architecture. + + [ Matthias Klose ] + * Default gcj to 4.8 on ia64 as well. + * Stop building the -spu packages on powerpc. + * Bump libgcj-common version to 4.8. + * Let gfortran provide the gfortran-mod version of the default + gfortran compiler. Addresses #714730. + + -- Matthias Klose Sun, 11 Aug 2013 16:54:31 +0200 + +gcc-defaults (1.122ubuntu3) saucy; urgency=low + + * Build ObjC, Obj-C++ and Go for AArch64. + + -- Matthias Klose Sat, 12 Oct 2013 04:34:16 +0200 + +gcc-defaults (1.122ubuntu2) saucy; urgency=low + + * Fix libgcj-common version. + + -- Matthias Klose Mon, 01 Jul 2013 17:42:08 +0200 + +gcc-defaults (1.122ubuntu1) saucy; urgency=low + + * 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. + - Stop building the -spu packages on powerpc. + - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages. + + -- Matthias Klose Mon, 01 Jul 2013 17:00:57 +0200 + +gcc-defaults (1.122) unstable; urgency=low + + [ Matthias Klose ] + * Update maintainer list. + * Default gccgo to 4.8 for every architecture (requiring 4.8.1-4). + * Fix gccgo-multilib dependency (closes: #712266). + * Default to 4.8 for m68k (Thorsten Glaser, Wouter Verhelst). + * Build gcj packages for arm64. + + [ Aurelien Jarno ] + * Default to 4.8 for mips and mipsel architectures. + + -- Matthias Klose Sun, 30 Jun 2013 23:33:50 +0200 + +gcc-defaults (1.121) unstable; urgency=low + + * Bump GCC 4.8 versions to 4.8.1. + * Bump GCC 4.7 versions to 4.7.3. + * Bump GCC 4.6 versions to 4.6.4. + * Default to 4.8 for all x86 architectures. + * Default to 4.8 for ARM architectures (agreed by the ARM porters). + * Default gdc to 4.8 for every architecture. + * Default gij/gcj to 4.8 for every architecture. + * Stop building the gdc-v1 package. + * Add support for x32 (Daniel Schepler). Closes: #692140. + * Fix broken symlink in gcj-jre-headless. Closes: #710471. + * Fix gcj package descriptions. Closes: #652495. + + -- Matthias Klose Wed, 12 Jun 2013 23:11:47 +0200 + +gcc-defaults (1.120ubuntu13) saucy; urgency=low + + * Stop building the -spu packages on powerpc. + + -- Matthias Klose Fri, 26 Apr 2013 15:21:07 +0200 + +gcc-defaults (1.120ubuntu12) saucy; urgency=low + + * Fix -multilib dependencies. + + -- Matthias Klose Fri, 26 Apr 2013 14:25:43 +0200 + +gcc-defaults (1.120ubuntu11) saucy; urgency=low + + * Default to GCC 4.8 for gcc, g++, gfortran, gobjc, gobjc++, gcj + on all architectures. + + -- Matthias Klose Thu, 25 Apr 2013 18:27:27 +0200 + +gcc-defaults (1.120ubuntu9) raring; urgency=low + + * Bump versions to 4.7.3 and 4.6.4. + + -- Matthias Klose Mon, 15 Apr 2013 23:21:36 +0200 + +gcc-defaults (1.120ubuntu8) raring; urgency=low + + * Update the /usr/lib/jvm symlink to include the architecture. + + -- Matthias Klose Wed, 19 Dec 2012 03:09:53 +0100 + +gcc-defaults (1.120ubuntu7) raring; urgency=low + + * Build the cert database file again. + + -- Matthias Klose Sat, 17 Nov 2012 13:49:24 +0100 + +gcc-defaults (1.120ubuntu6) raring; urgency=low + + * Temporary upload, don't build the cert database. + + -- Matthias Klose Sat, 17 Nov 2012 03:09:13 +0100 + +gcc-defaults (1.120ubuntu5) raring; urgency=low + + * Remove gcj-4.7-base build dependency for this upload. + + -- Matthias Klose Sat, 17 Nov 2012 02:27:39 +0100 + +gcc-defaults (1.120ubuntu4) raring; urgency=low + + * Fix libgcj soname for 4.7. + + -- Matthias Klose Sat, 17 Nov 2012 02:16:05 +0100 + +gcc-defaults (1.120ubuntu3) raring; urgency=low + + * Merge with Debian. + + -- Matthias Klose Wed, 14 Nov 2012 14:27:37 +0100 + +gcc-defaults (1.120) unstable; urgency=low + + * Bump GCC 4.7 versions to 4.7.2. + * Don't try to update the libgcj-db database for 4.5, removed for + the wheezy release. Closes: #620582, #626600. + + -- Matthias Klose Thu, 27 Sep 2012 02:00:03 +0200 + +gcc-defaults (1.119) unstable; urgency=low + + [ Matthias Klose ] + * Bump gcc-4.7 version to 4.7.1. + * Provide gcc-{ar,nm,ranlib} for architectures with 4.7 as the default. + * Update README.Debian for Wheezy. Closes: #675026. + + [Hiroyuki Yamamoto] + * Build gccgo on ppc64. Closes: #668861. + + -- Matthias Klose Tue, 26 Jun 2012 03:05:15 +0200 + +gcc-defaults (1.118) unstable; urgency=low + + * Default to GCC 4.7 for gcc, g++, gfortran on amd64, i386, + kfreebsd-amd64, kfreebsd-i386 and hurd-i386. + + -- Matthias Klose Mon, 07 May 2012 17:30:36 +0200 + +gcc-defaults (1.117ubuntu2) quantal-proposed; urgency=low + + * Bump versions to 4.7.2. + + -- Matthias Klose Fri, 21 Sep 2012 17:35:36 +0200 + +gcc-defaults (1.117ubuntu1) quantal; urgency=low + + * Default to GCC 4.7 for all architectures. + + -- Matthias Klose Wed, 25 Apr 2012 14:43:17 +0200 + +gcc-defaults (1.117exp1) experimental; urgency=low + + * Default to GCC-4.7. + + -- Matthias Klose Mon, 16 Apr 2012 19:19:42 +0200 + +gcc-defaults (1.117) unstable; urgency=low + + [ Samuel Thibault ] + * Default gij/gcj to 4.7 on the Hurd too. + + [ Matthias Klose ] + * Default the spu cross compilers to 4.7. + + -- Matthias Klose Mon, 16 Apr 2012 07:48:52 +0200 + +gcc-defaults (1.116) unstable; urgency=low + + * Bump libgcj soversion. Closes: #666437. + + -- Matthias Klose Mon, 02 Apr 2012 08:47:08 +0200 + +gcc-defaults (1.115) unstable; urgency=low + + * Don't build gccgo-multilib on kfreebsd-amd64, mips, mipsel. + + -- Matthias Klose Wed, 28 Mar 2012 16:50:54 +0200 + +gcc-defaults (1.114) unstable; urgency=low + + * Add new architectures for gccgo-multilib. + + -- Matthias Klose Wed, 28 Mar 2012 15:00:42 +0200 + +gcc-defaults (1.113) unstable; urgency=low + + * Bump GCC 4.6 versions to 4.6.3. + * Default gccgo to gccgo-4.7 (Go language version 1). + * Default gij/gcj to 4.7 for every architecture except ia64 and the Hurd. + * Bump standards version to 3.9.3. + * Remove Arthur from uploaders. + + -- Matthias Klose Tue, 27 Mar 2012 23:10:01 +0200 + gcc-defaults (1.112ubuntu5) precise; urgency=low * Don't build gccgo-multilib on ARM. diff -Nru gcc-defaults-1.112ubuntu5/debian/control gcc-defaults-1.124ubuntu6~ppa1204+1/debian/control --- gcc-defaults-1.112ubuntu5/debian/control 2012-03-12 17:18:56.000000000 +0000 +++ gcc-defaults-1.124ubuntu6~ppa1204+1/debian/control 2018-03-31 04:56:21.000000000 +0000 @@ -2,10 +2,12 @@ Section: devel Priority: standard Maintainer: Debian GCC Maintainers -Uploaders: Matthias Klose , Arthur Loiret -Standards-Version: 3.9.2 -Build-Depends: m4, debhelper (>= 5), dpkg-dev (>= 1.16.0~ubuntu4), gcj-4.6-base (>= 4.6.1~) [!arm !m68k], gcc-4.6-base (>= 4.6.1~) [!m68k], lsb-release -Build-Depends-Indep: ca-certificates, gcj-jdk, python (>= 2.6.6) +Uploaders: Matthias Klose +Standards-Version: 3.9.4 +Build-Depends: m4, debhelper (>= 5), + dpkg-dev (>= 1.16.0~ubuntu4), + gcc-4.8-base (>= 4.8.1-6~), + lsb-release Vcs-Svn: svn+ssh://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 @@ -40,7 +42,7 @@ Package: g++-multilib Priority: optional -Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc +Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips 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++. @@ -63,7 +65,7 @@ Package: gobjc-multilib Priority: optional -Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc +Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips 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 @@ -88,7 +90,7 @@ Package: gobjc++-multilib Priority: optional -Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc +Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips mipsel 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 @@ -102,7 +104,7 @@ Architecture: any Depends: cpp (>= ${version:cpp}), gcc (>= ${version:gcc}), gfortran-${pv:gfort} ${reqv:gfort}, ${misc:Depends} Suggests: ${pkgmulti:gfort}, gfortran-doc -Provides: fortran-compiler +Provides: fortran-compiler, ${fortran:mod-version} Description: GNU Fortran 95 compiler This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms supported by the gcc compiler. It uses the gcc backend to generate optimized @@ -112,7 +114,7 @@ Package: gfortran-multilib Priority: optional -Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc +Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips 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 @@ -135,8 +137,8 @@ Package: gccgo-multilib Priority: optional -Architecture: amd64 i386 powerpc -Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gccgo (>= ${version:gcc}), gccgo-${pv:ggo}-multilib ${reqv:ggo}, ${misc:Depends} +Architecture: amd64 i386 mips 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 the gcc compiler. It uses the gcc backend to generate optimized code. @@ -144,98 +146,6 @@ On architectures with multilib support, the package contains dependencies for the non-default multilib architecture(s). -Package: libgcj-common -Section: java -Architecture: all -Priority: optional -Depends: ${python:Depends}, ${misc:Depends} -Conflicts: classpath (<= 0.04-4) -Replaces: java-gcj-compat (<< 1.0.65-8), java-gcj-compat-dev (<< 1.0.80-2) -XB-Python-Version: ${python:Versions} -Description: Java runtime library (common files) - This package contains files shared by classpath and libgcj libraries. - -Package: libgcj-bc -Section: java -Architecture: any -Multi-Arch: same -Priority: optional -Pre-Depends: multiarch-support -Depends: libgcj-common (>= ${version:libgcjcommon}), ${pkg:libgcj} ${reqv:gij}, ${misc:Depends} -Description: Link time only library for use with gcj - A fake library that is used at link time only. It ensures that - binaries built with the BC-ABI link against a constant SONAME. - This way, BC-ABI binaries continue to work if the SONAME underlying - libgcj.so changes. - -Package: gcj-jdk -Section: java -Architecture: any -Priority: optional -Depends: libgcj-common (>= ${version:libgcjcommon}), gcj-jre (>= ${version:gcj}), ${dep:jdk}, ${pkg:gjdoc}, ${misc:Depends} -Provides: java-gcj-compat-dev, java-compiler, java-sdk, java2-sdk, java5-sdk, ${pkg:gjdoc} -Conflicts: gcj (<< ${ver:gcjconflict}), classpath-common (<= 2:0.97.2-1.1), ${pkg:gjdoc}, java-gcj-compat-dev (<< 1.0.80-2) -Replaces: ${pkg:gjdoc}, java-gcj-compat-dev (<< 1.0.80-2) -Description: gcj and classpath development tools for Java(TM) - GCJ is a front end to the GCC compiler which can natively compile both - Java(tm) source and bytecode files. The compiler can also generate class - files. Other java development tools from classpath are included in this - package. - . - The package contains as well a collection of wrapper scripts and symlinks. - It is meant to provide a Java-SDK-like interface to the GCJ tool set. - -Package: gcj-jre-headless -Priority: optional -Section: java -Architecture: any -Depends: libgcj-common (>= ${version:libgcjcommon}), ${dep:jrehl}, ${misc:Depends} -Suggests: gcj-jdk -Conflicts: gij (<< ${ver:gcjconflict}), java-gcj-compat-headless (<< 1.0.80-6) -Replaces: java-gcj-compat-headless (<< 1.0.80-6) -Provides: java-gcj-compat-headless, java-virtual-machine, java5-runtime-headless, java2-runtime-headless, java1-runtime-headless, java-runtime-headless -Description: Java runtime environment using GIJ/classpath (headless version) - GIJ is a Java bytecode interpreter, not limited to interpreting bytecode. - It includes a class loader which can dynamically load shared objects, so - it is possible to give it the name of a class which has been compiled and - put into a shared library on the class path. - . - The package contains as well a collection of wrapper scripts and symlinks. - It is meant to provide a Java-RTE-like interface to the GIJ/GCJ tool set, - limited to the headless tools and libraries. - -Package: gcj-jre -Section: java -Architecture: any -Priority: optional -Depends: libgcj-common (>= ${version:libgcjcommon}), gcj-jre-headless (>= ${version:gcj}), ${dep:jre}, ${misc:Depends} -Provides: java-gcj-compat, java5-runtime, java2-runtime, java1-runtime, java-runtime -Description: Java runtime environment using GIJ/classpath - GIJ is a Java bytecode interpreter, not limited to interpreting bytecode. - It includes a class loader which can dynamically load shared objects, so - it is possible to give it the name of a class which has been compiled and - put into a shared library on the class path. - . - The package contains as well a collection of wrapper scripts and symlinks. - It is meant to provide a Java-RTE-like interface to the GIJ/GCJ tool set. - -#Package: gpc -#Priority: optional -#Architecture: any -#Depends: cpp (>= ${version:cpp}), gcc (>= ${version:cpp}), gpc-${pv:gpc} ${reqv:gpc}, ${misc:Depends} -#Suggests: gpc-doc -#Conflicts: gpc-doc (<< 1:2.95.3) -#Provides: pascal-compiler -#Description: GNU Pascal compiler -# This is the GNU Pascal compiler, which compiles Pascal on platforms supported -# by the gcc compiler. It uses the gcc backend to generate optimized code. -# . -# The current version 2.2 (release candidate 2) implements Standard Pascal -# (ISO 7185, level 1), a large subset of Extended Pascal (ISO 10206), and -# Borland Pascal. Many Borland Pascal units supported. -# . -# This is a dependency package providing the default GNU Pascal compiler. - Package: gcc Priority: optional Architecture: any @@ -251,7 +161,7 @@ Package: gcc-multilib Priority: optional -Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x s390x sparc +Architecture: amd64 armel armhf i386 kfreebsd-amd64 mips 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] Pre-Depends: linux-libc-dev (>= 2.6.38-8.42) Replaces: gcc (<< 4.6.1-2ubuntu5) @@ -261,18 +171,9 @@ On architectures with multilib support, the package contains dependencies for the non-default multilib architecture(s). -#Package: gpc-doc -#Section: doc -#Architecture: any -#Priority: optional -#Depends: gpc-${pv:gpc}-doc ${reqv:gpc}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info -#Suggests: gpc (>= ${version:gpc}) -#Description: Documentation for the GNU Pascal compiler (gpc) -# Documentation for the GNU Pascal compiler in info format (dependency package). - Package: gdc Priority: optional -Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 +Architecture: any Depends: gdc-${pv:gdc} ${reqv:gdc}, ${misc:Depends} Replaces: gdc-4.1 (<< 0.25-4.1.2-18), gdc-4.2 (<< 0.25-4.2.2-7), gdc-4.3 (<< 1:1.043-4.3.4-1) Description: D compiler (language version 2), based on the GCC backend @@ -282,43 +183,6 @@ . This compiler supports D language version 2. -Package: gdc-v1 -Priority: optional -Architecture: any -Depends: gdc-${pv:gdc1} ${reqv:gdc1}, ${misc:Depends} -Replaces: gdc-4.1 (<< 0.25-4.1.2-18), gdc-4.2 (<< 0.25-4.2.2-7), gdc-4.3 (<< 1:1.043-4.3.4-1) -Description: D compiler (language version 1), based on the GCC backend - This is a dependency package providing the default D compiler. - Per policy, all packages that contain D sources must use this package - in their Build-Depends line. - . - This compiler supports D language version 1. - -Package: gcc-spu -Architecture: powerpc ppc64 -Section: devel -Priority: optional -Depends: cpp (>= ${version:cpp}), gcc-${pv:spu}-spu ${reqv:spu}, ${misc:Depends} -Description: SPU cross-compiler (preprocessor and C compiler) - GNU Compiler Collection for the Cell Broadband Engine SPU (preprocessor - and C compiler). - -Package: g++-spu -Architecture: powerpc ppc64 -Section: devel -Priority: optional -Depends: cpp (>= ${version:cpp}), g++-${pv:spu}-spu ${reqv:spu}, ${misc:Depends} -Description: SPU cross-compiler (C++ compiler) - GNU Compiler Collection for the Cell Broadband Engine SPU (C++ compiler). - -Package: gfortran-spu -Architecture: powerpc ppc64 -Section: devel -Priority: optional -Depends: cpp (>= ${version:cpp}), gfortran-${pv:spu}-spu ${reqv:spu}, ${misc:Depends} -Description: SPU cross-compiler (Fortran compiler) - GNU Compiler Collection for the Cell Broadband Engine SPU (Fortran compiler). - Package: cpp-doc Section: doc Architecture: any diff -Nru gcc-defaults-1.112ubuntu5/debian/.cvsignore gcc-defaults-1.124ubuntu6~ppa1204+1/debian/.cvsignore --- gcc-defaults-1.112ubuntu5/debian/.cvsignore 2001-04-02 22:18:01.000000000 +0000 +++ gcc-defaults-1.124ubuntu6~ppa1204+1/debian/.cvsignore 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -control diff -Nru gcc-defaults-1.112ubuntu5/debian/gcc-multilib.postinst gcc-defaults-1.124ubuntu6~ppa1204+1/debian/gcc-multilib.postinst --- gcc-defaults-1.112ubuntu5/debian/gcc-multilib.postinst 2011-09-24 15:06:23.000000000 +0000 +++ gcc-defaults-1.124ubuntu6~ppa1204+1/debian/gcc-multilib.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#! /bin/sh - -set -e - -case "$1" in - configure) - if [ -n "$2" ] && dpkg --compare-versions "$2" lt 4:4.6.1-3~; then - if [ ! -h /usr/include/asm ] && [ -d /usr/include/asm ]; then - rm -rf /usr/include/asm - ln -sf $(gcc --print-multiarch)/asm /usr/include/asm - fi - fi -esac - -#DEBHELPER# - -exit 0 diff -Nru gcc-defaults-1.112ubuntu5/debian/README.Debian gcc-defaults-1.124ubuntu6~ppa1204+1/debian/README.Debian --- gcc-defaults-1.112ubuntu5/debian/README.Debian 2012-01-08 07:33:30.000000000 +0000 +++ gcc-defaults-1.124ubuntu6~ppa1204+1/debian/README.Debian 2018-03-31 04:56:21.000000000 +0000 @@ -10,17 +10,26 @@ by means of the gcc-defaults package, which creates symbolic links as appropriate. -Versions of GCC present in Debian Squeeze +FIXME: Needs update for jessie + +Versions of GCC present in Debian Wheezy ----------------------------------------- -- GCC 4.3 is the default compiler for C, C++, Objective-C, Objective-C++, - Ada, Fortran 95, and Java on all architectures. This package also - provides libgcc1, libgcc2 (m68k) and libgcc4 (hppa) which contain the - GCC intrinsics, and libstdc++6. +- GCC 4.7 is the default compiler for Go and Java on all architectures. + On x86 architectures it is the default compiler for C, C++, Objective-C, + Objective-C++ and Fortran 95. + +- GCC 4.6 is the default compiler for Ada and D (language version 2). + On non x86 architectures it is the default compiler for C, C++, + Objective-C, Objective-C++ and Fortran 95. + +- GCC 4.5 was removed for the release of Wheezy. -- GCC 4.1 is the default compiler for D and Pascal. +- GCC 4.4 is the default compiler for D (language version 1). -- GCC 3.4 is provided for the C, but is not the default for any language. +- GCC 4.1 was removed for the release of Wheezy (was the default for Pascal). + +- GCC 3.4 was removed for the release of Squeeze. - GCC 3.3 is not provided anymore; it is used to build libstdc++5 on the amd64 and i386 architectures. It is expected that libstdc++5 is @@ -34,29 +43,28 @@ Starting in Debian 3.0, there is now a gcc-defaults package set. This creates the actual packages for gcc, gnat, g++, gobjc, chill, gcj, gij, gdc and gpc. These packages will depend on the corresponding default -compiler for that architecture. For Debian 4.0 for example, "gcc" -depends on "gcc-4.1", which means that the "gcc-4.1" package will -install a binary called "gcc-4.1", which is symlinked to in the "gcc" +compiler for that architecture. For Debian 5.0 for example, "gcc" +depends on "gcc-4.4", which means that the "gcc-4.4" package will +install a binary called "gcc-4.4", which is symlinked to in the "gcc" package as "gcc". This may seem confusing, but what it allows you do to is install more than one version of the GCC compiler collection at the same time, making sure you are always using the one preferred for that -architecture. To use the other compiler, simply set CC=gcc-4.1, or +architecture. To use the other compiler, simply set CC=gcc-4.6, or similar. The default compiler versions for Debian GNU/Linux on amd64 are (minor version numbers omitted): - cpp : cpp-4.6 - gcc : gcc-4.6 - g++ : g++-4.6 - gfortran : gfortran-4.6 - gcj : gcj-4.6 - gij : gij-4.6 - gobjc : gobjc-4.6 - gobjc++ : gobjc++-4.6 - gdc : gdc-4.6 + cpp : cpp-4.8 + gcc : gcc-4.8 + g++ : g++-4.8 + gfortran : gfortran-4.8 + gccgo : gccgo-4.9 + gobjc : gobjc-4.8 + gobjc++ : gobjc++-4.8 + gdc : gdc-4.8 Documentation for the default compilers can be found in @@ -75,10 +83,10 @@ C compiler, you should use the gcc-4.1 compiler driver for all your work. When configuring sources, use - CC=gcc-4.1 ./configure # bash - setenv CC gcc-4.1; ./configure # csh + CC=gcc-4.4 ./configure # bash + setenv CC gcc-4.4; ./configure # csh -When calling make, use make CC=gcc-4.1. +When calling make, use make CC=gcc-4.4. C Application Binary Interface ------------------------------ @@ -144,6 +152,10 @@ ----------------------------- Matthias Klose + +Former and/or inactive maintainers of these packages +---------------------------------------------------- + Ray Dassen Philip Blundell (arm-linux) Jeff Bailey (hurd-i386) diff -Nru gcc-defaults-1.112ubuntu5/debian/README.Debian.m4 gcc-defaults-1.124ubuntu6~ppa1204+1/debian/README.Debian.m4 --- gcc-defaults-1.112ubuntu5/debian/README.Debian.m4 2011-04-11 07:54:37.000000000 +0000 +++ gcc-defaults-1.124ubuntu6~ppa1204+1/debian/README.Debian.m4 2013-07-01 14:53:33.000000000 +0000 @@ -15,17 +15,26 @@ by means of the gcc-defaults package, which creates symbolic links as appropriate. -Versions of GCC present in Debian Squeeze +FIXME: Needs update for jessie + +Versions of GCC present in Debian Wheezy ----------------------------------------- -- GCC 4.3 is the default compiler for C, C++, Objective-C, Objective-C++, - Ada, Fortran 95, and Java on all architectures. This package also - provides libgcc1, libgcc2 (m68k) and libgcc4 (hppa) which contain the - GCC intrinsics, and libstdc++6. +- GCC 4.7 is the default compiler for Go and Java on all architectures. + On x86 architectures it is the default compiler for C, C++, Objective-C, + Objective-C++ and Fortran 95. + +- GCC 4.6 is the default compiler for Ada and D (language version 2). + On non x86 architectures it is the default compiler for C, C++, + Objective-C, Objective-C++ and Fortran 95. + +- GCC 4.5 was removed for the release of Wheezy. -- GCC 4.1 is the default compiler for D and Pascal. +- GCC 4.4 is the default compiler for D (language version 1). -- GCC 3.4 is provided for the C, but is not the default for any language. +- GCC 4.1 was removed for the release of Wheezy (was the default for Pascal). + +- GCC 3.4 was removed for the release of Squeeze. - GCC 3.3 is not provided anymore; it is used to build libstdc++5 on the amd64 and i386 architectures. It is expected that libstdc++5 is @@ -39,15 +48,15 @@ Starting in Debian 3.0, there is now a gcc-defaults package set. This creates the actual packages for gcc, gnat, g++, gobjc, chill, gcj, gij, gdc and gpc. These packages will depend on the corresponding default -compiler for that architecture. For Debian 4.0 for example, "gcc" -depends on "gcc-4.1", which means that the "gcc-4.1" package will -install a binary called "gcc-4.1", which is symlinked to in the "gcc" +compiler for that architecture. For Debian 5.0 for example, "gcc" +depends on "gcc-4.4", which means that the "gcc-4.4" package will +install a binary called "gcc-4.4", which is symlinked to in the "gcc" package as "gcc". This may seem confusing, but what it allows you do to is install more than one version of the GCC compiler collection at the same time, making sure you are always using the one preferred for that -architecture. To use the other compiler, simply set CC=gcc-4.1, or +architecture. To use the other compiler, simply set CC=gcc-4.6, or similar. The default compiler versions for Debian GNU/OS_NAME on DEB_ARCH are @@ -59,6 +68,7 @@ ifenabled(`gfortran',` gfortran : gfortran-PV_GFORT') ifenabled(`gcj',` gcj : gcj-PV_GCJ') ifenabled(`gcj',` gij : gij-PV_GIJ') +ifenabled(`gccgo',` gccgo : gccgo-PV_GGO') ifenabled(`gobjc',` gobjc : gobjc-PV_GOBJC') ifenabled(`gobjc++',` gobjc++ : gobjc++-PV_GOBJCXX') ifenabled(`gnat',` gnat : gnat-PV_GNAT') @@ -91,10 +101,10 @@ C compiler, you should use the `gcc-4.1' compiler driver for all your work. When configuring sources, use - CC=gcc-4.1 ./configure # bash - setenv CC gcc-4.1; ./configure # csh + CC=gcc-4.4 ./configure # bash + setenv CC gcc-4.4; ./configure # csh -When calling make, use `make CC=gcc-4.1'. +When calling make, use `make CC=gcc-4.4'. C Application Binary Interface @@ -167,6 +177,10 @@ ----------------------------- Matthias Klose + +Former and/or inactive maintainers of these packages +---------------------------------------------------- + Ray Dassen Philip Blundell (arm-linux) Jeff Bailey (hurd-i386) diff -Nru gcc-defaults-1.112ubuntu5/debian/rebuild-gcj-db gcc-defaults-1.124ubuntu6~ppa1204+1/debian/rebuild-gcj-db --- gcc-defaults-1.112ubuntu5/debian/rebuild-gcj-db 2011-04-11 07:54:37.000000000 +0000 +++ gcc-defaults-1.124ubuntu6~ppa1204+1/debian/rebuild-gcj-db 2014-01-15 19:34:44.000000000 +0000 @@ -85,12 +85,20 @@ # still different databases for each gcj-4.x -if which gcj-dbtool-4.6 >/dev/null 2>&1; then - rebuild_databases 4.6 +if which gcj-dbtool-4.9 >/dev/null 2>&1; then + rebuild_databases 4.9 +fi + +if which gcj-dbtool-4.8 >/dev/null 2>&1; then + rebuild_databases 4.8 fi -if which gcj-dbtool-4.5 >/dev/null 2>&1; then - rebuild_databases 4.5 +if which gcj-dbtool-4.7 >/dev/null 2>&1; then + rebuild_databases 4.7 +fi + +if which gcj-dbtool-4.6 >/dev/null 2>&1; then + rebuild_databases 4.6 fi if which gcj-dbtool-4.4 >/dev/null 2>&1; then diff -Nru gcc-defaults-1.112ubuntu5/debian/rules gcc-defaults-1.124ubuntu6~ppa1204+1/debian/rules --- gcc-defaults-1.112ubuntu5/debian/rules 2012-03-13 19:52:07.000000000 +0000 +++ gcc-defaults-1.124ubuntu6~ppa1204+1/debian/rules 2018-03-31 04:56:21.000000000 +0000 @@ -114,15 +114,26 @@ REL_NO_460 := $(shell expr $(VMINOR) - 99)$(REL_EXT) # gcc-defaults 1.106 is the first version with 4.6.1 support. REL_NO_461 := $(shell expr $(VMINOR) - 105)$(REL_EXT) -# gcc-defaults 1.109 is the first version with 4.6.1 support. +# gcc-defaults 1.109 is the first version with 4.6.2 support. REL_NO_462 := $(shell expr $(VMINOR) - 108)$(REL_EXT) -# gcc-defaults 1.109 is the first version with 4.6.1 support. -REL_NO_463 := $(shell expr $(VMINOR) - 111)$(REL_EXT) -REL_NO_470 := $(shell expr $(VMINOR) - 111)$(REL_EXT) - -GPC_VERSION := 2.1 -GDC_VERSION := 0.29 -GDC1_VERSION := 1.063 +# gcc-defaults 1.113 is the first version with 4.6.3 support. +REL_NO_463 := $(shell expr $(VMINOR) - 112)$(REL_EXT) +# gcc-defaults 1.120 is the first version with 4.6.4 support. +REL_NO_464 := $(shell expr $(VMINOR) - 119)$(REL_EXT) + +# gcc-defaults 1.113 is the first version with 4.7.0 support. +REL_NO_470 := $(shell expr $(VMINOR) - 112)$(REL_EXT) +# gcc-defaults 1.119 is the first version with 4.7.1 support. +REL_NO_471 := $(shell expr $(VMINOR) - 118)$(REL_EXT) +# gcc-defaults 1.120 is the first version with 4.7.2 support. +REL_NO_472 := $(shell expr $(VMINOR) - 119)$(REL_EXT) +# gcc-defaults 1.120 is the first version with 4.7.3 support. +REL_NO_473 := $(shell expr $(VMINOR) - 119)$(REL_EXT) + +REL_NO_481 := $(shell expr $(VMINOR) - 120)$(REL_EXT) +REL_NO_482 := $(shell expr $(VMINOR) - 123)$(REL_EXT) + +REL_NO_49 := $(shell expr $(VMINOR) - 123)$(REL_EXT) # minimum required gcc-X.Y versions REQV_295 := (>= 1:2.95.4-16) @@ -130,109 +141,108 @@ REQV_30 := (>= 1:3.0.4-12) REQV_32 := (>= 1:3.2.3-1) REQV_33 := (>= 1:3.3.6-1) -REQV_GPC_33 := (>= 1:3.3.6.$(GPC_DATE)-1) REQV_34 := (>= 3.4.6-1) REQV_40 := (>= 4.0.3-1) REQV_41 := (>= 4.1.2-1) REQV_41_GCJ := (>= 4.1.2-1) -REQV_41_GPC := (>= $(GPC_VERSION)-4.1.2-16) REQV_42 := (>= 4.2.4-1) REQV_42_GCJ := (>= 4.2.4-1) REQV_43 := (>= 4.3.5-1) -REQV_43_GDC := (>= $(GDC1_VERSION)-4.3.5-1) -REQV_44 := (>= 4.4.6-1~) -REQV_44_GDC := (>= $(GDC1_VERSION)-4.4.6-10~) +REQV_44 := (>= 4.4.7-1~) REQV_45 := (>= 4.5.3-1) -REQV_46 := (>= 4.6.3-1~) -REQV_46_GDC := (>= $(GDC_VERSION)-4.6.3-1~) -REQV_47 := (>= 4.7.0~rc1-0~) +REQV_46 := (>= 4.6.4-1~) +REQV_46_GDC := $(REQV_46) +REQV_47 := (>= 4.7.3-1~) +REQV_48 := (>= 4.8.2-5~) +REQV_49 := (>= 4.9) -REQV_LIBGCJ_BC := (>= 4.4.5-1~) +REQV_LIBGCJ_BC := (>= 4.8.2-1~) # architecture dependent variables DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -gcc46_archs = alpha amd64 armel armhf hppa i386 ia64 lpia m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386 -gcj46_archs = alpha amd64 armel armhf hppa i386 ia64 lpia mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386 +gcc47_archs = powerpcspe +#gcc48_archs = alpha amd64 armel armhf hppa i386 ia64 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386 +gcc48_archs = alpha amd64 armel armhf arm64 hppa i386 m68k mips mipsel powerpc ppc64 ppc64el x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386 s390x sparc64 +gcj48_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386 +gcj48_archs = # CV_XXX is the complete version number, including the release, without epoch -CV_CHILL:= 2.95.4-$(REL_NO_295) -CV_GPC := 3.4.6-$(REL_NO_346) - -CV_CPP := 4.4.6-$(REL_NO_446) -CV_GCC := 4.4.6-$(REL_NO_446) -CV_GPP := 4.4.6-$(REL_NO_446) -CV_GOBJC := 4.4.6-$(REL_NO_446) -CV_GOBJCXX := 4.4.6-$(REL_NO_446) -CV_GFORT := 4.4.6-$(REL_NO_446) -CV_GGO := 4.7.0~rc1-$(REL_NO_470) -CV_GCJ := 4.4.6-$(REL_NO_446) -CV_GIJ := 4.4.6-$(REL_NO_446) -CV_LIBGCJBC := 4.4.6-$(REL_NO_446) -CV_GPC := $(GPC_VERSION)-4.1.2-$(REL_NO_412) -CV_GDC := 4.6.3-$(REL_NO_463) -CV_GDC1 := 4.4.6-$(REL_NO_446) -CV_LIBGCJCOMMON := 1:4.6.3-$(REL_NO_463) -CV_SPU := 4.4.6-$(REL_NO_446) - -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc46_archs))) - CV_CPP := 4.6.3-$(REL_NO_463) - CV_GCC := 4.6.3-$(REL_NO_463) - CV_GPP := 4.6.3-$(REL_NO_463) - CV_GOBJC := 4.6.3-$(REL_NO_463) - CV_GOBJCXX := 4.6.3-$(REL_NO_463) - CV_GFORT := 4.6.3-$(REL_NO_463) - CV_SPU := 4.6.3-$(REL_NO_463) -endif - -ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj46_archs))) - CV_GCJ := 4.6.3-$(REL_NO_463) - CV_GIJ := 4.6.3-$(REL_NO_463) - CV_LIBGCJBC := 4.6.3-$(REL_NO_463) -endif - -REQV_CHILL = $(REQV_295) -REQV_GPC = $(REQV_34) - -REQV_CPP = $(REQV_44) -REQV_GCC = $(REQV_44) -REQV_GPP = $(REQV_44) -REQV_GOBJC = $(REQV_44) -REQV_GOBJCXX = $(REQV_44) -REQV_GFORT = $(REQV_44) -REQV_GGO = $(REQV_47) -REQV_GCJ = $(REQV_44) -REQV_GIJ = $(REQV_44) -REQV_GPC = $(REQV_41_GPC) -REQV_GDC = $(REQV_46_GDC) -REQV_GDC1 = $(REQV_44_GDC) -REQV_SPU = $(REQV_44) - -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcc46_archs))) - REQV_CPP = $(REQV_46) - REQV_GCC = $(REQV_46) - REQV_GPP = $(REQV_46) - REQV_GOBJC = $(REQV_46) - REQV_GOBJCXX = $(REQV_46) - REQV_GFORT = $(REQV_46) - REQV_SPU = $(REQV_46) -endif - -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj46_archs))) - REQV_GCJ = $(REQV_46) - REQV_GIJ = $(REQV_46) +CV_CPP := 4.6.4-$(REL_NO_464) +CV_GCC := 4.6.4-$(REL_NO_464) +CV_GPP := 4.6.4-$(REL_NO_464) +CV_GOBJC := 4.6.4-$(REL_NO_464) +CV_GOBJCXX := 4.6.4-$(REL_NO_464) +CV_GFORT := 4.6.4-$(REL_NO_464) +CV_GGO := 4.9-$(REL_NO_49) +CV_GCJ := 4.6.4-$(REL_NO_464) +CV_GIJ := 4.6.4-$(REL_NO_464) +CV_LIBGCJBC := 4.6.4-$(REL_NO_464) +CV_GDC := 4.8.2-$(REL_NO_482) +CV_LIBGCJCOMMON := 1:4.8.2-$(REL_NO_482) + +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc48_archs))) + CV_CPP := 4.8.2-$(REL_NO_482) + CV_GCC := 4.8.2-$(REL_NO_482) + CV_GPP := 4.8.2-$(REL_NO_482) + CV_GOBJC := 4.8.2-$(REL_NO_482) + CV_GOBJCXX := 4.8.2-$(REL_NO_482) + CV_GFORT := 4.8.2-$(REL_NO_482) +else ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc47_archs))) + CV_CPP := 4.7.3-$(REL_NO_473) + CV_GCC := 4.7.3-$(REL_NO_473) + CV_GPP := 4.7.3-$(REL_NO_473) + CV_GOBJC := 4.7.3-$(REL_NO_473) + CV_GOBJCXX := 4.7.3-$(REL_NO_473) + CV_GFORT := 4.7.3-$(REL_NO_473) +endif + +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj48_archs))) + CV_GCJ := 4.8.2-$(REL_NO_482) + CV_GIJ := 4.8.2-$(REL_NO_482) + CV_LIBGCJBC := 4.8.2-$(REL_NO_482) +endif + +REQV_CPP = $(REQV_46) +REQV_GCC = $(REQV_46) +REQV_GPP = $(REQV_46) +REQV_GOBJC = $(REQV_46) +REQV_GOBJCXX = $(REQV_46) +REQV_GFORT = $(REQV_46) +REQV_GGO = $(REQV_49) +REQV_GCJ = $(REQV_46) +REQV_GIJ = $(REQV_46) +REQV_GDC = $(REQV_48) + +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) +else ifneq (,$(filter $(DEB_HOST_ARCH),$(gcc47_archs))) + REQV_CPP = $(REQV_47) + REQV_GCC = $(REQV_47) + REQV_GPP = $(REQV_47) + REQV_GOBJC = $(REQV_47) + REQV_GOBJCXX = $(REQV_47) + REQV_GFORT = $(REQV_47) +endif + +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj48_archs))) + REQV_GCJ = $(REQV_48) + REQV_GIJ = $(REQV_48) endif EPOCH=4 -EPOCH_GPC=5 OS_NAME := Linux distribution := $(shell lsb_release -is) distrelease := $(shell lsb_release -cs) -all_packages := g++ gfortran gcj-jdk gobjc gobjc++ gdc gdc-v1 gccgo #gpc -all_packages += gcc-spu g++-spu gfortran-spu -no_packages := chill +all_packages := g++ gfortran gobjc gobjc++ gdc gccgo +no_packages := lib32 = /usr/lib32 @@ -241,19 +251,21 @@ with_multiarch_lib := yes endif -LIBGCJ = libgcj10 -LIBGCJ_PC = libgcj10.pc -LIBGCJ_SONAME = 10 - -ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj46_archs))) - LIBGCJ = libgcj12 - LIBGCJ_PC = libgcj12.pc - LIBGCJ_SONAME = 12 +LIBGCJ = libgcj13 +LIBGCJ_PC = libgcj13.pc +LIBGCJ_SONAME = 13 + +ifneq (,$(filter $(DEB_HOST_ARCH),$(gcj48_archs))) + LIBGCJ = libgcj14 + LIBGCJ_PC = libgcj14.pc + LIBGCJ_SONAME = 14 endif -gcj_archs = alpha amd64 armel armhf hppa i386 ia64 lpia m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386 -gcj_native_archs = alpha amd64 armel armhf hppa i386 ia64 lpia mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386 -multilib_archs = amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc +gcj_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386 +gcj_native_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386 +multilib_archs = amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32 +gcj_archs = +gcj_native_archs = ifneq (,$(filter $(DEB_HOST_ARCH), $(multilib_archs))) with_multilib = yes @@ -264,32 +276,21 @@ with_gfdl_docs := yes endif -go_archs = amd64 i386 powerpc armel armhf +go_archs = amd64 arm64 armel armhf i386 ia64 mips mipsel powerpc ppc64 ppc64el s390 s390x x32 ifeq (,$(filter $(DEB_HOST_ARCH),$(go_archs))) no_packages += gccgo endif java_no_archs := arm ifneq (,$(filter $(DEB_HOST_ARCH),$(java_no_archs))) - no_packages += libgcj-bc gcj-jre-headless gcj-jre gcj-jdk + #no_packages += libgcj-bc gcj-jre-headless gcj-jre gcj-jdk endif -gpc_no_archs := sh3 sh4 -ifneq (,$(filter $(DEB_HOST_ARCH),$(gpc_no_archs))) - no_packages += gpc gpc-doc -endif -no_packages += gpc gpc-doc - -gdc_no_archs = alpha armel armhf hppa ia64 m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 hurd-i386 +gdc_no_archs = arm64 s390 sh4 ifneq (,$(filter $(DEB_HOST_ARCH),$(gdc_no_archs))) no_packages += gdc endif -gdc1_no_archs := hurd-i386 -ifneq (,$(filter $(DEB_HOST_ARCH),$(gdc1_no_archs))) - no_packages += gdc-v1 -endif - ifeq ($(DEB_HOST_ARCH),hurd-i386) OS_NAME := Hurd endif @@ -302,10 +303,6 @@ OS_NAME := NetBSD endif -ifeq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) - no_packages += gcc-spu g++-spu gfortran-spu -endif - ifneq ($(with_gfdl_docs),yes) no_packages := $(sort $(no_packages) cpp-doc gcc-doc gfortran-doc) endif @@ -320,33 +317,29 @@ V_GOBJCXX := $(shell echo $(CV_GOBJCXX) | sed 's/-[^-]*$$//') V_GFORT := $(shell echo $(CV_GFORT) | sed 's/-[^-]*$$//') V_GGO := $(shell echo $(CV_GGO) | sed 's/-[^-]*$$//') -V_CHILL := $(shell echo $(CV_CHILL) | sed 's/-[^-]*$$//') V_GCJ := $(shell echo $(CV_GCJ) | sed 's/-[^-]*$$//') V_GIJ := $(shell echo $(CV_GIJ) | sed 's/-[^-]*$$//') ifneq (,$(CV_GCJ_HACKED)) V_GCJ := $(shell echo $(CV_GCJ_HACKED) | sed 's/-[^-]*$$//') V_GIJ := $(shell echo $(CV_GIJ_HACKED) | sed 's/-[^-]*$$//') endif -V_GPC := $(shell echo $(CV_GPC) | sed 's/$(GPC_VERSION)-//;s/-[^-]*$$//') V_GDC := $(shell echo $(CV_GDC) | sed 's/-[^-]*$$//') -V_GDC1 := $(shell echo $(CV_GDC1) | sed 's/-[^-]*$$//') -V_SPU := $(shell echo $(CV_SPU) | sed 's/-[^-]*$$//') # number for the package name 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_GDC1 := $(shell echo $(V_GDC1) | 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}') -PV_CHILL:= $(shell echo $(V_CHILL) | awk -F. '{printf "%d.%d", $$1, $$2}') 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}') -PV_GPC := $(shell echo $(V_GPC) | awk -F. '{printf "%d.%d", $$1, $$2}') -PV_SPU := $(shell echo $(V_SPU) | 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' \ + | head -1) README: m4 -DPACKAGES="$(packages)" \ @@ -357,15 +350,11 @@ -DV_GPP=$(V_GPP) -DPV_GPP=$(PV_GPP) \ -DV_GOBJC=$(V_GOBJC) -DPV_GOBJC=$(PV_GOBJC) \ -DV_GOBJCXX=$(V_GOBJCXX) -DPV_GOBJCXX=$(PV_GOBJCXX) \ - -DV_CHILL=$(V_CHILL) -DPV_CHILL=$(PV_CHILL) \ -DV_GFORT=$(V_GFORT) -DPV_GFORT=$(PV_GFORT) \ -DV_GGO=$(V_GGO) -DPV_GGO=$(PV_GGO) \ -DV_GCJ=$(V_GCJ) -DPV_GCJ=$(PV_GCJ) \ -DV_GIJ=$(V_GIJ) -DPV_GIJ=$(PV_GIJ) \ - -DV_GPC=$(V_GPC) -DPV_GPC=$(PV_GPC) \ -DV_GDC=$(V_GDC) -DPV_GDC=$(PV_GDC) \ - -DV_GDC1=$(V_GDC1) -DPV_GDC1=$(PV_GDC1) \ - -DV_SPU=$(V_SPU) -DPV_SPU=$(PV_SPU) \ $(if $(filter yes,$(with_gfdl_docs)), -DGFDL) \ debian/README.Debian.m4 > debian/README.Debian.tmp2 uniq debian/README.Debian.tmp2 > debian/README.Debian.tmp @@ -383,7 +372,6 @@ echo 'version:gobjc=$(EPOCH):$(CV_GOBJC)'; \ echo 'version:gij=$(EPOCH):$(CV_GIJ)'; \ echo 'version:gcj=$(EPOCH):$(CV_GCJ)'; \ - echo 'version:gpc=$(EPOCH_GPC):$(CV_GPC)'; \ echo 'version:gfort=$(EPOCH):$(CV_GFORT)'; \ echo 'version:ggo=$(EPOCH):$(CV_GGO)'; \ echo 'version:libgcjcommon=$(CV_LIBGCJCOMMON)'; \ @@ -392,29 +380,21 @@ echo 'pv:gpp=$(PV_GPP)'; \ echo 'pv:gobjc=$(PV_GOBJC)'; \ echo 'pv:gobjcxx=$(PV_GOBJCXX)'; \ - echo 'pv:chill=$(PV_CHILL)'; \ echo 'pv:gfort=$(PV_GFORT)'; \ echo 'pv:ggo=$(PV_GGO)'; \ echo 'pv:gcj=$(PV_GCJ)'; \ echo 'pv:gij=$(PV_GIJ)'; \ - echo 'pv:gpc=$(PV_GPC)'; \ echo 'pv:gdc=$(PV_GDC)'; \ - echo 'pv:gdc1=$(PV_GDC1)'; \ - echo 'pv:spu=$(PV_SPU)'; \ echo 'reqv:cpp=$(REQV_CPP)'; \ echo 'reqv:gcc=$(REQV_GCC)'; \ echo 'reqv:gpp=$(REQV_GPP)'; \ echo 'reqv:gobjc=$(REQV_GOBJC)'; \ echo 'reqv:gobjcxx=$(REQV_GOBJCXX)'; \ - echo 'reqv:chill=$(REQV_CHILL)'; \ echo 'reqv:gfort=$(REQV_GFORT)'; \ echo 'reqv:ggo=$(REQV_GGO)'; \ echo 'reqv:gcj=$(REQV_GCJ)'; \ echo 'reqv:gij=$(REQV_GIJ)'; \ - echo 'reqv:gpc=$(REQV_GPC)'; \ echo 'reqv:gdc=$(REQV_GDC)'; \ - echo 'reqv:gdc1=$(REQV_GDC1)'; \ - echo 'reqv:spu=$(REQV_SPU)'; \ echo 'pkg:libgcj=$(LIBGCJ)'; \ echo 'pkg:libgcjawt=$(LIBGCJ)-awt'; \ echo 'version:libgcjbc=$(CV_LIBGCJBC)'; \ @@ -429,7 +409,6 @@ echo 'pkgmulti:ggo=gccgo-multilib'; \ ) >> debian/substvars.local endif -#ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs))) ( \ echo 'dep:jrehl=gcj-$${pv:gij}-jre-headless $${reqv:gij}'; \ echo 'dep:jre=gcj-$${pv:gij}-jre $${reqv:gij}'; \ @@ -437,15 +416,12 @@ echo 'pkg:gjdoc=gjdoc'; \ echo 'ver:gcjconflict=4:4.4.0-2'; \ ) >> debian/substvars.local -#else -# ( \ -# echo 'dep:jrehl=java-gcj-compat-headless (>= 1.0.80), gij-$${pv:gij} $${reqv:gij}'; \ -# echo 'dep:jre=java-gcj-compat (>= 1.0.80)'; \ -# echo 'dep:jdk=java-gcj-compat-dev (>= 1.0.80), gcj-$${pv:gcj} $${reqv:gcj}'; \ -# echo 'ver:gcjconflict=4:4.3.3-6'; \ -# ) >> debian/substvars.local -#endif +ifneq (,$(MOD_VER)) + echo "fortran:mod-version=$(MOD_VER)" >> debian/substvars.local +endif +build-arch: build +build-indep: build-stamp build: README build-stamp build-stamp: dh_testdir @@ -506,7 +482,17 @@ /usr/bin/gcc-$(PV_GCC) /usr/bin/gcc \ /usr/bin/gcc-$(PV_GCC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gcc \ /usr/bin/gcov-$(PV_GCC) /usr/bin/gcov \ + /usr/bin/gcov-$(PV_GCC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gcov \ /usr/share/doc/gcc-$(PV_GCC)/README.Bugs /usr/share/doc/cpp/README.Bugs +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcc47_archs) $(gcc48_archs) $(gcc49_archs))) + dh_link -pgcc \ + /usr/bin/gcc-ar-$(PV_GCC) /usr/bin/gcc-ar \ + /usr/bin/gcc-nm-$(PV_GCC) /usr/bin/gcc-nm \ + /usr/bin/gcc-ranlib-$(PV_GCC) /usr/bin/gcc-ranlib \ + /usr/bin/gcc-ar-$(PV_GCC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gcc-ar \ + /usr/bin/gcc-nm-$(PV_GCC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gcc-nm \ + /usr/bin/gcc-ranlib-$(PV_GCC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gcc-ranlib +endif install -m 755 -p c89 debian/gcc/usr/bin/c89-gcc install -m 644 -p c89.1 debian/gcc/usr/share/man/man1/c89-gcc.1 install -m 755 -p c99 debian/gcc/usr/bin/c99-gcc @@ -520,7 +506,8 @@ dh_link -pgcc \ /usr/share/man/man1/gcc-$(PV_GCC).1.gz /usr/share/man/man1/gcc.1.gz \ /usr/share/man/man1/gcc-$(PV_GCC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gcc.1.gz \ - /usr/share/man/man1/gcov-$(PV_GCC).1.gz /usr/share/man/man1/gcov.1.gz + /usr/share/man/man1/gcov-$(PV_GCC).1.gz /usr/share/man/man1/gcov.1.gz \ + /usr/share/man/man1/gcov-$(PV_GCC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gcov.1.gz : # gcc-doc dh_installdirs -pgcc-doc \ @@ -542,8 +529,8 @@ # have separate asm headers installed for our non-default targets. dh_link -pgcc-multilib \ /usr/include/$(DEB_HOST_MULTIARCH)/asm /usr/include/asm - endif -endif + endif +endif ifneq (,$(filter gdc, $(packages))) : # gdc @@ -555,38 +542,21 @@ dh_link -pgdc \ /usr/bin/gdc-$(PV_GDC) /usr/bin/gdc \ /usr/bin/gdc-$(PV_GDC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gdc + # manpages + dh_link -pgdc \ + /usr/share/man/man1/gdc-$(PV_GDC).1.gz /usr/share/man/man1/gdc.1.gz \ + /usr/share/man/man1/gdc-$(PV_GDC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdc.1.gz + + ifeq (0,1) # gdmd binaries dh_link -pgdc \ /usr/bin/gdmd-$(PV_GDC) /usr/bin/gdmd \ /usr/bin/gdmd-$(PV_GDC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gdmd # manpages dh_link -pgdc \ - /usr/share/man/man1/gdc-$(PV_GDC).1.gz /usr/share/man/man1/gdc.1.gz \ - /usr/share/man/man1/gdc-$(PV_GDC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdc.1.gz \ /usr/share/man/man1/gdmd-$(PV_GDC).1.gz /usr/share/man/man1/gdmd.1.gz \ /usr/share/man/man1/gdmd-$(PV_GDC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdmd.1.gz -endif - -ifneq (,$(filter gdc-v1, $(packages))) - : # gdc v1 - dh_installdirs -pgdc-v1 \ - usr/share/doc usr/bin usr/share/man/man1 - dh_installdocs -pgdc-v1 debian/README.Debian - - # gdc binaries - dh_link -pgdc-v1 \ - /usr/bin/gdc-$(PV_GDC1) /usr/bin/gdc-v1 \ - /usr/bin/gdc-$(PV_GDC1) /usr/bin/$(DEB_HOST_GNU_TYPE)-gdc-v1 - # gdmd binaries - dh_link -pgdc-v1 \ - /usr/bin/gdmd-$(PV_GDC1) /usr/bin/gdmd-v1 \ - /usr/bin/gdmd-$(PV_GDC1) /usr/bin/$(DEB_HOST_GNU_TYPE)-gdmd-v1 - # manpages - dh_link -pgdc-v1 \ - /usr/share/man/man1/gdc-$(PV_GDC1).1.gz /usr/share/man/man1/gdc-v1.1.gz \ - /usr/share/man/man1/gdc-$(PV_GDC1).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdc-v1.1.gz \ - /usr/share/man/man1/gdmd-$(PV_GDC1).1.gz /usr/share/man/man1/gdmd-v1.1.gz \ - /usr/share/man/man1/gdmd-$(PV_GDC1).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdmd-v1.1.gz + endif endif ifneq (,$(filter gobjc, $(packages))) @@ -672,14 +642,6 @@ endif endif -ifeq (chill, $(findstring chill, $(packages))) - : # chill - dh_installdirs -pchill usr/bin /usr/share/man/man1 usr/share/doc - dh_link -pchill \ - /usr/share/doc/cpp /usr/share/doc/chill \ - /usr/bin/chill-$(PV_CHILL) /usr/bin/chill -endif - ifneq (,$(filter gcj-jdk, $(packages))) : # gcj-jre-headless dh_installdirs -pgcj-jre-headless usr/bin /usr/share/man/man1 usr/share/doc @@ -749,21 +711,19 @@ /usr/share/info/gcj-$(PV_GCJ).info.gz /usr/share/info/gcj.info.gz endif -# ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs))) dh_link -pgcj-jdk \ /usr/bin/gjdoc-$(PV_GCJ) /usr/bin/gjdoc \ /usr/share/man/man1/gjdoc-$(PV_GCJ).1.gz /usr/share/man/man1/gjdoc.1.gz cp -p debian/dh_javadoc debian/gcj-jdk/usr/bin/ pod2man -c Debhelper -r $(PV_GCJ) \ debian/dh_javadoc debian/gcj-jdk/usr/share/man/man1/dh_javadoc.1 -# endif : # libgcj-bc ifeq ($(with_multiarch_lib),yes) dh_installdirs -plibgcj-bc \ - usr/lib/$(DEB_BUILD_MULTIARCH) usr/share/doc usr/share/lintian/overrides + usr/lib/$(DEB_HOST_MULTIARCH) usr/share/doc usr/share/lintian/overrides ln -s libgcj.so.$(LIBGCJ_SONAME) \ - debian/libgcj-bc/usr/lib/$(DEB_BUILD_MULTIARCH)/libgcj_bc.so.1 + debian/libgcj-bc/usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 else dh_installdirs -plibgcj-bc \ usr/lib usr/share/doc usr/share/lintian/overrides @@ -779,21 +739,17 @@ echo "libgcj_bc 1 libgcj-bc $(REQV_LIBGCJ_BC)" \ > debian/libgcj-bc.shlibs -# echo "libgcj_bc 1 libgcj-bc" > debian/libgcj-bc.shlibs -# ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj44_archs))) : # gcj-jre-headless dh_installdirs -pgcj-jre-headless \ usr/share/doc usr/lib/jvm -# ln -sf java-1.5.0-gcj-$(PV_GCJ)-1.5.0.0 \ -# debian/gcj-jre-headless/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 - ln -sf java-1.5.0-gcj-$(PV_GCJ) \ + ln -sf java-1.5.0-gcj-$(PV_GCJ)-$(DEB_HOST_ARCH) \ debian/gcj-jre-headless/usr/lib/jvm/java-1.5.0-gcj ln -sf java-gcj-$(PV_GCJ) \ debian/gcj-jre-headless/usr/lib/jvm/java-gcj -# endif endif +ifneq (,$(gcj_archs)) : # libgcj-common dh_installdirs -plibgcj-common \ /usr/bin \ @@ -841,55 +797,6 @@ pod2man -c Debhelper debian/dh_nativejava debian/dh_nativejava.1 mkdir -p debian/libgcj-common/usr/share/man/man1 install -m644 debian/dh_nativejava.1 debian/libgcj-common/usr/share/man/man1/ - -ifneq (,$(filter gpc, $(packages))) - : # gpc - dh_installdirs -pgpc usr/bin /usr/share/man/man1 usr/share/doc - dh_link -pgpc \ - /usr/share/doc/cpp /usr/share/doc/gpc \ - /usr/bin/gpc-$(PV_GPC) /usr/bin/gpc \ - /usr/share/man/man1/gpc-$(PV_GPC).1.gz /usr/share/man/man1/gpc.1.gz \ - /usr/bin/gpc-run-$(PV_GPC) /usr/bin/gpc-run \ - /usr/share/man/man1/gpc-run-$(PV_GPC).1.gz /usr/share/man/man1/gpc-run.1.gz \ - /usr/bin/binobj-$(PV_GPC) /usr/bin/binobj \ - /usr/share/man/man1/binobj-$(PV_GPC).1.gz /usr/share/man/man1/binobj.1.gz \ - /usr/bin/gpidump-$(PV_GPC) /usr/bin/gpidump \ - /usr/share/man/man1/gpidump-$(PV_GPC).1.gz /usr/share/man/man1/gpidump.1.gz - - : # gpc-doc - dh_installdirs -pgpc-doc \ - usr/share/doc usr/share/info - dh_link -pgpc-doc \ - /usr/share/info/gpc-$(PV_GPC).info.gz /usr/share/info/gpc.info.gz \ - /usr/share/info/gpcs-$(PV_GPC).info.gz /usr/share/info/gpcs.info.gz \ - /usr/share/info/gpcs-de-$(PV_GPC).info.gz /usr/share/info/gpcs-de.info.gz \ - /usr/share/info/gpcs-hu-$(PV_GPC).info.gz /usr/share/info/gpcs-hu.info.gz -endif - -ifneq (,$(filter gcc-spu, $(packages))) - : # gcc-spu - dh_installdirs -pgcc-spu \ - usr/share/doc usr/bin - - dh_link -pgcc-spu \ - /usr/bin/spu-cpp-$(PV_SPU) /usr/bin/spu-cpp \ - /usr/bin/spu-gcc-$(PV_SPU) /usr/bin/spu-gcc -endif -ifneq (,$(filter g++-spu, $(packages))) - : # g++-spu - dh_installdirs -pg++-spu \ - usr/share/doc usr/bin - - dh_link -pg++-spu \ - /usr/bin/spu-g++-$(PV_SPU) /usr/bin/spu-g++ -endif -ifneq (,$(filter gfortran-spu, $(packages))) - : # gfortran-spu - dh_installdirs -pgfortran-spu \ - usr/share/doc usr/bin - - dh_link -pgfortran-spu \ - /usr/bin/spu-gfortran-$(PV_SPU) /usr/bin/spu-gfortran endif nopkgs :=-s $(foreach p, $(no_packages),-N$(p)) @@ -904,9 +811,10 @@ /etc/ssl/certs/ca-certificates.crt touch $@ -binary-indep: build cacerts-stamp install +binary-indep: build-indep install dh_testdir dh_testroot + ifneq (,$(gcj_archs)) dh_installchangelogs -i dh_installdocs -plibgcj-common @@ -923,13 +831,14 @@ dh_gencontrol -plibgcj-common -u-v$(CV_LIBGCJCOMMON) dh_md5sums -i dh_builddeb -i + endif -binary-arch: build install +binary-arch: build-arch install dh_testdir dh_testroot # dh_installdebconf dh_installdocs -pcpp - for p in `dh_listpackages $(nopkgs) -Ncpp -Nlibgcj-bc -Ncpp-doc -Ngcc-doc -Ngpc-doc -Ngfortran-doc -Nlibgcj-common -Ngdc -Ngdc-v1`; do \ + for p in `dh_listpackages $(nopkgs) -Ncpp $(if $(gcj_archs),-Nlibgcj-bc -Nlibgcj-common) -Ncpp-doc -Ngcc-doc -Ngfortran-doc -Ngdc`; do \ case "$$p" in gij|gcj-*) t=libgcj-common;; *) t=cpp; esac; \ echo ln -sf $$t debian/$$p/usr/share/doc/$$p; \ mkdir -p debian/$$p/usr/share/doc; \ @@ -937,19 +846,11 @@ ln -sf $$t debian/$$p/usr/share/doc/$$p; \ done - dh_installchangelogs -pcpp -pgdc -pgdc-v1 + dh_installchangelogs -pcpp -pgdc mv debian/cpp/usr/share/doc/cpp/changelog \ debian/cpp/usr/share/doc/cpp/changelog.Debian mv debian/gdc/usr/share/doc/gdc/changelog \ debian/gdc/usr/share/doc/gdc/changelog.Debian - cp -p debian/gdc/usr/share/doc/gdc/changelog.Debian \ - debian/gdc-v1/usr/share/doc/gdc-v1/changelog.Debian -ifneq (,$(filter gpc, $(packages))) - dh_installdocs -pgpc-doc - dh_installchangelogs -pgpc-doc - mv debian/gpc-doc/usr/share/doc/gpc-doc/changelog \ - debian/gpc-doc/usr/share/doc/gpc-doc/changelog.Debian -endif ifeq ($(with_gfdl_docs),yes) dh_installdocs -pcpp-doc -pgcc-doc -pgfortran-doc dh_installchangelogs -pcpp-doc -pgcc-doc -pgfortran-doc @@ -969,9 +870,6 @@ ifneq (,$(filter gdc, $(packages))) dh_gencontrol -pgdc -u-v$(CV_GDC) endif -ifneq (,$(filter gdc-v1, $(packages))) - dh_gencontrol -pgdc-v1 -u-v$(CV_GDC) -endif ifneq (,$(filter g++, $(packages))) dh_gencontrol -pg++ -u-v$(EPOCH):$(CV_GPP) ifeq ($(with_multilib),yes) @@ -1007,27 +905,11 @@ endif endif endif -ifneq (,$(filter gpc, $(packages))) - dh_gencontrol -pgpc -u-v$(EPOCH_GPC):$(CV_GPC) - dh_gencontrol -pgpc-doc -u-v$(EPOCH_GPC):$(CV_GPC) -endif ifneq (,$(filter gcj-jdk, $(packages))) dh_gencontrol -plibgcj-bc -u-v$(CV_LIBGCJBC) dh_gencontrol -pgcj-jre-headless -pgcj-jre -pgcj-jdk \ -u-v$(EPOCH):$(CV_GCJ) endif -ifneq (,$(filter chill, $(packages))) - dh_gencontrol -pchill -u-v$(EPOCH):$(CV_CHILL) -endif -ifneq (,$(filter gcc-spu, $(packages))) - dh_gencontrol -pgcc-spu -u-v$(CV_SPU) -endif -ifneq (,$(filter g++-spu, $(packages))) - dh_gencontrol -pg++-spu -u-v$(CV_SPU) -endif -ifneq (,$(filter gfortran-spu, $(packages))) - dh_gencontrol -pgfortran-spu -u-v$(CV_SPU) -endif dh_md5sums -s $(nopkgs) dh_builddeb -s $(nopkgs)