From c8aa4ea0aa610b337ccbcbbdaec205b11c9e7b60 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Wed, 2 Oct 2019 18:35:10 +0700 Subject: [PATCH] browser, regular.mk: drop palemoon ...it's no more in Sisyphus too: See-also: http://git.altlinux.org/tasks/archive/done/_232/238525 --- conf.d/regular.mk | 2 +- features.in/browser/config.mk | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 20feb828..9a242cb4 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -117,7 +117,7 @@ distro/regular-icewm: distro/.regular-sysv-gtk mixin/regular-icewm \ # wdm can't do autologin so add standalone one for livecd distro/regular-wmaker: distro/.regular-sysv \ - mixin/regular-wmaker use/live/autologin use/browser/palemoon/i18n + mixin/regular-wmaker use/live/autologin @$(call add,LIVE_PACKAGES,wdm wmxkbru) distro/regular-gnustep: distro/.regular-sysv \ diff --git a/features.in/browser/config.mk b/features.in/browser/config.mk index f8950aea..2e3f5abf 100644 --- a/features.in/browser/config.mk +++ b/features.in/browser/config.mk @@ -14,17 +14,6 @@ use/browser/seamonkey use/browser/netsurf \ use/browser/%: use/browser @$(call set,THE_BROWSER,$*) -ifeq (,$(filter-out i586 x86_64,$(ARCH))) -use/browser/palemoon: use/browser - @$(call set,THE_BROWSER,$*) - -use/browser/palemoon/i18n: use/browser/palemoon - @$(call add,THE_BROWSER,palemoon-ru) -else -use/browser/palemoon: use/browser/firefox; @: -use/browser/palemoon/i18n: use/browser/palemoon; @: -endif - # the complete lack of dependencies is intentional use/browser/firefox/esr: @$(call set,FX_FLAVOUR,-esr)