r18621 - in /desktop/experimental/epiphany-webkit/debian: changelog epiphany-webkit-data.gconf-defaults patches/14_webkit_temporary_gconf_rename.patch patches/series rules
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Tue Mar 3 20:30:19 UTC 2009
Author: kov
Date: Tue Mar 3 20:30:19 2009
New Revision: 18621
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18621
Log:
* 14_webkit_temporary_gconf_rename.patch:
- patch to rename all gconf keys used by epiphany, to allow sane
parallel installation with the gecko version
* debian/epiphany-webkit-data.gconf-defaults, debian/rules: updated
accordingly
Added:
desktop/experimental/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch
Modified:
desktop/experimental/epiphany-webkit/debian/changelog
desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults
desktop/experimental/epiphany-webkit/debian/patches/series
desktop/experimental/epiphany-webkit/debian/rules
Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=18621&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog Tue Mar 3 20:30:19 2009
@@ -17,8 +17,13 @@
* 13_gtk-doc_fix.patch:
- added; do not try to include ephy-cookie-manager in the documentation,
since it no longer exists
-
- -- Gustavo Noronha Silva <kov at debian.org> Tue, 03 Mar 2009 12:01:31 -0300
+ * 14_webkit_temporary_gconf_rename.patch:
+ - patch to rename all gconf keys used by epiphany, to allow sane
+ parallel installation with the gecko version
+ * debian/epiphany-webkit-data.gconf-defaults, debian/rules: updated
+ accordingly
+
+ -- Gustavo Noronha Silva <kov at debian.org> Tue, 03 Mar 2009 16:52:54 -0300
epiphany-browser (2.24.3-2) UNRELEASED; urgency=low
Modified: desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults?rev=18621&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults (original)
+++ desktop/experimental/epiphany-webkit/debian/epiphany-webkit-data.gconf-defaults Tue Mar 3 20:30:19 2009
@@ -1,3 +1,3 @@
-/apps/epiphany/general/homepage http://www.debian.org/
-/apps/epiphany/web/language [system]
-/apps/epiphany/web/autodetect_encoding universal_charset_detector
+/apps/epiphany-webkit/general/homepage http://www.debian.org/
+/apps/epiphany-webkit/web/language [system]
+/apps/epiphany-webkit/web/autodetect_encoding universal_charset_detector
Added: desktop/experimental/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch?rev=18621&op=file
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch (added)
+++ desktop/experimental/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch Tue Mar 3 20:30:19 2009
@@ -1,0 +1,912 @@
+Index: epiphany-2.27.0/data/epiphany-lockdown.schemas.in
+===================================================================
+--- epiphany-2.27.0.orig/data/epiphany-lockdown.schemas.in 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/data/epiphany-lockdown.schemas.in 2009-03-03 15:03:35.000000000 -0300
+@@ -1,8 +1,8 @@
+ <gconfschemafile>
+ <schemalist>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/disable_javascript_chrome</key>
+- <applyto>/apps/epiphany/lockdown/disable_javascript_chrome</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/disable_javascript_chrome</key>
++ <applyto>/apps/epiphany-webkit/lockdown/disable_javascript_chrome</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -12,8 +12,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/hide_menubar</key>
+- <applyto>/apps/epiphany/lockdown/hide_menubar</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/hide_menubar</key>
++ <applyto>/apps/epiphany-webkit/lockdown/hide_menubar</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -23,8 +23,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/disable_unsafe_protocols</key>
+- <applyto>/apps/epiphany/lockdown/disable_unsafe_protocols</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/disable_unsafe_protocols</key>
++ <applyto>/apps/epiphany-webkit/lockdown/disable_unsafe_protocols</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -35,8 +35,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/additional_safe_protocols</key>
+- <applyto>/apps/epiphany/lockdown/additional_safe_protocols</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/additional_safe_protocols</key>
++ <applyto>/apps/epiphany-webkit/lockdown/additional_safe_protocols</applyto>
+ <owner>epiphany</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+@@ -48,8 +48,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/disable_arbitrary_url</key>
+- <applyto>/apps/epiphany/lockdown/disable_arbitrary_url</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/disable_arbitrary_url</key>
++ <applyto>/apps/epiphany-webkit/lockdown/disable_arbitrary_url</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>0</default>
+@@ -59,8 +59,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/disable_bookmark_editing</key>
+- <applyto>/apps/epiphany/lockdown/disable_bookmark_editing</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/disable_bookmark_editing</key>
++ <applyto>/apps/epiphany-webkit/lockdown/disable_bookmark_editing</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>0</default>
+@@ -70,8 +70,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/disable_toolbar_editing</key>
+- <applyto>/apps/epiphany/lockdown/disable_toolbar_editing</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/disable_toolbar_editing</key>
++ <applyto>/apps/epiphany-webkit/lockdown/disable_toolbar_editing</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>0</default>
+@@ -81,8 +81,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/disable_history</key>
+- <applyto>/apps/epiphany/lockdown/disable_history</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/disable_history</key>
++ <applyto>/apps/epiphany-webkit/lockdown/disable_history</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>0</default>
+@@ -94,8 +94,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/fullscreen</key>
+- <applyto>/apps/epiphany/lockdown/fullscreen</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/fullscreen</key>
++ <applyto>/apps/epiphany-webkit/lockdown/fullscreen</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>0</default>
+@@ -105,8 +105,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/lockdown/disable_quit</key>
+- <applyto>/apps/epiphany/lockdown/disable_quit</applyto>
++ <key>/schemas/apps/epiphany-webkit/lockdown/disable_quit</key>
++ <applyto>/apps/epiphany-webkit/lockdown/disable_quit</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>0</default>
+Index: epiphany-2.27.0/data/epiphany.schemas.in
+===================================================================
+--- epiphany-2.27.0.orig/data/epiphany.schemas.in 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/data/epiphany.schemas.in 2009-03-03 15:03:35.000000000 -0300
+@@ -1,8 +1,8 @@
+ <gconfschemafile>
+ <schemalist>
+ <schema>
+- <key>/schemas/apps/epiphany/general/homepage</key>
+- <applyto>/apps/epiphany/general/homepage</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/homepage</key>
++ <applyto>/apps/epiphany-webkit/general/homepage</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>http://www.google.com</default>
+@@ -12,8 +12,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/history_date_filter</key>
+- <applyto>/apps/epiphany/dialogs/history_date_filter</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/history_date_filter</key>
++ <applyto>/apps/epiphany-webkit/dialogs/history_date_filter</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>ever</default>
+@@ -25,8 +25,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/bookmarks_view_details</key>
+- <applyto>/apps/epiphany/dialogs/bookmarks_view_details</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/bookmarks_view_details</key>
++ <applyto>/apps/epiphany-webkit/dialogs/bookmarks_view_details</applyto>
+ <owner>epiphany</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+@@ -40,8 +40,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/history_view_details</key>
+- <applyto>/apps/epiphany/dialogs/history_view_details</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/history_view_details</key>
++ <applyto>/apps/epiphany-webkit/dialogs/history_view_details</applyto>
+ <owner>epiphany</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+@@ -55,8 +55,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/preferences_font_language</key>
+- <applyto>/apps/epiphany/dialogs/preferences_font_language</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/preferences_font_language</key>
++ <applyto>/apps/epiphany-webkit/dialogs/preferences_font_language</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <locale name="C">
+@@ -74,8 +74,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/smooth_scroll</key>
+- <applyto>/apps/epiphany/web/smooth_scroll</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/smooth_scroll</key>
++ <applyto>/apps/epiphany-webkit/web/smooth_scroll</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -84,8 +84,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/minimum_font_size</key>
+- <applyto>/apps/epiphany/web/minimum_font_size</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/minimum_font_size</key>
++ <applyto>/apps/epiphany-webkit/web/minimum_font_size</applyto>
+ <owner>epiphany</owner>
+ <type>int</type>
+ <default>7</default>
+@@ -94,8 +94,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/use_own_colors</key>
+- <applyto>/apps/epiphany/web/use_own_colors</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/use_own_colors</key>
++ <applyto>/apps/epiphany-webkit/web/use_own_colors</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -106,8 +106,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/use_own_fonts</key>
+- <applyto>/apps/epiphany/web/use_own_fonts</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/use_own_fonts</key>
++ <applyto>/apps/epiphany-webkit/web/use_own_fonts</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -118,8 +118,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/always_show_tabs_bar</key>
+- <applyto>/apps/epiphany/general/always_show_tabs_bar</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/always_show_tabs_bar</key>
++ <applyto>/apps/epiphany-webkit/general/always_show_tabs_bar</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -129,8 +129,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/automatic_downloads</key>
+- <applyto>/apps/epiphany/general/automatic_downloads</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/automatic_downloads</key>
++ <applyto>/apps/epiphany-webkit/general/automatic_downloads</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -142,8 +142,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/middle_click_open_url</key>
+- <applyto>/apps/epiphany/general/middle_click_open_url</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/middle_click_open_url</key>
++ <applyto>/apps/epiphany-webkit/general/middle_click_open_url</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -155,8 +155,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/toolbar_style</key>
+- <applyto>/apps/epiphany/general/toolbar_style</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/toolbar_style</key>
++ <applyto>/apps/epiphany-webkit/general/toolbar_style</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default></default>
+@@ -168,8 +168,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/open_new_windows_in_tab</key>
+- <applyto>/apps/epiphany/general/open_new_windows_in_tab</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/open_new_windows_in_tab</key>
++ <applyto>/apps/epiphany-webkit/general/open_new_windows_in_tab</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -180,8 +180,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/show_toolbars</key>
+- <applyto>/apps/epiphany/general/show_toolbars</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/show_toolbars</key>
++ <applyto>/apps/epiphany-webkit/general/show_toolbars</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -190,8 +190,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/show_bookmarks_bar</key>
+- <applyto>/apps/epiphany/general/show_bookmarks_bar</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/show_bookmarks_bar</key>
++ <applyto>/apps/epiphany-webkit/general/show_bookmarks_bar</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -200,8 +200,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/show_statusbar</key>
+- <applyto>/apps/epiphany/general/show_statusbar</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/show_statusbar</key>
++ <applyto>/apps/epiphany-webkit/general/show_statusbar</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -210,8 +210,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/active_extensions</key>
+- <applyto>/apps/epiphany/general/active_extensions</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/active_extensions</key>
++ <applyto>/apps/epiphany-webkit/general/active_extensions</applyto>
+ <owner>epiphany</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+@@ -222,8 +222,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/default_encoding</key>
+- <applyto>/apps/epiphany/web/default_encoding</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/default_encoding</key>
++ <applyto>/apps/epiphany-webkit/web/default_encoding</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <locale name="C">
+@@ -249,8 +249,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/default_font_type</key>
+- <applyto>/apps/epiphany/web/default_font_type</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/default_font_type</key>
++ <applyto>/apps/epiphany-webkit/web/default_font_type</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>serif</default>
+@@ -261,8 +261,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/cache_size</key>
+- <applyto>/apps/epiphany/web/cache_size</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/cache_size</key>
++ <applyto>/apps/epiphany-webkit/web/cache_size</applyto>
+ <owner>epiphany</owner>
+ <type>int</type>
+ <default>50</default>
+@@ -272,8 +272,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/language</key>
+- <applyto>/apps/epiphany/web/language</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/language</key>
++ <applyto>/apps/epiphany-webkit/web/language</applyto>
+ <owner>epiphany</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+@@ -284,8 +284,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/print_page_title</key>
+- <applyto>/apps/epiphany/dialogs/print_page_title</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/print_page_title</key>
++ <applyto>/apps/epiphany-webkit/dialogs/print_page_title</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -294,8 +294,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/print_page_url</key>
+- <applyto>/apps/epiphany/dialogs/print_page_url</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/print_page_url</key>
++ <applyto>/apps/epiphany-webkit/dialogs/print_page_url</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -304,8 +304,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/print_date</key>
+- <applyto>/apps/epiphany/dialogs/print_date</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/print_date</key>
++ <applyto>/apps/epiphany-webkit/dialogs/print_date</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -314,8 +314,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/print_background_colors</key>
+- <applyto>/apps/epiphany/dialogs/print_background_colors</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/print_background_colors</key>
++ <applyto>/apps/epiphany-webkit/dialogs/print_background_colors</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -324,8 +324,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/print_background_images</key>
+- <applyto>/apps/epiphany/dialogs/print_background_images</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/print_background_images</key>
++ <applyto>/apps/epiphany-webkit/dialogs/print_background_images</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -334,8 +334,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/print_page_numbers</key>
+- <applyto>/apps/epiphany/dialogs/print_page_numbers</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/print_page_numbers</key>
++ <applyto>/apps/epiphany-webkit/dialogs/print_page_numbers</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -344,8 +344,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/print_frames</key>
+- <applyto>/apps/epiphany/dialogs/print_frames</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/print_frames</key>
++ <applyto>/apps/epiphany-webkit/dialogs/print_frames</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>normal</default>
+@@ -355,8 +355,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/directories/open</key>
+- <applyto>/apps/epiphany/directories/open</applyto>
++ <key>/schemas/apps/epiphany-webkit/directories/open</key>
++ <applyto>/apps/epiphany-webkit/directories/open</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>~</default>
+@@ -364,8 +364,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/directories/save</key>
+- <applyto>/apps/epiphany/directories/save</applyto>
++ <key>/schemas/apps/epiphany-webkit/directories/save</key>
++ <applyto>/apps/epiphany-webkit/directories/save</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>~</default>
+@@ -373,8 +373,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/directories/saveimage</key>
+- <applyto>/apps/epiphany/directories/saveimage</applyto>
++ <key>/schemas/apps/epiphany-webkit/directories/saveimage</key>
++ <applyto>/apps/epiphany-webkit/directories/saveimage</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>~</default>
+@@ -382,8 +382,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/directories/upload</key>
+- <applyto>/apps/epiphany/directories/upload</applyto>
++ <key>/schemas/apps/epiphany-webkit/directories/upload</key>
++ <applyto>/apps/epiphany-webkit/directories/upload</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>~</default>
+@@ -391,8 +391,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/directories/downloads_folder</key>
+- <applyto>/apps/epiphany/directories/downloads_folder</applyto>
++ <key>/schemas/apps/epiphany-webkit/directories/downloads_folder</key>
++ <applyto>/apps/epiphany-webkit/directories/downloads_folder</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>Downloads</default>
+@@ -402,8 +402,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/cookie_accept</key>
+- <applyto>/apps/epiphany/web/cookie_accept</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/cookie_accept</key>
++ <applyto>/apps/epiphany-webkit/web/cookie_accept</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>current site</default>
+@@ -414,8 +414,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/image_animation</key>
+- <applyto>/apps/epiphany/web/image_animation</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/image_animation</key>
++ <applyto>/apps/epiphany-webkit/web/image_animation</applyto>
+ <owner>epiphany</owner>
+ <type>string</type>
+ <default>normal</default>
+@@ -426,8 +426,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/remember_passwords</key>
+- <applyto>/apps/epiphany/general/remember_passwords</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/remember_passwords</key>
++ <applyto>/apps/epiphany-webkit/general/remember_passwords</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -437,8 +437,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/allow_popups</key>
+- <applyto>/apps/epiphany/web/allow_popups</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/allow_popups</key>
++ <applyto>/apps/epiphany-webkit/web/allow_popups</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -449,8 +449,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/java_enabled</key>
+- <applyto>/apps/epiphany/web/java_enabled</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/java_enabled</key>
++ <applyto>/apps/epiphany-webkit/web/java_enabled</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -459,8 +459,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/javascript_enabled</key>
+- <applyto>/apps/epiphany/web/javascript_enabled</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/javascript_enabled</key>
++ <applyto>/apps/epiphany-webkit/web/javascript_enabled</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -469,8 +469,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/browse_with_caret</key>
+- <applyto>/apps/epiphany/web/browse_with_caret</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/browse_with_caret</key>
++ <applyto>/apps/epiphany-webkit/web/browse_with_caret</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -479,8 +479,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/general/managed_network</key>
+- <applyto>/apps/epiphany/general/managed_network</applyto>
++ <key>/schemas/apps/epiphany-webkit/general/managed_network</key>
++ <applyto>/apps/epiphany-webkit/general/managed_network</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -489,8 +489,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/downloads_hidden</key>
+- <applyto>/apps/epiphany/dialogs/downloads_hidden</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/downloads_hidden</key>
++ <applyto>/apps/epiphany-webkit/dialogs/downloads_hidden</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+@@ -500,8 +500,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/dialogs/warn_on_close_unsubmitted_data</key>
+- <applyto>/apps/epiphany/dialogs/warn_on_close_unsubmitted_data</applyto>
++ <key>/schemas/apps/epiphany-webkit/dialogs/warn_on_close_unsubmitted_data</key>
++ <applyto>/apps/epiphany-webkit/dialogs/warn_on_close_unsubmitted_data</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>true</default>
+@@ -511,8 +511,8 @@
+ </locale>
+ </schema>
+ <schema>
+- <key>/schemas/apps/epiphany/web/inspector_enabled</key>
+- <applyto>/apps/epiphany/web/inspector_enabled</applyto>
++ <key>/schemas/apps/epiphany-webkit/web/inspector_enabled</key>
++ <applyto>/apps/epiphany-webkit/web/inspector_enabled</applyto>
+ <owner>epiphany</owner>
+ <type>bool</type>
+ <default>false</default>
+Index: epiphany-2.27.0/doc/reference/tmpl/ephy-permission-manager.sgml
+===================================================================
+--- epiphany-2.27.0.orig/doc/reference/tmpl/ephy-permission-manager.sgml 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/doc/reference/tmpl/ephy-permission-manager.sgml 2009-03-03 15:03:35.000000000 -0300
+@@ -21,9 +21,9 @@
+ <para>
+ The #EphyPermissionManager stores a list of site-specific permissions, but not
+ defaults. For popups, the default permission is determined by the GConf key
+-/apps/epiphany/web/allow_popups, which in turn determines Mozilla's
++/apps/epiphany-webkit/web/allow_popups, which in turn determines Mozilla's
+ dom.disable_open_during_load preference. For cookies, the GConf key
+-/apps/epiphany/web/cookie_accept determines Mozilla's
++/apps/epiphany-webkit/web/cookie_accept determines Mozilla's
+ network.cookie.cookieBehavior preference. For images, the default is determined
+ by Mozilla's network.image.imageBehavior preference.
+ </para>
+Index: epiphany-2.27.0/embed/ephy-embed-prefs.h
+===================================================================
+--- epiphany-2.27.0.orig/embed/ephy-embed-prefs.h 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/embed/ephy-embed-prefs.h 2009-03-03 15:03:35.000000000 -0300
+@@ -1,23 +1,23 @@
+-#define CONF_NETWORK_CACHE_SIZE "/apps/epiphany/web/cache_size"
+-#define CONF_RENDERING_FONT "/apps/epiphany/web/font"
+-#define CONF_RENDERING_FONT_VAR_SIZE "/apps/epiphany/web/variable_font_size"
+-#define CONF_RENDERING_FONT_FIXED_SIZE "/apps/epiphany/web/fixed_font_size"
+-#define CONF_RENDERING_FONT_MIN_SIZE "/apps/epiphany/web/minimum_font_size"
+-#define CONF_RENDERING_LANGUAGE "/apps/epiphany/web/language"
+-#define CONF_RENDERING_USE_OWN_COLORS "/apps/epiphany/web/use_own_colors"
+-#define CONF_RENDERING_USE_OWN_FONTS "/apps/epiphany/web/use_own_fonts"
+-#define CONF_USER_CSS_ENABLED "/apps/epiphany/web/user_css_enabled"
+-#define CONF_SECURITY_ALLOW_POPUPS "/apps/epiphany/web/allow_popups"
+-#define CONF_SECURITY_JAVA_ENABLED "/apps/epiphany/web/java_enabled"
+-#define CONF_SECURITY_JAVASCRIPT_ENABLED "/apps/epiphany/web/javascript_enabled"
+-#define CONF_SECURITY_COOKIES_ACCEPT "/apps/epiphany/web/cookie_accept"
+-#define CONF_LANGUAGE_AUTODETECT_ENCODING "/apps/epiphany/web/autodetect_encoding"
+-#define CONF_LANGUAGE_DEFAULT_ENCODING "/apps/epiphany/web/default_encoding"
+-#define CONF_BROWSE_WITH_CARET "/apps/epiphany/web/browse_with_caret"
+-#define CONF_IMAGE_ANIMATION_MODE "/apps/epiphany/web/image_animation"
+-#define CONF_IMAGE_LOADING_MODE "/apps/epiphany/web/image_loading"
+-#define CONF_DISPLAY_SMOOTHSCROLL "/apps/epiphany/web/smooth_scroll"
+-#define CONF_WEB_INSPECTOR_ENABLED "/apps/epiphany/web/inspector_enabled"
++#define CONF_NETWORK_CACHE_SIZE "/apps/epiphany-webkit/web/cache_size"
++#define CONF_RENDERING_FONT "/apps/epiphany-webkit/web/font"
++#define CONF_RENDERING_FONT_VAR_SIZE "/apps/epiphany-webkit/web/variable_font_size"
++#define CONF_RENDERING_FONT_FIXED_SIZE "/apps/epiphany-webkit/web/fixed_font_size"
++#define CONF_RENDERING_FONT_MIN_SIZE "/apps/epiphany-webkit/web/minimum_font_size"
++#define CONF_RENDERING_LANGUAGE "/apps/epiphany-webkit/web/language"
++#define CONF_RENDERING_USE_OWN_COLORS "/apps/epiphany-webkit/web/use_own_colors"
++#define CONF_RENDERING_USE_OWN_FONTS "/apps/epiphany-webkit/web/use_own_fonts"
++#define CONF_USER_CSS_ENABLED "/apps/epiphany-webkit/web/user_css_enabled"
++#define CONF_SECURITY_ALLOW_POPUPS "/apps/epiphany-webkit/web/allow_popups"
++#define CONF_SECURITY_JAVA_ENABLED "/apps/epiphany-webkit/web/java_enabled"
++#define CONF_SECURITY_JAVASCRIPT_ENABLED "/apps/epiphany-webkit/web/javascript_enabled"
++#define CONF_SECURITY_COOKIES_ACCEPT "/apps/epiphany-webkit/web/cookie_accept"
++#define CONF_LANGUAGE_AUTODETECT_ENCODING "/apps/epiphany-webkit/web/autodetect_encoding"
++#define CONF_LANGUAGE_DEFAULT_ENCODING "/apps/epiphany-webkit/web/default_encoding"
++#define CONF_BROWSE_WITH_CARET "/apps/epiphany-webkit/web/browse_with_caret"
++#define CONF_IMAGE_ANIMATION_MODE "/apps/epiphany-webkit/web/image_animation"
++#define CONF_IMAGE_LOADING_MODE "/apps/epiphany-webkit/web/image_loading"
++#define CONF_DISPLAY_SMOOTHSCROLL "/apps/epiphany-webkit/web/smooth_scroll"
++#define CONF_WEB_INSPECTOR_ENABLED "/apps/epiphany-webkit/web/inspector_enabled"
+
+ /* These are defined gnome wide now */
+ #define CONF_NETWORK_PROXY_MODE "/system/proxy/mode"
+@@ -35,10 +35,10 @@
+ #define CONF_DESKTOP_FONT_MONOSPACE "/desktop/gnome/interface/monospace_font_name"
+
+ /* DEPRECATED, we migrate them */
+-#define CONF_RENDERING_FONT_VAR_SIZE_OLD "/apps/epiphany/web/font_var_size"
+-#define CONF_RENDERING_FONT_FIXED_SIZE_OLD "/apps/epiphany/web/font_fixed_size"
+-#define CONF_RENDERING_FONT_MIN_SIZE_OLD "/apps/epiphany/web/font_min_size"
+-#define CONF_RENDERING_FONT_TYPE_OLD "/apps/epiphany/web/default_font_type"
++#define CONF_RENDERING_FONT_VAR_SIZE_OLD "/apps/epiphany-webkit/web/font_var_size"
++#define CONF_RENDERING_FONT_FIXED_SIZE_OLD "/apps/epiphany-webkit/web/font_fixed_size"
++#define CONF_RENDERING_FONT_MIN_SIZE_OLD "/apps/epiphany-webkit/web/font_min_size"
++#define CONF_RENDERING_FONT_TYPE_OLD "/apps/epiphany-webkit/web/default_font_type"
+
+ #if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+ #error "Only <epiphany/epiphany.h> can be included directly."
+Index: epiphany-2.27.0/embed/ephy-encodings.c
+===================================================================
+--- epiphany-2.27.0.orig/embed/ephy-encodings.c 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/embed/ephy-encodings.c 2009-03-03 15:03:35.000000000 -0300
+@@ -146,7 +146,7 @@
+ DETECTORS_NODE_ID = 5
+ };
+
+-#define RECENT_KEY "/apps/epiphany/general/recent_encodings"
++#define RECENT_KEY "/apps/epiphany-webkit/general/recent_encodings"
+ #define RECENT_MAX 4
+
+ static void ephy_encodings_class_init (EphyEncodingsClass *klass);
+Index: epiphany-2.27.0/embed/webkit/webkit-embed-prefs.c
+===================================================================
+--- epiphany-2.27.0.orig/embed/webkit/webkit-embed-prefs.c 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/embed/webkit/webkit-embed-prefs.c 2009-03-03 15:03:35.000000000 -0300
+@@ -165,7 +165,7 @@
+ {
+ int i;
+
+- eel_gconf_monitor_add ("/apps/epiphany/web");
++ eel_gconf_monitor_add ("/apps/epiphany-webkit/web");
+
+ settings = webkit_web_settings_new ();
+
+Index: epiphany-2.27.0/lib/ephy-prefs.h
+===================================================================
+--- epiphany-2.27.0.orig/lib/ephy-prefs.h 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/lib/ephy-prefs.h 2009-03-03 15:03:35.000000000 -0300
+@@ -27,46 +27,46 @@
+ G_BEGIN_DECLS
+
+ #define EPIPHANY_SCHEMA_VERSION 1
+-#define CONF_SCHEMA_VERSION "/apps/epiphany/schema_version"
++#define CONF_SCHEMA_VERSION "/apps/epiphany-webkit/schema_version"
+
+ /* General */
+-#define CONF_GENERAL_HOMEPAGE "/apps/epiphany/general/homepage"
+-#define CONF_ALWAYS_SHOW_TABS_BAR "/apps/epiphany/general/always_show_tabs_bar"
+-#define CONF_WINDOWS_SHOW_TOOLBARS "/apps/epiphany/general/show_toolbars"
+-#define CONF_WINDOWS_SHOW_BOOKMARKS_BAR "/apps/epiphany/general/show_bookmarks_bar"
+-#define CONF_WINDOWS_SHOW_STATUSBAR "/apps/epiphany/general/show_statusbar"
+-#define CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL "/apps/epiphany/general/middle_click_open_url"
+-#define CONF_INTERFACE_TOOLBAR_STYLE "/apps/epiphany/general/toolbar_style"
+-#define CONF_INTERFACE_OPEN_NEW_WINDOWS_IN_TAB "/apps/epiphany/general/open_new_windows_in_tab"
+-#define CONF_AUTO_DOWNLOADS "/apps/epiphany/general/automatic_downloads"
++#define CONF_GENERAL_HOMEPAGE "/apps/epiphany-webkit/general/homepage"
++#define CONF_ALWAYS_SHOW_TABS_BAR "/apps/epiphany-webkit/general/always_show_tabs_bar"
++#define CONF_WINDOWS_SHOW_TOOLBARS "/apps/epiphany-webkit/general/show_toolbars"
++#define CONF_WINDOWS_SHOW_BOOKMARKS_BAR "/apps/epiphany-webkit/general/show_bookmarks_bar"
++#define CONF_WINDOWS_SHOW_STATUSBAR "/apps/epiphany-webkit/general/show_statusbar"
++#define CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL "/apps/epiphany-webkit/general/middle_click_open_url"
++#define CONF_INTERFACE_TOOLBAR_STYLE "/apps/epiphany-webkit/general/toolbar_style"
++#define CONF_INTERFACE_OPEN_NEW_WINDOWS_IN_TAB "/apps/epiphany-webkit/general/open_new_windows_in_tab"
++#define CONF_AUTO_DOWNLOADS "/apps/epiphany-webkit/general/automatic_downloads"
+ #define CONF_DESKTOP_IS_HOME_DIR "/apps/nautilus/preferences/desktop_is_home_dir"
+-#define CONF_NETWORK_MANAGED "/apps/epiphany/general/managed_network"
+-#define CONF_DOWNLOADS_HIDDEN "/apps/epiphany/dialogs/downloads_hidden"
+-#define CONF_WARN_ON_CLOSE_UNSUBMITTED_DATA "/apps/epiphany/dialogs/warn_on_close_unsubmitted_data"
++#define CONF_NETWORK_MANAGED "/apps/epiphany-webkit/general/managed_network"
++#define CONF_DOWNLOADS_HIDDEN "/apps/epiphany-webkit/dialogs/downloads_hidden"
++#define CONF_WARN_ON_CLOSE_UNSUBMITTED_DATA "/apps/epiphany-webkit/dialogs/warn_on_close_unsubmitted_data"
+
+ /* i18n pref */
+-#define CONF_GECKO_ENABLE_PANGO "/apps/epiphany/web/enable_pango"
++#define CONF_GECKO_ENABLE_PANGO "/apps/epiphany-webkit/web/enable_pango"
+
+ /* Directories */
+-#define CONF_STATE_SAVE_DIR "/apps/epiphany/directories/save"
+-#define CONF_STATE_SAVE_IMAGE_DIR "/apps/epiphany/directories/saveimage"
+-#define CONF_STATE_OPEN_DIR "/apps/epiphany/directories/open"
+-#define CONF_STATE_DOWNLOAD_DIR "/apps/epiphany/directories/downloads_folder"
+-#define CONF_STATE_UPLOAD_DIR "/apps/epiphany/directories/upload"
++#define CONF_STATE_SAVE_DIR "/apps/epiphany-webkit/directories/save"
++#define CONF_STATE_SAVE_IMAGE_DIR "/apps/epiphany-webkit/directories/saveimage"
++#define CONF_STATE_OPEN_DIR "/apps/epiphany-webkit/directories/open"
++#define CONF_STATE_DOWNLOAD_DIR "/apps/epiphany-webkit/directories/downloads_folder"
++#define CONF_STATE_UPLOAD_DIR "/apps/epiphany-webkit/directories/upload"
+
+ /* Lockdown */
+-#define CONF_LOCKDOWN_FULLSCREEN "/apps/epiphany/lockdown/fullscreen"
+-#define CONF_LOCKDOWN_DISABLE_ARBITRARY_URL "/apps/epiphany/lockdown/disable_arbitrary_url"
+-#define CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING "/apps/epiphany/lockdown/disable_bookmark_editing"
+-#define CONF_LOCKDOWN_DISABLE_TOOLBAR_EDITING "/apps/epiphany/lockdown/disable_toolbar_editing"
+-#define CONF_LOCKDOWN_DISABLE_HISTORY "/apps/epiphany/lockdown/disable_history"
++#define CONF_LOCKDOWN_FULLSCREEN "/apps/epiphany-webkit/lockdown/fullscreen"
++#define CONF_LOCKDOWN_DISABLE_ARBITRARY_URL "/apps/epiphany-webkit/lockdown/disable_arbitrary_url"
++#define CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING "/apps/epiphany-webkit/lockdown/disable_bookmark_editing"
++#define CONF_LOCKDOWN_DISABLE_TOOLBAR_EDITING "/apps/epiphany-webkit/lockdown/disable_toolbar_editing"
++#define CONF_LOCKDOWN_DISABLE_HISTORY "/apps/epiphany-webkit/lockdown/disable_history"
+ #define CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK "/desktop/gnome/lockdown/disable_save_to_disk"
+-#define CONF_LOCKDOWN_DISABLE_HISTORY "/apps/epiphany/lockdown/disable_history"
++#define CONF_LOCKDOWN_DISABLE_HISTORY "/apps/epiphany-webkit/lockdown/disable_history"
+ #define CONF_LOCKDOWN_DISABLE_PRINTING "/desktop/gnome/lockdown/disable_printing"
+ #define CONF_LOCKDOWN_DISABLE_PRINT_SETUP "/desktop/gnome/lockdown/disable_print_setup"
+ #define CONF_LOCKDOWN_DISABLE_COMMAND_LINE "/desktop/gnome/lockdown/disable_command_line"
+-#define CONF_LOCKDOWN_DISABLE_QUIT "/apps/epiphany/lockdown/disable_quit"
+-#define CONF_LOCKDOWN_DISABLE_JAVASCRIPT_CHROME "/apps/epiphany/lockdown/disable_javascript_chrome"
++#define CONF_LOCKDOWN_DISABLE_QUIT "/apps/epiphany-webkit/lockdown/disable_quit"
++#define CONF_LOCKDOWN_DISABLE_JAVASCRIPT_CHROME "/apps/epiphany-webkit/lockdown/disable_javascript_chrome"
+
+ /* System prefs */
+ #define CONF_DESKTOP_FTP_HANDLER "/desktop/gnome/url-handlers/ftp/command"
+@@ -75,7 +75,7 @@
+ #define CONF_DESKTOP_BG_TYPE "/desktop/gnome/background/picture_options"
+
+ /* Privacy */
+-#define CONF_PRIVACY_REMEMBER_PASSWORDS "/apps/epiphany/general/remember_passwords"
++#define CONF_PRIVACY_REMEMBER_PASSWORDS "/apps/epiphany-webkit/general/remember_passwords"
+
+ G_END_DECLS
+
+Index: epiphany-2.27.0/src/bookmarks/ephy-bookmarks-editor.c
+===================================================================
+--- epiphany-2.27.0.orig/src/bookmarks/ephy-bookmarks-editor.c 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/src/bookmarks/ephy-bookmarks-editor.c 2009-03-03 15:03:35.000000000 -0300
+@@ -126,7 +126,7 @@
+
+ #define EPHY_BOOKMARKS_EDITOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKS_EDITOR, EphyBookmarksEditorPrivate))
+
+-#define CONF_BOOKMARKS_VIEW_DETAILS "/apps/epiphany/dialogs/bookmarks_view_details"
++#define CONF_BOOKMARKS_VIEW_DETAILS "/apps/epiphany-webkit/dialogs/bookmarks_view_details"
+
+ #define RESERVED_STRING N_("Remove from this topic")
+
+Index: epiphany-2.27.0/src/ephy-extensions-manager.c
+===================================================================
+--- epiphany-2.27.0.orig/src/ephy-extensions-manager.c 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/src/ephy-extensions-manager.c 2009-03-03 15:03:35.000000000 -0300
+@@ -64,7 +64,7 @@
+ #include "ephy-seed-loader.h"
+ #endif
+
+-#define CONF_LOADED_EXTENSIONS "/apps/epiphany/general/active_extensions"
++#define CONF_LOADED_EXTENSIONS "/apps/epiphany-webkit/general/active_extensions"
+ #define EE_GROUP "Epiphany Extension"
+ #define DOT_INI ".ephy-extension"
+ #define RELOAD_DELAY 333 /* ms */
+Index: epiphany-2.27.0/src/ephy-history-window.c
+===================================================================
+--- epiphany-2.27.0.orig/src/ephy-history-window.c 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/src/ephy-history-window.c 2009-03-03 15:03:35.000000000 -0300
+@@ -98,8 +98,8 @@
+
+ #define EPHY_HISTORY_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_HISTORY_WINDOW, EphyHistoryWindowPrivate))
+
+-#define CONF_HISTORY_DATE_FILTER "/apps/epiphany/dialogs/history_date_filter"
+-#define CONF_HISTORY_VIEW_DETAILS "/apps/epiphany/dialogs/history_view_details"
++#define CONF_HISTORY_DATE_FILTER "/apps/epiphany-webkit/dialogs/history_date_filter"
++#define CONF_HISTORY_VIEW_DETAILS "/apps/epiphany-webkit/dialogs/history_view_details"
+
+ struct _EphyHistoryWindowPrivate
+ {
+Index: epiphany-2.27.0/src/ephy-lockdown.c
+===================================================================
+--- epiphany-2.27.0.orig/src/ephy-lockdown.c 2009-03-03 14:56:57.000000000 -0300
++++ epiphany-2.27.0/src/ephy-lockdown.c 2009-03-03 15:03:35.000000000 -0300
+@@ -252,7 +252,7 @@
+ * so we don't need to do notify here.
+ */
+
+- eel_gconf_monitor_add ("/apps/epiphany/lockdown");
++ eel_gconf_monitor_add ("/apps/epiphany-webkit/lockdown");
+ eel_gconf_monitor_add ("/desktop/gnome/lockdown");
+ }
+
+@@ -269,7 +269,7 @@
+
+ LOG ("EphyLockdown finalising");
+
+- eel_gconf_monitor_remove ("/apps/epiphany/lockdown");
++ eel_gconf_monitor_remove ("/apps/epiphany-webkit/lockdown");
+ eel_gconf_monitor_remove ("/desktop/gnome/lockdown");
+
+ for (i = 0; i < G_N_ELEMENTS (keys); i++)
+Index: epiphany-2.27.0/src/ephy-main.c
+===================================================================
+--- epiphany-2.27.0.orig/src/ephy-main.c 2009-03-03 14:56:58.000000000 -0300
++++ epiphany-2.27.0/src/ephy-main.c 2009-03-03 15:03:35.000000000 -0300
+@@ -750,7 +750,7 @@
+ exit (1);
+ }
+
+- eel_gconf_monitor_add ("/apps/epiphany/general");
++ eel_gconf_monitor_add ("/apps/epiphany-webkit/general");
+ ephy_stock_icons_init ();
+ load_accels ();
+
+@@ -782,7 +782,7 @@
+ if (notify_is_initted ())
+ notify_uninit ();
+ #endif
+- eel_gconf_monitor_remove ("/apps/epiphany/general");
++ eel_gconf_monitor_remove ("/apps/epiphany-webkit/general");
+ save_accels ();
+ ephy_state_save ();
+ ephy_file_helpers_shutdown ();
+Index: epiphany-2.27.0/src/ephy-window.c
+===================================================================
+--- epiphany-2.27.0.orig/src/ephy-window.c 2009-03-03 14:56:58.000000000 -0300
++++ epiphany-2.27.0/src/ephy-window.c 2009-03-03 15:03:35.000000000 -0300
+@@ -411,7 +411,7 @@
+ #endif /* HAVE_X11_XF86KEYSYM_H */
+ };
+
+-#define CONF_LOCKDOWN_HIDE_MENUBAR "/apps/epiphany/lockdown/hide_menubar"
++#define CONF_LOCKDOWN_HIDE_MENUBAR "/apps/epiphany-webkit/lockdown/hide_menubar"
+
+ #define BOOKMARKS_MENU_PATH "/menubar/BookmarksMenu"
+
+@@ -1059,7 +1059,7 @@
+
+ /* We ignore the delete_event if the disable_quit lockdown has been set
+ */
+- if (eel_gconf_get_boolean("/apps/epiphany/lockdown/disable_quit")) return TRUE;
++ if (eel_gconf_get_boolean("/apps/epiphany-webkit/lockdown/disable_quit")) return TRUE;
+
+ /* Workaround a crash when closing a window while in print preview mode. See
+ * mozilla bug #241809. /
Modified: desktop/experimental/epiphany-webkit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/series?rev=18621&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/series (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/series Tue Mar 3 20:30:19 2009
@@ -9,5 +9,6 @@
10_smart_bookmarks.patch
12_safetypes.patch
13_gtk-doc_fix.patch
+14_webkit_temporary_gconf_rename.patch
99_autoreconf.patch
99_ltmain_as-needed.patch
Modified: desktop/experimental/epiphany-webkit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/rules?rev=18621&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/rules (original)
+++ desktop/experimental/epiphany-webkit/debian/rules Tue Mar 3 20:30:19 2009
@@ -111,17 +111,13 @@
find debian/epiphany-webkit-data/usr/share/omf/epiphany-webkit/ \
-name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-webkit/#' {} \;
# Make both epiphanies installable together
- for f in $(FLAVORS); do \
- F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \
- mkdir -p debian/epiphany-$$f/usr/share/applications ; \
- ( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \
- debian/epiphany-webkit-data/usr/share/applications/epiphany.desktop \
- | sed "s,epiphany-webkit,epiphany-$$f," \
- | grep -v ^TryExec | grep -v ^MimeType ; \
- echo NoDisplay=true ) \
- > debian/epiphany-$$f/usr/share/applications/epiphany-$$f.desktop ; \
- done
dh_install
+ cd debian/epiphany-webkit-data/etc/gconf/schemas && \
+ mv epiphany.schemas epiphany-webkit.schemas && \
+ mv epiphany-lockdown.schemas epiphany-webkit-lockdown.schemas
+ cd debian/epiphany-webkit-data/usr/share/applications && \
+ mv epiphany.desktop epiphany-webkit.desktop && \
+ mv bme.desktop bme-webkit.desktop
cd debian/epiphany-webkit/usr/bin && \
mv epiphany.sh epiphany
More information about the pkg-gnome-commits
mailing list