Merge branch 'master' of git://git.pld-linux.org/packages/iceweasel

diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index d6ef4e9d8cfbaf92b96dc66510054861bfe5c553..048b7b4fb549b69b5309b3b9b8f8ff13f4f86d4d 100644 (file)
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -81,13 +81,14 @@
  @BINPATH@/components/alerts.xpt
  #ifdef ACCESSIBILITY
  #ifdef XP_WIN32
-@@ -144,8 +161,10 @@
+@@ -144,8 +161,11 @@
  @BINPATH@/components/appstartup.xpt
  @BINPATH@/components/autocomplete.xpt
  @BINPATH@/components/autoconfig.xpt
 +#endif
  @BINPATH@/components/browsercompsbase.xpt
  @BINPATH@/components/browser-feeds.xpt
++@BINPATH@/components/browser.xpt
 +#ifndef LIBXUL_SDK
  @BINPATH@/components/caps.xpt
  @BINPATH@/components/chrome.xpt
@@ -358,3 +359,13 @@
  
  ; for Solaris SPARC
  #ifdef SOLARIS
+--- iceweasel-20.0.1/mozilla/browser/installer/removed-files.in~       2013-04-10 05:01:20.000000000 +0200
++++ iceweasel-20.0.1/mozilla/browser/installer/removed-files.in        2013-04-18 12:30:31.839633055 +0200
+@@ -884,7 +884,6 @@
+   components/addonManager.js
+   components/amContentHandler.js
+   components/amWebInstallListener.js
+-  components/browser.xpt
+   components/BrowserElementParent.js
+   components/BrowserElementParent.manifest
+   components/BrowserElementPromptService.jsm