r40790 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in epiphany-browser.install patches/00_epiphany-browser.patch patches/01_with_webkit2.patch patches/07_bookmarks.patch patches/10_smart_bookmarks.patch patches/series
jeansch-guest at users.alioth.debian.org
jeansch-guest at users.alioth.debian.org
Tue Mar 4 17:26:19 UTC 2014
Author: jeansch-guest
Date: Tue Mar 4 17:26:19 2014
New Revision: 40790
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40790
Log:
* New upstream version.
* debian/control.in:
- Bump libgtk-3-dev build dependency to (>= 3.11.6).
- Bump libwebkit2gtk-3.0-dev build dependency to (>= 2.3.90).
- Drop libwebkitgtk-3.0-dev build dependency.
- Drop duplicated libavahi-gobject-dev build-dependecy.
- Bump Standards-Version to 3.9.2. No further changes.
* debian/patches
- Refresh debian/patches/00_epiphany-browser.patch.
- Refresh debian/patches/10_smart_bookmarks.patch.
- Refresh debian/patches/07_bookmarks.patch.
- Drop 01_with_webkit2.patch applied upstream.
Removed:
desktop/experimental/epiphany-browser/debian/patches/01_with_webkit2.patch
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/epiphany-browser.install
desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch
desktop/experimental/epiphany-browser/debian/patches/07_bookmarks.patch
desktop/experimental/epiphany-browser/debian/patches/10_smart_bookmarks.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=40790&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Tue Mar 4 17:26:19 2014
@@ -1,3 +1,20 @@
+epiphany-browser (3.11.90-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ * debian/control.in:
+ - Bump libgtk-3-dev build dependency to (>= 3.11.6).
+ - Bump libwebkit2gtk-3.0-dev build dependency to (>= 2.3.90).
+ - Drop libwebkitgtk-3.0-dev build dependency.
+ - Drop duplicated libavahi-gobject-dev build-dependecy.
+ - Bump Standards-Version to 3.9.2. No further changes.
+ * debian/patches
+ - Refresh debian/patches/00_epiphany-browser.patch.
+ - Refresh debian/patches/10_smart_bookmarks.patch.
+ - Refresh debian/patches/07_bookmarks.patch.
+ - Drop 01_with_webkit2.patch applied upstream.
+
+ -- Jean Schurger <jean at schurger.org> Tue, 04 Mar 2014 11:19:55 -0500
+
epiphany-browser (3.10.1-2) UNRELEASED; urgency=low
* debian/rules:
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=40790&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Tue Mar 4 17:26:19 2014
@@ -7,14 +7,14 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 8),
cdbs (>= 0.4.90),
dh-autoreconf,
gnome-pkg-tools (>= 0.10),
pkg-config,
libglib2.0-dev (>= 2.31.2),
- libgtk-3-dev (>= 3.9.12),
+ libgtk-3-dev (>= 3.11.6),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
libgnome-keyring-dev (>= 2.26.0),
@@ -27,8 +27,7 @@
libnss3-dev,
libnotify-dev (>= 0.5.1),
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 2.1.4),
- libwebkit2gtk-3.0-dev (>= 2.0.2),
+ libwebkit2gtk-3.0-dev (>= 2.3.90),
libsecret-1-dev (>= 0.14),
libwnck-3-dev,
gnome-common (>= 3.6),
@@ -38,12 +37,11 @@
iso-codes (>= 0.35),
intltool (>= 0.50.0),
x11proto-core-dev,
- libavahi-gobject-dev (>= 0.6.22),
gtk-doc-tools (>= 1.0),
gsettings-desktop-schemas-dev (>= 0.0.1),
yelp-tools
Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
Homepage: http://www.gnome.org/projects/epiphany/
Vcs-Browser: http://svn.debian.org/viewpkg-gnome/desktop/unstable/epiphany-browser/
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/epiphany-browser/
@@ -79,22 +77,13 @@
Simplicity is achieved by a well designed user interface and reliance
on external applications for performing external tasks (such as reading
email). Simplicity does not mean less features; Epiphany has everything
- a modern web browser is expected to have, and can have more through
- its extensions.
+ a modern web browser is expected to have.
.
Standards compliance is achieved on the HTML side by using the
WebKitGTK+ rendering engine (which is based on the engine used by
Apple Safari and Google Chrome); and on the user interface side by
closely following the GNOME Human Interface Guidelines (HIG) and by
close integration with the GNOME desktop.
-
-Package: epiphany-extensions
-Architecture: all
-Description: Transitional package, to satisfy the GNOME meta package dependency
- Epiphany no longer supports extensions. While they may come back
- later, it will likely be in a different form. This package is empty
- and can be safely removed. It exists only to satisfy the GNOME meta
- package dependencies.
Package: epiphany-browser-data
Architecture: all
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=40790&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Tue Mar 4 17:26:19 2014
@@ -9,7 +9,7 @@
gnome-pkg-tools (>= 0.10),
pkg-config,
libglib2.0-dev (>= 2.31.2),
- libgtk-3-dev (>= 3.9.12),
+ libgtk-3-dev (>= 3.11.6),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
libgnome-keyring-dev (>= 2.26.0),
@@ -22,8 +22,7 @@
libnss3-dev,
libnotify-dev (>= 0.5.1),
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 2.1.4),
- libwebkit2gtk-3.0-dev (>= 2.0.2),
+ libwebkit2gtk-3.0-dev (>= 2.3.90),
libsecret-1-dev (>= 0.14),
libwnck-3-dev,
gnome-common (>= 3.6),
@@ -33,12 +32,11 @@
iso-codes (>= 0.35),
intltool (>= 0.50.0),
x11proto-core-dev,
- libavahi-gobject-dev (>= 0.6.22),
gtk-doc-tools (>= 1.0),
gsettings-desktop-schemas-dev (>= 0.0.1),
yelp-tools
Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
Homepage: http://www.gnome.org/projects/epiphany/
Vcs-Browser: http://svn.debian.org/viewpkg-gnome/desktop/unstable/epiphany-browser/
Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/epiphany-browser/
Modified: desktop/experimental/epiphany-browser/debian/epiphany-browser.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/epiphany-browser.install?rev=40790&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/epiphany-browser.install [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/epiphany-browser.install [utf-8] Tue Mar 4 17:26:19 2014
@@ -1,4 +1,4 @@
debian/epiphany.sh usr/bin
debian/bug/control usr/share/bug/epiphany-browser
usr/bin usr
-usr/lib/epiphany/3.10/web-extensions/*.so usr/lib/epiphany/3.10/web-extensions
+usr/lib/epiphany/3.11/web-extensions/*.so usr/lib/epiphany/3.11/web-extensions
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=40790&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] Tue Mar 4 17:26:19 2014
@@ -1,14 +1,3 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@
- 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])
-+AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
-
- AC_PREREQ([2.59])
-
--- a/data/epiphany.desktop.in.in
+++ b/data/epiphany.desktop.in.in
@@ -4,7 +4,7 @@
@@ -22,7 +11,7 @@
Type=Application
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
-@@ -316,7 +316,7 @@
+@@ -310,7 +310,7 @@
user_time = get_startup_id ();
option_context = g_option_context_new ("");
@@ -31,7 +20,7 @@
N_("Web"),
N_("Web options"),
NULL, NULL);
-@@ -474,7 +474,7 @@
+@@ -468,7 +468,7 @@
} else {
mode = EPHY_EMBED_SHELL_MODE_BROWSER;
@@ -40,3 +29,14 @@
g_set_application_name (_("Web"));
gtk_window_set_default_icon_name ("web-browser");
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@
+ m4_define([epiphany_version_micro],[90])
+ 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])
++AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
+
+ AC_PREREQ([2.59])
+
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=40790&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] Tue Mar 4 17:26:19 2014
@@ -1,8 +1,8 @@
--- 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>
+ https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -->
+ <_ephy:smartlink>https://duckduckgo.com/?q=%s&t=epiphany</_ephy:smartlink>
</item>
+ <item rdf:about="http://www.debian.org/">
+ <_title>Debian</_title>
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=40790&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] Tue Mar 4 17:26:19 2014
@@ -1,25 +1,20 @@
-GNOME #571794
-
-Index: epiphany-browser-2.91.92/src/bookmarks/ephy-bookmark-action.c
-===================================================================
---- 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);
- }
+--- a/src/bookmarks/ephy-bookmark-action.c
++++ b/src/bookmarks/ephy-bookmark-action.c
+@@ -224,6 +224,17 @@
+ gdk_event_free (event);
+ }
-+ /* If we are clicking on the button, activate the entry instead */
-+ if (!GTK_IS_EDITABLE (widget))
-+ {
-+ GtkWidget *otherwidget = gtk_widget_get_parent (widget);
-+ if (otherwidget)
-+ otherwidget = gtk_widget_get_parent (otherwidget);
-+ if (otherwidget)
-+ otherwidget = GTK_WIDGET (g_object_get_data (G_OBJECT (otherwidget), "entry"));
-+ if (otherwidget)
-+ widget = otherwidget;
-+ }
-+
- ephy_bookmark_action_activate
- (action, widget, (control || ephy_gui_is_middle_click ()) ? EPHY_LINK_NEW_TAB : 0);
++ /* If we are clicking on the button, activate the entry instead */
++ if (!GTK_IS_EDITABLE (widget))
++ {
++ GtkWidget *otherwidget = gtk_widget_get_parent (widget);
++ if (otherwidget)
++ otherwidget = gtk_widget_get_parent (otherwidget);
++ if (otherwidget)
++ otherwidget = GTK_WIDGET (g_object_get_data (G_OBJECT (otherwidget), "entry"));
++ if (otherwidget)
++ widget = otherwidget;
++ }
+ ephy_bookmark_action_activate
+ (action, widget, (control || ephy_gui_is_middle_click ()) ? EPHY_LINK_NEW_TAB : 0);
}
Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=40790&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series [utf-8] Tue Mar 4 17:26:19 2014
@@ -1,4 +1,3 @@
00_epiphany-browser.patch
-01_with_webkit2.patch
07_bookmarks.patch
12_safetypes.patch
More information about the pkg-gnome-commits
mailing list