From fed39d54cc2f5c197678e601eb9c48a818d76636 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 13 Jan 2020 10:56:53 -0500 Subject: update some rules/control from stevep --- palemoon/debian/control | 7 +------ palemoon/debian/rules | 18 +++++++++--------- 2 files changed, 10 insertions(+), 15 deletions(-) (limited to 'palemoon/debian') diff --git a/palemoon/debian/control b/palemoon/debian/control index 194753e..29b9108 100644 --- a/palemoon/debian/control +++ b/palemoon/debian/control @@ -6,22 +6,17 @@ Bugs: mailto: XSBC-Original-Maintainer: Steven Pusser Build-Depends: debhelper (>= 12), autoconf2.13, - build-essential, - gcc-8, g++-8, cpp-8, libasound2-dev, - libbz2-dev, libdbus-glib-1-dev (>= 0.60), - libegl1-mesa-dev, libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), - libsqlite3-dev, libssl-dev, libx11-xcb-dev, libxt-dev, lsb-release, + mesa-common-dev, pkg-config, python (>= 2.7), - python-dbus, unzip, yasm (>= 1.1), zip, diff --git a/palemoon/debian/rules b/palemoon/debian/rules index b56d4f7..5705c90 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -2,15 +2,15 @@ export SHELL=/bin/bash -# borrowed from stevepusser's logic -# Build with gcc-8 on Buster (beowulf/ceres) -distrelease := $(shell lsb_release -cs) -ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres)) -export CC=gcc-8 -export CXX=g++-8 -export CPP=cpp-8 -export LD=gcc-8 -endif +## borrowed from stevepusser's logic +## Build with gcc-8 on Buster (beowulf/ceres) +#distrelease := $(shell lsb_release -cs) +#ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres)) +#export CC=gcc-8 +#export CXX=g++-8 +#export CPP=cpp-8 +#export LD=gcc-8 +#endif %: dh $@ -- cgit