r40215 - in /desktop/experimental/epiphany-browser/debian: changelog patches/00_epiphany-browser.patch patches/01_with_webkit2.patch patches/07_bookmarks.patch

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Nov 3 17:25:24 UTC 2013


Author: sjoerd
Date: Sun Nov  3 17:25:23 2013
New Revision: 40215

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40215
Log:
* debian/patches/01_with_webkit2.patch
  debian/patches/07_bookmarks.patch
  debian/patches/00_epiphany-browser.patch:
  + Refreshed

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch
    desktop/experimental/epiphany-browser/debian/patches/01_with_webkit2.patch
    desktop/experimental/epiphany-browser/debian/patches/07_bookmarks.patch

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=40215&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog	[utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog	[utf-8] Sun Nov  3 17:25:23 2013
@@ -5,10 +5,12 @@
     libwebkitgtk-3.0-dev (>= * 2.1.4)
   * Force build on newer libgnome-desktop
   * debian/epiphany-browser.install: Extensions dir is now 3.10
-  * WIP
-
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 03 Nov 2013 11:48:08 +0100
+  * debian/patches/01_with_webkit2.patch
+    debian/patches/07_bookmarks.patch
+    debian/patches/00_epiphany-browser.patch:
+    + Refreshed
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 03 Nov 2013 18:24:34 +0100
 
 epiphany-browser (3.8.2-4) 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=40215&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 Nov  3 17:25:23 2013
@@ -1,7 +1,7 @@
 --- a/configure.ac
 +++ b/configure.ac
 @@ -20,7 +20,7 @@
- m4_define([epiphany_version_micro],[2])
+ m4_define([epiphany_version_micro],[1])
  m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
  
 -AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
@@ -22,7 +22,7 @@
  Type=Application
 --- a/src/ephy-main.c
 +++ b/src/ephy-main.c
-@@ -301,7 +301,7 @@
+@@ -316,7 +316,7 @@
    user_time = get_startup_id ();
  
    option_context = g_option_context_new ("");
@@ -31,7 +31,7 @@
                                       N_("Web"),
                                       N_("Web options"),
                                       NULL, NULL);
-@@ -437,7 +437,7 @@
+@@ -454,7 +454,7 @@
        /* Skip the 'app-' part */
        app_name += strlen (EPHY_WEB_APP_PREFIX);
  
@@ -40,7 +40,7 @@
        g_set_application_name (app_name);
  
        gtk_window_set_default_icon_from_file (app_icon, NULL);
-@@ -451,7 +451,7 @@
+@@ -474,7 +474,7 @@
    } else {
      mode = EPHY_EMBED_SHELL_MODE_BROWSER;
  

Modified: desktop/experimental/epiphany-browser/debian/patches/01_with_webkit2.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/01_with_webkit2.patch?rev=40215&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/01_with_webkit2.patch	[utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/01_with_webkit2.patch	[utf-8] Sun Nov  3 17:25:23 2013
@@ -1,19 +1,3 @@
-Index: epiphany-browser-3.8.2/configure.ac
-===================================================================
---- epiphany-browser-3.8.2.orig/configure.ac	2013-08-23 12:08:34.352933545 -0300
-+++ epiphany-browser-3.8.2/configure.ac	2013-08-23 12:08:34.348933516 -0300
-@@ -89,8 +89,9 @@
- GCR_REQUIRED=3.5.5
- AVAHI_REQUIRED=0.6.22
- 
--# Set to 'no' to build with the WebKit1 backend
--with_webkit2=yes
-+AC_ARG_WITH(webkit2,
-+	[AS_HELP_STRING([--with-webkit2],[build with WebKit2 [default=no]])],
-+	[],[with_webkit2=no])
- 
- if test "x$with_webkit2" != xno; then
-    WEBKIT_GTK_PC_NAME=webkit2gtk-3.0
 Index: epiphany-browser-3.8.2/lib/widgets/ephy-overview-store.h
 ===================================================================
 --- epiphany-browser-3.8.2.orig/lib/widgets/ephy-overview-store.h	2012-09-25 05:04:04.000000000 -0300

Modified: desktop/experimental/epiphany-browser/debian/patches/07_bookmarks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/07_bookmarks.patch?rev=40215&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/07_bookmarks.patch	[utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/07_bookmarks.patch	[utf-8] Sun Nov  3 17:25:23 2013
@@ -1,10 +1,8 @@
-Index: epiphany-browser-3.4.0.1/data/default-bookmarks.rdf.in
-===================================================================
---- epiphany-browser-3.4.0.1.orig/data/default-bookmarks.rdf.in	2012-03-16 00:53:14.000000000 +0100
-+++ epiphany-browser-3.4.0.1/data/default-bookmarks.rdf.in	2012-03-28 08:57:44.984358139 +0200
-@@ -20,4 +20,21 @@
- 	 "http://www.google.nl" and "http://www.google.nl/search?q=%s" -->
-     <_ephy:smartlink>http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8</_ephy:smartlink>
+--- a/data/default-bookmarks.rdf.in
++++ b/data/default-bookmarks.rdf.in
+@@ -34,4 +34,21 @@
+          http://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -->
+     <_ephy:smartlink>http://duckduckgo.com/?q=%s&t=epiphany</_ephy:smartlink>
    </item>
 +  <item rdf:about="http://www.debian.org/">
 +    <_title>Debian</_title>




More information about the pkg-gnome-commits mailing list