# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1414668601 -3600
# Node ID f4578fb6fcc3b0e12383ddba410377bb3129047c
# Parent  f721a3dea21995422404ec577eb358dc6310d7dc
33.1 preparation

diff -r f721a3dea219 -r f4578fb6fcc3 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Thu Oct 30 11:42:24 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu Oct 30 12:30:01 2014 +0100
@@ -1,4 +1,19 @@
 -------------------------------------------------------------------
+Thu Oct 30 10:48:57 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 33.1
+  33.0.1
+  * Firefox displays a black screen at start-up with certain
+    graphics drivers
+  33.0.2
+  * Fix a startup crash with some combination of hardware and drivers
+  33.1
+  * DuckDuckGo is now included upstream (bmo#1061736)
+  * fix to allow overriding sec_error_ca_cert_invalid errors
+    (bmo#1042889)
+  * disable http/1 framing enforcement (bmo#1088850)
+
+-------------------------------------------------------------------
 Tue Oct 28 15:23:09 UTC 2014 - josua.mayer97@gmail.com
 
 - added mozilla-bmo1088588.patch to fix build with EGL (bmo#1088588)
diff -r f721a3dea219 -r f4578fb6fcc3 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Oct 30 11:42:24 2014 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Oct 30 12:30:01 2014 +0100
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 33
-%define mainver %major.0.1
+%define mainver %major.1
 %define update_channel release
-%define releasedate 2014102500
+%define releasedate 2014102900
 
 # general build definitions
 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
diff -r f721a3dea219 -r f4578fb6fcc3 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Thu Oct 30 11:42:24 2014 +0100
+++ b/MozillaFirefox/create-tar.sh	Thu Oct 30 12:30:01 2014 +0100
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_33_0_1_RELEASE"
-VERSION="33.0.1"
+RELEASE_TAG="FIREFOX_33_1_RELEASE"
+VERSION="33.1"
 
 # mozilla
 if [ -d mozilla ]; then
diff -r f721a3dea219 -r f4578fb6fcc3 firefox-multilocale-chrome.patch
--- a/firefox-multilocale-chrome.patch	Thu Oct 30 11:42:24 2014 +0100
+++ b/firefox-multilocale-chrome.patch	Thu Oct 30 12:30:01 2014 +0100
@@ -1,12 +1,12 @@
 # HG changeset patch
-# Parent 9e20873aca55242f18dd1b93e863eded6d1d08bd
+# Parent 78b2c4af37108b3a2b6a856da7544335001cd444
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 Add searchplugins to chrome packaging for proper localization
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -375,16 +375,20 @@ pref("browser.helperApps.deleteTempFileO
+@@ -381,16 +381,20 @@ pref("browser.helperApps.deleteTempFileO
  #endif
  
  // search engines URL
@@ -39,10 +39,10 @@
  ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
  SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt))
  else
--SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
+-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg
 +SEARCHPLUGINS_NAMES = $(shell cat \
-+    $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
-+    @srcdir@/en-US/searchplugins/list.txt ) )
++   $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
++   @srcdir@/en-US/searchplugins/list.txt ) ) ddg
  endif
  SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
  SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES))
@@ -128,7 +128,7 @@
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -133,14 +133,15 @@
+@@ -135,14 +135,15 @@
      locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
  #endif
  % locale browser-region @AB_CD@ %locale/browser-region/