[linux] 01/02: Revert "[x86] Compile with gcc-5"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

zumbi pushed a commit to branch jessie-backports
in repository linux.

commit bd71a92c965881a26f79624c19afff653366f8fb
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Wed Dec 23 17:03:03 2015 +0100

    Revert "[x86] Compile with gcc-5"
    
    This reverts commit 465d398a64aaeffb84c0c773b643314c82caa65c.
---
 debian/config/amd64/defines       | 3 +--
 debian/config/defines             | 7 ++++---
 debian/config/i386/defines        | 3 +--
 debian/templates/control.extra.in | 7 +++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 1598f12..ea197ee 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -1,5 +1,4 @@
 [base]
-compiler: gcc-5
 featuresets:
  none
  rt
@@ -15,7 +14,7 @@ configs:
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-x86
+headers%gcc-4.9: linux-compiler-gcc-4.9-x86
 
 [amd64_description]
 hardware: 64-bit PCs
diff --git a/debian/config/defines b/debian/config/defines
index 2c6a46d..02cda64 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -59,9 +59,10 @@ type: plain
 
 [relations]
 # compilers
-gcc-4.8: gcc-4.8 <!stage1>
-gcc-4.9: gcc-4.9 <!stage1>
-gcc-5: gcc-5 <!stage1>
+gcc-4.6: gcc-4.6
+gcc-4.7: gcc-4.7
+gcc-4.8: gcc-4.8
+gcc-4.9: gcc-4.9
 
 # initramfs-generators
 initramfs-fallback: linux-initramfs-tool
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index dcec368..e5345e6 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -1,5 +1,4 @@
 [base]
-compiler: gcc-5
 featuresets:
  none
  rt
@@ -20,7 +19,7 @@ configs:
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-x86
+headers%gcc-4.9: linux-compiler-gcc-4.9-x86
 
 [686_description]
 hardware: older PCs
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index c48546f..d51fba3 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -16,11 +16,10 @@ Description: Compiler for Linux on IBM zSeries (meta-package)
  This package depends on gcc 4.9 of the appropriate architecture for
  Linux on s390 and s390x.
 
-Package: linux-compiler-gcc-5-x86
-Build-Profiles: <!stage1>
-Depends: gcc-5, ${misc:Depends}
+Package: linux-compiler-gcc-4.9-x86
+Depends: gcc-4.9, ${misc:Depends}
 Architecture: amd64 i386 x32
 Multi-Arch: foreign
 Description: Compiler for Linux on x86 (meta-package)
- This package depends on gcc 5 of the appropriate architecture for
+ This package depends on gcc 4.9 of the appropriate architecture for
  Linux on amd64, i386 and x32.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git