r30615 - in /desktop/experimental/epiphany-browser/debian: changelog patches/00_epiphany-browser.patch patches/03_dbus.patch patches/11_browse_to.patch patches/series

kov at users.alioth.debian.org kov at users.alioth.debian.org
Sun Oct 16 15:57:34 UTC 2011 

Author: kov
Date: Sun Oct 16 15:57:34 2011
New Revision: 30615

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30615
Log:
  * debian/patches/00_epiphany-browser.patch:
  - refreshed
  * debian/patches/11_browse_to.patch:
  - applied upstream
  * debian/patches/03_dbus.patch:
  - Epiphany no longer uses dbus directly, but relies on GtkApplication
    for the functionality, which makes this patch obsolete

Removed:
    desktop/experimental/epiphany-browser/debian/patches/03_dbus.patch
    desktop/experimental/epiphany-browser/debian/patches/11_browse_to.patch
Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.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=30615&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Sun Oct 16 15:57:34 2011
@@ -5,8 +5,15 @@
   - bump build dependencies on webkitgtk to 1.6.1 and glib to 2.29.10
   * debian/watch:
   - watch for .tar.xz files
-
- -- Gustavo Noronha Silva <kov at debian.org>  Sun, 16 Oct 2011 13:37:34 -0200
+  * debian/patches/00_epiphany-browser.patch:
+  - refreshed
+  * debian/patches/11_browse_to.patch:
+  - applied upstream
+  * debian/patches/03_dbus.patch:
+  - Epiphany no longer uses dbus directly, but relies on GtkApplication
+    for the functionality, which makes this patch obsolete
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Sun, 16 Oct 2011 13:55:33 -0200
 
 epiphany-browser (3.0.4-1) unstable; urgency=low
 

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=30615&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] Sun Oct 16 15:57:34 2011
@@ -1,7 +1,7 @@
-Index: epiphany-browser-2.91.92/data/bme.desktop.in.in
+Index: epiphany-browser-3.2.0/data/bme.desktop.in.in
 ===================================================================
---- 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
+--- epiphany-browser-3.2.0.orig/data/bme.desktop.in.in	2011-04-20 00:49:50.000000000 -0300
++++ epiphany-browser-3.2.0/data/bme.desktop.in.in	2011-10-16 13:46:37.048348995 -0200
 @@ -2,7 +2,7 @@
  _Name=Epiphany Web Bookmarks
  _GenericName=Web Bookmarks
@@ -11,10 +11,10 @@
  StartupNotify=true
  Terminal=false
  Type=Application
-Index: epiphany-browser-2.91.92/data/epiphany.desktop.in.in
+Index: epiphany-browser-3.2.0/data/epiphany.desktop.in.in
 ===================================================================
---- 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
+--- epiphany-browser-3.2.0.orig/data/epiphany.desktop.in.in	2011-04-20 00:49:50.000000000 -0300
++++ epiphany-browser-3.2.0/data/epiphany.desktop.in.in	2011-10-16 13:46:37.048348995 -0200
 @@ -3,7 +3,7 @@
  _GenericName=Web Browser
  _X-GNOME-FullName=Epiphany Web Browser
@@ -24,10 +24,10 @@
  StartupNotify=true
  Terminal=false
  Type=Application
-Index: epiphany-browser-2.91.92/configure.ac
+Index: epiphany-browser-3.2.0/configure.ac
 ===================================================================
---- 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
+--- epiphany-browser-3.2.0.orig/configure.ac	2011-09-27 07:47:16.000000000 -0300
++++ epiphany-browser-3.2.0/configure.ac	2011-10-16 13:46:37.048348995 -0200
 @@ -23,7 +23,7 @@
  # This can be either "trunk" or "branches/gnome-x-y"
  m4_define([epiphany_branch],["trunk"])
@@ -37,35 +37,31 @@
  
  AC_PREREQ([2.59])
  
-Index: epiphany-browser-2.91.92/src/ephy-main.c
+Index: epiphany-browser-3.2.0/src/ephy-main.c
 ===================================================================
---- 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;
+--- epiphany-browser-3.2.0.orig/src/ephy-main.c	2011-09-22 15:09:29.000000000 -0300
++++ epiphany-browser-3.2.0/src/ephy-main.c	2011-10-16 13:48:49.860477166 -0200
+@@ -321,7 +321,7 @@
+   user_time = get_startup_id ();
  
- 	/* sets name to help matching with the .desktop file */
--	g_set_prgname ("epiphany");
-+	g_set_prgname ("epiphany-browser");
+   option_context = g_option_context_new ("");
+-  option_group = g_option_group_new ("epiphany",
++  option_group = g_option_group_new ("epiphany-browser",
+                                      N_("GNOME Web Browser"),
+                                      N_("GNOME Web Browser options"),
+                                      NULL, NULL);
+@@ -456,9 +456,13 @@
+   } else {
+     mode = EPHY_EMBED_SHELL_MODE_BROWSER;
  
- 	/* If we're given -remote arguments, translate them */
- 	if (argc >= 2 &&
-@@ -519,7 +519,7 @@
- 	user_time = get_startup_id ();
+-    g_set_prgname ("epiphany");
++    g_set_prgname ("epiphany-browser");
+     g_set_application_name (_("Web Browser"));
+     gtk_window_set_default_icon_name (EPHY_STOCK_EPHY);
++
++    /* We need to re-set this because we have already parsed the
++     * options, which inits GTK+ and sets this as a side effect. */
++    gdk_set_program_class ("epiphany");
+   }
  
- 	option_context = g_option_context_new ("");
--	option_group = g_option_group_new ("epiphany",
-+	option_group = g_option_group_new ("epiphany-browser",
- 					   N_("GNOME Web Browser"),
- 					   N_("GNOME Web Browser options"),
- 					   NULL, NULL);
-@@ -649,6 +649,9 @@ main (int argc,
- 	/* Set default window icon */
- 	gtk_window_set_default_icon_name (EPHY_STOCK_EPHY);
- 
-+	/* sets WM_CLASS to help GNOME Shell windows matching */
-+	gdk_set_program_class ("epiphany");
-+
- 	startup_error_quark = g_quark_from_static_string ("epiphany-startup-error");
- 
- 	if (!_ephy_dbus_startup (!private_instance, &error))
+   _ephy_shell_create_instance (mode);

Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=30615&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series [utf-8] Sun Oct 16 15:57:34 2011
@@ -1,8 +1,6 @@
 00_epiphany-browser.patch
 01_bookmarks_menu.patch
-03_dbus.patch
 05_libexecdir.patch
 07_bookmarks.patch
 10_smart_bookmarks.patch
-11_browse_to.patch
 12_safetypes.patch

More information about the pkg-gnome-commits mailing list