iceweasel-1:45.0.deb1-1: updating version

2 files changed, 160 insertions, 137 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 9e1011b41..dc1a5cfbc 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -15,10 +15,12 @@
 _pgo=true
 
 # We're getting this from Debian Sid
-_debname=iceweasel
-_debver=44.0.2
+_debname=firefox
+_debver=45.0
 _debrel=deb1
+_brandingrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
+_parabolarepo=https://repo.parabola.nu/other/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=firefox
@@ -30,7 +32,7 @@ pkgrel=1
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gtk3 hicolor-icon-theme hunspell icu=56.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
+depends=(alsa-lib dbus-glib desktop-file-utils ffmpeg gtk2 gtk3 hicolor-icon-theme hunspell icu=56.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
 makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
@@ -38,14 +40,15 @@ if $_pgo; then
   options+=(!ccache)
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'ffmpeg: H264/AAC/MP3 decoding'
             'upower: Battery API')
-url="http://packages.debian.org/sid/$pkgname"
+url="https://wiki.parabola.nu/$pkgname"
 install=$pkgname.install
 replaces=("$pkgname-libre" "$_pkgname")
 conflicts=("$pkgname-libre")
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
+        "$_parabolarepo/`debfile $pkgname`_$_debver-${_brandingrel}.branding.tar.xz"
+        "$_parabolarepo/`debfile $pkgname`_$_debver-${_brandingrel}.branding.tar.xz.sig"
         mozconfig
         libre.patch
         gnu_headshadow.png
@@ -54,20 +57,26 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         $pkgname-install-dir.patch
         vendor.js
         $pkgname-fixed-loading-icon.png)
