r20822 - 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
Thu Jul 30 15:38:47 UTC 2009
Author: kov
Date: Thu Jul 30 15:38:47 2009
New Revision: 20822
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20822
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=20822&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-webkit/debian/changelog [utf-8] Thu Jul 30 15:38:47 2009
@@ -4,8 +4,10 @@
* debian/patches/16_reimplement_search_on_locationbar.patch:
- fetched from upstream bugzilla (see http://bugzilla.gnome.org/show_bug.cgi?id=583795)
(Closes: #538325)
-
- -- Gustavo Noronha Silva <kov at debian.org> Thu, 30 Jul 2009 17:16:54 +0200
+ * debian/patches/14_webkit_temporary_gconf_rename.patch:
+ - refreshed
+
+ -- Gustavo Noronha Silva <kov at debian.org> Thu, 30 Jul 2009 17:38:30 +0200
epiphany-webkit (2.27.3-1) unstable; urgency=low
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=20822&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch [utf-8] (original)
+++ desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch [utf-8] Thu Jul 30 15:38:47 2009
@@ -1,7 +1,7 @@
-Index: epiphany-webkit-2.27.3/data/epiphany-lockdown.schemas.in
-===================================================================
---- epiphany-webkit-2.27.3.orig/data/epiphany-lockdown.schemas.in 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.3/data/epiphany-lockdown.schemas.in 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/data/epiphany-lockdown.schemas.in
+===================================================================
+--- epiphany-webkit-2.27.5.orig/data/epiphany-lockdown.schemas.in 2009-04-17 08:06:40.000000000 +0200
++++ epiphany-webkit-2.27.5/data/epiphany-lockdown.schemas.in 2009-07-30 17:36:57.510292222 +0200
@@ -1,8 +1,8 @@
<gconfschemafile>
<schemalist>
@@ -112,10 +112,10 @@
<owner>epiphany</owner>
<type>bool</type>
<default>0</default>
-Index: epiphany-webkit-2.27.3/data/epiphany.schemas.in
-===================================================================
---- epiphany-webkit-2.27.3.orig/data/epiphany.schemas.in 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.3/data/epiphany.schemas.in 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/data/epiphany.schemas.in
+===================================================================
+--- epiphany-webkit-2.27.5.orig/data/epiphany.schemas.in 2009-04-17 08:06:40.000000000 +0200
++++ epiphany-webkit-2.27.5/data/epiphany.schemas.in 2009-07-30 17:36:57.514292775 +0200
@@ -1,8 +1,8 @@
<gconfschemafile>
<schemalist>
@@ -611,10 +611,10 @@
<owner>epiphany</owner>
<type>bool</type>
<default>false</default>
-Index: epiphany-webkit-2.27.3/doc/reference/tmpl/ephy-permission-manager.sgml
-===================================================================
---- epiphany-webkit-2.27.3.orig/doc/reference/tmpl/ephy-permission-manager.sgml 2009-06-15 14:51:00.000000000 -0300
-+++ epiphany-webkit-2.27.3/doc/reference/tmpl/ephy-permission-manager.sgml 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/doc/reference/tmpl/ephy-permission-manager.sgml
+===================================================================
+--- epiphany-webkit-2.27.5.orig/doc/reference/tmpl/ephy-permission-manager.sgml 2009-07-27 18:23:18.000000000 +0200
++++ epiphany-webkit-2.27.5/doc/reference/tmpl/ephy-permission-manager.sgml 2009-07-30 17:36:57.514292775 +0200
@@ -21,9 +21,9 @@
<para>
The #EphyPermissionManager stores a list of site-specific permissions, but not
@@ -627,11 +627,11 @@
network.cookie.cookieBehavior preference. For images, the default is determined
by Mozilla's network.image.imageBehavior preference.
</para>
-Index: epiphany-webkit-2.27.3/embed/ephy-embed-prefs.h
-===================================================================
---- epiphany-webkit-2.27.3.orig/embed/ephy-embed-prefs.h 2009-06-05 12:58:57.000000000 -0300
-+++ epiphany-webkit-2.27.3/embed/ephy-embed-prefs.h 2009-06-24 17:24:19.000000000 -0300
-@@ -23,25 +23,25 @@
+Index: epiphany-webkit-2.27.5/embed/ephy-embed-prefs.h
+===================================================================
+--- epiphany-webkit-2.27.5.orig/embed/ephy-embed-prefs.h 2009-07-24 17:57:14.000000000 +0200
++++ epiphany-webkit-2.27.5/embed/ephy-embed-prefs.h 2009-07-30 17:37:48.330292735 +0200
+@@ -23,24 +23,24 @@
#include "ephy-embed.h"
@@ -648,7 +648,6 @@
-#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"
@@ -667,7 +666,6 @@
+#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"
@@ -676,8 +674,8 @@
/* These are defined gnome wide now */
#define CONF_NETWORK_PROXY_MODE "/system/proxy/mode"
-@@ -59,10 +59,10 @@
- #define CONF_DESKTOP_FONT_FIXED_SIZE "/desktop/gnome/interface/monospace_font_name"
+@@ -58,10 +58,10 @@
+ #define CONF_DESKTOP_FONT_FIXED_NAME "/desktop/gnome/interface/monospace_font_name"
/* DEPRECATED, we migrate them */
-#define CONF_RENDERING_FONT_VAR_SIZE_OLD "/apps/epiphany/web/font_var_size"
@@ -691,10 +689,10 @@
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
#error "Only <epiphany/epiphany.h> can be included directly."
-Index: epiphany-webkit-2.27.3/embed/ephy-encodings.c
-===================================================================
---- epiphany-webkit-2.27.3.orig/embed/ephy-encodings.c 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.3/embed/ephy-encodings.c 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/embed/ephy-encodings.c
+===================================================================
+--- epiphany-webkit-2.27.5.orig/embed/ephy-encodings.c 2009-04-17 08:06:40.000000000 +0200
++++ epiphany-webkit-2.27.5/embed/ephy-encodings.c 2009-07-30 17:36:57.514292775 +0200
@@ -146,7 +146,7 @@
DETECTORS_NODE_ID = 5
};
@@ -704,10 +702,10 @@
#define RECENT_MAX 4
static void ephy_encodings_class_init (EphyEncodingsClass *klass);
-Index: epiphany-webkit-2.27.3/lib/ephy-prefs.h
-===================================================================
---- epiphany-webkit-2.27.3.orig/lib/ephy-prefs.h 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.3/lib/ephy-prefs.h 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/lib/ephy-prefs.h
+===================================================================
+--- epiphany-webkit-2.27.5.orig/lib/ephy-prefs.h 2009-04-17 08:06:40.000000000 +0200
++++ epiphany-webkit-2.27.5/lib/ephy-prefs.h 2009-07-30 17:36:57.514292775 +0200
@@ -27,46 +27,46 @@
G_BEGIN_DECLS
@@ -791,10 +789,10 @@
G_END_DECLS
-Index: epiphany-webkit-2.27.3/src/bookmarks/ephy-bookmarks-editor.c
-===================================================================
---- epiphany-webkit-2.27.3.orig/src/bookmarks/ephy-bookmarks-editor.c 2009-06-05 12:09:05.000000000 -0300
-+++ epiphany-webkit-2.27.3/src/bookmarks/ephy-bookmarks-editor.c 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/src/bookmarks/ephy-bookmarks-editor.c
+===================================================================
+--- epiphany-webkit-2.27.5.orig/src/bookmarks/ephy-bookmarks-editor.c 2009-06-05 17:09:05.000000000 +0200
++++ epiphany-webkit-2.27.5/src/bookmarks/ephy-bookmarks-editor.c 2009-07-30 17:36:57.514292775 +0200
@@ -126,7 +126,7 @@
#define EPHY_BOOKMARKS_EDITOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKS_EDITOR, EphyBookmarksEditorPrivate))
@@ -804,10 +802,10 @@
#define RESERVED_STRING N_("Remove from this topic")
-Index: epiphany-webkit-2.27.3/src/ephy-extensions-manager.c
-===================================================================
---- epiphany-webkit-2.27.3.orig/src/ephy-extensions-manager.c 2009-06-05 18:22:48.000000000 -0300
-+++ epiphany-webkit-2.27.3/src/ephy-extensions-manager.c 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/src/ephy-extensions-manager.c
+===================================================================
+--- epiphany-webkit-2.27.5.orig/src/ephy-extensions-manager.c 2009-06-05 23:22:48.000000000 +0200
++++ epiphany-webkit-2.27.5/src/ephy-extensions-manager.c 2009-07-30 17:36:57.514292775 +0200
@@ -59,7 +59,7 @@
#include "ephy-seed-loader.h"
#endif
@@ -817,10 +815,10 @@
#define EE_GROUP "Epiphany Extension"
#define DOT_INI ".ephy-extension"
#define RELOAD_DELAY 333 /* ms */
-Index: epiphany-webkit-2.27.3/src/ephy-history-window.c
-===================================================================
---- epiphany-webkit-2.27.3.orig/src/ephy-history-window.c 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.3/src/ephy-history-window.c 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/src/ephy-history-window.c
+===================================================================
+--- epiphany-webkit-2.27.5.orig/src/ephy-history-window.c 2009-07-20 19:03:51.000000000 +0200
++++ epiphany-webkit-2.27.5/src/ephy-history-window.c 2009-07-30 17:36:57.518292141 +0200
@@ -98,8 +98,8 @@
#define EPHY_HISTORY_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_HISTORY_WINDOW, EphyHistoryWindowPrivate))
@@ -832,10 +830,10 @@
struct _EphyHistoryWindowPrivate
{
-Index: epiphany-webkit-2.27.3/src/ephy-lockdown.c
-===================================================================
---- epiphany-webkit-2.27.3.orig/src/ephy-lockdown.c 2009-06-05 12:09:05.000000000 -0300
-+++ epiphany-webkit-2.27.3/src/ephy-lockdown.c 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/src/ephy-lockdown.c
+===================================================================
+--- epiphany-webkit-2.27.5.orig/src/ephy-lockdown.c 2009-06-05 17:09:05.000000000 +0200
++++ epiphany-webkit-2.27.5/src/ephy-lockdown.c 2009-07-30 17:36:57.518292141 +0200
@@ -254,7 +254,7 @@
* so we don't need to do notify here.
*/
@@ -854,10 +852,10 @@
eel_gconf_monitor_remove ("/desktop/gnome/lockdown");
for (i = 0; i < G_N_ELEMENTS (keys); i++)
-Index: epiphany-webkit-2.27.3/src/ephy-main.c
-===================================================================
---- epiphany-webkit-2.27.3.orig/src/ephy-main.c 2009-06-24 17:21:40.000000000 -0300
-+++ epiphany-webkit-2.27.3/src/ephy-main.c 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/src/ephy-main.c
+===================================================================
+--- epiphany-webkit-2.27.5.orig/src/ephy-main.c 2009-07-30 17:36:28.786824106 +0200
++++ epiphany-webkit-2.27.5/src/ephy-main.c 2009-07-30 17:36:57.518292141 +0200
@@ -755,7 +755,7 @@
/* Migrate profile */
_ephy_profile_migrate ();
@@ -876,10 +874,10 @@
save_accels ();
ephy_state_save ();
ephy_file_helpers_shutdown ();
-Index: epiphany-webkit-2.27.3/src/ephy-window.c
-===================================================================
---- epiphany-webkit-2.27.3.orig/src/ephy-window.c 2009-06-15 14:25:27.000000000 -0300
-+++ epiphany-webkit-2.27.3/src/ephy-window.c 2009-06-24 17:22:58.000000000 -0300
+Index: epiphany-webkit-2.27.5/src/ephy-window.c
+===================================================================
+--- epiphany-webkit-2.27.5.orig/src/ephy-window.c 2009-07-24 18:00:48.000000000 +0200
++++ epiphany-webkit-2.27.5/src/ephy-window.c 2009-07-30 17:36:57.518292141 +0200
@@ -407,7 +407,7 @@
#endif /* HAVE_X11_XF86KEYSYM_H */
};
@@ -898,11 +896,11 @@
/* Workaround a crash when closing a window while in print preview mode. See
* mozilla bug #241809. /
-Index: epiphany-webkit-2.27.3/embed/ephy-embed-prefs.c
-===================================================================
---- epiphany-webkit-2.27.3.orig/embed/ephy-embed-prefs.c 2009-06-24 17:25:11.000000000 -0300
-+++ epiphany-webkit-2.27.3/embed/ephy-embed-prefs.c 2009-06-24 17:25:23.000000000 -0300
-@@ -205,7 +205,7 @@
+Index: epiphany-webkit-2.27.5/embed/ephy-embed-prefs.c
+===================================================================
+--- epiphany-webkit-2.27.5.orig/embed/ephy-embed-prefs.c 2009-07-24 18:10:26.000000000 +0200
++++ epiphany-webkit-2.27.5/embed/ephy-embed-prefs.c 2009-07-30 17:36:57.518292141 +0200
+@@ -243,7 +243,7 @@
{
int i;
More information about the pkg-gnome-commits
mailing list