This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pale-moon. from 4c899e0 debian/patches: refresh. new 65c633d debian/rules: move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel to harmonize the base. new e529cb7 debian/installer/Makefile.in: fix build-browser to build-palemoon. new 00c1044 debian/rules: fixup comment grammar for last change. new f3689f7 debian/rules: handle include files by moving the versionated /usr/include/palemoon-$VER directory to /usr/include/palemoon and afterwards its contents to /usr/lib/palemoon-devel/include/. new 6f331da debian/rules: replace hardcoded locations with $(LIB_DIR). The 5 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 | 9 +++++++++ debian/installer/Makefile.in | 2 +- debian/rules | 37 +++++++++++++++++++++++++------------ 3 files changed, 35 insertions(+), 13 deletions(-) -- 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 65c633d3f97752dfe09dc056905dfbae86c87733 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Sep 17 02:03:38 2018 +0200 debian/rules: move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel to harmonize the base. --- debian/changelog | 2 ++ debian/rules | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index f7b8a07..95c6ca6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -77,6 +77,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Generate configure files correctly, since we're actually using a nightly-based source. - Add rule for package-manifest generation. + - Move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel + to harmonize the base. * 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 b1e23ed..3c2475e 100755 --- a/debian/rules +++ b/debian/rules @@ -190,6 +190,13 @@ endif TAR_CREATE_FLAGS="--exclude=.mkdir.done --hard-dereference -chf" \ SIGN_NSS= + # SDK stuff is typically installed into a versioned directory, but we don't need this additional complexity. + # Additionally, Mozilla stopped bundling SDKs as part of the XUL/XPCOM deprecation in favor of WebExtensions, so if PM decided to follow this path, we can easily drop the -dev package, too. + # For now, just move content over to the palemoon-devel directory. + mkdir -p debian/tmp/$(LIB_DIR)-devel + mv debian/tmp/$(LIB_DIR)-devel-*/* debian/tmp/$(LIB_DIR)-devel/ + rmdir debian/tmp/$(LIB_DIR)-devel-* + # Fixup permissions find debian/tmp/usr/share debian/tmp/usr/include -type f -print0 | xargs -0 chmod 644 chmod +x debian/tmp/usr/lib/palemoon-devel/sdk/bin/xpcshell || : # Failure not fatal since we might not have this file. -- 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 e529cb776b4369264ada3c19aeb42829ce0de4a1 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Sep 17 02:07:34 2018 +0200 debian/installer/Makefile.in: fix build-browser to build-palemoon. --- debian/changelog | 2 ++ debian/installer/Makefile.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 95c6ca6..61eaeb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Ignore autogenerated ChangeLog.gitlog file. * debian/patches: - Refresh. + * debian/installer/Makefile.in: + - Fix build-browser to build-palemoon. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 diff --git a/debian/installer/Makefile.in b/debian/installer/Makefile.in index 67cc642..f0c476f 100644 --- a/debian/installer/Makefile.in +++ b/debian/installer/Makefile.in @@ -9,7 +9,7 @@ STANDALONE_MAKEFILE := 1 include $(topsrcdir)/config/rules.mk -DEFINES += $(shell $(MAKE) --no-print-directory -C $(DEPTH)/../build-browser/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/browser/installer DEPTH="$(abspath $(DEPTH))" topsrcdir="$(abspath $(topsrcdir))" srcdir='$(topsrcdir)/browser/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)]/' > $@ -- 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 00c1044eb91e1336df954fb900af405889f9cd0b Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Sep 17 04:00:07 2018 +0200 debian/rules: fixup comment grammar for last change. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 61eaeb2..e21c69a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -79,6 +79,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add rule for package-manifest generation. - Move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel to harmonize the base. + - Fixup comment grammar for last change. * 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 3c2475e..d2b90b5 100755 --- a/debian/rules +++ b/debian/rules @@ -192,7 +192,7 @@ endif # SDK stuff is typically installed into a versioned directory, but we don't need this additional complexity. # Additionally, Mozilla stopped bundling SDKs as part of the XUL/XPCOM deprecation in favor of WebExtensions, so if PM decided to follow this path, we can easily drop the -dev package, too. - # For now, just move content over to the palemoon-devel directory. + # For now, just move the versioned content over to the palemoon-devel directory. mkdir -p debian/tmp/$(LIB_DIR)-devel mv debian/tmp/$(LIB_DIR)-devel-*/* debian/tmp/$(LIB_DIR)-devel/ rmdir debian/tmp/$(LIB_DIR)-devel-* -- 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 f3689f7fe42e069da42e5f57fa59dac03e76e3bc Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Sep 17 04:05:22 2018 +0200 debian/rules: handle include files by moving the versionated /usr/include/palemoon-$VER directory to /usr/include/palemoon and afterwards its contents to /usr/lib/palemoon-devel/include/. --- debian/changelog | 3 +++ debian/rules | 26 ++++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index e21c69a..93d69ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,9 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel to harmonize the base. - Fixup comment grammar for last change. + - Handle include files by moving the versionated + /usr/include/palemoon-$VER directory to /usr/include/palemoon and + afterwards its contents to /usr/lib/palemoon-devel/include/. * 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 d2b90b5..a504aa0 100755 --- a/debian/rules +++ b/debian/rules @@ -190,15 +190,24 @@ endif TAR_CREATE_FLAGS="--exclude=.mkdir.done --hard-dereference -chf" \ SIGN_NSS= + # Palemoon-specific hacks. + # SDK stuff is typically installed into a versioned directory, but we don't need this additional complexity. # Additionally, Mozilla stopped bundling SDKs as part of the XUL/XPCOM deprecation in favor of WebExtensions, so if PM decided to follow this path, we can easily drop the -dev package, too. # For now, just move the versioned content over to the palemoon-devel directory. + # Likewise for the include files. mkdir -p debian/tmp/$(LIB_DIR)-devel mv debian/tmp/$(LIB_DIR)-devel-*/* debian/tmp/$(LIB_DIR)-devel/ rmdir debian/tmp/$(LIB_DIR)-devel-* + mv debian/tmp/usr/include/palemoon-* debian/tmp/usr/include/palemoon + + # Stage headers into $(LIB_DIR)-devel/include. + install -d -m 755 debian/tmp$(LIB_DIR)-devel/include + mv debian/tmp/usr/include/palemoon/* debian/tmp$(LIB_DIR)-devel/include/ + rmdir debian/tmp/usr/include/palemoon # Fixup permissions - find debian/tmp/usr/share debian/tmp/usr/include -type f -print0 | xargs -0 chmod 644 + find debian/tmp/usr/share debian/tmp/$(LIB_DIR)-devel/include -type f -print0 | xargs -0 chmod 644 chmod +x debian/tmp/usr/lib/palemoon-devel/sdk/bin/xpcshell || : # Failure not fatal since we might not have this file. # Replace some installed files by symlinks @@ -212,25 +221,22 @@ endif done ifneq (,$(USE_SYSTEM_NSPR)$(USE_SYSTEM_NSS)) - # FIXME: this needs to be updated to work on debian/tmp$(LIB_DIR)-devel. - for f in $(if $(USE_SYSTEM_NSPR),/usr/include/nspr/*) $(if $(USE_SYSTEM_NSS),/usr/include/nss/*); do \ - ln -s $$f debian/tmp/usr/include/palemoon/$$(basename $$f); \ + for f in $(if $(USE_SYSTEM_NSPR),/usr/include/nspr/*); do \ + ln -s $$f debian/tmp/$(LIB_DIR)-devel/include/nspr/$$(basename $$f); \ + done + for f in $(if $(USE_SYSTEM_NSS),/usr/include/nss/*); do \ + ln -s $$f debian/tmp/$(LIB_DIR)-devel/include/nss/$$(basename $$f); \ done endif - # FIXME: this needs to be updated to work on debian/tmp$(LIB_DIR)-devel. for h in $$(grep -l -r EXPORTS build-palemoon/media | grep Makefile$ | \ while read f; do $(MAKE) --no-print-directory -C $$(dirname $$f) echo-variable-EXPORTS echo-variable-EXPORTS_NAMESPACES; done); do \ - rm -rf debian/tmp/usr/include/palemoon/$$h; \ + rm -rf debian/tmp/$(LIB_DIR)-devel/include/$$h; \ done -TZ=UTC unzip -d debian/tmp$(LIB_DIR)/browser debian/tmp$(LIB_DIR)/browser/omni.ja 'defaults/preferences/*' # Palemoon-specific hacks. - # Stage headers into $(LIB_DIR)-devel/include. - install -d -m 755 debian/tmp$(LIB_DIR)-devel/include - mv debian/tmp/usr/include/palemoon debian/tmp$(LIB_DIR)-devel/include/ - # Stage idl into $(LIB_DIR)-devel/share. install -d -m 755 debian/tmp$(LIB_DIR)-devel/share mv debian/tmp/usr/share/idl debian/tmp$(LIB_DIR)-devel/share/ -- 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 6f331da111a4c7f5d9f64d4a6977559341bf50b0 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Sep 17 04:06:34 2018 +0200 debian/rules: replace hardcoded locations with $(LIB_DIR). --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93d69ef..7260092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Handle include files by moving the versionated /usr/include/palemoon-$VER directory to /usr/include/palemoon and afterwards its contents to /usr/lib/palemoon-devel/include/. + - Replace hardcoded locations with $(LIB_DIR). * 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 a504aa0..2fbd47b 100755 --- a/debian/rules +++ b/debian/rules @@ -208,11 +208,11 @@ endif # Fixup permissions find debian/tmp/usr/share debian/tmp/$(LIB_DIR)-devel/include -type f -print0 | xargs -0 chmod 644 - chmod +x debian/tmp/usr/lib/palemoon-devel/sdk/bin/xpcshell || : # Failure not fatal since we might not have this file. + chmod +x debian/tmp/$(LIB_DIR)-devel/sdk/bin/xpcshell || : # Failure not fatal since we might not have this file. # Replace some installed files by symlinks for d in lib bin; do \ - cd "$(CURDIR)/debian/tmp/usr/lib/palemoon-devel/sdk/$$d"; \ + cd "$(CURDIR)/debian/tmp/$(LIB_DIR)-devel/sdk/$$d"; \ for f in *; do \ if [ -f "$(CURDIR)/debian/tmp$(LIB_DIR)/$$f" ]; then \ rm -f $$f ; ln -s $(LIB_DIR)/$$f $$f; \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
-
git-admin＠x2go.org