-sha256sums=('adc1c9127b73bd11b282a469d499122396d63af1a4f1e8d5a9cfd46e36899834'
-            '58560cf8c8632de5b943b8ca000bad8607b1a1144ad082d2cae5ef7bf1488258'
+sha256sums=('96f8b5ccae9864d7a4eece3735378a148481090f76ebfe6524dc433cec229351'
+            '9a698bbeec395352932bf0f07bdb959d87eaa8b99e9e43fcff2fd97e1c2028c5'
+            '5864190874aefe162900d9061f030ae5944ae163be4ae5c1dbe89db94dcb3a38'
+            'SKIP'
             'abc617c170b0c4d549d1995d018285e16e9a30adf5e9c116d8b4d0070758070f'
-            'a28bd21522f0c7d93e9669f1fcc35309c9841d9b2332aa16b0b746ad18fc878c'
+            'e392d975bab18a0351278d8b6777d00afe9382dd285491a1301c23b14e8a235b'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
             'e6e43c6b481891e33dbb95849865410a2a9e77165f7de2c2057d3a8bab990aec'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
+validpgpkeys=('C92BAA713B8D53D3CAE63FC9E6974752F9704456') # André Silva
 
 prepare() {
   cd "$srcdir/$_pkgname-$_debver"
   mv "$srcdir/debian" .
+  mv "$srcdir/$pkgname-$_debver/branding" debian
+  mv "$srcdir/$pkgname-$_debver/patches/iceweasel-branding" debian/patches
+  cat "$srcdir/$pkgname-$_debver/patches/series" >> debian/patches/series
 
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index a31729ad2..b6ce9f4fe 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,7 +1,8 @@
-diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
---- a/browser/base/content/abouthome/aboutHome.css	2015-10-29 19:17:46.000000000 -0300
-+++ b/browser/base/content/abouthome/aboutHome.css	2015-11-05 02:05:34.656054627 -0300
-@@ -347,26 +347,46 @@
+diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
+index c1ef3a4..48e1a16 100644
+--- a/browser/base/content/abouthome/aboutHome.css
++++ b/browser/base/content/abouthome/aboutHome.css
+@@ -343,26 +343,46 @@ body[narrow] #restorePreviousSession::before {
    width: 32px;
  }
  
@@ -55,7 +56,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/
  }
  
  /* [HiDPI]
-@@ -443,9 +463,5 @@
+@@ -435,9 +455,5 @@ body[narrow] #restorePreviousSession::before {
      transform: scale(-0.5, 0.5) translateX(24px);
      transform-origin: top center;
    }
@@ -65,9 +66,10 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/
 -  }
  }
  
-diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
---- a/browser/base/content/abouthome/aboutHome.js	2015-10-29 19:17:46.000000000 -0300
-+++ b/browser/base/content/abouthome/aboutHome.js	2015-11-05 02:08:05.691711824 -0300
+diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
+index 7ad7d68..091e7e0 100644
+--- a/browser/base/content/abouthome/aboutHome.js
++++ b/browser/base/content/abouthome/aboutHome.js
 @@ -9,17 +9,13 @@
  //   * add a <span/> for it in aboutHome.xhtml
  //   * add an entry here in the proper ordering (based on spans)
@@ -86,12 +88,13 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a
  const DATABASE_VERSION = 1;
 -const DATABASE_STORAGE = "persistent";
  const SNIPPETS_OBJECTSTORE_NAME = "snippets";
+ var searchText;
  
- // This global tracks if the page has been set up before, to prevent double inits
-diff -Nur a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
---- a/browser/base/content/abouthome/aboutHome.xhtml	2015-10-29 19:17:46.000000000 -0300
-+++ b/browser/base/content/abouthome/aboutHome.xhtml	2015-11-05 02:21:42.590232015 -0300
-@@ -48,10 +48,6 @@
+diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
+index 2f708ec..29d7307 100644
+--- a/browser/base/content/abouthome/aboutHome.xhtml
++++ b/browser/base/content/abouthome/aboutHome.xhtml
+@@ -49,10 +49,6 @@
        </div>
  
        <div id="snippetContainer">
@@ -111,10 +114,11 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/conten
 +    <a id="aboutDRMfree" href="https://defectivebydesign.org/drm-free"></a>
    </body>
  </html>
-diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn
---- a/browser/base/jar.mn	2015-10-29 19:17:46.000000000 -0300
-+++ b/browser/base/jar.mn	2015-11-05 02:04:47.155135935 -0300
-@@ -32,7 +32,8 @@
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+index 3a97c53..1486ef6 100644
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -32,7 +32,8 @@ browser.jar:
          content/browser/abouthome/settings.png        (content/abouthome/settings.png)
          content/browser/abouthome/restore.png         (content/abouthome/restore.png)
          content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
@@ -124,7 +128,7 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn
          content/browser/abouthome/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
          content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
          content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
-@@ -44,7 +45,6 @@
+@@ -43,7 +44,6 @@ browser.jar:
          content/browser/abouthome/settings@2x.png      (content/abouthome/settings@2x.png)
          content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
          content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
@@ -132,9 +136,10 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn
  
          content/browser/aboutNetError.xhtml            (content/aboutNetError.xhtml)
  
-diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd	2015-10-29 19:17:49.000000000 -0300
-+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd	2015-11-05 02:42:55.632130642 -0300
+diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
+index 6d6d1c5..69bd37b 100644
+--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
 @@ -11,14 +11,6 @@
  
  <!ENTITY abouthome.pageTitle "&brandFullName; Start Page">
@@ -150,102 +155,10 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales
  <!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
  <!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
  
-diff -Nur a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd
---- a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd	2015-10-29 19:17:49.000000000 -0300
-+++ b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd	2015-11-05 02:04:47.171801755 -0300
-@@ -24,7 +24,7 @@
- <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
- these strings will be concatenated in a single label, remoteDocumentation will
- be used as text for a link to MDN. -->
--<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the 'Remote debugging' option in the remote device. For more, see the ">
-+<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the 'Remote debugging' option in the remote device. For more, see the ">
- <!ENTITY remoteDocumentation "documentation">
- <!ENTITY remoteHelpSuffix ".">
- 
-diff -Nur a/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties b/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties
---- a/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties	2015-10-29 19:17:50.000000000 -0300
-+++ b/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties	2015-11-05 02:04:47.171801755 -0300
-@@ -4,7 +4,7 @@
- 
- # LOCALIZATION NOTE These strings are used inside the Source Editor component.
- # This component is used whenever source code is displayed for the purpose of
--# being edited, inside the Firefox developer tools - current examples are the
-+# being edited, inside the Iceweasel developer tools - current examples are the
- # Scratchpad and the Style Editor tools.
- 
- # LOCALIZATION NOTE The correct localization of this file might be to keep it
-diff -Nur a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
---- a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-10-29 19:17:50.000000000 -0300
-+++ b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-11-05 02:04:47.171801755 -0300
-@@ -90,7 +90,7 @@
-   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
-   -  boolean preference in about:config, in the options panel. -->
- <!ENTITY options.enableRemote.label3    "Enable remote debugging">
--<!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS">
-+<!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Iceweasel instance like Iceweasel OS">
- 
- <!-- LOCALIZATION NOTE (options.enableWorkers.label): This is the label for the
-   -  checkbox that toggles worker debugging, i.e. devtools.debugger.workers
-@@ -119,7 +119,7 @@
- <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
-   -  the heading of group of checkboxes corresponding to the default developer
-   -  tools. -->
--<!ENTITY options.selectDefaultTools.label     "Default Firefox Developer Tools">
-+<!ENTITY options.selectDefaultTools.label     "Default Iceweasel Developer Tools">
- 
- <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
-   -  the heading of group of checkboxes corresponding to the developer tools
-diff -Nur a/browser/locales/en-US/chrome/browser/devtools/webide.dtd b/browser/locales/en-US/chrome/browser/devtools/webide.dtd
---- a/browser/locales/en-US/chrome/browser/devtools/webide.dtd	2015-10-29 19:17:50.000000000 -0300
-+++ b/browser/locales/en-US/chrome/browser/devtools/webide.dtd	2015-11-05 02:04:47.171801755 -0300
-@@ -2,7 +2,7 @@
-    - License, v. 2.0. If a copy of the MPL was not distributed with this
-    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
- 
--<!ENTITY windowTitle "Firefox WebIDE">
-+<!ENTITY windowTitle "Iceweasel WebIDE">
- 
- <!ENTITY projectMenu_label "Project">
- <!ENTITY projectMenu_accesskey "P">
-@@ -58,7 +58,7 @@
- <!ENTITY projectButton_label "Open App">
- <!ENTITY runtimeButton_label "Select Runtime">
- 
--<!-- We try to repicate Firefox' bindings: -->
-+<!-- We try to repicate Iceweasel' bindings: -->
- <!-- quit app -->
- <!ENTITY key_quit "W">
- <!-- open menu -->
-diff -Nur a/browser/locales/en-US/chrome/browser/devtools/webide.properties b/browser/locales/en-US/chrome/browser/devtools/webide.properties
---- a/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-10-29 19:17:50.000000000 -0300
-+++ b/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-11-05 02:04:47.171801755 -0300
-@@ -2,8 +2,8 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--title_noApp=Firefox WebIDE
--title_app=Firefox WebIDE: %S
-+title_noApp=Iceweasel WebIDE
-+title_app=Iceweasel WebIDE: %S
- 
- runtimeButton_label=Select Runtime
- projectButton_label=Open App
-@@ -54,10 +54,10 @@
- addons_stable=stable
- addons_unstable=unstable
- # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of
--# a given simulator version in the "Manage Simulators" pane.  %1$S: Firefox OS
-+# a given simulator version in the "Manage Simulators" pane.  %1$S: Iceweasel OS
- # version in the simulator, ex. 1.3.  %2$S: Simulator stability label, ex.
- # "stable" or "unstable".
--addons_simulator_label=Firefox OS %1$S Simulator (%2$S)
-+addons_simulator_label=Iceweasel OS %1$S Simulator (%2$S)
- addons_install_button=install
- addons_uninstall_button=uninstall
- addons_adb_label=ADB Helper Add-on
-diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
---- a/browser/locales/en-US/chrome/browser-region/region.properties	2015-10-29 19:17:49.000000000 -0300
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties	2015-11-05 02:04:47.171801755 -0300
+diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
+index e078ed5..ce2c5ed 100644
+--- a/browser/locales/en-US/chrome/browser-region/region.properties
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
 @@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
@@ -268,7 +181,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -22,20 +17,10 @@
+@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=4
  
@@ -293,9 +206,10 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
-diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
---- a/browser/locales/generic/profile/bookmarks.html.in	2015-10-29 19:17:50.000000000 -0300
-+++ b/browser/locales/generic/profile/bookmarks.html.in	2015-11-05 02:04:47.171801755 -0300
+diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
+index 076ca38..1826961 100644
+--- a/browser/locales/generic/profile/bookmarks.html.in
++++ b/browser/locales/generic/profile/bookmarks.html.in
 @@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -323,10 +237,11 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/
 +        <DT><A HREF="https://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
      </DL><p>
  </DL><p>
-diff -Nur a/debian/branding/Makefile.in b/debian/branding/Makefile.in
---- a/debian/branding/Makefile.in	2015-11-03 20:35:49.000000000 -0300
-+++ b/debian/branding/Makefile.in	2015-11-05 04:24:34.326560824 -0300
-@@ -32,9 +32,9 @@
+diff --git a/debian/branding/Makefile.in b/debian/branding/Makefile.in
+index b395c62..fd4768c 100644
+--- a/debian/branding/Makefile.in
++++ b/debian/branding/Makefile.in
+@@ -32,9 +32,9 @@ default48.png: SIZE=48
  GARBAGE += document_icon.png default64.png
  
  mozicon128.png default16.png default32.png default48.png default64.png: $(srcdir)/iceweasel_icon.svg
@@ -338,10 +253,11 @@ diff -Nur a/debian/branding/Makefile.in b/debian/branding/Makefile.in
 +	convert -background none $< -resize 256x256^ -gravity center -extent 256x256 $@
  
  GARBAGE += iceweasel_logo.png
-diff -Nur a/debian/branding/content/Makefile.in b/debian/branding/content/Makefile.in
---- a/debian/branding/content/Makefile.in	2015-11-03 21:06:22.000000000 -0300
-+++ b/debian/branding/content/Makefile.in	2015-11-05 04:26:53.849713418 -0300
-@@ -23,10 +23,10 @@
+diff --git a/debian/branding/content/Makefile.in b/debian/branding/content/Makefile.in
+index 6c13eac..bb4cf4a 100644
+--- a/debian/branding/content/Makefile.in
++++ b/debian/branding/content/Makefile.in
+@@ -23,10 +23,10 @@ about.png: %.png: ../iceweasel_logo.png %-base.png
  	convert - -define png:exclude-chunk=time +set date:create +set date:modify $@
  
  about-logo.png: ../iceweasel_icon.svg
@@ -354,3 +270,101 @@ diff -Nur a/debian/branding/content/Makefile.in b/debian/branding/content/Makefi
  
  about-wordmark.svg: wordmark.xsl ../iceweasel_logo.svg
  	xsltproc -o $@ $^
+diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd
+index ba304a3..4274e50 100644
+--- a/devtools/client/locales/en-US/connection-screen.dtd
++++ b/devtools/client/locales/en-US/connection-screen.dtd
+@@ -24,7 +24,7 @@
+ <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
+ these strings will be concatenated in a single label, remoteDocumentation will
+ be used as text for a link to MDN. -->
+-<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the 'Remote debugging' option in the remote device. For more, see the ">
++<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the 'Remote debugging' option in the remote device. For more, see the ">
+ <!ENTITY remoteDocumentation "documentation">
+ <!ENTITY remoteHelpSuffix ".">
+ 
+diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
+index 01447e3..0bc043e 100644
+--- a/devtools/client/locales/en-US/sourceeditor.properties
++++ b/devtools/client/locales/en-US/sourceeditor.properties
+@@ -4,7 +4,7 @@
+ 
+ # LOCALIZATION NOTE These strings are used inside the Source Editor component.
+ # This component is used whenever source code is displayed for the purpose of
+-# being edited, inside the Firefox developer tools - current examples are the
++# being edited, inside the Iceweasel developer tools - current examples are the
+ # Scratchpad and the Style Editor tools.
+ 
+ # LOCALIZATION NOTE The correct localization of this file might be to keep it
+diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
+index c44a6b3..2ab78bc 100644
+--- a/devtools/client/locales/en-US/toolbox.dtd
++++ b/devtools/client/locales/en-US/toolbox.dtd
+@@ -105,7 +105,7 @@ values from browser.dtd.  -->
+   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
+   -  boolean preference in about:config, in the options panel. -->
+ <!ENTITY options.enableRemote.label3    "Enable remote debugging">
+-<!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS">
++<!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Iceweasel instance like Iceweasel OS">
+ 
+ <!-- LOCALIZATION NOTE (options.enableWorkers.label): This is the label for the
+   -  checkbox that toggles worker debugging, i.e. devtools.debugger.workers
+@@ -134,7 +134,7 @@ values from browser.dtd.  -->
+ <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
+   -  the heading of group of checkboxes corresponding to the default developer
+   -  tools. -->
+-<!ENTITY options.selectDefaultTools.label     "Default Firefox Developer Tools">
++<!ENTITY options.selectDefaultTools.label     "Default Iceweasel Developer Tools">
+ 
+ <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
+   -  the heading of group of checkboxes corresponding to the developer tools
+diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
+index 67a2332..06573a3 100644
+--- a/devtools/client/locales/en-US/webide.dtd
++++ b/devtools/client/locales/en-US/webide.dtd
+@@ -2,7 +2,7 @@
+    - License, v. 2.0. If a copy of the MPL was not distributed with this
+    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+ 
+-<!ENTITY windowTitle "Firefox WebIDE">
++<!ENTITY windowTitle "Iceweasel WebIDE">
+ 
+ <!ENTITY projectMenu_label "Project">
+ <!ENTITY projectMenu_accesskey "P">
+@@ -59,7 +59,7 @@
+ <!ENTITY projectButton_label "Open App">
+ <!ENTITY runtimeButton_label "Select Runtime">
+ 
+-<!-- We try to repicate Firefox' bindings: -->
++<!-- We try to repicate Iceweasel' bindings: -->
+ <!-- quit app -->
+ <!ENTITY key_quit "W">
+ <!-- open menu -->
+diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties
+index 441e993..dee7e08 100644
+--- a/devtools/client/locales/en-US/webide.properties
++++ b/devtools/client/locales/en-US/webide.properties
+@@ -2,8 +2,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-title_noApp=Firefox WebIDE
+-title_app=Firefox WebIDE: %S
++title_noApp=Iceweasel WebIDE
++title_app=Iceweasel WebIDE: %S
+ 
+ runtimeButton_label=Select Runtime
+ projectButton_label=Open App
+@@ -54,10 +54,10 @@ error_runtimeVersionTooRecent=The connected runtime has a more recent build date
+ addons_stable=stable
+ addons_unstable=unstable
+ # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of
+-# a given simulator version in the "Manage Simulators" pane.  %1$S: Firefox OS
++# a given simulator version in the "Manage Simulators" pane.  %1$S: Iceweasel OS
+ # version in the simulator, ex. 1.3.  %2$S: Simulator stability label, ex.
+ # "stable" or "unstable".
+-addons_simulator_label=Firefox OS %1$S Simulator (%2$S)
++addons_simulator_label=Iceweasel OS %1$S Simulator (%2$S)
+ addons_install_button=install
+ addons_uninstall_button=uninstall
+ addons_adb_label=ADB Helper Add-on