From e296713613c589d9cfe0f590d69386da443ba48a Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 4 Jan 2022 13:29:48 -0500 Subject: remove lsb-release --- newmoon/debian/control | 1 - newmoon/debian/newmoon+devuan.dsc | 2 +- newmoon/debian/rules | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'newmoon') diff --git a/newmoon/debian/control b/newmoon/debian/control index 7d167fd..29a09a3 100644 --- a/newmoon/debian/control +++ b/newmoon/debian/control @@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 12), libssl-dev, libx11-xcb-dev, libxt-dev, - lsb-release, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), diff --git a/newmoon/debian/newmoon+devuan.dsc b/newmoon/debian/newmoon+devuan.dsc index 5485498..53f3d03 100644 --- a/newmoon/debian/newmoon+devuan.dsc +++ b/newmoon/debian/newmoon+devuan.dsc @@ -6,7 +6,7 @@ Version: 29.4.3-1+devuan Maintainer: B. Stack Homepage: http://www.palemoon.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), gcc (<< 11) | gcc-10, g++ (<< 11) | g++-10, autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip, lsb-release +Build-Depends: debhelper (>= 12), gcc (<< 11) | gcc-10, g++ (<< 11) | g++-10, autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip Package-List: newmoon deb web optional arch=any Files: diff --git a/newmoon/debian/rules b/newmoon/debian/rules index d93a6a0..89ddd3f 100755 --- a/newmoon/debian/rules +++ b/newmoon/debian/rules @@ -5,13 +5,13 @@ export SHELL=/bin/bash ## borrowed from stevepusser's logic ## Build with gcc-10 on releases where default gcc is 11 ## If you enable this, then d/control needs lsb-release as a build dependency. -distrelease := $(shell lsb_release -cs) -ifeq ($(distrelease),$(filter $(distrelease),sid beowulf/ceres)) +#distrelease := $(shell lsb_release -cs) +#ifeq ($(distrelease),$(filter $(distrelease),sid beowulf/ceres)) export CC=gcc-10 export CXX=g++-10 export CPP=cpp-10 export LD=gcc-10 -endif +#endif export MCFILE=debian/mozconfig -- cgit