diff --git a/helpers/DATA/thunderbird/branding/content/about-wordmark.svg b/helpers/DATA/thunderbird/branding/content/about-wordmark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4fd7a8ca5682dde543aa56d76b9f28a3a5929ddc
--- /dev/null
+++ b/helpers/DATA/thunderbird/branding/content/about-wordmark.svg
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="52.493332mm"
+ height="14.111111mm"
+ viewBox="0 0 52.493332 14.111111"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="drawing.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="382.05713"
+ inkscape:cy="-459.04764"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="918"
+ inkscape:window-height="916"
+ inkscape:window-x="988"
+ inkscape:window-y="171"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-6.2592888,-13.265869)">
+ <image
+ y="13.265869"
+ x="6.2592888"
+ id="image3791"
+ xlink:href="data:image/png;base64,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
+QaIFEGxSypI75hYxUiFSBBhepOpUxgcG0rP5gtIHmZDrmC9CngUBdfQYAcZFniAqHYGSWv+eKYLj
+NINB6K9IVnNHUSl16gQFosSDoOWHEQwvItBB1gAVGhBgyFhSCrWld+qS8OykiYB7pF8VYRjSGH8f
+T8skTX6JTGxD5cDekfoZghj2jlnJ8wX7YDugX+bPOp7sTidWVjqCnxdwkCtUVklnCPVzur6XDlTp
+zpRKySggABvORgDBkggKcBUN2dH66AQUJrUizk+fZ0mwYyhJD/dkk6EN+NWiHr8U0TG41VTuOnKC
+Z2jajrt+YuY04gINDBymMSQEAmaRlfkeWbB508kEqDlbh/9oDTa7qI6ASqKOniHYKuLdZO/rgvm5
+nY3UoTMhdB6qB7sd8Nj7GpSLisyHSv3A+6F/ruv0NJkuCwBGnD0WSJ9wTigArdu6rM0gbZHJoT3p
+WPRMxuZUQBR2Yw4XUDdsU49iwgbpBkYN5BuobQwZBTp4kcs2HY6jbagn+5xuEXEqEjvWFgXZBW+f
+YwZVN6Vpwjqti6RRIWwa9EqFq1Fk9HKuTIUTQ59L1+ixpK/VFWDElh6+jk+bpIDUPwI+hIKIQKKY
+0p70I3ZDJ17AD/4KwLg2YxD6X4BNGbfwXc2R0Lv6P4n0oKwEuJbybGuwQXpKD6U8ulLP8GiEo6f4
+YH5B+ugAYTYUz0aQPWRL3zT8IQvjHU/Y+78xnnaAKmiISd0t3x3G1dZYQK/XuRr0QsQ/iMNAXL3L
+lo+Wj6HpByEH2qAmw1bjfgAPgh+uQwvnZ6oZCDDifh1txIdefv7zV/ef3vCPBpKnNUjU/S9JcE/H
+pMJIawAAAF56VFh0UmF3IHByb2ZpbGUgdHlwZSBpcHRjAAB42j1JuQ2AQAzrMwUjJLYlwjrkGjoK
+9hfhBNiSXzvOq2yZEIwpaNNwNX/EiHJw7ZgEncFsxePzqX72dw2KMIyvutsNMgsU3r/6gaYAAA9K
+aVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBN
+cENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEv
+IiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMC1FeGl2MiI+CiA8cmRmOlJERiB4bWxuczpyZGY9Imh0
+dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogIDxyZGY6RGVzY3Jp
+cHRpb24gcmRmOmFib3V0PSIiCiAgICB4bWxuczppcHRjRXh0PSJodHRwOi8vaXB0Yy5vcmcvc3Rk
+L0lwdGM0eG1wRXh0LzIwMDgtMDItMjkvIgogICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9i
+ZS5jb20veGFwLzEuMC9tbS8iCiAgICB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94
+YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIgogICAgeG1sbnM6cGx1cz0iaHR0cDovL25zLnVz
+ZXBsdXMub3JnL2xkZi94bXAvMS4wLyIKICAgIHhtbG5zOkdJTVA9Imh0dHA6Ly93d3cuZ2ltcC5v
+cmcveG1wLyIKICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIK
+ICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgeG1wTU06RG9j
+dW1lbnRJRD0iZ2ltcDpkb2NpZDpnaW1wOmU5YWFjYmNiLTBmY2YtNGU5Zi1iNjU2LTA2N2NhYjAz
+YTFiYyIKICAgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDplMDg0YjQyZi1iNmZlLTQ3OTItOGJh
+OS1iZThlOTU0MTAzZTciCiAgIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpmOGQx
+NzYwYy1hMDM5LTQ5ZWYtYWExMy1mOGE5ZDg3MWIzNTIiCiAgIEdJTVA6QVBJPSIyLjAiCiAgIEdJ
+TVA6UGxhdGZvcm09IkxpbnV4IgogICBHSU1QOlRpbWVTdGFtcD0iMTUxODk5NDkwMjk0MDI4MyIK
+ICAgR0lNUDpWZXJzaW9uPSIyLjkuOSIKICAgZGM6Rm9ybWF0PSJpbWFnZS9wbmciCiAgIHhtcDpD
+cmVhdG9yVG9vbD0iR0lNUCAyLjkvMi4xMCI+CiAgIDxpcHRjRXh0OkxvY2F0aW9uQ3JlYXRlZD4K
+ICAgIDxyZGY6QmFnLz4KICAgPC9pcHRjRXh0OkxvY2F0aW9uQ3JlYXRlZD4KICAgPGlwdGNFeHQ6
+TG9jYXRpb25TaG93bj4KICAgIDxyZGY6QmFnLz4KICAgPC9pcHRjRXh0OkxvY2F0aW9uU2hvd24+
+CiAgIDxpcHRjRXh0OkFydHdvcmtPck9iamVjdD4KICAgIDxyZGY6QmFnLz4KICAgPC9pcHRjRXh0
+OkFydHdvcmtPck9iamVjdD4KICAgPGlwdGNFeHQ6UmVnaXN0cnlJZD4KICAgIDxyZGY6QmFnLz4K
+ICAgPC9pcHRjRXh0OlJlZ2lzdHJ5SWQ+CiAgIDx4bXBNTTpIaXN0b3J5PgogICAgPHJkZjpTZXE+
+CiAgICAgPHJkZjpsaQogICAgICBzdEV2dDphY3Rpb249InNhdmVkIgogICAgICBzdEV2dDpjaGFu
+Z2VkPSIvIgogICAgICBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjRjMmU2YjZlLTMxYTctNGM1
+NS05NjFlLTljNThlOGU2MDg5NCIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iR2ltcCAyLjkv
+Mi4xMCAoTGludXgpIgogICAgICBzdEV2dDp3aGVuPSItMDU6MDAiLz4KICAgIDwvcmRmOlNlcT4K
+ICAgPC94bXBNTTpIaXN0b3J5PgogICA8cGx1czpJbWFnZVN1cHBsaWVyPgogICAgPHJkZjpTZXEv
+PgogICA8L3BsdXM6SW1hZ2VTdXBwbGllcj4KICAgPHBsdXM6SW1hZ2VDcmVhdG9yPgogICAgPHJk
+ZjpTZXEvPgogICA8L3BsdXM6SW1hZ2VDcmVhdG9yPgogICA8cGx1czpDb3B5cmlnaHRPd25lcj4K
+ICAgIDxyZGY6U2VxLz4KICAgPC9wbHVzOkNvcHlyaWdodE93bmVyPgogICA8cGx1czpMaWNlbnNv
+cj4KICAgIDxyZGY6U2VxLz4KICAgPC9wbHVzOkxpY2Vuc29yPgogIDwvcmRmOkRlc2NyaXB0aW9u
+PgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+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
+"
+ preserveAspectRatio="none"
+ height="14.111111"
+ width="52.493332" />
+ <path
+ style="fill:#000000;stroke-width:0.28222221"
+ d=""
+ id="path3794"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/helpers/make-thunderbird b/helpers/make-thunderbird
index e6bc4372aca0589b774145fd8978cd32fd1811d9..7d569a98c8e1758d343bdbfb9701d5595c997958 100644
--- a/helpers/make-thunderbird
+++ b/helpers/make-thunderbird
@@ -1,6 +1,7 @@
#!/bin/bash
#
# Copyright (C) 2018 Ruben Rodriguez <ruben@trisquel.info>
+# Copyright (C) 2019 David Trudgian <dave@trudgian.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,12 +17,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+set -x
-VERSION=1
+VERSION=2
. ./config
-cp $DATA/branding/* mail/branding/nightly/ -r
+cp $DATA/branding/* comm/mail/branding/nightly/ -r
cat << EOF >> debian/vendor.js
@@ -48,15 +50,13 @@ pref("app.releaseNotesURL", "http://trisquel.info/mailclient");
pref("pfs.datasource.url", "https://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
pref("pfs.filehint.url", "https://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
pref("keyword.URL", "https://duckduckgo.com/?t=trisquel&q=!+");
-pref("browser.search.defaultenginename", "Wikipedia (en)");
-pref("browser.search.order.1", "Wikipedia (en)");
-pref("browser.search.defaultenginename", "Wikipedia (en)");
+pref("browser.search.defaultenginename", "DuckDuckGo");
+pref("browser.search.order.1", "DuckDuckGo");
+pref("browser.search.defaultenginename", "DuckDuckGo");
pref("browser.search.showOneOffButtons", false);
pref("browser.search.suggest.enabled",false);
EOF
-sed '/enable-tests/d' -i debian/config/mozconfig.in
-
sed '/^MOZ_PKG_NAME/s/.*/MOZ_PKG_NAME=icedove/' -i debian/build/config.mk
@@ -69,10 +69,8 @@ MOZ_ENABLE_BREAKPAD = 0
EOF
# Replace Thunderbird branding
-find -type d | grep thunderbird | xargs rename s/thunderbird/icedove/
-find -type d | grep thunderbird | xargs rename s/thunderbird/icedove/
-find -type f | grep thunderbird | xargs rename s/thunderbird/icedove/
-find -type f | grep Thunderbird | xargs rename s/Thunderbird/Icedove/
+find -type d -name '*thunderbird*' | xargs rename s/thunderbird/icedove/
+find -type f -name '*thunderbird*' | xargs rename s/thunderbird/icedove/
SEDSCRIPT="
s/Mozilla Thunderbird/Icedove/g;
@@ -92,16 +90,13 @@ s/Trisquel Foundation/Mozilla Foundation/g;
s/Trisquel Corporation/Mozilla Corporation/g;
"
echo "Running batch replace operation"
-find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
+find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -iregex '.*third_party/rust.*' -execdir /bin/sed --follow-symlinks -i "$SEDSCRIPT" '{}' ';'
-replace Daily Icedove mail/branding/
-sed '/.*<description.*communityExperimentalDesc/,/\/description/d' -i ./mail/base/content/aboutDialog.xul
-sed '/.*<description.*communityDesc/,/\/description/d' -i ./mail/base/content/aboutDialog.xul
-sed '/.*<description.*contributeDesc/,/\/description/d' -i ./mail/base/content/aboutDialog.xul
+replace Daily Trisquel comm/mail/branding/
+sed '/.*<description.*communityExperimentalDesc/,/\/description/d' -i ./comm/mail/base/content/aboutDialog.xul
+sed '/.*<description.*communityDesc/,/\/description/d' -i ./comm/mail/base/content/aboutDialog.xul
+sed '/.*<description.*contributeDesc/,/\/description/d' -i ./comm/mail/base/content/aboutDialog.xul
-# We went too far...
-sed s/Trisquel/Mozilla/ l10n/compare-locales/scripts/compare-locales -i
-sed s/Trisquel/Mozilla/ l10n/compare-locales/setup.py -i
sed '/^Source/s/.*/Source: thunderbird/' -i debian/control.in
sed 's/Provides: mail-reader,/Provides: mail-reader, thunderbird,/' -i debian/control.in