This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 60a5332914fcaccaa05c9d2ef9934182770f1a17 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 18 03:12:26 2019 +0100 debian/installer/Makefile.in: switch some hardcoded places to use $(MOZ_BUILD_APP), some other places to hardcoded filename extensions and drop the (hopefully unneeded) replacement magic - with an explanative comment. --- debian/changelog | 4 ++++ debian/installer/Makefile.in | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1cb749e..055a569 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium * debian/rules: - --build parameter not supported by configure any longer, replaced by --target. + * debian/installer/Makefile.in: + - Switch some hardcoded places to use $(MOZ_BUILD_APP), some other places + to hardcoded filename extensions and drop the (hopefully unneeded) + replacement magic - with an explanative comment. -- Mihai Moldovan <ionic@ionic.de> Thu, 31 Jan 2019 01:36:58 +0100 diff --git a/debian/installer/Makefile.in b/debian/installer/Makefile.in index f0c476f..f66cfa5 100644 --- a/debian/installer/Makefile.in +++ b/debian/installer/Makefile.in @@ -9,10 +9,18 @@ STANDALONE_MAKEFILE := 1 include $(topsrcdir)/config/rules.mk -DEFINES += $(shell $(MAKE) --no-print-directory -C $(DEPTH)/../build-palemoon/browser/installer DEPTH="$(abspath $(DEPTH))" topsrcdir="$(abspath $(topsrcdir))" srcdir='$(topsrcdir)/browser/installer' VPATH='$(srcdir)' echo-variable-DEFINES | sed 's/"/\\"/g') +DEFINES += $(shell $(MAKE) --no-print-directory -C $(DEPTH)/../build-palemoon/$(MOZ_BUILD_APP)/installer DEPTH="$(abspath $(DEPTH))" topsrcdir="$(abspath $(topsrcdir))" srcdir='$(topsrcdir)/$(MOZ_BUILD_APP)/installer' VPATH='$(srcdir)' echo-variable-DEFINES | sed 's/"/\\"/g') -package-manifest: $(topsrcdir)/browser/installer/package-manifest.in $(srcdir)/package-manifest.$(MOZ_BUILD_APP) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) $^ | sed 's/^\[browser\]/[$(MOZ_BUILD_APP)]/' > $@ +# FIXME: Debian packaging uses $(MOZ_BUILD_APP) instead of hardcoding the "browser" extension +# and a call to sed 's/^\[browser\]/[$(MOZ_BUILD_APP)]/' to transform sections into the +# "correct" internal application name. +# In PM builds, $(MOZ_BUILD_APP) will evaluate to "application/palemoon" nowadays, so we +# cannot use that as part of path values (at least not for extensions). +# Furthermore, the replacement command doesn't actually replace anything under normal +# circumstances, since in Firefox builds $(MOZ_BUILD_APP) evaluates to just "browser". +# Let's hope we can just drop it and hardcode the name. +package-manifest: $(topsrcdir)/$(MOZ_BUILD_APP)/installer/package-manifest.in $(srcdir)/package-manifest.browser + $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) $^ > $@ GARBAGE += package-manifest -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git