3 files changed, 128 insertions, 18 deletions
diff --git a/newmoon/debian/patches/pm-to-nm.patch b/newmoon/debian/patches/pm-to-nm.patch
new file mode 100644
index 0000000..d192c55
--- /dev/null
+++ b/newmoon/debian/patches/pm-to-nm.patch
@@ -0,0 +1,127 @@
+Date: 2020-08-18
+Purpose: Use newmoon branding instead of palemoon
+Message: 
+This includes using ~/.config/newmoon instead of some other directory.
+
+This one right here changes the directory for where the user profile goes.
+diff -Naur palemoon/app/application.ini palemoon/app/application.ini.new
+--- Pale-Moon/palemoon/app/application.ini 2020-07-30 06:09:43.000000000 -0400
++++ Pale-Moon/palemoon/app/application.ini.new   2020-08-18 19:28:30.840797999 -0400
+@@ -20,9 +20,9 @@
+ 
+ [App]
+ # Vendor=@MOZ_APP_VENDOR@
+-Vendor=Moonchild Productions
++Vendor=Config
+ # Name=@MOZ_APP_BASENAME@
+-Name=Pale Moon
++Name=newmoon
+ RemotingName=@MOZ_APP_REMOTINGNAME@
+ #ifdef MOZ_APP_DISPLAYNAME
+ CodeName=@MOZ_APP_DISPLAYNAME@
+Message: The following 
+Made with approximately: 
+$ cd Palemoon.new/palemoon/branding/unofficial
+$ sed -i -r -e 's/New Moon/newmoon/ig;'  $( grep -l -riIE 'new moon' )
+$ sed -i -r -e 's/pale/new/g;' newmoon.desktop 
+diff -aur Pale-Moon/palemoon/branding/unofficial/branding.nsi Pale-Moon.new/palemoon/branding/unofficial/branding.nsi
+--- Pale-Moon/palemoon/branding/unofficial/branding.nsi	2020-07-30 06:09:43.000000000 -0400
++++ Pale-Moon.new/palemoon/branding/unofficial/branding.nsi	2020-08-22 13:39:41.676568689 -0400
+@@ -8,7 +8,7 @@
+ 
+ # BrandFullNameInternal is used for some registry and file system values
+ # instead of BrandFullName and typically should not be modified.
+-!define BrandFullNameInternal "New Moon"
++!define BrandFullNameInternal "newmoon"
+ !define CompanyName           "Moonchild Productions"
+ !define URLInfoAbout          "http://www.palemoon.org"
+ !define URLUpdateInfo         "http://www.palemoon.org"
+diff -aur Pale-Moon/palemoon/branding/unofficial/configure.sh Pale-Moon.new/palemoon/branding/unofficial/configure.sh
+--- Pale-Moon/palemoon/branding/unofficial/configure.sh	2020-07-30 06:09:43.000000000 -0400
++++ Pale-Moon.new/palemoon/branding/unofficial/configure.sh	2020-08-22 13:39:41.676568689 -0400
+@@ -2,4 +2,4 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-MOZ_APP_DISPLAYNAME="New Moon"
++MOZ_APP_DISPLAYNAME="newmoon"
+diff -aur Pale-Moon/palemoon/branding/unofficial/locales/en-US/brand.dtd Pale-Moon.new/palemoon/branding/unofficial/locales/en-US/brand.dtd
+--- Pale-Moon/palemoon/branding/unofficial/locales/en-US/brand.dtd	2020-07-30 06:09:43.000000000 -0400
++++ Pale-Moon.new/palemoon/branding/unofficial/locales/en-US/brand.dtd	2020-08-22 13:39:41.676568689 -0400
+@@ -2,7 +2,7 @@
+    - License, v. 2.0. If a copy of the MPL was not distributed with this
+    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+ 
+-<!ENTITY  brandShortName        "New Moon">
+-<!ENTITY  brandFullName         "New Moon">
++<!ENTITY  brandShortName        "newmoon">
++<!ENTITY  brandFullName         "newmoon">
+ <!ENTITY  vendorShortName       "a community developer">
+ <!ENTITY  trademarkInfo.part1   " ">
+diff -aur Pale-Moon/palemoon/branding/unofficial/locales/en-US/brand.properties Pale-Moon.new/palemoon/branding/unofficial/locales/en-US/brand.properties
+--- Pale-Moon/palemoon/branding/unofficial/locales/en-US/brand.properties	2020-07-30 06:09:43.000000000 -0400
++++ Pale-Moon.new/palemoon/branding/unofficial/locales/en-US/brand.properties	2020-08-22 13:39:41.676568689 -0400
+@@ -2,8 +2,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-brandShortName=New Moon
+-brandFullName=New Moon
++brandShortName=newmoon
++brandFullName=newmoon
+ vendorShortName=Moonchild
+ 
+ syncBrandShortName=Sync
+diff -aur Pale-Moon/palemoon/branding/unofficial/newmoon.desktop Pale-Moon.new/palemoon/branding/unofficial/newmoon.desktop
+--- Pale-Moon/palemoon/branding/unofficial/newmoon.desktop	2020-07-30 06:09:43.000000000 -0400
++++ Pale-Moon.new/palemoon/branding/unofficial/newmoon.desktop	2020-08-22 19:22:15.505363587 -0400
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=New Moon
++Name=newmoon
+ GenericName=Web Browser
+ GenericName[ar]=متصفح ويب
+ GenericName[ast]=Restolador Web
+@@ -81,15 +81,15 @@
+ Comment[vi]=Để duyệt các trang web
+ Comment[zh_CN]=浏览互联网
+ Comment[zh_TW]=瀏覽網際網路
+-Exec=palemoon %u
++Exec=newmoon %u
+ Terminal=false
+ Type=Application
+-Icon=palemoon
++Icon=newmoon
+ Categories=Network;WebBrowser;
+ MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+ StartupNotify=false
+ Actions=NewTab;NewWindow;NewPrivateWindow;
+-StartupWMClass="new moon"
++StartupWMClass="newmoon"
+ 
+ [Desktop Action NewTab]
+ Name=Open new tab
+@@ -176,7 +176,7 @@
+ Name[xh]=Vula ithebhu entsha
+ Name[zh_CN]=打开新标签页
+ Name[zh_TW]=開啟新分頁
+-Exec=palemoon -new-tab
++Exec=newmoon -new-tab
+ 
+ [Desktop Action NewWindow]
+ Name=Open new window
+@@ -263,7 +263,7 @@
+ Name[xh]=Vula iwindow entsha
+ Name[zh_CN]=打开新窗口
+ Name[zh_TW]=開啟新視窗
+-Exec=palemoon -new-window
++Exec=newmoon -new-window
+ 
+ [Desktop Action NewPrivateWindow]
+ Name=New private window
+@@ -350,4 +350,4 @@
+ Name[xh]=Ifestile yangasese entsha
+ Name[zh_CN]=新建隐私浏览窗口
+ Name[zh_TW]=新增隱私視窗
+-Exec=palemoon -private-window
++Exec=newmoon -private-window
diff --git a/newmoon/debian/patches/series b/newmoon/debian/patches/series
index 0922dcc..3737af1 100644
--- a/newmoon/debian/patches/series
+++ b/newmoon/debian/patches/series
@@ -1,7 +1,7 @@
 small-icons.patch
 bgstack15-newmoon.patch
 pm-devuan.patch
