[X2Go-Commits] [pale-moon] 133/216: debian/control.in: rework GCC dependencies.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository pale-moon.

commit 90c33a71b176b843b7112d94134f45d31467812f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Sep 21 22:36:35 2018 +0200

    debian/control.in: rework GCC dependencies.
---
 debian/changelog  |  1 +
 debian/control.in | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9492b1e..8d6b059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
       compiler.
   * debian/control.in:
     - Update debhelper dependency.
+    - Rework GCC dependencies.
   * debian/rules:
     - Tabbify.
     - Add dh_testdir protection. Debian's firefox(-esr) package uses it.
diff --git a/debian/control.in b/debian/control.in
index 43996cc..4bb4b7c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,14 +9,20 @@ Build-Depends:
 %else
                debhelper (>= 9.20160114),
 %endif
+%if DIST == wheezy
+               gcc-mozilla,
+%endif
+%if DIST == jessie || DIST == xenial || DIST == Horizon
+               gcc-4.9,
+               g++-4.9,
+%endif
+%if DIST == buster || DIST == experimental || DIST == artful || DIST == bionic || DIST == cosmic
+               gcc-6,
+               g++-6,
+%endif
         autotools-dev,
         dpkg-dev (>= 1.16.1.1~),
-# Add for the conditional in rules to force use of gcc-4.9 on newer distreleases
-# that default to gcc-5 or 6
         lsb-release,
-        gcc-6 | gcc-4.9 | gcc,
-        g++-6 | g++-4.9 | g++,
-        cpp-6 | cpp-4.9 | cpp,
 # standard build-deps
         autoconf2.13,
         python (>= 2.7),

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git