[X2Go-Commits] [pale-moon] 199/216: debian/rules: add ICU_DATA_FILE with a stub value, preprocessing palemoon.install.in fails otherwise.
git-admin at x2go.org
git-admin at x2go.org
Sat Feb 16 02:43:33 CET 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pale-moon.
commit d4f80d993141d6edf38dd97b3233b9372d752f6a
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Sep 24 00:33:18 2018 +0200
debian/rules: add ICU_DATA_FILE with a stub value, preprocessing palemoon.install.in fails otherwise.
---
debian/changelog | 2 ++
debian/rules | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 33aed7e..e6092d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -187,6 +187,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
branding. This is a Palemoon-imposed restriction.
- Use old sed rule for MOZ_APP_REMOTINGNAME change - config.status is
still a python script in Palemoon.
+ - Add ICU_DATA_FILE with a stub value, preprocessing palemoon.install.in
+ fails otherwise.
* 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 ec29c0f..c3ffae1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,7 +113,9 @@ endif
CXXFLAGS = $(CFLAGS)
-EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MOZILLA_OFFICIAL
+ICU_DATA_FILE = stub
+
+EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MOZILLA_OFFICIAL ICU_DATA_FILE
$(call lazy,CONFIGURE_ENV,$$(foreach export,$(EXPORTS),$$(export)="$$($$(export))"))
IN_FILES := $(wildcard debian/*.in)
@@ -129,7 +131,7 @@ debian/control: debian/rules debian/changelog
DICT_DIR := /usr/share/hunspell
-$(PREPROCESSED_FILES): VARS = UPSTREAM_VERSION DICT_DIR MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) GTK3 DIST CRASH_REPORTER RUST BUILD_RUST DEB_BUILD_ARCH
+$(PREPROCESSED_FILES): VARS = UPSTREAM_VERSION DICT_DIR MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) GTK3 DIST ICU_DATA_FILE CRASH_REPORTER RUST BUILD_RUST DEB_BUILD_ARCH
$(PREPROCESSED_FILES):
$(PYTHON) python/mozbuild/mozbuild/preprocessor.py --marker % -Fsubstitution $(foreach var,$(VARS),-D$(var)="$($(var))" )$< > $@
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
More information about the x2go-commits
mailing list