-vendor.patch
+pm-to-nm.patch
 UXP-eliminate-need-for-GTK-2.patch
 UXP-GTK-3-interface-Ensure-horizontal-scrollbars-are-not-too-tall.patch
 UXP-strip-object-files-before-shared-library-linking.patch
diff --git a/newmoon/debian/patches/vendor.patch b/newmoon/debian/patches/vendor.patch
deleted file mode 100644
index 10e2cb7..0000000
--- a/newmoon/debian/patches/vendor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Date: 2020-08-18
-Purpose: Use .config/newmoon as the directory for the application contents
-diff -Naur palemoon/app/application.ini palemoon/app/application.ini.new
---- Pale-Moon/palemoon/app/application.ini 2020-07-30 06:09:43.000000000 -0400
-+++ Pale-Moon/palemoon/app/application.ini.new   2020-08-18 19:28:30.840797999 -0400
-@@ -20,9 +20,9 @@
- 
- [App]
- # Vendor=@MOZ_APP_VENDOR@
--Vendor=Moonchild Productions
-+Vendor=Config
- # Name=@MOZ_APP_BASENAME@
--Name=Pale Moon
-+Name=newmoon
- RemotingName=@MOZ_APP_REMOTINGNAME@
- #ifdef MOZ_APP_DISPLAYNAME
- CodeName=@MOZ_APP_DISPLAYNAME@