# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1433350451 -7200
# Node ID cf7e96afbe3a241361987daa4d959f1557ad5b5f
# Parent  e11af0d6cb48f89530c2e127f19079d7c39dde73
Firefox 38.0.5

diff -r e11af0d6cb48 -r cf7e96afbe3a MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Fri May 15 13:12:10 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed Jun 03 18:54:11 2015 +0200
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Sat May 23 21:13:49 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 38.0.5
+  * Keep track of articles and videos with Pocket
+  * Clean formatting for articles and blog posts with Reader View
+  * Share the active tab or window in a Hello conversation
+- add changes file as source for SRPM (bsc#932142)
+
+-------------------------------------------------------------------
 Fri May 15 10:40:19 UTC 2015 - normand@linux.vnet.ibm.com
 
 - add mozilla-add-glibcxx_use_cxx11_abi.patch grabbed from
diff -r e11af0d6cb48 -r cf7e96afbe3a MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri May 15 13:12:10 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Jun 03 18:54:11 2015 +0200
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 38
-%define mainver %major.0.1
+%define mainver %major.0.5
 %define update_channel release
-%define releasedate 2015051400
+%define releasedate 2015052300
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
@@ -131,6 +131,7 @@
 Source13:       spellcheck.js
 Source14:       create-tar.sh
 Source15:       firefox-appdata.xml
+Source16:       MozillaFirefox.changes
 # Gecko/Toolkit
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-nongnome-proxies.patch
diff -r e11af0d6cb48 -r cf7e96afbe3a MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Fri May 15 13:12:10 2015 +0200
+++ b/MozillaFirefox/create-tar.sh	Wed Jun 03 18:54:11 2015 +0200
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_38_0_1_RELEASE"
-VERSION="38.0.1"
+RELEASE_TAG="FIREFOX_38_0_5_RELEASE"
+VERSION="38.0.5"
 
 # mozilla
 if [ -d mozilla ]; then
diff -r e11af0d6cb48 -r cf7e96afbe3a firefox-kde.patch
--- a/firefox-kde.patch	Fri May 15 13:12:10 2015 +0200
+++ b/firefox-kde.patch	Wed Jun 03 18:54:11 2015 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  a21f91aa3ed60b4e95b47f45715dfda379dab7c8
+# Parent  db8f62578ee4614fc23c628b523e2bc7ae92ea04
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
@@ -1330,7 +1330,7 @@
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1228,17 +1228,17 @@
+@@ -1234,17 +1234,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1363,14 +1363,14 @@
  *       content/browser/browser.xul                   (content/browser.xul)
 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
 +%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
+         content/browser/browser-pocket-en-US.properties (content/browser-pocket-en-US.properties)
+         content/browser/browser-pocket.dtd            (content/browser-pocket.dtd)
+         content/browser/browser-pocket-de.properties  (content/browser-pocket-de.properties)
+         content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties)
+         content/browser/browser-pocket-ja.properties  (content/browser-pocket-ja.properties)
+         content/browser/browser-pocket-ru.properties  (content/browser-pocket-ru.properties)
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/chatWindow.xul                (content/chatWindow.xul)
-         content/browser/content.js                    (content/content.js)
-         content/browser/defaultthemes/1.footer.jpg    (content/defaultthemes/1.footer.jpg)
-         content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
-         content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
-         content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
-         content/browser/defaultthemes/2.footer.jpg    (content/defaultthemes/2.footer.jpg)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp