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

diff --combined iceweasel-packaging.patch
index be03f6a4b3d51320548b65547dfa92e6afaa4e50,d6ef4e9d8cfbaf92b96dc66510054861bfe5c553..048b7b4fb549b69b5309b3b9b8f8ff13f4f86d4d
--- 1/iceweasel-packaging.patch
--- 2/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@@ -81,14 -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
@@@ -215,21 -214,21 +215,21 @@@
   @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
   #endif
  @@ -457,6 +500,7 @@
-  @BINPATH@/components/nsINIProcessor.js
-  @BINPATH@/components/nsPrompter.manifest
-  @BINPATH@/components/nsPrompter.js
- +#endif
-  #ifdef MOZ_SERVICES_AITC
   @BINPATH@/components/AitcComponents.manifest
   @BINPATH@/components/Aitc.js
+  #endif
+ +#endif
+  #ifdef MOZ_DATA_REPORTING
+  @BINPATH@/components/DataReporting.manifest
+  @BINPATH@/components/DataReportingService.js
  @@ -468,6 +512,7 @@
-  @BINPATH@/components/SyncComponents.manifest
-  @BINPATH@/components/Weave.js
+  #ifdef MOZ_SERVICES_HEALTHREPORT
+  @BINPATH@/components/HealthReportComponents.manifest
   #endif
  +#ifndef LIBXUL_SDK
-  @BINPATH@/components/servicesComponents.manifest
-  @BINPATH@/components/cryptoComponents.manifest
-  @BINPATH@/components/TelemetryPing.js
+  #ifdef MOZ_SERVICES_SYNC
+  @BINPATH@/components/SyncComponents.manifest
+  @BINPATH@/components/Weave.js
  @@ -488,11 +533,14 @@
   @BINPATH@/components/AlarmsManager.manifest
   @BINPATH@/components/TCPSocket.js
@@@ -288,6 -287,26 +288,26 @@@
   ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
   @BINPATH@/defaults/pref/channel-prefs.js
   #else
+ @@ -566,15 +616,19 @@
+  #endif
+  
+  ; Services (gre) prefs
+ +#ifndef LIBXUL_SDK
+  #ifdef MOZ_SERVICES_AITC
+  @BINPATH@/defaults/pref/services-aitc.js
+  #endif
+ +#endif
+  #ifdef MOZ_SERVICES_NOTIFICATIONS
+  @BINPATH@/defaults/pref/services-notifications.js
+  #endif
+ +#ifndef LIBXUL_SDK
+  #ifdef MOZ_SERVICES_SYNC
+  @BINPATH@/defaults/pref/services-sync.js
+  #endif
+ +#endif
+  
+  ; [Layout Engine Resources]
+  ; Style Sheets, Graphics and other Resources used by the layout engine. 
  @@ -573,6 +623,7 @@
   
   ; [Layout Engine Resources]
@@@ -339,13 -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