Shuffle in old patches

comm-release/patches/1564611-70a1.patch

@@ -2,7 +2,7 @@
 # User Rob Lemley <rob@thunderbird.net>
 # Date 1562712264 14400
 # Node ID f29f4cb6a42e99421afbf05bf53b98144f3cd00c
-# Parent  d6f5d51f7cfd123eca779015c4d6b9d401e81077
+# Parent  026fffeee19869906797c06351241a219b3f34d5
 Bug 1564611 - Port bug 1458385: Repackaging Windows builds on Linux. r=darktrojan DONTBUILD
 
 Based on the changes in the referenced M-C bug.
@@ -15,7 +15,7 @@ diff --git a/mail/confvars.sh b/mail/confvars.sh
  
  BROWSER_CHROME_URL=chrome://messenger/content/messengercompose/messengercompose.xul
  
- MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
+ MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/nightly
  MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
  
  MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}

comm-release/patches/PPPPPPP-tbbranding-253.patch

@@ -1,14 +1,14 @@
 # HG changeset patch
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
 # Date 1621294423 -7200
-# Parent  836bd763431961afdde07981ec9af8b89df3e890
+# Parent  347ad14715e978bc41e19451a27683c855097206
 Bug PPPPPPP - frg 2.53 Use release branding for TB.
 Private patch not for any official SeaMonkey branch.
 
 diff --git a/mail/confvars.sh b/mail/confvars.sh
 --- a/mail/confvars.sh
 +++ b/mail/confvars.sh
-@@ -19,17 +19,17 @@ if test "$OS_ARCH" = "WINNT"; then
+@@ -18,17 +18,17 @@ if test "$OS_ARCH" = "WINNT"; then
    fi
  fi
  
@@ -22,8 +22,8 @@ diff --git a/mail/confvars.sh b/mail/confvars.sh
  MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/mail/branding/thunderbird
  
  MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
- # This should usually be the same as the value MAR_CHANNEL_ID.
- # If more than one ID is needed, then you should use a comma separated list
- # of values.
- ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-release
- # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
+ 
+ MOZ_PROFILE_MIGRATOR=1
+ MOZ_BINARY_EXTENSIONS=1
+ MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES=1
+ 

comm-release/patches/series

@@ -2151,6 +2151,11 @@ NOBUG-fixcalbackend-25318.patch
 1902851-1-version-prebeta-cr-25320.patch
 1434951-60a1.patch
 1478168-63a1.patch
+1488138-64a1.patch
+1564611-70a1.patch
+1658682-1-81a1.patch
+1658682-2-81a1.patch
+1661940-82a1.patch
 1909853-removemsnicq-25320.patch
 1909855-debugqa-esr128-25320.patch
 1909743-suite-prefs-prefers-color-scheme-25320.patch
@@ -2165,6 +2170,7 @@ TOP-NOBUG-PY3-support-25317.patch
 TOP-NOBUG-PY3-switch-25317.patch
 TOP-1859386-mailfluent-25318.patch
 TOP-1859386-fixl10nbuilds-25318.patch
+TOP-1906540-mozdevice-removal-comm-25320.patch
 WIP-1296850-indicators-V6.patch
 WIP-1370314-installer.patch
 WIP-1320556-webextensions.patch
@@ -2173,7 +2179,6 @@ WIP-521861-Account_Creation.patch
 WIP-9999999-lintglobals.patch
 WIP-1687385-mozconfigs-v2_0-253.patch
 WIP-1070492-composer-findbar-v3-25319.patch
-TOP-1906540-mozdevice-removal-comm-25320.patch
 1911830-helpInfo-25320.patch
 1911841-browserChromeURL-25320.patch
 1911844-boxObject-utilityOverlay-25320.patch
@@ -2181,17 +2186,12 @@ TOP-1906540-mozdevice-removal-comm-25320.patch
 1911847-tabbrowser-boxObject-25320.patch
 1911848-tabbrowser-tabDrop-25320.patch
 1912354-domiselect-25320.patch
-1488138-64a1.patch
 1913579-removed-files-25320.patch
-1564611-70a1.patch
 1913633-mar-channel-ids-1_1-25320.patch
 1897801-2-about-seamonkey-25320.patch
 1656564-fix-themes-browseURL-25320.patch
 1920367-domi-remove-atomservice-25320.patch
 1920565-irc-channels-v1_1-25320.patch
-1658682-1-81a1.patch
-1658682-2-81a1.patch
-1661940-82a1.patch
 1923211-irc-fix-decodeTagData-25320.patch
 1923213-irc-network-away-fix-25320.patch
 1923215-irc-remove-XTLabelRecord-25320.patch
@@ -2206,15 +2206,15 @@ TOP-1906540-mozdevice-removal-comm-25320.patch
 1924336-irc-logins-25320.patch
 1924337-irc-zipReader-25320.patch
 1924338-irc-newObject-25320.patch
-9999999-wikiico-25320.patch
-9999999-handler-25320.patch
-TOP-1378089-4-WIP-bookmarks-25320.patch
-TOP-1872623-cancelbookmark-25319.patch
-9999999-specificsearch-25320.patch
-9999999-focus-25320.patch
 1924586-irc-remove-getWindowByType-25320.patch
 1924587-irc-inline-viewCert-25320.patch
 1924588-irc-tidy-dirsvc-25320.patch
 1924589-irc-tidy-nss-25320.patch
 1924592-irc-tidy-message-manager-25320.patch
 1924595-irc-getService-25320.patch
+9999999-wikiico-25320.patch
+9999999-handler-25320.patch
+TOP-1378089-4-WIP-bookmarks-25320.patch
+TOP-1872623-cancelbookmark-25319.patch
+9999999-specificsearch-25320.patch
+9999999-focus-25320.patch