r37038 - in /desktop/experimental/epiphany-browser/debian: control patches/00_epiphany-browser.patch
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Tue Mar 19 00:44:28 UTC 2013
Author: kov
Date: Tue Mar 19 00:44:28 2013
New Revision: 37038
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37038
Log:
Refreshed 00_epiphany-browser.patch
Modified:
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/patches/00_epiphany-browser.patch
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=37038&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Tue Mar 19 00:44:28 2013
@@ -57,15 +57,14 @@
${misc:Depends}
Conflicts: epiphany-gecko (<< 2.28),
epiphany-webkit (<< 2.28),
- swfdec-mozilla
+ swfdec-mozilla,
+ epiphany-extensions (<< 3.7.91)
Replaces: epiphany-gecko (<< 2.28),
epiphany-webkit (<< 2.28)
Recommends: yelp,
evince,
ca-certificates
-Suggests: epiphany-extensions
-Breaks: epiphany-extensions (<< 2.30.0-4),
- gnome-session (<< 3.4.2.1-3),
+Breaks: gnome-session (<< 3.4.2.1-3),
gnome-shell (<< 3.4.2-1)
Provides: www-browser, gnome-www-browser
Description: Intuitive GNOME web browser
@@ -85,6 +84,14 @@
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
Depends: ${misc:Depends}
@@ -96,22 +103,6 @@
.
This package contains the common files, artwork and translations for
Epiphany.
-
-Package: epiphany-browser-dev
-Architecture: any
-Section: devel
-Depends: epiphany-browser (= ${binary:Version}),
- epiphany-browser-data (= ${source:Version}),
- gir1.2-epiphany-3.6 (= ${binary:Version}),
- ${misc:Depends},
- libgtk-3-dev (>= 3.5.2),
- libwebkitgtk-3.0-dev (>= 1.9.6)
-Description: Development files for the GNOME web browser
- Epiphany is a simple yet powerful GNOME web browser targeted at
- non-technical users. Its principles are simplicity and standards
- compliance.
- .
- This package is required to develop extensions for Epiphany/WebKitGTK+.
Package: epiphany-browser-dbg
Architecture: any
@@ -126,21 +117,3 @@
compliance.
.
This package contains detached debugging symbols.
-
-Package: gir1.2-epiphany-3.6
-Section: introspection
-Architecture: any
-Depends: epiphany-browser (= ${binary:Version}),
- ${gir:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: gir1.2-epiphany-3.4 (>= 3.6)
-Replaces: gir1.2-epiphany-3.4 (>= 3.6)
-Description: GObject introspection data for the GNOME web browser
- Epiphany is a simple yet powerful GNOME web browser targeted at
- non-technical users. Its principles are simplicity and standards
- compliance.
- .
- This package contains introspection data for the GNOME web browser. It
- allows writing extensions in languages that can use this data to
- generate bindings.
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=37038&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 19 00:44:28 2013
@@ -1,9 +1,9 @@
-Index: epiphany-3.4.1/configure.ac
+Index: epiphany-browser-3.7.91/configure.ac
===================================================================
---- epiphany-3.4.1.orig/configure.ac 2012-04-18 16:30:21.000000000 +0200
-+++ epiphany-3.4.1/configure.ac 2012-04-30 18:05:10.686231369 +0200
+--- epiphany-browser-3.7.91.orig/configure.ac 2013-03-18 21:42:15.699367778 -0300
++++ epiphany-browser-3.7.91/configure.ac 2013-03-18 21:42:15.691367651 -0300
@@ -20,7 +20,7 @@
- m4_define([epiphany_version_micro],[1])
+ m4_define([epiphany_version_micro],[91])
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])
@@ -11,24 +11,24 @@
AC_PREREQ([2.59])
-Index: epiphany-3.4.1/data/epiphany.desktop.in.in
+Index: epiphany-browser-3.7.91/data/epiphany.desktop.in.in
===================================================================
---- epiphany-3.4.1.orig/data/epiphany.desktop.in.in 2012-03-26 17:59:35.000000000 +0200
-+++ epiphany-3.4.1/data/epiphany.desktop.in.in 2012-04-30 18:05:10.686231369 +0200
-@@ -3,7 +3,7 @@
- _GenericName=Web Browser
+--- epiphany-browser-3.7.91.orig/data/epiphany.desktop.in.in 2013-03-18 21:42:15.699367778 -0300
++++ epiphany-browser-3.7.91/data/epiphany.desktop.in.in 2013-03-18 21:43:22.680426014 -0300
+@@ -4,7 +4,7 @@
_X-GNOME-FullName=Epiphany Web Browser
_Comment=Browse the web
+ _Keywords=web;browser;internet;
-Exec=epiphany %U
+Exec=epiphany-browser %U
StartupNotify=true
Terminal=false
Type=Application
-Index: epiphany-3.4.1/src/ephy-main.c
+Index: epiphany-browser-3.7.91/src/ephy-main.c
===================================================================
---- epiphany-3.4.1.orig/src/ephy-main.c 2012-04-18 16:28:36.000000000 +0200
-+++ epiphany-3.4.1/src/ephy-main.c 2012-04-30 18:05:10.694231364 +0200
-@@ -317,7 +317,7 @@
+--- epiphany-browser-3.7.91.orig/src/ephy-main.c 2013-03-18 21:42:15.699367778 -0300
++++ epiphany-browser-3.7.91/src/ephy-main.c 2013-03-18 21:42:15.691367651 -0300
+@@ -305,7 +305,7 @@
user_time = get_startup_id ();
option_context = g_option_context_new ("");
@@ -37,7 +37,7 @@
N_("Web"),
N_("Web options"),
NULL, NULL);
-@@ -449,7 +449,7 @@
+@@ -441,7 +441,7 @@
/* Skip the 'app-' part */
app_name += strlen (EPHY_WEB_APP_PREFIX);
@@ -46,7 +46,7 @@
g_set_application_name (app_name);
gtk_window_set_default_icon_from_file (app_icon, NULL);
-@@ -463,7 +463,7 @@
+@@ -455,7 +455,7 @@
} else {
mode = EPHY_EMBED_SHELL_MODE_BROWSER;
More information about the pkg-gnome-commits
mailing list