From 6d16ac88353be42ac1298e09d5bbe1ba2ba2eb91 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 10 Nov 2015 13:50:05 +0000 Subject: [PATCH] [s390*] Update linux-compiler metapackage to gcc-4.9 (cherry picked from commit 900fda3c2b6d88f0a5e28de58b18dbc77f85195f) --- debian/changelog | 1 + debian/config/s390x/defines | 2 +- debian/templates/control.extra.in | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f3415f80..d2e77a5d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ linux (4.2.6-2) UNRELEASED; urgency=medium * netfilter: Enable NFT_DUP_IPV4, NFT_DUP_IPV6 as modules (Closes: #803370) * [x86] Enable PINCTRL_BAYTRAIL (Closes: #797949) * qxl: Enable by default (Closes: #779515) + * [s390*] Update linux-compiler metapackage to gcc-4.9 -- Salvatore Bonaccorso Tue, 10 Nov 2015 22:05:58 +0100 diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines index 21cca5435..5e0ff29ea 100644 --- a/debian/config/s390x/defines +++ b/debian/config/s390x/defines @@ -12,7 +12,7 @@ configs: install-stem: vmlinuz [relations] -headers%gcc-4.8: linux-compiler-gcc-4.8-s390 +headers%gcc-4.9: linux-compiler-gcc-4.9-s390 [s390x_build] debug-info: true diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in index 30aa11a6a..ce735f898 100644 --- a/debian/templates/control.extra.in +++ b/debian/templates/control.extra.in @@ -6,12 +6,12 @@ Description: Compiler for Linux on ARM (meta-package) This package depends on gcc 4.9 of the appropriate architecture for Linux on armel and armhf. -Package: linux-compiler-gcc-4.8-s390 -Depends: gcc-4.8, ${misc:Depends} +Package: linux-compiler-gcc-4.9-s390 +Depends: gcc-4.9, ${misc:Depends} Architecture: s390 s390x Multi-Arch: foreign Description: Compiler for Linux on IBM zSeries (meta-package) - This package depends on gcc 4.8 of the appropriate architecture for + This package depends on gcc 4.9 of the appropriate architecture for Linux on s390 and s390x. Package: linux-compiler-gcc-4.9-x86