importing 52.0-1 sources from https://repomirror.parabola.nu/other/iceweasel/iceweasel_52.0-1.branding.tar.xz52.0-152.0

3 files changed, 27 insertions, 1 deletions

diff --git a/release.sh b/release.sh
index a2d1e05..a662cdd 100755
--- a/release.sh
+++ b/release.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-pkgver=50.0
+pkgver=52.0
 pkgrel=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
new file mode 100644
index 0000000..156a14a
--- /dev/null
+++ b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch
@@ -0,0 +1,25 @@
+From: André Silva <emulatorman@parabola.nu>
+Date: Thu, 9 Mar 2017 01:20:04 -0300
+Subject: Allowed-dupes for Iceweasel
+
+---
+ browser/installer/allowed-dupes.mn | 6 +++---
+ 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
+--- a/browser/installer/allowed-dupes.mn
++++ b/browser/installer/allowed-dupes.mn
+@@ -208,9 +208,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
+ components/FxAccountsPush.js
+ 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
+-firefox
+-firefox-bin
++# Iceweasel branding
++iceweasel
++iceweasel-bin
+ modules/FxAccountsPush.js
+ modules/commonjs/index.js
+ modules/commonjs/sdk/ui/button/view/events.js
diff --git a/src/patches/series b/src/patches/series
index 6c7dde7..77874b0 100644
--- a/src/patches/series
+++ b/src/patches/series
@@ -1,3 +1,4 @@
 iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
 iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch
 iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch
+iceweasel-branding/Allowed-dupes_for_Iceweasel.patch