r37039 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in epiphany-browser-data.install epiphany-browser-webkit2.install epiphany-browser.install rules
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Tue Mar 19 02:44:45 UTC 2013
Author: kov
Date: Tue Mar 19 02:44:45 2013
New Revision: 37039
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37039
Log:
Add WebKit2-powered package
Added:
desktop/experimental/epiphany-browser/debian/epiphany-browser-webkit2.install
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-data.install
desktop/experimental/epiphany-browser/debian/epiphany-browser.install
desktop/experimental/epiphany-browser/debian/rules
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=37039&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Tue Mar 19 02:44:45 2013
@@ -10,8 +10,9 @@
debian/epiphany-browser-dev.*, debian/rules:
- remove GIR and -dev packages, there is no extensions support
anymore, so those packages are no longer needed
-
- -- Gustavo Noronha Silva <kov at debian.org> Mon, 18 Mar 2013 21:38:48 -0300
+ * Add packages for a WebKit2-powered Epiphany
+
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 18 Mar 2013 23:44:13 -0300
epiphany-browser (3.6.1-2) experimental; urgency=low
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=37039&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Tue Mar 19 02:44:45 2013
@@ -27,7 +27,8 @@
libnss3-dev,
libnotify-dev (>= 0.5.1),
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 1.9.6),
+ libwebkitgtk-3.0-dev (>= 1.11.5),
+ libwebkit2gtk-3.0-dev,
gnome-common (>= 3.6),
lsb-release,
gobject-introspection (>= 0.9.12-4~),
@@ -37,7 +38,6 @@
x11proto-core-dev,
libavahi-gobject-dev (>= 0.6.22),
gtk-doc-tools (>= 1.0),
- ca-certificates,
gsettings-desktop-schemas-dev (>= 0.0.1)
Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc
Standards-Version: 3.9.3
@@ -84,6 +84,51 @@
closely following the GNOME Human Interface Guidelines (HIG) and by
close integration with the GNOME desktop.
+Package: epiphany-browser-webkit2
+Architecture: any
+Depends: epiphany-browser-data (>= ${gnome:Version}),
+ epiphany-browser-data (<< ${gnome:NextVersion}),
+ ${shlibs:Depends},
+ gnome-icon-theme (>= 2.9.90),
+ dbus-x11,
+ iso-codes,
+ gsettings-desktop-schemas,
+ ${misc:Depends}
+Conflicts: epiphany-gecko (<< 2.28),
+ epiphany-webkit (<< 2.28),
+ swfdec-mozilla,
+ epiphany-extensions (<< 3.7.91),
+ epiphany-browser
+Replaces: epiphany-gecko (<< 2.28),
+ epiphany-webkit (<< 2.28),
+ epiphany-browser
+Recommends: yelp,
+ evince,
+ ca-certificates
+Breaks: gnome-session (<< 3.4.2.1-3),
+ gnome-shell (<< 3.4.2-1)
+Provides: www-browser, gnome-www-browser, epiphany-browser
+Description: Intuitive GNOME web browser - WebKit2-powered
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ 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.
+ .
+ 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.
+ .
+ This package contains Epiphany built with the WebKit2GTK+ library.
+ Notice WebKit2GTK+ is not yet as mature as WebKitGTK+, and the port
+ is still a work-in-progress.
+
Package: epiphany-extensions
Architecture: all
Description: Transitional package, to satisfy the GNOME meta package dependency
@@ -117,3 +162,19 @@
compliance.
.
This package contains detached debugging symbols.
+
+Package: epiphany-browser-webkit2-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: epiphany-browser-webkit2 (= ${binary:Version}),
+ ${misc:Depends}
+Recommends: libwebkit2gtk-3.0-0-dbg
+Conflicts: epiphany-browser-dbg
+Description: Debugging symbols 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 detached debugging symbols for Epiphany
+ built with WebKit2GTK+.
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=37039&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Tue Mar 19 02:44:45 2013
@@ -22,7 +22,8 @@
libnss3-dev,
libnotify-dev (>= 0.5.1),
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 1.9.6),
+ libwebkitgtk-3.0-dev (>= 1.11.5),
+ libwebkit2gtk-3.0-dev,
gnome-common (>= 3.6),
lsb-release,
gobject-introspection (>= 0.9.12-4~),
@@ -32,7 +33,6 @@
x11proto-core-dev,
libavahi-gobject-dev (>= 0.6.22),
gtk-doc-tools (>= 1.0),
- ca-certificates,
gsettings-desktop-schemas-dev (>= 0.0.1)
Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc
Standards-Version: 3.9.3
@@ -79,6 +79,51 @@
closely following the GNOME Human Interface Guidelines (HIG) and by
close integration with the GNOME desktop.
+Package: epiphany-browser-webkit2
+Architecture: any
+Depends: epiphany-browser-data (>= ${gnome:Version}),
+ epiphany-browser-data (<< ${gnome:NextVersion}),
+ ${shlibs:Depends},
+ gnome-icon-theme (>= 2.9.90),
+ dbus-x11,
+ iso-codes,
+ gsettings-desktop-schemas,
+ ${misc:Depends}
+Conflicts: epiphany-gecko (<< 2.28),
+ epiphany-webkit (<< 2.28),
+ swfdec-mozilla,
+ epiphany-extensions (<< 3.7.91),
+ epiphany-browser
+Replaces: epiphany-gecko (<< 2.28),
+ epiphany-webkit (<< 2.28),
+ epiphany-browser
+Recommends: yelp,
+ evince,
+ ca-certificates
+Breaks: gnome-session (<< 3.4.2.1-3),
+ gnome-shell (<< 3.4.2-1)
+Provides: www-browser, gnome-www-browser, epiphany-browser
+Description: Intuitive GNOME web browser - WebKit2-powered
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ 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.
+ .
+ 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.
+ .
+ This package contains Epiphany built with the WebKit2GTK+ library.
+ Notice WebKit2GTK+ is not yet as mature as WebKitGTK+, and the port
+ is still a work-in-progress.
+
Package: epiphany-extensions
Architecture: all
Description: Transitional package, to satisfy the GNOME meta package dependency
@@ -112,3 +157,19 @@
compliance.
.
This package contains detached debugging symbols.
+
+Package: epiphany-browser-webkit2-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: epiphany-browser-webkit2 (= ${binary:Version}),
+ ${misc:Depends}
+Recommends: libwebkit2gtk-3.0-0-dbg
+Conflicts: epiphany-browser-dbg
+Description: Debugging symbols 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 detached debugging symbols for Epiphany
+ built with WebKit2GTK+.
Modified: desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install?rev=37039&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/epiphany-browser-data.install [utf-8] Tue Mar 19 02:44:45 2013
@@ -1,8 +1,7 @@
-usr/share/applications
-usr/share/dbus-1
-usr/share/epiphany-browser/[!m]*
-usr/share/epiphany-browser/mime-types-permissions.xml etc/gnome/epiphany
-usr/share/GConf
-usr/share/glib-2.0
-usr/share/locale
-usr/share/man
+regular/usr/share/applications usr/share
+regular/usr/share/dbus-1 usr/share
+regular/usr/share/epiphany-browser/[!m]* usr/share/epiphany-browser
+regular/usr/share/epiphany-browser/mime-types-permissions.xml etc/gnome/epiphany
+regular/usr/share/glib-2.0 usr/share
+regular/usr/share/locale usr/share
+regular/usr/share/man usr/share
Added: desktop/experimental/epiphany-browser/debian/epiphany-browser-webkit2.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/epiphany-browser-webkit2.install?rev=37039&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/epiphany-browser-webkit2.install (added)
+++ desktop/experimental/epiphany-browser/debian/epiphany-browser-webkit2.install [utf-8] Tue Mar 19 02:44:45 2013
@@ -1,0 +1,3 @@
+debian/epiphany.sh usr/bin
+debian/bug/control usr/share/bug/epiphany-browser
+webkit2/usr/bin usr
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=37039&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 19 02:44:45 2013
@@ -1,3 +1,3 @@
-debian/epiphany.sh /usr/bin/
-debian/bug/control /usr/share/bug/epiphany-browser/
-usr/bin
+debian/epiphany.sh usr/bin
+debian/bug/control usr/share/bug/epiphany-browser
+regular/usr/bin usr
Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=37039&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/rules [utf-8] Tue Mar 19 02:44:45 2013
@@ -1,4 +1,7 @@
#!/usr/bin/make -f
+
+DEB_MAKE_FLAVORS = regular webkit2
+DEB_BUILDDIR = build
include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
@@ -12,12 +15,15 @@
LDFLAGS += -Wl,-O1 -Wl,--as-needed
+DEB_CONFIGURE_EXTRA_FLAGS_webkit2 += \
+ --with-webkit2
+
DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-zeroconf \
- --libexecdir=\$${prefix}/lib/epiphany-browser \
--enable-gtk-doc \
--enable-introspection \
- --with-distributor-name=Debian
+ --with-distributor-name=Debian \
+ $(DEB_CONFIGURE_EXTRA_FLAGS_$(cdbs_make_curflavor))
DEB_DH_INSTALLCHANGELOGS_ARGS_ALL := --no-act
DEB_INSTALL_DOCS_ALL := --no-act
@@ -28,6 +34,11 @@
binary-post-install/epiphany-browser::
cd debian/epiphany-browser/usr/bin \
+ && mv epiphany epiphany-browser \
+ && mv epiphany.sh epiphany
+
+binary-post-install/epiphany-browser-webkit2::
+ cd debian/epiphany-browser-webkit2/usr/bin \
&& mv epiphany epiphany-browser \
&& mv epiphany.sh epiphany
More information about the pkg-gnome-commits
mailing list