<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173757] releases/WebKitGTK/webkit-2.6</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173757">173757</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-19 09:01:44 -0700 (Fri, 19 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173755">r173755</a> - [GTK] Missing inspector files in the tarball
https://bugs.webkit.org/show_bug.cgi?id=136952
Reviewed by Gustavo Noronha Silva.
Source/WebKit2:
* PlatformGTK.cmake: Use APPEND instead of GLOB to add individual
and generated files to the list of inspector files.
Tools:
* gtk/manifest.txt: Add
Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
to the tarball.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2PlatformGTKcmake">releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsChangeLog">releases/WebKitGTK/webkit-2.6/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26Toolsgtkmanifesttxt">releases/WebKitGTK/webkit-2.6/Tools/gtk/manifest.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (173756 => 173757)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-09-19 16:00:48 UTC (rev 173756)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-09-19 16:01:44 UTC (rev 173757)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-09-19 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Missing inspector files in the tarball
+ https://bugs.webkit.org/show_bug.cgi?id=136952
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Use APPEND instead of GLOB to add individual
+ and generated files to the list of inspector files.
+
+2014-09-19 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Webkitgtk 2.5.3: tarball contains APPLE LICENSE file - stating not distributable
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136632
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake (173756 => 173757)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-09-19 16:00:48 UTC (rev 173756)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-09-19 16:01:44 UTC (rev 173757)
</span><span class="lines">@@ -372,7 +372,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> file(GLOB InspectorFiles
</span><del>- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
</del><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
</span><span class="lines">@@ -385,6 +384,10 @@
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.png
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg
</span><ins>+)
+
+list(APPEND InspectorFiles
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
</ins><span class="cx"> ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
</span><span class="cx"> ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorWebBackendCommands.js
</span><span class="cx"> )
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (173756 => 173757)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-09-19 16:00:48 UTC (rev 173756)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-09-19 16:01:44 UTC (rev 173757)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-09-19 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Missing inspector files in the tarball
+ https://bugs.webkit.org/show_bug.cgi?id=136952
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * gtk/manifest.txt: Add
+ Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
+ to the tarball.
+
+2014-09-19 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Webkitgtk 2.5.3: tarball contains APPLE LICENSE file - stating not distributable
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136632
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26Toolsgtkmanifesttxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/gtk/manifest.txt (173756 => 173757)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/gtk/manifest.txt 2014-09-19 16:00:48 UTC (rev 173756)
+++ releases/WebKitGTK/webkit-2.6/Tools/gtk/manifest.txt 2014-09-19 16:01:44 UTC (rev 173757)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> file Source/WebKit2/gtk/NEWS NEWS
</span><span class="cx">
</span><span class="cx"> file Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js
</span><ins>+file Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
</ins><span class="cx">
</span><span class="cx"> # Include only the resources we actually build
</span><span class="cx"> file Source/WebCore/Resources/deleteButton.png
</span></span></pre>
</div>
</div>
</body>
</html>