r32778 - in /desktop/experimental/epiphany-browser: ./ debian/ debian/patches/
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Mon Mar 5 02:00:35 UTC 2012
Author: jbicha-guest
Date: Mon Mar 5 02:00:34 2012
New Revision: 32778
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32778
Log:
* New upstream release
* debian/rules, debian/branding.conf.in:
- Use lsb-release to fill in user agent string
* debian/control.in:
- Bump minimum GTK, glib, libsoup, and webkit
- Build-depend on lsb-release
- Standards-Version 3.9.3
* debian/epiphany-browser-data.gconf-defaults:
- Dropped, obsolete. (Epiphany doesn't support a homepage setting
any more.)
* debian/epiphany-browser-data.install:
- Icons were dropped upstream
* debian/patches/00_epiphany-browser.patch: Refreshed
* debian/patches/01_bookmarks_menu.patch: Dropped, obsolete
* debian/patches/10_smart_bookmarks: Dropped, obsolete
Added:
desktop/experimental/epiphany-browser/
- copied from r32773, desktop/unstable/epiphany-browser/
Removed:
desktop/experimental/epiphany-browser/debian/epiphany-browser-data.gconf-defaults
desktop/experimental/epiphany-browser/debian/patches/01_bookmarks_menu.patch
Modified:
desktop/experimental/epiphany-browser/debian/branding.conf.in
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/patches/00_epiphany-browser.patch
desktop/experimental/epiphany-browser/debian/patches/series
desktop/experimental/epiphany-browser/debian/rules
Modified: desktop/experimental/epiphany-browser/debian/branding.conf.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/branding.conf.in?rev=32778&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/branding.conf.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/branding.conf.in [utf-8] Mon Mar 5 02:00:34 2012
@@ -1,4 +1,4 @@
[User Agent]
-Vendor=Debian
-VendorSub=sid/experimental
+Vendor=@DISTROID@
+VendorSub=@DISTROVERSION@
VendorComment=@PACKAGEVERSION@
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=32778&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Mon Mar 5 02:00:34 2012
@@ -1,8 +1,26 @@
-epiphany-browser (3.2.1-3) UNRELEASED; urgency=low
-
+epiphany-browser (3.3.90-1) UNRELEASED; urgency=low
+
+ [ Michael Biebl ]
* Change section of gir1.2-epiphany-3.2 to introspection.
- -- Michael Biebl <biebl at debian.org> Fri, 16 Dec 2011 04:33:29 +0100
+ [ Jeremy Bicha ]
+ * New upstream release
+ * debian/rules, debian/branding.conf.in:
+ - Use lsb-release to fill in user agent string
+ * debian/control.in:
+ - Bump minimum GTK, glib, libsoup, and webkit
+ - Build-depend on lsb-release
+ - Standards-Version 3.9.3
+ * debian/epiphany-browser-data.gconf-defaults:
+ - Dropped, obsolete. (Epiphany doesn't support a homepage setting
+ any more.)
+ * debian/epiphany-browser-data.install:
+ - Icons were dropped upstream
+ * debian/patches/00_epiphany-browser.patch: Refreshed
+ * debian/patches/01_bookmarks_menu.patch: Dropped, obsolete
+ * debian/patches/10_smart_bookmarks: Dropped, obsolete
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Sun, 04 Mar 2012 20:31:42 -0500
epiphany-browser (3.2.1-2) unstable; urgency=low
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=32778&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Mon Mar 5 02:00:34 2012
@@ -13,16 +13,17 @@
dh-autoreconf,
gnome-pkg-tools (>= 0.10),
pkg-config,
- libglib2.0-dev (>= 2.29.10),
- libgtk-3-dev (>= 3.0.8-1~),
+ libglib2.0-dev (>= 2.31.2),
+ libgtk-3-dev (>= 3.3.11),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
libgnome-keyring-dev (>= 2.26.0),
- libsoup-gnome2.4-dev (>= 2.33.1),
+ libsoup-gnome2.4-dev (>= 2.37.1),
libnss3-dev,
libnotify-dev (>= 0.5.1),
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 1.6.1),
+ libwebkitgtk-3.0-dev (>= 1.7.3),
+ lsb-release,
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12),
gir1.2-glib-2.0,
@@ -38,7 +39,7 @@
ca-certificates,
gsettings-desktop-schemas-dev (>= 0.0.1)
Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.gnome.org/projects/epiphany/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-browser/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/epiphany-browser/
@@ -100,8 +101,8 @@
epiphany-browser-data (= ${source:Version}),
gir1.2-epiphany-3.2 (>= ${binary:Version}),
${misc:Depends},
- libgtk-3-dev (>= 3.0.2),
- libwebkitgtk-3.0-dev (>= 1.4.0)
+ libgtk-3-dev (>= 3.3.11),
+ libwebkitgtk-3.0-dev (>= 1.7.3)
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
@@ -115,7 +116,7 @@
Priority: extra
Depends: epiphany-browser (= ${binary:Version}),
${misc:Depends}
-Recommends: libwebkitgtk-3.0-0-dbg (>= 1.4.0)
+Recommends: libwebkitgtk-3.0-0-dbg (>= 1.7.3)
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
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=32778&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Mon Mar 5 02:00:34 2012
@@ -8,16 +8,17 @@
dh-autoreconf,
gnome-pkg-tools (>= 0.10),
pkg-config,
- libglib2.0-dev (>= 2.29.10),
- libgtk-3-dev (>= 3.0.8-1~),
+ libglib2.0-dev (>= 2.31.2),
+ libgtk-3-dev (>= 3.3.11),
libxml2-dev (>= 2.6.12),
libxslt1-dev (>= 1.1.7),
libgnome-keyring-dev (>= 2.26.0),
- libsoup-gnome2.4-dev (>= 2.33.1),
+ libsoup-gnome2.4-dev (>= 2.37.1),
libnss3-dev,
libnotify-dev (>= 0.5.1),
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 1.6.1),
+ libwebkitgtk-3.0-dev (>= 1.7.3),
+ lsb-release,
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12),
gir1.2-glib-2.0,
@@ -33,7 +34,7 @@
ca-certificates,
gsettings-desktop-schemas-dev (>= 0.0.1)
Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.gnome.org/projects/epiphany/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/epiphany-browser/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/epiphany-browser/
@@ -95,8 +96,8 @@
epiphany-browser-data (= ${source:Version}),
gir1.2-epiphany-3.2 (>= ${binary:Version}),
${misc:Depends},
- libgtk-3-dev (>= 3.0.2),
- libwebkitgtk-3.0-dev (>= 1.4.0)
+ libgtk-3-dev (>= 3.3.11),
+ libwebkitgtk-3.0-dev (>= 1.7.3)
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
@@ -110,7 +111,7 @@
Priority: extra
Depends: epiphany-browser (= ${binary:Version}),
${misc:Depends}
-Recommends: libwebkitgtk-3.0-0-dbg (>= 1.4.0)
+Recommends: libwebkitgtk-3.0-0-dbg (>= 1.7.3)
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
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=32778&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] Mon Mar 5 02:00:34 2012
@@ -5,7 +5,6 @@
usr/share/GConf
usr/share/glib-2.0
usr/share/gnome
-usr/share/icons
usr/share/locale
usr/share/man
usr/share/omf
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=32778&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] Mon Mar 5 02:00:34 2012
@@ -1,20 +1,20 @@
-Index: epiphany-browser-3.2.0/data/bme.desktop.in.in
+Index: epiphany-browser-3.3.90/configure.ac
===================================================================
---- epiphany-browser-3.2.0.orig/data/bme.desktop.in.in 2011-04-20 00:49:50.000000000 -0300
-+++ epiphany-browser-3.2.0/data/bme.desktop.in.in 2011-10-16 13:46:37.048348995 -0200
-@@ -2,7 +2,7 @@
- _Name=Epiphany Web Bookmarks
- _GenericName=Web Bookmarks
- _Comment=Browse and organize your bookmarks
--Exec=epiphany --bookmarks-editor
-+Exec=epiphany-browser --bookmarks-editor
- StartupNotify=true
- Terminal=false
- Type=Application
-Index: epiphany-browser-3.2.0/data/epiphany.desktop.in.in
+--- epiphany-browser-3.3.90.orig/configure.ac 2012-02-21 21:39:23.025607166 -0500
++++ epiphany-browser-3.3.90/configure.ac 2012-02-21 21:39:24.769615814 -0500
+@@ -23,7 +23,7 @@
+ # 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])
+
+ AC_PREREQ([2.59])
+
+Index: epiphany-browser-3.3.90/data/epiphany.desktop.in.in
===================================================================
---- epiphany-browser-3.2.0.orig/data/epiphany.desktop.in.in 2011-04-20 00:49:50.000000000 -0300
-+++ epiphany-browser-3.2.0/data/epiphany.desktop.in.in 2011-10-16 13:46:37.048348995 -0200
+--- epiphany-browser-3.3.90.orig/data/epiphany.desktop.in.in 2012-02-21 21:39:23.057607324 -0500
++++ epiphany-browser-3.3.90/data/epiphany.desktop.in.in 2012-02-21 21:39:24.769615814 -0500
@@ -3,7 +3,7 @@
_GenericName=Web Browser
_X-GNOME-FullName=Epiphany Web Browser
@@ -24,44 +24,34 @@
StartupNotify=true
Terminal=false
Type=Application
-Index: epiphany-browser-3.2.0/configure.ac
+Index: epiphany-browser-3.3.90/src/ephy-main.c
===================================================================
---- epiphany-browser-3.2.0.orig/configure.ac 2011-09-27 07:47:16.000000000 -0300
-+++ epiphany-browser-3.2.0/configure.ac 2011-10-16 13:46:37.048348995 -0200
-@@ -23,7 +23,7 @@
- # 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])
-
- AC_PREREQ([2.59])
-
-Index: epiphany-browser-3.2.0/src/ephy-main.c
-===================================================================
---- epiphany-browser-3.2.0.orig/src/ephy-main.c 2011-09-22 15:09:29.000000000 -0300
-+++ epiphany-browser-3.2.0/src/ephy-main.c 2011-10-16 13:48:49.860477166 -0200
-@@ -321,7 +321,7 @@
+--- epiphany-browser-3.3.90.orig/src/ephy-main.c 2012-02-09 11:19:02.000000000 -0500
++++ epiphany-browser-3.3.90/src/ephy-main.c 2012-02-21 21:40:11.473847408 -0500
+@@ -317,7 +317,7 @@
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"),
+ N_("Web"),
+ N_("Web options"),
NULL, NULL);
-@@ -456,9 +456,13 @@
+@@ -444,7 +444,7 @@
+ /* Skip the 'app-' part */
+ app_name += strlen (EPHY_WEB_APP_PREFIX);
+
+- g_set_prgname (app_name);
++ g_set_prgname ("epiphany-browser");
+ g_set_application_name (app_name);
+
+ gtk_window_set_default_icon_from_file (app_icon, NULL);
+@@ -458,7 +458,7 @@
} else {
mode = EPHY_EMBED_SHELL_MODE_BROWSER;
- g_set_prgname ("epiphany");
+ g_set_prgname ("epiphany-browser");
- g_set_application_name (_("Web Browser"));
- gtk_window_set_default_icon_name (EPHY_STOCK_EPHY);
-+
-+ /* We need to re-set this because we have already parsed the
-+ * options, which inits GTK+ and sets this as a side effect. */
-+ gdk_set_program_class ("epiphany");
- }
+ g_set_application_name (_("Web"));
- _ephy_shell_create_instance (mode);
+ gtk_window_set_default_icon_name ("web-browser");
Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=32778&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series [utf-8] Mon Mar 5 02:00:34 2012
@@ -1,6 +1,4 @@
00_epiphany-browser.patch
-01_bookmarks_menu.patch
05_libexecdir.patch
07_bookmarks.patch
-10_smart_bookmarks.patch
12_safetypes.patch
Modified: desktop/experimental/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/rules?rev=32778&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/rules [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/rules [utf-8] Mon Mar 5 02:00:34 2012
@@ -47,5 +47,7 @@
&& echo 'MimeType=x-scheme-handler/http;x-scheme-handler/https;' >> epiphany-newtab.desktop \
&& echo 'NoDisplay=true' >> epiphany-newtab.desktop \
&& sed -ri 's,x-scheme-handler/[^;]+;,,g' epiphany.desktop
- sed 's/@PACKAGEVERSION@/$(DEB_VERSION)/' debian/branding.conf.in \
- > debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf
+ sed -i s/@PACKAGEVERSION@/$(DEB_VERSION)/ debian/branding.conf.in
+ sed -i s/@DISTROID@/`lsb_release -is`/ debian/branding.conf.in
+ sed -i s/@DISTROVERSION@/`lsb_release -rs`/ debian/branding.conf.in \
+ && mv debian/branding.conf.in debian/epiphany-browser-data/usr/share/epiphany-browser/branding.conf
More information about the pkg-gnome-commits
mailing list