This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pale-moon. from 1a94baa debian/patches: add new patch for hopefully filtering out the addonsInfo files from the general "browser" section, which in PM sadly uses a wildcard to include all files below the components/ directory. new 99c6845 debian/patches: remove patch to remove addonsInfo files from the general "browser" section. new e0f577e debian/: remove debian/installer modifications. new 1692654 debian/patches: remove installer modification integration into the upstream build system. new 8732d9a debian/rules: no need to generate a special manifest file and use it any longer. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 ++++++++ debian/installer/Makefile.in | 27 ---------------------- debian/installer/package-manifest.browser | 3 --- ...am-build-system-create-debian-installer-M.patch | 17 -------------- .../Remove-AddonsInfo-from-browser-section.patch | 11 --------- debian/patches/series | 2 -- debian/rules | 3 +-- 7 files changed, 11 insertions(+), 62 deletions(-) delete mode 100644 debian/installer/Makefile.in delete mode 100644 debian/installer/package-manifest.browser delete mode 100644 debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch delete mode 100644 debian/patches/debian-hacks/Remove-AddonsInfo-from-browser-section.patch -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 99c68455c57fd01a290ea07f57cf5847edd16f03 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 22 06:22:32 2019 +0100 debian/patches: remove patch to remove addonsInfo files from the general "browser" section. While the file's documentation mentions that specific paths can be removed, this operation is actually not implemented and doing so would be difficult to accomplish. --- debian/changelog | 4 ++++ .../debian-hacks/Remove-AddonsInfo-from-browser-section.patch | 11 ----------- debian/patches/series | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index e87765e..7ad6f5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,10 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium - Add new patch for hopefully filtering out the addonsInfo files from the general "browser" section, which in PM sadly uses a wildcard to include all files below the components/ directory. + - Remove patch to remove addonsInfo files from the general "browser" + section. While the file's documentation mentions that specific paths can + be removed, this operation is actually not implemented and doing so + would be difficult to accomplish. -- Mihai Moldovan <ionic@ionic.de> Thu, 31 Jan 2019 01:36:58 +0100 diff --git a/debian/patches/debian-hacks/Remove-AddonsInfo-from-browser-section.patch b/debian/patches/debian-hacks/Remove-AddonsInfo-from-browser-section.patch deleted file mode 100644 index 82128af..0000000 --- a/debian/patches/debian-hacks/Remove-AddonsInfo-from-browser-section.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/application/palemoon/installer/package-manifest.in -+++ b/application/palemoon/installer/package-manifest.in -@@ -144,6 +144,8 @@ - - ; [Components] - @RESPATH@/components/* -+-@RESPATH@/components/addonsInfo.js -+-@RESPATH@/components/addonsInfo.manifest - @RESPATH@/browser/components/* - #ifdef MOZ_ARTIFACT_BUILDS - #endif diff --git a/debian/patches/series b/debian/patches/series index 3aeb1ca..0c0ca9f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch -debian-hacks/Remove-AddonsInfo-from-browser-section.patch -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit e0f577e211088c0df4f0eeca0e10b85578d5f873 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 22 06:27:42 2019 +0100 debian/: remove debian/installer modifications. We do not need this, since upstream uses a globbing mechanism that will pick up any files we throw at the build automatically. --- debian/changelog | 3 +++ debian/installer/Makefile.in | 27 --------------------------- debian/installer/package-manifest.browser | 3 --- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7ad6f5a..0983a24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium - Replace palemoon.desktop with upstream file (i.e., copy). - Merge in changes from downstream Debian packaging. Remove obsolete splice patch file. + - Remove debian/installer modifications. We do not need this, since + upstream uses a globbing mechanism that will pick up any files we throw + at the build automatically. * debian/control.in: - Fix syntax error. * debian/upstream.mk: diff --git a/debian/installer/Makefile.in b/debian/installer/Makefile.in deleted file mode 100644 index f66cfa5..0000000 --- a/debian/installer/Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -STANDALONE_MAKEFILE := 1 - -include $(topsrcdir)/config/rules.mk - -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') - -# 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 - -libs:: package-manifest diff --git a/debian/installer/package-manifest.browser b/debian/installer/package-manifest.browser deleted file mode 100644 index 50392f3..0000000 --- a/debian/installer/package-manifest.browser +++ /dev/null @@ -1,3 +0,0 @@ -[debian] -bin/components/addonsInfo.js -bin/components/addonsInfo.manifest -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 16926546342708e4541e896a338cc3f87ed146a4 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 22 06:28:54 2019 +0100 debian/patches: remove installer modification integration into the upstream build system. --- debian/changelog | 2 ++ ...pstream-build-system-create-debian-installer-M.patch | 17 ----------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0983a24..b524fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium section. While the file's documentation mentions that specific paths can be removed, this operation is actually not implemented and doing so would be difficult to accomplish. + - Remove installer modification integration into the upstream build + system. -- Mihai Moldovan <ionic@ionic.de> Thu, 31 Jan 2019 01:36:58 +0100 diff --git a/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch b/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch deleted file mode 100644 index b97b48f..0000000 --- a/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Mike Hommey <mh@glandium.org> -Date: Mon, 16 Dec 2013 11:11:13 +0900 -Subject: Make upstream build system create debian/installer/Makefile - ---- - moz.build | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/moz.build -+++ b/moz.build -@@ -88,4 +88,6 @@ if not CONFIG['JS_STANDALONE'] and CONFI - if not CONFIG['LIBXUL_SDK']: - DIRS += ['debian/extra-stuff'] - -+CONFIGURE_SUBST_FILES += ['debian/installer/Makefile'] -+ - include('build/templates.mozbuild') diff --git a/debian/patches/series b/debian/patches/series index 0c0ca9f..0e06003 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch -debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 8732d9a463480c657b4bbc326f255cb58f0fdb6c Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 22 06:29:58 2019 +0100 debian/rules: no need to generate a special manifest file and use it any longer. --- debian/changelog | 1 + debian/rules | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b524fa2..dd31ba9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium * debian/rules: - --build parameter not supported by configure any longer, replaced by --target. + - No need to generate a special manifest file and use it any longer. * 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) diff --git a/debian/rules b/debian/rules index c74a574..acf9a2f 100755 --- a/debian/rules +++ b/debian/rules @@ -229,12 +229,11 @@ debian/mozilla-nspr.pc: VARS += NSPR_VERSION debian/mozilla-nspr.pc: stamps/build-palemoon endif -stamps/install-palemoon:: build-palemoon/debian/installer/package-manifest +stamps/install-palemoon:: ifneq (,$(filter mips,$(DEB_BUILD_ARCH))) sed -i '/"javascript.options.\(baselinejit\|ion\)"/s/true/false/' build-palemoon/dist/bin/greprefs.js || : endif dh_auto_install --builddirectory=build-palemoon -- installdir=$(LIB_DIR) \ - MOZ_PKG_MANIFEST=$(CURDIR)/$< \ MOZ_NONLOCALIZED_PKG_LIST="xpcom debian" \ MOZ_LOCALIZED_PKG_LIST=en-US \ TAR_CREATE_FLAGS="--exclude=.mkdir.done --hard-dereference -chf" \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
-
git-admin＠x2go.org