diff --git a/helpers/DATA/firefox/debug_brand/PrivateBrowsing_150.png b/helpers/DATA/firefox/debug_brand/PrivateBrowsing_150.png new file mode 100644 index 0000000..a1d89fc Binary files /dev/null and b/helpers/DATA/firefox/debug_brand/PrivateBrowsing_150.png differ diff --git a/helpers/DATA/firefox/debug_brand/PrivateBrowsing_70.png b/helpers/DATA/firefox/debug_brand/PrivateBrowsing_70.png new file mode 100644 index 0000000..caaa315 Binary files /dev/null and b/helpers/DATA/firefox/debug_brand/PrivateBrowsing_70.png differ diff --git a/helpers/DATA/firefox/debug_brand/about-logo-private.png b/helpers/DATA/firefox/debug_brand/about-logo-private.png new file mode 100644 index 0000000..dc7cdcd Binary files /dev/null and b/helpers/DATA/firefox/debug_brand/about-logo-private.png differ diff --git a/helpers/DATA/firefox/debug_brand/about-logo-private@2x.png b/helpers/DATA/firefox/debug_brand/about-logo-private@2x.png new file mode 100644 index 0000000..9382701 Binary files /dev/null and b/helpers/DATA/firefox/debug_brand/about-logo-private@2x.png differ diff --git a/helpers/DATA/firefox/debug_brand/debuglogo.svg b/helpers/DATA/firefox/debug_brand/debuglogo.svg new file mode 100644 index 0000000..f93894a --- /dev/null +++ b/helpers/DATA/firefox/debug_brand/debuglogo.svg @@ -0,0 +1,620 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Internet Category + + + Jakub Steiner + + + + + Tuomas Kuosmanen + + + + http://jimmac.musichall.cz + + + internet + tools + applications + category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/helpers/DATA/firefox/debug_brand/debuglogo_gray.svg b/helpers/DATA/firefox/debug_brand/debuglogo_gray.svg new file mode 100644 index 0000000..727f3d6 --- /dev/null +++ b/helpers/DATA/firefox/debug_brand/debuglogo_gray.svg @@ -0,0 +1,619 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + + + Tuomas Kuosmanen + + + + http://jimmac.musichall.cz + + + internet + tools + applications + category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/helpers/make-firefox b/helpers/make-firefox index a983d98..5506f82 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=102 +VERSION=103 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 @@ -326,6 +326,7 @@ s|brand-product-name = Firefox|brand-product-name = Abrowser|; s|Sign in to Firefox|Sign in to Sync|; s|Search addons.mozilla.org|Search|g; s|firefox.settings.services.mozilla.com|127.0.0.1|g; +s|this-firefox|this-abrowser|g; " echo "Running batch replace operation" @@ -377,9 +378,9 @@ do done ##Remove invalid policy for trisquel. find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d' -find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/d" +find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d" find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d" -find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/d" +find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/,/<\/li>/d" #EO about: mods. sed -i 's/Mozilla\ Project<\/a>/Trisquel\ Project<\/a>/g' browser/base/content/overrides/app-license.html @@ -426,6 +427,17 @@ cp $DATA/android/mobile.ico mobile/android/app/ #cp $DATA/android/images/* mobile/android/themes/core/images/ cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res +# Rebrand svg & debug tools & privacy logos +find devtools/client/themes/images/ -name aboutdebugging-firefox-*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg +find devtools/client/themes/images/ -name aboutdebugging-fenix*.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg + +find browser/branding/ -name about-logo.svg | xargs -n1 cp $DATA/debug_brand/debuglogo.svg + +find browser/branding/ -name about-logo-private.png | xargs -n1 cp $DATA/debug_brand/about-logo-private.png +find browser/branding/ -name about-logo-private@2x.png | xargs -n1 cp $DATA/debug_brand/about-logo-private@2x.png +find browser/branding/ -name PrivateBrowsing_70.png | xargs -n1 cp $DATA/debug_brand/PrivateBrowsing_70.png +find browser/branding/ -name PrivateBrowsing_150.png | xargs -n1 cp $DATA/debug_brand/PrivateBrowsing_150.png + #Fixes by patch on source. ##Firefox v100, based on parabola 9004-FSDG-misc.patch patch --no-backup-if-mismatch -p1 < $DATA/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch