This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 2368cfef3cd957050210465d54c78fa3f545cc38 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 05:12:00 2018 +0200 debian/rules: move branding and remotingname variables up a few hunks. --- debian/changelog | 1 + debian/rules | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae6cee1..86168d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add branding stubs. - Add MOZ_APP_REMOTINGNAME. - Enhance configure phase with branding options and the remotingname hack. + - Move branding and remotingname variables up a few hunks. * debian/mozconfig: - Remove autoconf flags that should better be handled by debian/rules. * debian/make.mk: diff --git a/debian/rules b/debian/rules index d5d0852..abec09d 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,14 @@ $(call lazy,DEB_BUILD_ARCH_ENDIAN,$$(shell dpkg-architecture -qDEB_BUILD_ARCH_EN export SHELL=/bin/bash +OFFICIAL_BRANDING := browser/branding/official +MOZILLA_OFFICIAL := 1 +BRANDING ?= $(OFFICIAL_BRANDING) + +BRANDING_CONFIGURE_FLAG = $(if $(filter $(BRANDING),$(OFFICIAL_BRANDING)),--enable-official-branding,--with-branding=$(BRANDING)) + +MOZ_APP_REMOTINGNAME := $(call uc_first,$($(PRODUCT))) + LIB_DIR := /usr/lib/palemoon LDFLAGS := -Wl,--as-needed @@ -40,14 +48,6 @@ export CPP=cpp-4.9 export LD=gcc-4.9 endif -OFFICIAL_BRANDING := browser/branding/official -MOZILLA_OFFICIAL := 1 -BRANDING ?= $(OFFICIAL_BRANDING) - -BRANDING_CONFIGURE_FLAG = $(if $(filter $(BRANDING),$(OFFICIAL_BRANDING)),--enable-official-branding,--with-branding=$(BRANDING)) - -MOZ_APP_REMOTINGNAME := $(call uc_first,$($(PRODUCT))) - AUTOCONF_DIRS := build/autoconf js/src/build/autoconf ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git