16 files changed, 111 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 320dde2..8fbac72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .*.swp
+.swp
 .debhelper
 /*.tar.?z
 /*.bz2
diff --git a/newmoon/debian/bluemoon-icons.tgz b/newmoon/debian/bluemoon-icons.tgz
new file mode 100644
index 0000000..9449e66
--- /dev/null
+++ b/newmoon/debian/bluemoon-icons.tgz
diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog
index cf9d6f5..966de18 100644
--- a/newmoon/debian/changelog
+++ b/newmoon/debian/changelog
@@ -1,3 +1,70 @@
+newmoon (28.13.0-5+devuan) obs; urgency=medium
+
+  * Import bluemoon icons from Gord N. Squash
+
+ -- Ben Stack <bgstack15@gmail.com>  Wed, 16 Sep 2020 19:16:08 -0400
+
+newmoon (28.13.0-4+devuan) obs; urgency=low
+
+  * Import xfce-helper/palemoon.desktop from stevep@mxlinux.org release
+
+ -- Ben Stack <bgstack15@gmail.com>  Wed, 09 Sep 2020 14:43:04 -0400
+
+newmoon (28.13.0-3+devuan) obs; urgency=medium
+
+  * This is a compatibility, bugfix and security update. Special thanks 
+    to our new code contributors this cycle (you know who you are)!
+    - Updated the included site-specific user-agent overrides for a 
+      number of websites that need them.
+    - Rewritten the browser's padlock code to use more modern APIs and 
+      provide more accurate security status indication.
+    - Now also with localized tooltips!
+    - Fixed a missing close button on the undo prompt after removing a 
+      thumbnail from the QuickDial new tab page.
+    - Fixed an issue with the alternative stylesheet menu in the 
+      browser's UI not working.
+    - Implemented the use of intrinsic aspect ratios for images to 
+      improve layout during load and page positioning.
+    - Added a preference to the use of node.getRootNode and disabled by 
+      default. See implementation notes.
+    - Added CSS -webkit-appearance as an alias for -moz-appearance to 
+      improve compatibility with websites that only try to use 
+      Chrome-specific keywords to style standard form elements.
+    - Updated the SQLite library to 3.33.0.
+    - Reinstated precise floating point precision model in JavaScript 
+      for those alternate builders who foolishly try to use the inaccurate 
+      "fast" model.
+    - Improved spec compliance of modular JavaScript use (ECMAScript 
+      modules).
+    - Changed media errors to be a more generic response, and added a 
+      preference (media.sourceErrorDetails.enabled) to enable detailed error 
+      reporting of media errors for debugging purposes.
+    - Previously, detailed errors were provided by default which could 
+      lead to privacy issues.
+    - Improved code stability of the AbortController implementation.
+    - Fixed a race condition in the secure connection library (NSS).
+    - Security issues fixed: CVE-2020-15664, CVE-2020-15666, 
+      CVE-2020-15667, CVE-2020-15668 and CVE-2020-15669.
+    - Unified XUL Platform Mozilla Security Patch Summary: 4 fixed, 1 
+      defense-in-depth, 1 rejected, 9 not applicable.
+  * Implementation notes
+    - In 28.11.0 we introduced node.getRootNode because some websites 
+      would fail with an error if this function was not present. 
+      Unfortunately, this caused problems with other sites that (incorrectly) 
+      assume Google WebComponents are available when this utility function is 
+      present (feature detection gone wrong). While it is considered by some 
+      to be part of the Google WebComponents implementation, it actually has 
+      utility value outside of that use. Because of the problems caused, 
+      we've added a preference and disabled it by default, fixing these kinds 
+      of websites.
+    - When needed, you can re-enable this function with 
+      dom.getRootNode.enabled
+    - This should improve web compatibility by default yet still allow 
+      users to enable this function for websites that use its utility but do 
+      not use WebComponents.
+
+ -- Ben Stack <bgstack15@gmail.com>  Fri, 04 Sep 2020 19:50:02 -0400
+
 newmoon (28.12.0-2+devuan) obs; urgency=low
 
   * Forked from palemoon. This is an experimental release
diff --git a/newmoon/debian/control b/newmoon/debian/control
index b319ff0..f5f6304 100644
--- a/newmoon/debian/control
+++ b/newmoon/debian/control
@@ -33,7 +33,7 @@ Homepage: http://www.palemoon.org/
 Package: newmoon
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-         libavcodec54 | libavcodec-extra54 |libavcodec55 | libavcodec-extra55 | libavcodec56 | libavcodec-extra56 | libavcodec57 | libavcodec-extra57 | libavcodec58 | libavcodec-extra58 | libavcodec-ffmpeg56 | libavcodec-ffmpeg-extra56
+         libavcodec54 | libavcodec-extra54 | libavcodec55 | libavcodec-extra55 | libavcodec56 | libavcodec-extra56 | libavcodec57 | libavcodec-extra57 | libavcodec58 | libavcodec-extra58 | libavcodec-ffmpeg56 | libavcodec-ffmpeg-extra56
 Provides: gnome-www-browser, www-browser, x-www-browser
 Conflicts: palemoon-nonsse2
 Replaces: palemoon-nonsse2
diff --git a/newmoon/debian/install b/newmoon/debian/install
index d5498db..e6a7364 100644
--- a/newmoon/debian/install
+++ b/newmoon/debian/install
@@ -1,2 +1,3 @@
+debian/xfce-helper/newmoon.desktop usr/share/xfce4/helpers
 palemoon/branding/unofficial/newmoon.desktop usr/share/applications
 debian/bgstack15-newmoon-prefs.js /usr/lib/newmoon/browser/defaults/preferences/
diff --git a/newmoon/debian/mozconfig b/newmoon/debian/mozconfig
index 7661740..097882d 100644
--- a/newmoon/debian/mozconfig
+++ b/newmoon/debian/mozconfig
@@ -26,6 +26,7 @@ ac_add_options --enable-devtools
 ac_add_options --disable-jemalloc
 ac_add_options --with-pthreads
 ac_add_options --enable-strip
+ac_add_options --enable-phoenix-extensions
 # Disables
 ac_add_options --disable-debug
 ac_add_options --enable-eme
@@ -33,7 +34,8 @@ ac_add_options --disable-gamepad
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-tests
 ac_add_options --disable-updater
-ac_add_options --enable-webrtc
+# unfortunately newmoon does not have the client-side bits for webrtc so enabling it does nothing, per upstream
+#ac_add_options --enable-webrtc
 # Disable temeletry
 export MOZ_TELEMETRY_REPORTING=
 ac_add_options --disable-crashreporter
diff --git a/newmoon/debian/newmoon+devuan.dsc b/newmoon/debian/newmoon+devuan.dsc
index 0075a2a..4e09722 100644
--- a/newmoon/debian/newmoon+devuan.dsc
+++ b/newmoon/debian/newmoon+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: newmoon
 Binary: newmoon
 Architecture: any
-Version: 28.12.0-2+devuan
+Version: 28.13.0-5+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: http://www.palemoon.org/
 Standards-Version: 3.9.6
diff --git a/newmoon/debian/rules b/newmoon/debian/rules
index 461d685..230114f 100755
--- a/newmoon/debian/rules
+++ b/newmoon/debian/rules
@@ -22,9 +22,16 @@ override_dh_auto_clean:
 	rm -f mozconfig
 	dh_auto_clean
 	find . -name '*.pyc' -delete
+	test -d palemoon/branding/unofficial.unbuilt && { \
+		rm -rf palemoon/branding/unofficial palemoon/branding/*.blue* ; \
+		mv palemoon/branding/unofficial.unbuilt palemoon/branding/unofficial ; \
+	} || :
 
 override_dh_auto_configure:
 	cp ${MCFILE} mozconfig
+	! test -d palemoon/branding/unofficial.unbuilt && { \
+		cp -pr palemoon/branding/unofficial palemoon/branding/unofficial.unbuilt && \
+		tar -C palemoon/branding -zxf debian/bluemoon-icons.tgz ; } || :
 
 override_dh_auto_build:
 	make -f client.mk build ENABLE_STRIP=1
diff --git a/newmoon/debian/source/include-binaries b/newmoon/debian/source/include-binaries
index dd76db8..d745d04 100644
--- a/newmoon/debian/source/include-binaries
+++ b/newmoon/debian/source/include-binaries
@@ -8,3 +8,4 @@ debian/distribution/bundles/statusbar@palemoon.org/components/status4evar.xpt
 debian/distribution/bundles/{3ff46564-d77c-491c-bfc5-fc555c87dbc4}/chrome/content/images/stop.png
 debian/distribution/bundles/{3ff46564-d77c-491c-bfc5-fc555c87dbc4}/chrome/content/images/statusbar.png
 debian/distribution/bundles/{3ff46564-d77c-491c-bfc5-fc555c87dbc4}/chrome/content/images/icon.png
+debian/bluemoon-icons.tgz
diff --git a/newmoon/debian/xfce-helper/newmoon.desktop b/newmoon/debian/xfce-helper/newmoon.desktop
new file mode 100644
index 0000000..513aecc
--- /dev/null
+++ b/newmoon/debian/xfce-helper/newmoon.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Icon=newmoon
+Name=Newmoon
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Type=X-XFCE-Helper
+X-XFCE-Binaries=newmoon;
+X-XFCE-Category=WebBrowser
+X-XFCE-Commands=%B;
+X-XFCE-CommandsWithParameter=%B "%s";
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index 65b57af..3ca9b8d 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -5,7 +5,7 @@
 %global stackrpms_custom 1
 # derive from inside the full source tree or from notes at https://github.com/MoonchildProductions/Pale-Moon/releases
 # git submodule | awk -v "name=platform" '$2 == name {gsub("-","",$1); print $1}'
-%global submodule_platform_tag RELBASE_20200831
+%global submodule_platform_tag RELBASE_20200901
 
 # additional repos to get python27 and devtoolset-7
 # for el6 and el7: Software Collection;, for x86_64 only
@@ -43,7 +43,7 @@ Name:    palemoon
 %endif
 Summary:	Pale Moon web browser
 Version:	28.13.0
-Release:	1
+Release:	2
 
 Group:	Networking/Web
 License:	MPLv2.0
@@ -285,6 +285,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %doc AUTHORS LICENSE
 
 %changelog
+* Fri Sep 25 2020 B Stack <bgstack15@gmail.com> - 28.13.0-2
+- use valid RELBASE. Upstream probably unpublished RELBASE_20200831
+
 * Fri Sep 04 2020 B Stack <bgstack15@gmail.com> - 28.13.0-1
 - update version
 
diff --git a/xdgmenumaker/README.md b/xdgmenumaker/README.md
index 5e9aa56..af7f1f9 100644
--- a/xdgmenumaker/README.md
+++ b/xdgmenumaker/README.md
@@ -23,7 +23,7 @@ https://wiki.archlinux.org/index.php/Xdg-menu
 # Reverse dependency matrix
 Distro     | xdgmenumaker version
 ---------- | ----------------
-All        | 1.5
+All        | 1.6
 
 # Differences from upstream
 None
diff --git a/xdgmenumaker/debian/changelog b/xdgmenumaker/debian/changelog
index 1b9715f..a960442 100644
--- a/xdgmenumaker/debian/changelog
+++ b/xdgmenumaker/debian/changelog
@@ -1,3 +1,9 @@
+xdgmenumaker (1.6-1+devuan) obs; urgency=medium
+
+  * Handle OnlyShowIn and NotShowIn better patch merged into upstream
+
+ -- Ben Stack <bgstack15@gmail.com>  Thu, 17 Sep 2020 10:00:05 -0400
+
 xdgmenumaker (1.5-5+devuan) obs; urgency=medium
 
   * Suppress minor warnings during dpkg-trigger
diff --git a/xdgmenumaker/debian/control b/xdgmenumaker/debian/control
index 384cccf..29a70cb 100644
--- a/xdgmenumaker/debian/control
+++ b/xdgmenumaker/debian/control
@@ -25,7 +25,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
 #   python2
 #   python-gi
 #   python-gtk2
-Suggests:
+Recommends:
 # for python3:
    python3-pil
 # for python2:
diff --git a/xdgmenumaker/debian/xdgmenumaker_devuan.dsc b/xdgmenumaker/debian/xdgmenumaker+devuan.dsc
index de1eb65..7386485 100644
--- a/xdgmenumaker/debian/xdgmenumaker_devuan.dsc
+++ b/xdgmenumaker/debian/xdgmenumaker+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: xdgmenumaker
 Binary: xdgmenumaker
 Architecture: any
-Version: 1.5-5+devuan
+Version: 1.6-1+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: https://github.com/gapan/xdgmenumaker
 Standards-Version: 4.1.4
@@ -10,5 +10,5 @@ Build-Depends: debhelper (>= 12~), dh-python, txt2tags
 Package-List:
  xdgmenumaker deb x11 optional arch=any
 Files:
- 00000000000000000000000000000000 1 xdgmenumaker_1.5.orig.tar.gz
+ 00000000000000000000000000000000 1 xdgmenumaker.orig.tar.gz
  00000000000000000000000000000000 1 xdgmenumaker_devuan.debian.tar.xz
diff --git a/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop b/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop
index 2064c6f..348f6dc 100644
--- a/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop
+++ b/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop
@@ -10,3 +10,4 @@ StartupNotify=true
 Terminal=false
 Type=Application
 Version=1.0
+OnlyShowIn=Fluxbox;