r27250 - in /desktop/experimental/epiphany-browser/debian: ./ patches/
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Fri Apr 1 02:51:01 UTC 2011
Author: kov
Date: Fri Apr 1 02:51:01 2011
New Revision: 27250
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27250
Log:
Preparing 1.3.13
Patches refreshed and bumped WebKitGTK+ requirement.
Modified:
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/control.in
desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch
desktop/experimental/epiphany-browser/debian/patches/03_dbus.patch
desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch
desktop/experimental/epiphany-browser/debian/patches/15_fix_tab_reuse_after_session_restore.patch
desktop/experimental/epiphany-browser/debian/patches/series
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Fri Apr 1 02:51:01 2011
@@ -1,8 +1,13 @@
-epiphany-browser (2.91.91-3) UNRELEASED; urgency=low
-
+epiphany-browser (2.91.92-1) UNRELEASED; urgency=low
+
+ [ Josselin Mouette ]
* Make the -dev package depend on the gir package.
- -- Josselin Mouette <joss at debian.org> Wed, 30 Mar 2011 17:10:26 +0200
+ [ Gustavo Noronha Silva ]
+ * debian/control:
+ - bump WebKitGTK+ requirement to 1.3.13, following upstream
+
+ -- Gustavo Noronha Silva <kov at debian.org> Thu, 31 Mar 2011 23:37:12 -0300
epiphany-browser (2.91.91-2) experimental; urgency=low
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Fri Apr 1 02:51:01 2011
@@ -23,7 +23,7 @@
libsoup-gnome2.4-dev (>= 2.29.91),
libnss3-dev,
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 1.3.9),
+ libwebkitgtk-3.0-dev (>= 1.3.13),
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12),
gir1.2-glib-2.0,
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Fri Apr 1 02:51:01 2011
@@ -18,7 +18,7 @@
libsoup-gnome2.4-dev (>= 2.29.91),
libnss3-dev,
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 1.3.9),
+ libwebkitgtk-3.0-dev (>= 1.3.13),
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12),
gir1.2-glib-2.0,
Modified: desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch [utf-8] Fri Apr 1 02:51:01 2011
@@ -1,7 +1,7 @@
-Index: epiphany-2.30.2/data/bme.desktop.in.in
+Index: epiphany-browser-2.91.92/data/bme.desktop.in.in
===================================================================
---- epiphany-2.30.2.orig/data/bme.desktop.in.in 2010-07-03 01:15:41.903613446 +0200
-+++ epiphany-2.30.2/data/bme.desktop.in.in 2010-07-03 01:16:49.823610950 +0200
+--- epiphany-browser-2.91.92.orig/data/bme.desktop.in.in 2010-08-26 09:39:47.000000000 -0300
++++ epiphany-browser-2.91.92/data/bme.desktop.in.in 2011-03-31 23:47:47.652211920 -0300
@@ -2,7 +2,7 @@
_Name=Epiphany Web Bookmarks
_GenericName=Web Bookmarks
@@ -11,11 +11,11 @@
StartupNotify=true
Terminal=false
Type=Application
-Index: epiphany-2.30.2/data/epiphany.desktop.in.in
+Index: epiphany-browser-2.91.92/data/epiphany.desktop.in.in
===================================================================
---- epiphany-2.30.2.orig/data/epiphany.desktop.in.in 2010-07-03 01:15:41.887610155 +0200
-+++ epiphany-2.30.2/data/epiphany.desktop.in.in 2010-07-03 01:16:49.823610950 +0200
-@@ -3,7 +3,7 @@ _Name=Epiphany
+--- epiphany-browser-2.91.92.orig/data/epiphany.desktop.in.in 2010-10-12 09:15:43.000000000 -0300
++++ epiphany-browser-2.91.92/data/epiphany.desktop.in.in 2011-03-31 23:47:47.652211920 -0300
+@@ -3,7 +3,7 @@
_GenericName=Web Browser
_X-GNOME-FullName=Epiphany Web Browser
_Comment=Browse the web
@@ -24,24 +24,24 @@
StartupNotify=true
Terminal=false
Type=Application
-Index: epiphany-2.30.2/configure.ac
+Index: epiphany-browser-2.91.92/configure.ac
===================================================================
---- epiphany-2.30.2.orig/configure.ac 2010-07-03 01:15:41.711610616 +0200
-+++ epiphany-2.30.2/configure.ac 2010-07-03 01:16:49.823610950 +0200
-@@ -23,7 +23,7 @@ m4_define([epiphany_version],[epiphany_v
+--- epiphany-browser-2.91.92.orig/configure.ac 2011-03-22 08:33:58.000000000 -0300
++++ epiphany-browser-2.91.92/configure.ac 2011-03-31 23:47:47.652211920 -0300
+@@ -23,7 +23,7 @@
# This can be either "trunk" or "branches/gnome-x-y"
m4_define([epiphany_branch],["trunk"])
-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
- GNOME_COMMON_INIT
+ AC_PREREQ([2.59])
-Index: epiphany-2.30.2/src/ephy-main.c
+Index: epiphany-browser-2.91.92/src/ephy-main.c
===================================================================
---- epiphany-2.30.2.orig/src/ephy-main.c 2010-07-03 01:17:01.692110855 +0200
-+++ epiphany-2.30.2/src/ephy-main.c 2010-07-03 01:17:41.131611192 +0200
-@@ -456,7 +456,7 @@ main (int argc,
+--- epiphany-browser-2.91.92.orig/src/ephy-main.c 2011-01-22 12:53:25.000000000 -0200
++++ epiphany-browser-2.91.92/src/ephy-main.c 2011-03-31 23:47:47.652211920 -0300
+@@ -453,7 +453,7 @@
LIBXML_TEST_VERSION;
/* sets name to help matching with the .desktop file */
@@ -50,7 +50,7 @@
/* If we're given -remote arguments, translate them */
if (argc >= 2 &&
-@@ -522,7 +522,7 @@ main (int argc,
+@@ -519,7 +519,7 @@
user_time = get_startup_id ();
option_context = g_option_context_new ("");
Modified: desktop/experimental/epiphany-browser/debian/patches/03_dbus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/03_dbus.patch?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/03_dbus.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/03_dbus.patch [utf-8] Fri Apr 1 02:51:01 2011
@@ -1,8 +1,8 @@
-Index: epiphany-browser-2.28.0/src/ephy-main.c
+Index: epiphany-browser-2.91.92/src/ephy-main.c
===================================================================
---- epiphany-browser-2.28.0.orig/src/ephy-main.c 2009-09-24 18:15:07.912464628 -0300
-+++ epiphany-browser-2.28.0/src/ephy-main.c 2009-09-24 18:18:45.428939915 -0300
-@@ -654,11 +654,13 @@
+--- epiphany-browser-2.91.92.orig/src/ephy-main.c 2011-03-31 23:47:47.652211920 -0300
++++ epiphany-browser-2.91.92/src/ephy-main.c 2011-03-31 23:48:07.304476639 -0300
+@@ -653,11 +653,13 @@
if (!_ephy_dbus_startup (!private_instance, &error))
{
Modified: desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/05_libexecdir.patch [utf-8] Fri Apr 1 02:51:01 2011
@@ -1,7 +1,7 @@
-Index: epiphany-browser-2.30.3/data/epiphany.pc.in
+Index: epiphany-browser-2.91.92/data/epiphany.pc.in
===================================================================
---- epiphany-browser-2.30.3.orig/data/epiphany.pc.in 2010-08-16 23:08:14.000000000 +0200
-+++ epiphany-browser-2.30.3/data/epiphany.pc.in 2010-08-18 20:04:59.007686500 +0200
+--- epiphany-browser-2.91.92.orig/data/epiphany.pc.in 2010-08-26 09:39:47.000000000 -0300
++++ epiphany-browser-2.91.92/data/epiphany.pc.in 2011-03-31 23:48:14.240572472 -0300
@@ -2,8 +2,8 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
@@ -13,11 +13,11 @@
datarootdir=@datarootdir@
datadir=@datadir@
icondir=@datadir@/@PACKAGE@/icons
-Index: epiphany-browser-2.30.3/lib/Makefile.am
+Index: epiphany-browser-2.91.92/lib/Makefile.am
===================================================================
---- epiphany-browser-2.30.3.orig/lib/Makefile.am 2010-04-22 21:45:15.000000000 +0200
-+++ epiphany-browser-2.30.3/lib/Makefile.am 2010-08-18 20:04:59.023786595 +0200
-@@ -79,7 +79,7 @@
+--- epiphany-browser-2.91.92.orig/lib/Makefile.am 2011-02-27 19:30:27.000000000 -0300
++++ epiphany-browser-2.91.92/lib/Makefile.am 2011-03-31 23:48:14.240572472 -0300
+@@ -80,7 +80,7 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -26,11 +26,11 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
-Index: epiphany-browser-2.30.3/src/Makefile.am
+Index: epiphany-browser-2.91.92/src/Makefile.am
===================================================================
---- epiphany-browser-2.30.3.orig/src/Makefile.am 2010-08-16 23:08:15.000000000 +0200
-+++ epiphany-browser-2.30.3/src/Makefile.am 2010-08-18 20:04:59.031688648 +0200
-@@ -106,8 +106,8 @@
+--- epiphany-browser-2.91.92.orig/src/Makefile.am 2011-03-07 17:38:38.000000000 -0300
++++ epiphany-browser-2.91.92/src/Makefile.am 2011-03-31 23:48:14.244572529 -0300
+@@ -104,8 +104,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
Modified: desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.patch [utf-8] Fri Apr 1 02:51:01 2011
@@ -1,10 +1,10 @@
GNOME #571794
-Index: epiphany-browser-2.28.0/src/bookmarks/ephy-bookmark-action.c
+Index: epiphany-browser-2.91.92/src/bookmarks/ephy-bookmark-action.c
===================================================================
---- epiphany-browser-2.28.0.orig/src/bookmarks/ephy-bookmark-action.c 2009-09-24 18:15:07.588438388 -0300
-+++ epiphany-browser-2.28.0/src/bookmarks/ephy-bookmark-action.c 2009-09-24 18:19:26.440440234 -0300
-@@ -399,6 +399,18 @@
+--- epiphany-browser-2.91.92.orig/src/bookmarks/ephy-bookmark-action.c 2010-12-16 09:02:19.000000000 -0200
++++ epiphany-browser-2.91.92/src/bookmarks/ephy-bookmark-action.c 2011-03-31 23:48:20.204655880 -0300
+@@ -398,6 +398,18 @@
gdk_event_free (event);
}
Modified: desktop/experimental/epiphany-browser/debian/patches/15_fix_tab_reuse_after_session_restore.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/15_fix_tab_reuse_after_session_restore.patch?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/15_fix_tab_reuse_after_session_restore.patch [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/15_fix_tab_reuse_after_session_restore.patch [utf-8] Fri Apr 1 02:51:01 2011
@@ -12,18 +12,15 @@
src/ephy-session.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
-diff --git a/src/ephy-session.c b/src/ephy-session.c
-index 65ca3d2..183ef2d 100644
---- a/src/ephy-session.c
-+++ b/src/ephy-session.c
-@@ -1620,6 +1620,7 @@ ephy_session_load (EphySession *session,
- xmlFreeDoc (doc);
+Index: epiphany-browser-2.91.92/src/ephy-session.c
+===================================================================
+--- epiphany-browser-2.91.92.orig/src/ephy-session.c 2011-03-12 12:05:50.000000000 -0300
++++ epiphany-browser-2.91.92/src/ephy-session.c 2011-03-31 23:48:25.360728719 -0300
+@@ -473,6 +473,7 @@
+ user_time = gtk_get_current_event_time ();
priv->dont_save = FALSE;
+ priv->resume_window = NULL;
- ephy_session_save (session, SESSION_CRASHED);
-
---
-1.7.4.1
-
+ gtk_widget_destroy (info_bar);
+ priv->resume_infobar = NULL;
Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=27250&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series [utf-8] Fri Apr 1 02:51:01 2011
@@ -7,4 +7,4 @@
12_safetypes.patch
15_fix_tab_reuse_after_session_restore.patch
16_fix_missing_restore_option.patch
-17_do_not_include_removed_header.patch
+17_do_not_include_removed_header.patch
More information about the pkg-gnome-commits
mailing list