r24665 - in /desktop/unstable/epiphany-browser/debian: changelog patches/00_browser_wrapper_path.patch patches/00_epiphany-browser.patch patches/02_ac_init.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Jul  2 23:20:04 2010
New Revision: 24665

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24665
Log:
* Merge 00_browser_wrapper_path.patch and 02_ac_init.patch into a new 
  00_epiphany-browser.patch.
* Add to it a pair of missing renames: g_set_prgname (used by 
  bug-buddy) and the --help message.

Added:
    desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch
      - copied, changed from r24625, desktop/unstable/epiphany-browser/debian/patches/00_browser_wrapper_path.patch
Removed:
    desktop/unstable/epiphany-browser/debian/patches/00_browser_wrapper_path.patch
    desktop/unstable/epiphany-browser/debian/patches/02_ac_init.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=24665&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Fri Jul  2 23:20:04 2010
@@ -8,6 +8,10 @@
     Closes: #570142.
   * Switch to 3.0 source package format.
   * Move the packaging to use quilt.
+  * Merge 00_browser_wrapper_path.patch and 02_ac_init.patch into a new 
+    00_epiphany-browser.patch.
+  * Add to it a pair of missing renames: g_set_prgname (used by 
+    bug-buddy) and the --help message.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 02 Jul 2010 21:35:39 +0200
 

Copied: desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch (from r24625, desktop/unstable/epiphany-browser/debian/patches/00_browser_wrapper_path.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch?rev=24665&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/00_browser_wrapper_path.patch [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/00_epiphany-browser.patch [utf-8] Fri Jul  2 23:20:04 2010
@@ -1,7 +1,7 @@
-Index: epiphany-browser-2.28.0/data/bme.desktop.in.in
+Index: epiphany-2.30.2/data/bme.desktop.in.in
 ===================================================================
---- epiphany-browser-2.28.0.orig/data/bme.desktop.in.in	2009-09-24 18:15:08.164439853 -0300
-+++ epiphany-browser-2.28.0/data/bme.desktop.in.in	2009-09-24 18:18:17.524940227 -0300
+--- 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
 @@ -2,7 +2,7 @@
  _Name=Epiphany Web Bookmarks
  _GenericName=Web Bookmarks
@@ -11,11 +11,11 @@
  StartupNotify=true
  Terminal=false
  Type=Application
-Index: epiphany-browser-2.28.0/data/epiphany.desktop.in.in
+Index: epiphany-2.30.2/data/epiphany.desktop.in.in
 ===================================================================
---- epiphany-browser-2.28.0.orig/data/epiphany.desktop.in.in	2009-09-24 18:15:08.152447132 -0300
-+++ epiphany-browser-2.28.0/data/epiphany.desktop.in.in	2009-09-24 18:18:17.524940227 -0300
-@@ -3,7 +3,7 @@
+--- 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
  _GenericName=Web Browser
  _X-GNOME-FullName=Epiphany Web Browser
  _Comment=Browse the web
@@ -24,3 +24,38 @@
  StartupNotify=true
  Terminal=false
  Type=Application
+Index: epiphany-2.30.2/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
+ # 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
+ 
+Index: epiphany-2.30.2/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,
+ 	LIBXML_TEST_VERSION;
+ 
+ 	/* sets name to help matching with the .desktop file */
+-	g_set_prgname ("epiphany");
++	g_set_prgname ("epiphany-browser");
+ 
+ 	/* If we're given -remote arguments, translate them */
+ 	if (argc >= 2 &&
+@@ -522,7 +522,7 @@ main (int argc,
+ 	user_time = get_startup_id ();
+ 
+ 	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);

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=24665&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Fri Jul  2 23:20:04 2010
@@ -1,6 +1,5 @@
-00_browser_wrapper_path.patch
+00_epiphany-browser.patch
 01_bookmarks_menu.patch
-02_ac_init.patch
 03_dbus.patch
 05_libexecdir.patch
 07_bookmarks.patch