[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kov at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 12a75e7fbabe620d692bcf2a75f6d47b2fe94ba8
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 19:59:07 2010 +0000

    2010-08-06  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Xan Lopez.
    
            Use new "package" name also for the directory where the inspector
            support files are installed.
    
            * GNUmakefile.am:
    
    WebKit/gtk
    
    2010-08-06  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Xan Lopez.
    
            Use the new paths, and also fix the path for localizedStrings.
    
            * WebCoreSupport/InspectorClientGtk.cpp:
            (WebKit::InspectorClient::openInspectorFrontend):
            (WebKit::InspectorFrontendClient::localizedStringsURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index be1c88d..a137261 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-06  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        Use new "package" name also for the directory where the inspector
+        support files are installed.
+
+        * GNUmakefile.am:
+
 2010-08-06  Jian Li  <jianli at chromium.org>
 
         Fix chromium build break.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 4ae59ac..5e880f2 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -4530,14 +4530,14 @@ EXTRA_DIST += \
 	WebCore/xml/XPathGrammar.y
 
 # Installing web inspector files
-webinspectordir = ${datadir}/webkit- at WEBKITGTK_API_VERSION@/webinspector
+webinspectordir = ${datadir}/webkitgtk- at WEBKITGTK_API_VERSION@/webinspector
 dist_webinspector_DATA = \
 	$(WebCore)/English.lproj/localizedStrings.js \
 	$(shell ls $(WebCore)/inspector/front-end/*.js) \
 	$(shell ls $(WebCore)/inspector/front-end/*.html) \
 	$(shell ls $(WebCore)/inspector/front-end/*.css)
 
-webinspectorimagesdir = ${datadir}/webkit- at WEBKITGTK_API_VERSION@/webinspector/Images
+webinspectorimagesdir = ${datadir}/webkitgtk- at WEBKITGTK_API_VERSION@/webinspector/Images
 dist_webinspectorimages_DATA = \
 	$(shell ls $(WebCore)/inspector/front-end/Images/*.gif) \
 	$(shell ls $(WebCore)/inspector/front-end/Images/*.png)
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 92c8f95..e429a69 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-06  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        Use the new paths, and also fix the path for localizedStrings.
+
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::InspectorClient::openInspectorFrontend):
+        (WebKit::InspectorFrontendClient::localizedStringsURL):
+
 2010-08-06  Jessie Berlin  <jberlin at apple.com>
 
         Roll out http://trac.webkit.org/changeset/64801, which broke the Safari Windows Build.
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index bb7d661..1256000 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -86,7 +86,7 @@ void InspectorClient::openInspectorFrontend(InspectorController* controller)
         GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/inspector/front-end/inspector.html", currentDirectory.get()));
         inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
     } else {
-        GOwnPtr<gchar> dataPath(g_strdup_printf(DATA_DIR"/webkit-%.1f/webinspector/inspector.html", WEBKITGTK_API_VERSION));
+        GOwnPtr<gchar> dataPath(g_strdup_printf(DATA_DIR"/webkitgtk-%.1f/webinspector/inspector.html", WEBKITGTK_API_VERSION));
         inspectorURI.set(g_filename_to_uri(dataPath.get(), NULL, NULL));
     }
 
@@ -205,8 +205,10 @@ String InspectorFrontendClient::localizedStringsURL()
         GOwnPtr<gchar> currentDirectory(g_get_current_dir());
         GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/English.lproj/localizedStrings.js", currentDirectory.get()));
         URL.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
-    } else
-        URL.set(g_filename_to_uri(DATA_DIR"/webkit-1.0/webinspector/localizedStrings.js", NULL, NULL));
+    } else {
+        GOwnPtr<gchar> localizedStringsPath(g_strdup_printf(DATA_DIR"/webkitgtk-%.1f/webinspector/localizedStrings.js", WEBKITGTK_API_VERSION));
+        URL.set(g_filename_to_uri(localizedStringsPath.get(), NULL, NULL));
+    }
 
     // FIXME: support l10n of localizedStrings.js
     return String::fromUTF8(URL.get());

-- 
WebKit Debian packaging