r20135 - in /desktop/unstable/epiphany-webkit/debian: changelog patches/14_webkit_temporary_gconf_rename.patch
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Wed May 27 14:09:53 UTC 2009
Author: kov
Date: Wed May 27 14:09:53 2009
New Revision: 20135
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20135
Log:
Refreshed debian/patches/14_webkit_temporary_gconf_rename.patch
Modified:
desktop/unstable/epiphany-webkit/debian/changelog
desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch
Modified: desktop/unstable/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/changelog?rev=20135&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/changelog (original)
+++ desktop/unstable/epiphany-webkit/debian/changelog Wed May 27 14:09:53 2009
@@ -4,6 +4,8 @@
* debian/control.in:
- do not Recommend epiphany-extensions, since they are Gecko-only for
now and will pull epiphany-gecko
+ * debian/patches/14_webkit_temporary_gconf_rename.patch:
+ - refreshed
[ "Marcelo Jorge Vieira (metal)" <metal at alucinados.com> ]
* debian/control.in:
Modified: desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch?rev=20135&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch (original)
+++ desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch Wed May 27 14:09:53 2009
@@ -1,7 +1,7 @@
-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
+Index: epiphany-webkit-2.27.2/data/epiphany-lockdown.schemas.in
+===================================================================
+--- epiphany-webkit-2.27.2.orig/data/epiphany-lockdown.schemas.in 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.2/data/epiphany-lockdown.schemas.in 2009-05-27 11:06:32.000000000 -0300
@@ -1,8 +1,8 @@
<gconfschemafile>
<schemalist>
@@ -112,10 +112,10 @@
<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
+Index: epiphany-webkit-2.27.2/data/epiphany.schemas.in
+===================================================================
+--- epiphany-webkit-2.27.2.orig/data/epiphany.schemas.in 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.2/data/epiphany.schemas.in 2009-05-27 11:06:32.000000000 -0300
@@ -1,8 +1,8 @@
<gconfschemafile>
<schemalist>
@@ -611,10 +611,10 @@
<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
+Index: epiphany-webkit-2.27.2/doc/reference/tmpl/ephy-permission-manager.sgml
+===================================================================
+--- epiphany-webkit-2.27.2.orig/doc/reference/tmpl/ephy-permission-manager.sgml 2009-05-25 04:02:08.000000000 -0300
++++ epiphany-webkit-2.27.2/doc/reference/tmpl/ephy-permission-manager.sgml 2009-05-27 11:06:32.000000000 -0300
@@ -21,9 +21,9 @@
<para>
The #EphyPermissionManager stores a list of site-specific permissions, but not
@@ -627,15 +627,13 @@
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 @@
+Index: epiphany-webkit-2.27.2/embed/ephy-embed-prefs.h
+===================================================================
+--- epiphany-webkit-2.27.2.orig/embed/ephy-embed-prefs.h 2009-04-28 05:45:24.000000000 -0300
++++ epiphany-webkit-2.27.2/embed/ephy-embed-prefs.h 2009-05-27 11:07:47.000000000 -0300
+@@ -1,22 +1,22 @@
-#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"
@@ -652,10 +650,9 @@
-#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_CARET_BROWSING_ENABLED "/apps/epiphany/web/browse_with_caret"
+#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"
@@ -672,11 +669,12 @@
+#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"
++#define CONF_CARET_BROWSING_ENABLED "/apps/epiphany-webkit/web/browse_with_caret"
/* 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"
+@@ -34,10 +34,10 @@
+ #define CONF_DESKTOP_FONT_FIXED_SIZE "/desktop/gnome/interface/monospace_font_name"
/* DEPRECATED, we migrate them */
-#define CONF_RENDERING_FONT_VAR_SIZE_OLD "/apps/epiphany/web/font_var_size"
@@ -690,10 +688,10 @@
#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
+Index: epiphany-webkit-2.27.2/embed/ephy-encodings.c
+===================================================================
+--- epiphany-webkit-2.27.2.orig/embed/ephy-encodings.c 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.2/embed/ephy-encodings.c 2009-05-27 11:06:32.000000000 -0300
@@ -146,7 +146,7 @@
DETECTORS_NODE_ID = 5
};
@@ -703,11 +701,11 @@
#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 @@
+Index: epiphany-webkit-2.27.2/embed/webkit/webkit-embed-prefs.c
+===================================================================
+--- epiphany-webkit-2.27.2.orig/embed/webkit/webkit-embed-prefs.c 2009-04-28 05:45:24.000000000 -0300
++++ epiphany-webkit-2.27.2/embed/webkit/webkit-embed-prefs.c 2009-05-27 11:06:32.000000000 -0300
+@@ -206,7 +206,7 @@
{
int i;
@@ -716,10 +714,10 @@
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
+Index: epiphany-webkit-2.27.2/lib/ephy-prefs.h
+===================================================================
+--- epiphany-webkit-2.27.2.orig/lib/ephy-prefs.h 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.2/lib/ephy-prefs.h 2009-05-27 11:06:32.000000000 -0300
@@ -27,46 +27,46 @@
G_BEGIN_DECLS
@@ -803,10 +801,10 @@
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
+Index: epiphany-webkit-2.27.2/src/bookmarks/ephy-bookmarks-editor.c
+===================================================================
+--- epiphany-webkit-2.27.2.orig/src/bookmarks/ephy-bookmarks-editor.c 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.2/src/bookmarks/ephy-bookmarks-editor.c 2009-05-27 11:06:32.000000000 -0300
@@ -126,7 +126,7 @@
#define EPHY_BOOKMARKS_EDITOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKS_EDITOR, EphyBookmarksEditorPrivate))
@@ -816,10 +814,10 @@
#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
+Index: epiphany-webkit-2.27.2/src/ephy-extensions-manager.c
+===================================================================
+--- epiphany-webkit-2.27.2.orig/src/ephy-extensions-manager.c 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.2/src/ephy-extensions-manager.c 2009-05-27 11:06:32.000000000 -0300
@@ -64,7 +64,7 @@
#include "ephy-seed-loader.h"
#endif
@@ -829,10 +827,10 @@
#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
+Index: epiphany-webkit-2.27.2/src/ephy-history-window.c
+===================================================================
+--- epiphany-webkit-2.27.2.orig/src/ephy-history-window.c 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.2/src/ephy-history-window.c 2009-05-27 11:06:32.000000000 -0300
@@ -98,8 +98,8 @@
#define EPHY_HISTORY_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_HISTORY_WINDOW, EphyHistoryWindowPrivate))
@@ -844,10 +842,10 @@
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
+Index: epiphany-webkit-2.27.2/src/ephy-lockdown.c
+===================================================================
+--- epiphany-webkit-2.27.2.orig/src/ephy-lockdown.c 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.2/src/ephy-lockdown.c 2009-05-27 11:06:32.000000000 -0300
@@ -252,7 +252,7 @@
* so we don't need to do notify here.
*/
@@ -866,20 +864,20 @@
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);
- }
+Index: epiphany-webkit-2.27.2/src/ephy-main.c
+===================================================================
+--- epiphany-webkit-2.27.2.orig/src/ephy-main.c 2009-05-27 11:06:14.000000000 -0300
++++ epiphany-webkit-2.27.2/src/ephy-main.c 2009-05-27 11:06:32.000000000 -0300
+@@ -755,7 +755,7 @@
+ /* Migrate profile */
+ _ephy_profile_migrate ();
- 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 @@
+ load_accels ();
+
+@@ -787,7 +787,7 @@
if (notify_is_initted ())
notify_uninit ();
#endif
@@ -888,10 +886,10 @@
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
+Index: epiphany-webkit-2.27.2/src/ephy-window.c
+===================================================================
+--- epiphany-webkit-2.27.2.orig/src/ephy-window.c 2009-04-24 15:13:46.000000000 -0300
++++ epiphany-webkit-2.27.2/src/ephy-window.c 2009-05-27 11:06:32.000000000 -0300
@@ -411,7 +411,7 @@
#endif /* HAVE_X11_XF86KEYSYM_H */
};
@@ -901,7 +899,7 @@
#define BOOKMARKS_MENU_PATH "/menubar/BookmarksMenu"
-@@ -1059,7 +1059,7 @@
+@@ -1057,7 +1057,7 @@
/* We ignore the delete_event if the disable_quit lockdown has been set
*/
More information about the pkg-gnome-commits
mailing list