[X2Go-Commits] [pale-moon] 122/216: debian/rules: use UPSTREAM_VERSION instead of GRE_VERSION, since GRE_VERSION is not used within Palemoon (and refers to the Goanna version).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit 34fa10175568a58302b3bb8119e16dd9b0893c51
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Sep 21 04:14:21 2018 +0200

    debian/rules: use UPSTREAM_VERSION instead of GRE_VERSION, since GRE_VERSION is not used within Palemoon (and refers to the Goanna version).
---
 debian/changelog | 2 ++
 debian/rules     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c51fe8..a580f12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -110,6 +110,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
       supported.
     - Remove GENSYMBOLS_FLAGS setting, the source code doesn't even use it.
     - Export MOZILLA_OFFICIAL variable.
+    - Use UPSTREAM_VERSION instead of GRE_VERSION, since GRE_VERSION is not
+      used within Palemoon (and refers to the Goanna version).
   * 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 e415522..3607a78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS MOZILLA_OFFICIAL
 $(call lazy,CONFIGURE_ENV,$$(foreach export,$(EXPORTS),$$(export)="$$($$(export))"))
 
 IN_FILES := $(wildcard debian/*.in)
-preprocessed_filename = $(subst GRE_VERSION,$(GRE_VERSION),$(1:.in=))
+preprocessed_filename = $(subst UPSTREAM_VERSION,$(UPSTREAM_VERSION),$(1:.in=))
 define preprocess
 $(call preprocessed_filename,$(1)): $(1)
 PREPROCESSED_FILES += $(call preprocessed_filename,$(1))
@@ -118,7 +118,7 @@ $(foreach f,$(IN_FILES),$(eval $(call preprocess, $(f))))
 GENERATED_FILES += $(PREPROCESSED_FILES)
 debian/control: debian/rules debian/changelog
 
-$(PREPROCESSED_FILES): VARS = GRE_VERSION MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) GTK3 DIST CRASH_REPORTER RUST BUILD_RUST DEB_BUILD_ARCH
+$(PREPROCESSED_FILES): VARS = UPSTREAM_VERSION MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) GTK3 DIST 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