This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pale-moon. from 17c6ecb debian/rules: generate configure files correctly, since we're actually using a nightly-based source. new 1a29ed6 debian/rules: add rule for package-manifest generation. new 640c875 debian/: new directory "installer" with package-manifest data for extra installation files. new 67bc8da debian/: new directory "extra-stuff" containing Debian-specific additions (currently only addonsInfo). new 1fff1ec debian/: new directory "patches" populated with Debian-specific copied patches. new 4c899e0 debian/patches: refresh. 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 | 8 ++ .../contents.rdf => debian/extra-stuff/Makefile.in | 0 debian/extra-stuff/addonsInfo.js | 108 +++++++++++++++++++++ debian/extra-stuff/addonsInfo.manifest | 3 + debian/extra-stuff/moz.build | 1 + debian/installer/Makefile.in | 19 ++++ debian/installer/package-manifest.browser | 3 + ...extra-stuff-to-upstream-build-system-dire.patch | 18 ++++ ...am-build-system-create-debian-installer-M.patch | 17 ++++ debian/patches/series | 3 + debian/rules | 3 + 11 files changed, 183 insertions(+) copy xulrunner/examples/simple/content/contents.rdf => debian/extra-stuff/Makefile.in (100%) create mode 100644 debian/extra-stuff/addonsInfo.js create mode 100644 debian/extra-stuff/addonsInfo.manifest create mode 100644 debian/extra-stuff/moz.build create mode 100644 debian/installer/Makefile.in create mode 100644 debian/installer/package-manifest.browser create mode 100644 debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch create mode 100644 debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch create mode 100644 debian/patches/series -- 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 1a29ed661ffdcab63972abbb47716ea0bd55e482 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 31 05:37:23 2018 +0200 debian/rules: add rule for package-manifest generation. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb42b71..ccddf30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium needle strings match, so change the filter call parameter order. - Generate configure files correctly, since we're actually using a nightly-based source. + - Add rule for package-manifest generation. * 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 58d45a7..b1e23ed 100755 --- a/debian/rules +++ b/debian/rules @@ -96,6 +96,9 @@ CXXFLAGS = $(CFLAGS) EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS $(call lazy,CONFIGURE_ENV,$$(foreach export,$(EXPORTS),$$(export)="$$($$(export))")) +%/package-manifest: + $(MAKE) -C $* + override_dh_auto_configure: stamps/prepare-configure:: stamps/dummy -- 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 640c8752f3fc911c8f304a8882f72bb01a558101 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 31 05:38:29 2018 +0200 debian/: new directory "installer" with package-manifest data for extra installation files. --- debian/changelog | 2 ++ debian/installer/Makefile.in | 19 +++++++++++++++++++ debian/installer/package-manifest.browser | 3 +++ 3 files changed, 24 insertions(+) diff --git a/debian/changelog b/debian/changelog index ccddf30..8e95df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add new palemoon-dev.install file. - Add noinstall file. Without preprocessing. - Add very stripped-down upstream.mk file. + - New directory "installer" with package-manifest data for extra + installation files. * debian/changelog: - Change repack-1 in version string to repack1 because a dash denotes the start of a downstream change. diff --git a/debian/installer/Makefile.in b/debian/installer/Makefile.in new file mode 100644 index 0000000..67cc642 --- /dev/null +++ b/debian/installer/Makefile.in @@ -0,0 +1,19 @@ +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-browser/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)]/' > $@ + +GARBAGE += package-manifest + +libs:: package-manifest diff --git a/debian/installer/package-manifest.browser b/debian/installer/package-manifest.browser new file mode 100644 index 0000000..50392f3 --- /dev/null +++ b/debian/installer/package-manifest.browser @@ -0,0 +1,3 @@ +[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 1fff1ecccb29f8017d8aaa20f899d58ff2875136 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 31 05:41:30 2018 +0200 debian/: new directory "patches" populated with Debian-specific copied patches. --- debian/changelog | 1 + ...n-extra-stuff-to-upstream-build-system-dire.patch | 20 ++++++++++++++++++++ ...ream-build-system-create-debian-installer-M.patch | 19 +++++++++++++++++++ debian/patches/series | 3 +++ 4 files changed, 43 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2a373ec..ab9843e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium installation files. - New directory "extra-stuff" containing Debian-specific additions (currently only addonsInfo). + - New directory "patches" populated with Debian-specific copied patches. * debian/changelog: - Change repack-1 in version string to repack1 because a dash denotes the start of a downstream change. diff --git a/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch new file mode 100644 index 0000000..7a98fa4 --- /dev/null +++ b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch @@ -0,0 +1,20 @@ +From: Mike Hommey <mh@glandium.org> +Date: Mon, 16 Dec 2013 10:53:58 +0900 +Subject: Add debian/extra-stuff to upstream build system directory traversal + +--- + moz.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/moz.build b/moz.build +index fee89428deea..0eff8b810f05 100644 +--- a/moz.build ++++ b/moz.build +@@ -86,4 +86,7 @@ if not CONFIG['JS_STANDALONE'] and CONFIG['MOZ_BUILD_APP']: + + CONFIGURE_SUBST_FILES += ['.cargo/config'] + ++if not CONFIG['LIBXUL_SDK']: ++ DIRS += ['debian/extra-stuff'] ++ + include('build/templates.mozbuild') 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 new file mode 100644 index 0000000..0377a8f --- /dev/null +++ b/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch @@ -0,0 +1,19 @@ +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(+) + +diff --git a/moz.build b/moz.build +index 0eff8b810f05..0d6658691925 100644 +--- a/moz.build ++++ b/moz.build +@@ -89,4 +89,6 @@ CONFIGURE_SUBST_FILES += ['.cargo/config'] + 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 new file mode 100644 index 0000000..0c0ca9f --- /dev/null +++ b/debian/patches/series @@ -0,0 +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 + -- 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 67bc8da8d9acbc768b3b55dcde5cd8c16c31b447 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 31 05:39:48 2018 +0200 debian/: new directory "extra-stuff" containing Debian-specific additions (currently only addonsInfo). --- debian/changelog | 2 + debian/extra-stuff/Makefile.in | 0 debian/extra-stuff/addonsInfo.js | 108 +++++++++++++++++++++++++++++++++ debian/extra-stuff/addonsInfo.manifest | 3 + debian/extra-stuff/moz.build | 1 + 5 files changed, 114 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8e95df6..2a373ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,6 +88,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add very stripped-down upstream.mk file. - New directory "installer" with package-manifest data for extra installation files. + - New directory "extra-stuff" containing Debian-specific additions + (currently only addonsInfo). * debian/changelog: - Change repack-1 in version string to repack1 because a dash denotes the start of a downstream change. diff --git a/debian/extra-stuff/Makefile.in b/debian/extra-stuff/Makefile.in new file mode 100644 index 0000000..e69de29 diff --git a/debian/extra-stuff/addonsInfo.js b/debian/extra-stuff/addonsInfo.js new file mode 100644 index 0000000..42d76b8 --- /dev/null +++ b/debian/extra-stuff/addonsInfo.js @@ -0,0 +1,108 @@ +const Cc = Components.classes; +const Ci = Components.interfaces; +Components.utils.import("resource://gre/modules/Services.jsm"); +Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); +Components.utils.import("resource://gre/modules/AddonManager.jsm"); + +function compare(a, b) { + return String.localeCompare(a.name, b.name); +} + +function dumper() {} +dumper.prototype = { + close: function() { }, + writeString: function(str) { + dump(str); + } +}; + +function dump_addons(out) { + var addons = false; + AddonManager.getAllAddons(function(aAddons) { + addons = aAddons; + }); + + var thread = Services.tm.currentThread; + while (addons == false) { + thread.processNextEvent(true); + } + + addons.sort(compare); + out.writeString("-- Extensions information\n"); + addons.forEach(function(extension) { + if (extension.type == "plugin") + return; + out.writeString("Name: " + extension.name); + if (extension.type != "extension") + out.writeString(" " + extension.type); + out.writeString("\n"); + if (extension.getResourceURI) { + var location = extension.getResourceURI("").QueryInterface(Ci.nsIFileURL).file; + if (extension.scope == AddonManager.SCOPE_PROFILE) + out.writeString("Location: ${PROFILE_EXTENSIONS}/" + + location.leafName + "\n"); + else + out.writeString("Location: " + location.path + "\n"); + } + out.writeString("Status: " + (extension.appDisabled ? "app-disabled" : + (extension.userDisabled ? "user-disabled" : + "enabled")) + "\n"); + out.writeString("\n"); + }); + + var phs = Cc["@mozilla.org/plugin/host;1"] + .getService(Ci.nsIPluginHost); + var plugins = phs.getPluginTags({ }); + plugins.sort(compare); + out.writeString("-- Plugins information\n"); + plugins.forEach(function(plugin) { + out.writeString("Name: " + plugin.name + + (plugin.version ? " (" + plugin.version + ")" : "") + "\n"); + out.writeString("Location: " + + (plugin.fullpath ? plugin.fullpath : plugin.filename) + "\n"); + out.writeString("Status: " + (plugin.disabled ? "disabled" : "enabled") + + (plugin.blocklisted ? " blocklisted" : "") + "\n"); + out.writeString("\n"); + }); +} + +function addonsInfoHandler() {} +addonsInfoHandler.prototype = { + handle: function clh_handle(cmdLine) { + var path; + var out; + try { + path = cmdLine.handleFlagWithParam("dump-addons-info", false); + if (!path) + return; + } catch(e) { + if (!cmdLine.handleFlag("dump-addons-info", false)) + return; + } + + cmdLine.preventDefault = true; + + if (path) { + var file = Cc["@mozilla.org/file/local;1"] + .createInstance(Ci.nsILocalFile); + file.initWithPath(path); + var outstream = Cc["@mozilla.org/network/file-output-stream;1"] + .createInstance(Ci.nsIFileOutputStream); + outstream.init(file, 0x2A /* TRUNCATE | WRONLY | CREATE */, 0666, 0); + out = Cc["@mozilla.org/intl/converter-output-stream;1"] + .createInstance(Ci.nsIConverterOutputStream); + out.init(outstream, "UTF-8", 0, 0); + } else + out = new dumper(); + + dump_addons(out); + out.close(); + }, + + classDescription: "addonsInfoHandler", + classID: Components.ID("{17a1f091-70f7-411c-a9d7-191689552d01}"), + contractID: "@mozilla.org/toolkit/addonsInfo-clh;1", + QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]), +}; + +const NSGetFactory = XPCOMUtils.generateNSGetFactory([addonsInfoHandler]); diff --git a/debian/extra-stuff/addonsInfo.manifest b/debian/extra-stuff/addonsInfo.manifest new file mode 100644 index 0000000..c7a0699 --- /dev/null +++ b/debian/extra-stuff/addonsInfo.manifest @@ -0,0 +1,3 @@ +component {17a1f091-70f7-411c-a9d7-191689552d01} addonsInfo.js +contract @mozilla.org/toolkit/addonsInfo-clh;1 {17a1f091-70f7-411c-a9d7-191689552d01} +category command-line-handler a-addons-info @mozilla.org/toolkit/addonsInfo-clh;1 diff --git a/debian/extra-stuff/moz.build b/debian/extra-stuff/moz.build new file mode 100644 index 0000000..91950c6 --- /dev/null +++ b/debian/extra-stuff/moz.build @@ -0,0 +1 @@ +EXTRA_COMPONENTS += ['addonsInfo.js', '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 4c899e0f0dc69b25535014fcadfd5f69bfd4e2f5 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 31 05:45:38 2018 +0200 debian/patches: refresh. --- debian/changelog | 2 ++ .../Add-debian-extra-stuff-to-upstream-build-system-dire.patch | 8 +++----- .../Make-upstream-build-system-create-debian-installer-M.patch | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab9843e..f7b8a07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium the first one, like it was previously). * debian/source/local-options: - Ignore autogenerated ChangeLog.gitlog file. + * debian/patches: + - Refresh. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 diff --git a/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch index 7a98fa4..da84ac3 100644 --- a/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch +++ b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch @@ -6,13 +6,11 @@ Subject: Add debian/extra-stuff to upstream build system directory traversal moz.build | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/moz.build b/moz.build -index fee89428deea..0eff8b810f05 100644 --- a/moz.build +++ b/moz.build -@@ -86,4 +86,7 @@ if not CONFIG['JS_STANDALONE'] and CONFIG['MOZ_BUILD_APP']: - - CONFIGURE_SUBST_FILES += ['.cargo/config'] +@@ -70,4 +70,7 @@ if not CONFIG['JS_STANDALONE']: + # Bring in the configuration for the configured application. + include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild') +if not CONFIG['LIBXUL_SDK']: + DIRS += ['debian/extra-stuff'] 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 index 0377a8f..7307c4c 100644 --- 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 @@ -6,11 +6,9 @@ Subject: Make upstream build system create debian/installer/Makefile moz.build | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/moz.build b/moz.build -index 0eff8b810f05..0d6658691925 100644 --- a/moz.build +++ b/moz.build -@@ -89,4 +89,6 @@ CONFIGURE_SUBST_FILES += ['.cargo/config'] +@@ -73,4 +73,6 @@ if not CONFIG['JS_STANDALONE']: if not CONFIG['LIBXUL_SDK']: DIRS += ['debian/extra-stuff'] -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git