summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrizzlyuser <grizzlyuser@protonmail.com>2020-05-06 20:40:35 +0300
committerbill-auger <mr.j.spam.me@gmail.com>2020-06-25 05:09:52 -0400
commit17f7a6f877e30303a3ca31956412931be467d643 (patch)
tree9df6a74d845d81a075e88074a927661013b4be2e
parentff65a296c44c75cbab3355606fd624f30d2f3cd7 (diff)
Bump version, update patches76.0-1
Signed-off-by: Andreas Grapentin <andreas@grapentin.org>
-rwxr-xr-xrelease.sh2
-rw-r--r--src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch12
2 files changed, 7 insertions, 7 deletions
diff --git a/release.sh b/release.sh
index c622039..bb70659 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
set -eu
pkgname=iceweasel
-brandingver=75.0
+brandingver=76.0
brandingrel=1
srcdir=src
diff --git a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
index 26f1ef3..52cb29b 100644
--- a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
+++ b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
@@ -7,19 +7,19 @@ Subject: Allowed-dupes for Iceweasel
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
-index c5ab86b65..c402ab76f 100644
+index 8f699b479c..c930bed678 100644
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
-@@ -112,9 +112,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
- components/FxAccountsPush.js
+@@ -36,9 +36,9 @@ browser/chrome.manifest
crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
+
-# firefox/firefox-bin is bug 658850
-@MOZ_APP_NAME@
-@MOZ_APP_NAME@-bin
+# Iceweasel branding
+iceweasel
+iceweasel-bin
- modules/FxAccountsPush.js
- modules/commonjs/index.js
- modules/commonjs/sdk/ui/button/view/events.js
+
+ # Row and column icons are duplicated
+ res/table-remove-column-active.gif