--- epiphany-browser-2.22.2.orig/config.guess
+++ epiphany-browser-2.22.2/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
--- epiphany-browser-2.22.2.orig/debian/epiphany-gecko.menu
+++ epiphany-browser-2.22.2/debian/epiphany-gecko.menu
@@ -0,0 +1,6 @@
+?package(epiphany-gecko):needs="x11" \
+ section="Applications/Network/Web Browsing" \
+ title="Epiphany web browser (Gecko)" \
+ longtitle="Epiphany web browser with Gecko backend" \
+ command="/usr/bin/epiphany-gecko" \
+ hints="Web browsers"
--- epiphany-browser-2.22.2.orig/debian/patches/05_libexecdir.patch
+++ epiphany-browser-2.22.2/debian/patches/05_libexecdir.patch
@@ -0,0 +1,136 @@
+---
+ data/epiphany.pc.in | 4 ++--
+ embed/mozilla/Makefile.am | 2 +-
+ lib/Makefile.am | 2 +-
+ plugins/desktop-file/Makefile.am | 2 +-
+ src/Makefile.am | 8 ++++----
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+Index: epiphany-browser-2.22.2/data/epiphany.pc.in
+===================================================================
+--- epiphany-browser-2.22.2.orig/data/epiphany.pc.in
++++ epiphany-browser-2.22.2/data/epiphany.pc.in
+@@ -1,14 +1,14 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
+-extensionsdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/extensions
+-loaderdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/loaders
++extensionsdir=@libexecdir@/@EPIPHANY_MAJOR@/extensions
++loaderdir=@libexecdir@/@EPIPHANY_MAJOR@/loaders
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ icondir=@datadir@/@PACKAGE@/icons
+ features=@EPIPHANY_FEATURES@
+ engine=@with_engine@
+
+ Name: Epiphany Browser
+ Description: GNOME Web Browser
+Index: epiphany-browser-2.22.2/embed/mozilla/Makefile.am
+===================================================================
+--- epiphany-browser-2.22.2.orig/embed/mozilla/Makefile.am
++++ epiphany-browser-2.22.2/embed/mozilla/Makefile.am
+@@ -148,17 +148,17 @@
+ xpconnect
+
+ libephymozillaembed_la_CPPFLAGS = \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir) \
+ $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \
+ -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
+ -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
+ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
+ -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \
+ -DALLOW_PRIVATE_API \
+ $(AM_CPPFLAGS)
+
+ if HAVE_GECKO_1_9
+Index: epiphany-browser-2.22.2/lib/Makefile.am
+===================================================================
+--- epiphany-browser-2.22.2.orig/lib/Makefile.am
++++ epiphany-browser-2.22.2/lib/Makefile.am
+@@ -75,17 +75,17 @@
+ nodist_libephymisc_la_SOURCES = \
+ $(BUILT_SOURCES)
+
+ libephymisc_la_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -I$(top_builddir)/lib/egg \
+ -I$(top_srcdir)/lib/egg \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
+ $(AM_CPPFLAGS)
+
+ libephymisc_la_CFLAGS = \
+ $(DEPENDENCIES_CFLAGS) \
+ $(AM_CFLAGS)
+
+ libephymisc_la_LIBADD =
+
+Index: epiphany-browser-2.22.2/plugins/desktop-file/Makefile.am
+===================================================================
+--- epiphany-browser-2.22.2.orig/plugins/desktop-file/Makefile.am
++++ epiphany-browser-2.22.2/plugins/desktop-file/Makefile.am
+@@ -1,9 +1,9 @@
+-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
+ plugin_LTLIBRARIES = libdesktopfileplugin.la
+
+ libdesktopfileplugin_la_SOURCES = \
+ plugin.cpp
+
+ gecko_include_subdirs = \
+ . \
+ dom \
+Index: epiphany-browser-2.22.2/src/Makefile.am
+===================================================================
+--- epiphany-browser-2.22.2.orig/src/Makefile.am
++++ epiphany-browser-2.22.2/src/Makefile.am
+@@ -101,18 +101,18 @@
+ -I$(top_builddir)/lib \
+ -I$(top_builddir)/lib/egg \
+ -I$(top_builddir)/embed \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/egg \
+ -I$(top_srcdir)/lib/widgets \
+ -I$(top_srcdir)/src/bookmarks \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
+- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
+ -DDATADIR=\""$(pkgdatadir)"\" \
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ $(AM_CPPFLAGS)
+
+ libephymain_la_CFLAGS = \
+ $(DEPENDENCIES_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(AM_CFLAGS)
+@@ -153,18 +153,18 @@
+ -I$(top_builddir)/lib \
+ -I$(top_builddir)/lib/widgets \
+ -I$(top_builddir)/lib/egg \
+ -I$(top_builddir)/embed \
+ -I$(top_builddir)/embed/$(with_engine) \
+ -I$(top_builddir)/src \
+ -I$(top_builddir)/src/bookmarks \
+ $(PYTHON_INCLUDES) \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
+- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ $(AM_CPPFLAGS)
+
+ libpyphany_la_CFLAGS = \
+ $(DEPENDENCIES_CFLAGS) \
+ $(NO_STRICT_ALIASING_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(PYGTK_CFLAGS) \
--- epiphany-browser-2.22.2.orig/debian/patches/07_bookmarks.patch
+++ epiphany-browser-2.22.2/debian/patches/07_bookmarks.patch
@@ -0,0 +1,16 @@
+Index: epiphany-browser-2.22.0/src/bookmarks/ephy-bookmarks.c
+===================================================================
+--- epiphany-browser-2.22.0.orig/src/bookmarks/ephy-bookmarks.c 2008-03-09 21:55:53.000000000 +0100
++++ epiphany-browser-2.22.0/src/bookmarks/ephy-bookmarks.c 2008-03-13 14:19:22.000000000 +0100
+@@ -108,6 +108,11 @@
+ * For instance in .nl these should be
+ * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
+ */
++ { N_("Debian"), N_("http://www.debian.org/") },
++ { N_("GNOME"), N_("http://www.gnome.org/") },
++ { N_("Ubuntu"), N_("http://www.ubuntu.com/") },
++ { N_("Planet Ubuntu"), N_("http://planet.ubuntu.com/") },
++ { N_("Ubuntu Wiki (community-edited website)"), N_("https://wiki.ubuntu.com/") },
+ { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }
+ };
+
--- epiphany-browser-2.22.2.orig/debian/patches/08_load_on_new_tab.patch
+++ epiphany-browser-2.22.2/debian/patches/08_load_on_new_tab.patch
@@ -0,0 +1,90 @@
+Index: epiphany-browser-2.18.0/data/epiphany.schemas.in
+===================================================================
+--- epiphany-browser-2.18.0.orig/data/epiphany.schemas.in 2007-03-06 12:31:58.000000000 +0000
++++ epiphany-browser-2.18.0/data/epiphany.schemas.in 2007-03-11 21:01:46.000000000 +0000
+@@ -168,6 +168,21 @@
+
+
+
++ /schemas/apps/epiphany/general/load_on_new_tab
++ /apps/epiphany/general/load_on_new_tab
++ epiphany
++ int
++ 1
++
++ Page to open when opening a new tab
++ Page to open when opening a new tab. Allowed values are -1
++ (browser startup page), 0 (blank page), 1 (homepage), 2 (last visited
++ page), as defined for mozilla's browser.tab.loadOnNewTab about:config
++ option. Both -1 and 1 are implemented the same way; 2 is not
++ implemented.
++
++
++
+ /schemas/apps/epiphany/general/show_bookmarks_bar
+ /apps/epiphany/general/show_bookmarks_bar
+ epiphany
+Index: epiphany-browser-2.18.0/lib/ephy-prefs.h
+===================================================================
+--- epiphany-browser-2.18.0.orig/lib/ephy-prefs.h 2007-03-06 12:31:55.000000000 +0000
++++ epiphany-browser-2.18.0/lib/ephy-prefs.h 2007-03-11 21:01:46.000000000 +0000
+@@ -37,6 +37,7 @@
+ #define CONF_AUTO_DOWNLOADS "/apps/epiphany/general/automatic_downloads"
+ #define CONF_DESKTOP_IS_HOME_DIR "/apps/nautilus/preferences/desktop_is_home_dir"
+ #define CONF_NETWORK_MANAGED "/apps/epiphany/general/managed_network"
++#define CONF_BROWSER_TABS_LOADONNEWTAB "/apps/epiphany/general/load_on_new_tab"
+
+ /* i18n pref */
+ #define CONF_GECKO_ENABLE_PANGO "/apps/epiphany/web/enable_pango"
+Index: epiphany-browser-2.18.0/src/ephy-shell.c
+===================================================================
+--- epiphany-browser-2.18.0.orig/src/ephy-shell.c 2007-03-06 12:31:28.000000000 +0000
++++ epiphany-browser-2.18.0/src/ephy-shell.c 2007-03-11 21:01:46.000000000 +0000
+@@ -530,14 +530,45 @@
+ gtk_window_fullscreen (GTK_WINDOW (window));
+ }
+
+- if (flags & EPHY_NEW_TAB_HOME_PAGE ||
+- flags & EPHY_NEW_TAB_NEW_PAGE)
++ if (flags & EPHY_NEW_TAB_HOME_PAGE)
+ {
+ ephy_tab_set_typed_address (tab, "",
+ EPHY_TAB_ADDRESS_EXPIRE_NEXT);
+ ephy_toolbar_activate_location (toolbar);
+ is_empty = load_homepage (embed);
+ }
++ else if (flags & EPHY_NEW_TAB_NEW_PAGE)
++ {
++ /* Simulate mozilla's browser.tabs.loadOnNewTab option through
++ * a gconf option.
++ *
++ * Documentation at: http://kb.mozillazine.org/About:config_entries
++ *
++ * To ensure that no blank page is displayed by default, this key
++ * is set to 1 by default in the schema (see data/epiphany.schema.in)
++ */
++ int load_on_new_tab = eel_gconf_get_integer (CONF_BROWSER_TABS_LOADONNEWTAB);
++
++ switch (load_on_new_tab)
++ {
++ case 0: /* Blank page */
++ ephy_embed_load_url (embed, "about:blank");
++ is_empty = url_is_empty ("about:blank");
++ break;
++
++ case 2: /* Last visited */
++ /* NOT IMPLEMENTED */
++
++ case -1: /* Start-up page */
++ case 1: /* Homepage */
++ default:
++ /* Same as in the previous 'if' test */
++ ephy_tab_set_typed_address (tab, "",
++ EPHY_TAB_ADDRESS_EXPIRE_NEXT);
++ ephy_toolbar_activate_location (toolbar);
++ is_empty = load_homepage (embed);
++ }
++ }
+ else if (flags & EPHY_NEW_TAB_OPEN_PAGE)
+ {
+ EphyEmbedLoadFlags load_flags = 0;
--- epiphany-browser-2.22.2.orig/debian/patches/99_autoreconf.patch
+++ epiphany-browser-2.22.2/debian/patches/99_autoreconf.patch
@@ -0,0 +1,576 @@
+---
+ configure | 16 ++-
+ embed/mozilla/Makefile.in | 2
+ gtk-doc.make | 174 +++++++++++++++++++++++++++++++++++++++
+ intltool-extract.in | 12 ++
+ lib/Makefile.in | 2
+ plugins/desktop-file/Makefile.in | 2
+ src/Makefile.in | 8 -
+ 7 files changed, 206 insertions(+), 10 deletions(-)
+
+Index: epiphany-browser-2.22.2/configure
+===================================================================
+--- epiphany-browser-2.22.2.orig/configure
++++ epiphany-browser-2.22.2/configure
+@@ -722,17 +722,17 @@
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
+ # Identity of this package.
+ PACKAGE_NAME='GNOME Web Browser'
+-PACKAGE_TARNAME='epiphany'
++PACKAGE_TARNAME='epiphany-browser'
+ PACKAGE_VERSION='2.22.2'
+ PACKAGE_STRING='GNOME Web Browser 2.22.2'
+ PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+
+ ac_unique_file="configure.ac"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include
+@@ -1629,17 +1629,17 @@
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+- --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany]
++ --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany-browser]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
+ _ACEOF
+
+ cat <<\_ACEOF
+
+@@ -2672,17 +2672,17 @@
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+ fi
+
+
+ # Define the identity of the package.
+- PACKAGE='epiphany'
++ PACKAGE='epiphany-browser'
+ VERSION='2.22.2'
+
+
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE "$PACKAGE"
+ _ACEOF
+
+
+@@ -23326,32 +23326,34 @@
+ gmodule-2.0
+ gio-unix-2.0 >= \$GLIB_REQUIRED
+ gtk+-2.0 >= \$GTK_REQUIRED
+ gtk+-unix-print-2.0 >= \$GTK_REQUIRED
+ libxml-2.0 >= \$LIBXML_REQUIRED
+ libxslt >= \$LIBXSLT_REQUIRED
+ libgnome-2.0 >= \$LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= \$LIBGLADE_REQUIRED \\
+ gconf-2.0
+ gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED
+ \$LIBNOTIFY_PACKAGE
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+ $LIBNOTIFY_PACKAGE
+ ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -23361,16 +23363,17 @@
+ gmodule-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+ $LIBNOTIFY_PACKAGE
+ " 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -23389,32 +23392,34 @@
+ gmodule-2.0
+ gio-unix-2.0 >= \$GLIB_REQUIRED
+ gtk+-2.0 >= \$GTK_REQUIRED
+ gtk+-unix-print-2.0 >= \$GTK_REQUIRED
+ libxml-2.0 >= \$LIBXML_REQUIRED
+ libxslt >= \$LIBXSLT_REQUIRED
+ libgnome-2.0 >= \$LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= \$LIBGLADE_REQUIRED \\
+ gconf-2.0
+ gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED
+ \$LIBNOTIFY_PACKAGE
+ \"") >&5
+ ($PKG_CONFIG --exists --print-errors "
+ glib-2.0 >= $GLIB_REQUIRED
+ gmodule-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+ $LIBNOTIFY_PACKAGE
+ ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -23424,16 +23429,17 @@
+ gmodule-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+ $LIBNOTIFY_PACKAGE
+ " 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -23458,16 +23464,17 @@
+ gmodule-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+ $LIBNOTIFY_PACKAGE
+ "`
+ else
+ DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+@@ -23475,16 +23482,17 @@
+ gmodule-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+ $LIBNOTIFY_PACKAGE
+ "`
+ fi
+ # Put the nasty error message in config.log where it belongs
+@@ -23495,16 +23503,17 @@
+ gmodule-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+ $LIBNOTIFY_PACKAGE
+ ) were not met:
+
+ $DEPENDENCIES_PKG_ERRORS
+@@ -23521,16 +23530,17 @@
+ gmodule-2.0
+ gio-unix-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+ $LIBNOTIFY_PACKAGE
+ ) were not met:
+
+ $DEPENDENCIES_PKG_ERRORS
+Index: epiphany-browser-2.22.2/embed/mozilla/Makefile.in
+===================================================================
+--- epiphany-browser-2.22.2.orig/embed/mozilla/Makefile.in
++++ epiphany-browser-2.22.2/embed/mozilla/Makefile.in
+@@ -505,17 +505,17 @@
+ xmlextras \
+ xpcom \
+ xpconnect
+
+ libephymozillaembed_la_CPPFLAGS = -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/embed -I$(top_srcdir) $(addprefix \
+ -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \
+ -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
+ -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
+ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
+ -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" -DALLOW_PRIVATE_API \
+ $(AM_CPPFLAGS) $(am__append_6)
+ libephymozillaembed_la_CXXFLAGS = \
+ $(GECKO_CFLAGS) \
+ $(DEPENDENCIES_CFLAGS) \
+Index: epiphany-browser-2.22.2/gtk-doc.make
+===================================================================
+--- /dev/null
++++ epiphany-browser-2.22.2/gtk-doc.make
+@@ -0,0 +1,174 @@
++# -*- mode: makefile -*-
++
++####################################
++# Everything below here is generic #
++####################################
++
++if GTK_DOC_USE_LIBTOOL
++GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
++else
++GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
++endif
++
++# We set GPATH here; this gives us semantics for GNU make
++# which are more like other make's VPATH, when it comes to
++# whether a source that is a target of one rule is then
++# searched for in VPATH/GPATH.
++#
++GPATH = $(srcdir)
++
++TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
++
++EXTRA_DIST = \
++ $(content_files) \
++ $(HTML_IMAGES) \
++ $(DOC_MAIN_SGML_FILE) \
++ $(DOC_MODULE)-sections.txt \
++ $(DOC_MODULE)-overrides.txt
++
++DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++
++SCANOBJ_FILES = \
++ $(DOC_MODULE).args \
++ $(DOC_MODULE).hierarchy \
++ $(DOC_MODULE).interfaces \
++ $(DOC_MODULE).prerequisites \
++ $(DOC_MODULE).signals
++
++REPORT_FILES = \
++ $(DOC_MODULE)-undocumented.txt \
++ $(DOC_MODULE)-undeclared.txt \
++ $(DOC_MODULE)-unused.txt
++
++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++
++if ENABLE_GTK_DOC
++all-local: html-build.stamp
++else
++all-local:
++endif
++
++docs: html-build.stamp
++
++#### scan ####
++
++scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
++ @echo 'gtk-doc: Scanning header files'
++ @-chmod -R u+w $(srcdir)
++ cd $(srcdir) && \
++ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
++ else \
++ cd $(srcdir) ; \
++ for i in $(SCANOBJ_FILES) ; do \
++ test -f $$i || touch $$i ; \
++ done \
++ fi
++ touch scan-build.stamp
++
++$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
++ @true
++
++#### templates ####
++
++tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
++ @echo 'gtk-doc: Rebuilding template files'
++ @-chmod -R u+w $(srcdir)
++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ touch tmpl-build.stamp
++
++tmpl.stamp: tmpl-build.stamp
++ @true
++
++tmpl/*.sgml:
++ @true
++
++
++#### xml ####
++
++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++ @echo 'gtk-doc: Building XML'
++ @-chmod -R u+w $(srcdir)
++ cd $(srcdir) && \
++ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
++ touch sgml-build.stamp
++
++sgml.stamp: sgml-build.stamp
++ @true
++
++#### html ####
++
++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++ @echo 'gtk-doc: Building HTML'
++ @-chmod -R u+w $(srcdir)
++ rm -rf $(srcdir)/html
++ mkdir $(srcdir)/html
++ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ @echo 'gtk-doc: Fixing cross-references'
++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ touch html-build.stamp
++
++##############
++
++clean-local:
++ rm -f *~ *.bak
++ rm -rf .libs
++
++distclean-local:
++ cd $(srcdir) && \
++ rm -rf xml $(REPORT_FILES) \
++ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++
++maintainer-clean-local: clean
++ cd $(srcdir) && rm -rf xml html
++
++install-data-local:
++ installfiles=`echo $(srcdir)/html/*`; \
++ if test "$$installfiles" = '$(srcdir)/html/*'; \
++ then echo '-- Nothing to install' ; \
++ else \
++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
++ for i in $$installfiles; do \
++ echo '-- Installing '$$i ; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
++ done; \
++ echo '-- Installing $(srcdir)/html/index.sgml' ; \
++ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
++ if test `which gtkdoc-rebase` != ""; then \
++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
++ fi \
++ fi
++
++
++uninstall-local:
++ rm -f $(DESTDIR)$(TARGET_DIR)/*
++
++#
++# Require gtk-doc when making dist
++#
++if ENABLE_GTK_DOC
++dist-check-gtkdoc:
++else
++dist-check-gtkdoc:
++ @echo "*** gtk-doc must be installed and enabled in order to make dist"
++ @false
++endif
++
++dist-hook: dist-check-gtkdoc dist-hook-local
++ mkdir $(distdir)/tmpl
++ mkdir $(distdir)/xml
++ mkdir $(distdir)/html
++ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
++ -cp $(srcdir)/xml/*.xml $(distdir)/xml
++ cp $(srcdir)/html/* $(distdir)/html
++ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
++ cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
++ cd $(distdir) && rm -f $(DISTCLEANFILES)
++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++
++.PHONY : dist-hook-local docs
+Index: epiphany-browser-2.22.2/plugins/desktop-file/Makefile.in
+===================================================================
+--- epiphany-browser-2.22.2.orig/plugins/desktop-file/Makefile.in
++++ epiphany-browser-2.22.2/plugins/desktop-file/Makefile.in
+@@ -308,17 +308,17 @@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ with_engine = @with_engine@
+-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
+ plugin_LTLIBRARIES = libdesktopfileplugin.la
+ libdesktopfileplugin_la_SOURCES = \
+ plugin.cpp
+
+ gecko_include_subdirs = \
+ . \
+ dom \
+ plugin
+Index: epiphany-browser-2.22.2/src/Makefile.in
+===================================================================
+--- epiphany-browser-2.22.2.orig/src/Makefile.in
++++ epiphany-browser-2.22.2/src/Makefile.in
+@@ -547,18 +547,18 @@
+ -I$(top_builddir)/lib \
+ -I$(top_builddir)/lib/egg \
+ -I$(top_builddir)/embed \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/egg \
+ -I$(top_srcdir)/lib/widgets \
+ -I$(top_srcdir)/src/bookmarks \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
+- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
+ -DDATADIR=\""$(pkgdatadir)"\" \
+ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ $(AM_CPPFLAGS)
+
+ libephymain_la_CFLAGS = \
+ $(DEPENDENCIES_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(AM_CFLAGS)
+@@ -586,18 +586,18 @@
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/lib \
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/lib/widgets \
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/lib/egg \
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/embed \
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/embed/$(with_engine) \
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
+ @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
+ @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
+-@ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
+-@ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
++@ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
++@ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
+ @ENABLE_PYTHON_TRUE@ -DDATADIR=\""$(datadir)"\" \
+ @ENABLE_PYTHON_TRUE@ $(AM_CPPFLAGS)
+
+ @ENABLE_PYTHON_TRUE@libpyphany_la_CFLAGS = \
+ @ENABLE_PYTHON_TRUE@ $(DEPENDENCIES_CFLAGS) \
+ @ENABLE_PYTHON_TRUE@ $(NO_STRICT_ALIASING_CFLAGS) \
+ @ENABLE_PYTHON_TRUE@ $(DBUS_CFLAGS) \
+ @ENABLE_PYTHON_TRUE@ $(PYGTK_CFLAGS) \
+Index: epiphany-browser-2.22.2/intltool-extract.in
+===================================================================
+--- epiphany-browser-2.22.2.orig/intltool-extract.in
++++ epiphany-browser-2.22.2/intltool-extract.in
+@@ -726,16 +726,28 @@
+ my $before = $`;
+ $message =~ s/\\\"/\"/g;
+ $before =~ s/[^\n]//g;
+ $messages{$message} = [];
+ $loc{$message} = length ($before) + 2;
+ }
+ }
+
++sub type_quotedxml {
++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++ my $message = $1;
++ my $before = $`;
++ $message =~ s/\\\"/\"/g;
++ $message = entity_decode($message);
++ $before =~ s/[^\n]//g;
++ $messages{$message} = [];
++ $loc{$message} = length ($before) + 2;
++ }
++}
++
+ sub type_glade {
+ ### For translatable Glade XML files ###
+
+ my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message";
+
+ while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) {
+ # Glade sometimes uses tags that normally mark translatable things for
+ # little bits of non-translatable content. We work around this by not
+Index: epiphany-browser-2.22.2/lib/Makefile.in
+===================================================================
+--- epiphany-browser-2.22.2.orig/lib/Makefile.in
++++ epiphany-browser-2.22.2/lib/Makefile.in
+@@ -428,17 +428,17 @@
+ nodist_libephymisc_la_SOURCES = \
+ $(BUILT_SOURCES)
+
+ libephymisc_la_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -I$(top_builddir)/lib/egg \
+ -I$(top_srcdir)/lib/egg \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
+- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
+ $(AM_CPPFLAGS)
+
+ libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
+ $(am__append_2)
+ libephymisc_la_LIBADD = $(am__append_3)
+ BUILT_SOURCES = \
+ ephy-lib-type-builtins.c \
+ ephy-lib-type-builtins.h \
--- epiphany-browser-2.22.2.orig/debian/patches/80_from_upstream_fix_printing_scale.patch
+++ epiphany-browser-2.22.2/debian/patches/80_from_upstream_fix_printing_scale.patch
@@ -0,0 +1,15 @@
+diff -urp epiphany-browser-2.22.2.orig/embed/mozilla/GeckoPrintService.cpp epiphany-browser-2.22.2/embed/mozilla/GeckoPrintService.cpp
+--- epiphany-browser-2.22.2.orig/embed/mozilla/GeckoPrintService.cpp 2008-05-26 13:56:35.000000000 -0400
++++ epiphany-browser-2.22.2/embed/mozilla/GeckoPrintService.cpp 2008-07-01 22:33:17.000000000 -0400
+@@ -735,7 +735,9 @@ GeckoPrintService::TranslateSettings (Gt
+
+ /* FIXME: only if GTK_PRINT_CAPABILITY_SCALE is not set? */
+ aSettings->SetScaling (gtk_print_settings_get_scale (aGtkSettings) / 100.0);
+- gtk_print_settings_set_scale (aGtkSettings, 1.0);
++ /* According to http://library.gnome.org/devel/gtk/unstable/GtkPrintSettings.html#gtk-print-settings-set-scale
++ * the scale should be set to a percentage, not a value -- fixes Ubuntu LP #217151 */
++ gtk_print_settings_set_scale (aGtkSettings, 100.0);
+
+ aSettings->SetShrinkToFit (PR_FALSE); /* FIXME setting */
+
+
--- epiphany-browser-2.22.2.orig/debian/patches/series
+++ epiphany-browser-2.22.2/debian/patches/series
@@ -0,0 +1,23 @@
+00_browser_wrapper_path.patch
+01_bookmarks_menu.patch
+02_ac_init.patch
+#03_dbus.patch
+#04_move_tabs.patch
+05_libexecdir.patch
+06_lpi.patch
+06_ssl_weak_ciphers.patch
+07_bookmarks.patch
+#08_load_on_new_tab.patch
+08_localized_startup_page.patch
+09_download_dialog.patch -p0
+10_url_double-click.patch
+#11_useragent-weasel.patch
+#98_xulrunner1.9_build_changes.patch
+80_from_upstream_fix_printing_scale.patch
+98_ephy-boot-xul-early.patch
+#98b_gtk_nss_dialog_missing_symbol.patch
+98a_xul_b5_rc1_api_transition.patch
+98b_fix_remove_password_2.22.2.patch
+98b_fix_autodownload.2.22.2.patch
+99_autoreconf.patch
+
--- epiphany-browser-2.22.2.orig/debian/patches/08_localized_startup_page.patch
+++ epiphany-browser-2.22.2/debian/patches/08_localized_startup_page.patch
@@ -0,0 +1,212 @@
+Index: epiphany-browser-2.21.4/src/ephy-home-action.c
+===================================================================
+--- epiphany-browser-2.21.4.orig/src/ephy-home-action.c 2007-09-12 20:35:23.000000000 +0200
++++ epiphany-browser-2.21.4/src/ephy-home-action.c 2007-12-17 10:49:07.000000000 +0100
+@@ -156,16 +156,95 @@
+ }
+ }
+
++static char *
++escape_homepage (char *homepage, char *languages)
++{
++ const char *inptr, *start;
++ GString *page;
++
++ languages = g_strdelimit (languages, ".@:", '\0');
++
++ page = g_string_new (NULL);
++
++ start = inptr = homepage;
++ while ((inptr = strchr (inptr, '%')) != NULL) {
++ g_string_append_len (page, start, inptr - start);
++ inptr++;
++ switch (*inptr) {
++ case 'l':
++ g_string_append (page, languages);
++ break;
++ case '%':
++ g_string_append_c (page, '%');
++ break;
++ default:
++ g_string_append_c (page, '%');
++ if (*inptr)
++ g_string_append_c (page, *inptr);
++ break;
++ }
++
++ if (*inptr)
++ inptr++;
++ start = inptr;
++ }
++
++ g_string_append (page, start);
++
++ return g_string_free (page, FALSE);
++}
++
+ static void
+ ephy_home_action_activate (GtkAction *action)
+ {
+ char *action_name;
+ char *address;
++ const char * const * languages;
++ char *homepage;
+
+ g_object_get (G_OBJECT (action), "name", &action_name, NULL);
+
+ address = eel_gconf_get_string (CONF_GENERAL_HOMEPAGE);
+
++ if (address != NULL && address[0] != '\0' && (*address == '/' || !strncmp(address, "file://", 7)))
++ {
++ languages = g_get_language_names ();
++ if (languages)
++ {
++ int i;
++ gboolean page_set = FALSE;
++
++ for (i = 0; languages[i] != NULL; i++)
++ {
++ if (page_set)
++ break;
++
++ homepage = escape_homepage (address, languages[i]);
++
++ if (!strncmp(address, "file://", 7))
++ {
++ char *path;
++ path = homepage + 7;
++
++ if (g_file_test (path, G_FILE_TEST_EXISTS))
++ page_set = TRUE;
++
++ }
++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS))
++ page_set = TRUE;
++ }
++
++ if (!page_set)
++ homepage = escape_homepage (address, "C");
++ }
++ else
++ homepage = escape_homepage (address, "C");
++
++ g_free (address);
++ address = g_strdup (homepage);
++ g_free (homepage);
++ }
++
+ action_name_association (action, action_name, address, FALSE);
+
+ g_free (address);
+Index: epiphany-browser-2.21.4/src/ephy-shell.c
+===================================================================
+--- epiphany-browser-2.21.4.orig/src/ephy-shell.c 2007-11-16 16:09:42.000000000 +0100
++++ epiphany-browser-2.21.4/src/ephy-shell.c 2007-12-17 10:46:49.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "ephy-shell.h"
+ #include "ephy-type-builtins.h"
+@@ -394,6 +395,44 @@
+ return ephy_shell;
+ }
+
++static char *
++escape_homepage (char *homepage, char *languages)
++{
++ const char *inptr, *start;
++ GString *page;
++
++ languages = g_strdelimit (languages, ".@:", '\0');
++
++ page = g_string_new (NULL);
++
++ start = inptr = homepage;
++ while ((inptr = strchr (inptr, '%')) != NULL) {
++ g_string_append_len (page, start, inptr - start);
++ inptr++;
++ switch (*inptr) {
++ case 'l':
++ g_string_append (page, languages);
++ break;
++ case '%':
++ g_string_append_c (page, '%');
++ break;
++ default:
++ g_string_append_c (page, '%');
++ if (*inptr)
++ g_string_append_c (page, *inptr);
++ break;
++ }
++
++ if (*inptr)
++ inptr++;
++ start = inptr;
++ }
++
++ g_string_append (page, start);
++
++ return g_string_free (page, FALSE);
++}
++
+ static gboolean
+ url_is_empty (const char *location)
+ {
+@@ -411,7 +450,8 @@
+ static gboolean
+ load_homepage (EphyEmbed *embed)
+ {
+- char *home;
++ const char * const * languages;
++ char *homepage, *home;
+ gboolean is_empty;
+
+ home = eel_gconf_get_string(CONF_GENERAL_HOMEPAGE);
+@@ -422,6 +462,44 @@
+
+ home = g_strdup ("about:blank");
+ }
++ else if (*home == '/' || !strncmp(home, "file://", 7))
++ {
++ languages = g_get_language_names ();
++ if (languages)
++ {
++ int i;
++ gboolean page_set = FALSE;
++
++ for (i = 0; languages[i] != NULL; i++)
++ {
++ if (page_set)
++ break;
++
++ homepage = escape_homepage (home, languages[i]);
++
++ if (!strncmp(home, "file://", 7))
++ {
++ char *path;
++ path = homepage + 7;
++
++ if (g_file_test (path, G_FILE_TEST_EXISTS))
++ page_set = TRUE;
++
++ }
++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS))
++ page_set = TRUE;
++ }
++
++ if (!page_set)
++ homepage = escape_homepage (home, "C");
++ }
++ else
++ homepage = escape_homepage (home, "C");
++
++ g_free (home);
++ home = g_strdup (homepage);
++ g_free (homepage);
++ }
+
+ is_empty = url_is_empty (home);
+
--- epiphany-browser-2.22.2.orig/debian/patches/03_dbus.patch
+++ epiphany-browser-2.22.2/debian/patches/03_dbus.patch
@@ -0,0 +1,23 @@
+Index: epiphany-2.20.0/src/ephy-main.c
+===================================================================
+--- epiphany-2.20.0.orig/src/ephy-main.c 2007-09-21 14:46:15.134076289 +0200
++++ epiphany-2.20.0/src/ephy-main.c 2007-09-21 14:47:40.806958509 +0200
+@@ -624,11 +624,13 @@
+
+ if (!_ephy_dbus_startup (!private_instance, &error))
+ {
+- _ephy_dbus_release ();
+-
+- show_error_message (&error);
+-
+- exit (1);
++ GtkWidget *dialog = gtk_message_dialog_new (NULL, 0,
++ GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
++ "Epiphany could not connect to the session message bus. "
++ "Your default settings will not be available.");
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++ private_instance = TRUE;
+ }
+
+ /* If we're remoting, no need to start up any further services,
--- epiphany-browser-2.22.2.orig/debian/patches/04_move_tabs.patch
+++ epiphany-browser-2.22.2/debian/patches/04_move_tabs.patch
@@ -0,0 +1,13 @@
+Index: epiphany-browser-2.18.0/src/ephy-notebook.c
+===================================================================
+--- epiphany-browser-2.18.0.orig/src/ephy-notebook.c 2007-03-06 12:31:28.000000000 +0000
++++ epiphany-browser-2.18.0/src/ephy-notebook.c 2007-03-11 20:57:46.000000000 +0000
+@@ -58,7 +58,7 @@
+ #define TOOLTIP_MAX_LENGTH 256
+
+ /* Until https://bugzilla.mozilla.org/show_bug.cgi?id=296002 is fixed */
+-#define KEEP_TAB_IN_SAME_TOPLEVEL
++#undef KEEP_TAB_IN_SAME_TOPLEVEL
+
+ #define EPHY_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NOTEBOOK, EphyNotebookPrivate))
+
--- epiphany-browser-2.22.2.orig/debian/patches/98b_fix_autodownload.2.22.2.patch
+++ epiphany-browser-2.22.2/debian/patches/98b_fix_autodownload.2.22.2.patch
@@ -0,0 +1,27 @@
+---
+ embed/mozilla/ContentHandler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: epiphany-browser-2.22.2/embed/mozilla/ContentHandler.cpp
+===================================================================
+--- epiphany-browser-2.22.2.orig/embed/mozilla/ContentHandler.cpp
++++ epiphany-browser-2.22.2/embed/mozilla/ContentHandler.cpp
+@@ -403,17 +403,17 @@
+ mAction = mHelperApp ? CONTENT_ACTION_OPEN_TMP : CONTENT_ACTION_SAVEAS;
+ }
+
+ if (mPermission != EPHY_MIME_PERMISSION_SAFE)
+ {
+ mAction = auto_downloads ? CONTENT_ACTION_DOWNLOAD : CONTENT_ACTION_NONE;
+ MIMEConfirmAction ();
+ }
+- else if (mAction == CONTENT_ACTION_OPEN_TMP)
++ else if (!auto_downloads && mAction == CONTENT_ACTION_OPEN_TMP)
+ {
+ MIMEConfirmAction ();
+ }
+ else
+ {
+ MIMEDoAction ();
+ }
+
--- epiphany-browser-2.22.2.orig/debian/patches/06_ssl_weak_ciphers.patch
+++ epiphany-browser-2.22.2/debian/patches/06_ssl_weak_ciphers.patch
@@ -0,0 +1,11 @@
+Index: epiphany-2.20.0/data/default-prefs-common.js
+===================================================================
+--- epiphany-2.20.0.orig/data/default-prefs-common.js 2007-08-27 22:19:01.000000000 +0200
++++ epiphany-2.20.0/data/default-prefs-common.js 2007-09-21 14:29:58.022393868 +0200
+@@ -163,3 +163,6 @@
+ // set to true for parity with gtk entries
+ pref("bidi.edit.delete_immediately", true);
+
++// enable weak SSL ciphers, as Epiphany warns about them anyway
++pref("security.ssl3.rsa_rc4_40_md5", true);
++pref("security.ssl3.rsa_rc2_40_md5", true);
--- epiphany-browser-2.22.2.orig/debian/patches/09_download_dialog.patch
+++ epiphany-browser-2.22.2/debian/patches/09_download_dialog.patch
@@ -0,0 +1,233 @@
+---
+ data/glade/prefs-dialog.glade | 38 +++++++++++++++++++-------------------
+ embed/mozilla/ContentHandler.cpp | 19 +++++++++++--------
+ src/prefs-dialog.c | 14 ++++++++++++++
+ 3 files changed, 44 insertions(+), 27 deletions(-)
+
+Index: embed/mozilla/ContentHandler.cpp
+===================================================================
+--- embed/mozilla/ContentHandler.cpp.orig
++++ embed/mozilla/ContentHandler.cpp
+@@ -334,18 +334,21 @@
+ image = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (button), image);
+ /* don't show the image! see bug #307818 */
+ gtk_widget_show (button);
+ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, CONTENT_ACTION_SAVEAS);
+
+ gtk_dialog_add_button (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+- gtk_dialog_add_button (GTK_DIALOG (dialog),
+- action_label, mAction);
++ if (mAction != CONTENT_ACTION_NONE)
++ {
++ gtk_dialog_add_button (GTK_DIALOG (dialog),
++ action_label, mAction);
++ }
+
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
+
+ int defaultResponse = mAction == CONTENT_ACTION_NONE
+ ? (int) GTK_RESPONSE_CANCEL
+ : (int) mAction;
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), defaultResponse);
+
+@@ -385,30 +388,30 @@
+ {
+ mHelperApp = nsnull;
+ }
+ }
+
+ #ifndef HAVE_GECKO_1_9
+ if (auto_downloads)
+ {
+- mAction = CONTENT_ACTION_OPEN;
++ mAction = mHelperApp ? CONTENT_ACTION_OPEN : CONTENT_ACTION_DOWNLOAD;
+ }
+ else
+ #endif /* !HAVE_GECKO_1_9 */
+ {
+- mAction = CONTENT_ACTION_OPEN_TMP;
++ mAction = mHelperApp ? CONTENT_ACTION_OPEN_TMP : CONTENT_ACTION_SAVEAS;
+ }
+
+- if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE)
++ if (mPermission != EPHY_MIME_PERMISSION_SAFE)
+ {
+- mAction = CONTENT_ACTION_DOWNLOAD;
++ mAction = auto_downloads ? CONTENT_ACTION_DOWNLOAD : CONTENT_ACTION_NONE;
++ MIMEConfirmAction ();
+ }
+-
+- if (!auto_downloads || mAction == CONTENT_ACTION_DOWNLOAD)
++ else if (mAction == CONTENT_ACTION_OPEN_TMP)
+ {
+ MIMEConfirmAction ();
+ }
+ else
+ {
+ MIMEDoAction ();
+ }
+
+Index: data/glade/prefs-dialog.glade
+===================================================================
+--- data/glade/prefs-dialog.glade.orig
++++ data/glade/prefs-dialog.glade
+@@ -298,16 +298,35 @@
+
+
+
+ True
+ False
+ 6
+
+
++
++ True
++ True
++ A_utomatically download and open files
++ True
++ GTK_RELIEF_NORMAL
++ True
++ False
++ False
++ True
++
++
++ 0
++ False
++ False
++
++
++
++
+
+ True
+ False
+ 12
+
+
+
+ True
+@@ -338,35 +357,16 @@
+
+
+
+ 0
+ False
+ True
+
+
+-
+-
+-
+- True
+- True
+- A_utomatically download and open files
+- True
+- GTK_RELIEF_NORMAL
+- True
+- False
+- False
+- True
+-
+-
+- 0
+- False
+- False
+-
+-
+
+
+
+
+ 0
+ False
+ True
+
+Index: src/prefs-dialog.c
+===================================================================
+--- src/prefs-dialog.c.orig
++++ src/prefs-dialog.c
+@@ -357,16 +357,23 @@
+
+ id = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
+ id = CLAMP (id, 0, 3);
+
+ ephy_gui_help (GTK_WINDOW (window), "epiphany", help_preferences[id]);
+ }
+
+ static void
++automatic_downloads_toggled (GtkToggleButton *button,
++ GtkWidget *widget)
++{
++ g_object_set (widget, "sensitive", gtk_toggle_button_get_active (button), NULL);
++}
++
++static void
+ setup_font_combo (EphyDialog *dialog,
+ const char *type,
+ const char *code,
+ int prop)
+ {
+ GtkWidget *combo;
+ GtkListStore *store;
+ GtkTreeIter iter;
+@@ -1486,16 +1493,17 @@
+ }
+
+ static void
+ prefs_dialog_init (PrefsDialog *pd)
+ {
+ EphyDialog *dialog = EPHY_DIALOG (pd);
+ EphyEncodings *encodings;
+ GtkWidget *window, *curr_button, *blank_button;
++ GtkWidget *automatic_downloads_checkbutton, *download_button_hbox;
+ GtkWidget *clear_cache_button, *font_prefs_button;
+ GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
+ gboolean sensitive;
+
+ pd->priv = EPHY_PREFS_DIALOG_GET_PRIVATE (pd);
+
+ ephy_dialog_construct (dialog,
+ properties,
+@@ -1506,16 +1514,18 @@
+ ephy_dialog_add_enum (dialog, properties[ACCEPT_COOKIES_PROP].id,
+ G_N_ELEMENTS (cookies_accept_enum), cookies_accept_enum);
+
+ ephy_dialog_get_controls
+ (dialog,
+ properties[WINDOW_PROP].id, &window,
+ properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
+ properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
++ properties[AUTO_OPEN_PROP].id, &automatic_downloads_checkbutton,
++ properties[DOWNLOAD_PATH_HBOX_PROP].id, &download_button_hbox,
+ properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button,
+ properties[CSS_CHECKBOX_PROP].id, &css_checkbox,
+ properties[CSS_EDIT_BOX_PROP].id, &css_edit_box,
+ properties[CSS_EDIT_BUTTON_PROP].id, &css_edit_button,
+ properties[CSS_CONTAINER_PROP].id, &css_container,
+ properties[CLEAR_CACHE_BUTTON_PROP].id, &clear_cache_button,
+ NULL);
+
+@@ -1529,16 +1539,20 @@
+ g_signal_connect (blank_button, "clicked",
+ G_CALLBACK (prefs_homepage_blank_button_clicked_cb), dialog);
+
+ /* set homepage button sensitivity */
+ sensitive = eel_gconf_key_is_writable (CONF_GENERAL_HOMEPAGE);
+ gtk_widget_set_sensitive (curr_button, sensitive);
+ gtk_widget_set_sensitive (blank_button, sensitive);
+
++ automatic_downloads_toggled (GTK_TOGGLE_BUTTON (automatic_downloads_checkbutton), download_button_hbox);
++ g_signal_connect (automatic_downloads_checkbutton, "toggled",
++ G_CALLBACK (automatic_downloads_toggled), download_button_hbox);
++
+ g_signal_connect (font_prefs_button, "clicked",
+ G_CALLBACK (font_prefs_button_clicked_cb), dialog);
+
+ css_checkbox_toggled (GTK_TOGGLE_BUTTON (css_checkbox), css_edit_box);
+ g_signal_connect (css_checkbox, "toggled",
+ G_CALLBACK (css_checkbox_toggled), css_edit_box);
+
+ g_signal_connect (css_edit_button, "clicked",
--- epiphany-browser-2.22.2.orig/debian/patches/98b_fix_remove_password_2.22.2.patch
+++ epiphany-browser-2.22.2/debian/patches/98b_fix_remove_password_2.22.2.patch
@@ -0,0 +1,47 @@
+Summary (asac):
+* reverted 2.22.1.1 to 2.22.2 changes in password (remove impl) code.
+ (see https://bugs.edge.launchpad.net/ubuntu/+source/epiphany-browser/+bug/236116)
+
+---
+---
+ embed/mozilla/mozilla-embed-single.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: epiphany-browser-2.22.2/embed/mozilla/mozilla-embed-single.cpp
+===================================================================
+--- epiphany-browser-2.22.2.orig/embed/mozilla/mozilla-embed-single.cpp
++++ epiphany-browser-2.22.2/embed/mozilla/mozilla-embed-single.cpp
+@@ -1085,31 +1085,31 @@
+ nsString userNameField;
+ nsString password;
+ nsString passwordField;
+ nsString httpRealm;
+ nsString formSubmitURL;
+
+ if (info->host)
+ NS_CStringToUTF16 (nsCString(info->host),
+- NS_CSTRING_ENCODING_UTF8, userName);
++ NS_CSTRING_ENCODING_UTF8, host);
+ else
+ host.SetIsVoid (PR_TRUE);
+
+ if (info->usernameField)
+ NS_CStringToUTF16 (nsCString(info->usernameField),
+ NS_CSTRING_ENCODING_UTF8, userNameField);
+ else
+ userNameField.SetIsVoid (PR_TRUE);
+
+ if (info->httpRealm)
+ NS_CStringToUTF16 (nsCString(info->httpRealm),
+ NS_CSTRING_ENCODING_UTF8, httpRealm);
+ else
+- userName.SetIsVoid (PR_TRUE);
++ httpRealm.SetIsVoid (PR_TRUE);
+
+ if (info->password)
+ NS_CStringToUTF16 (nsCString(info->password),
+ NS_CSTRING_ENCODING_UTF8, password);
+ else
+ password.SetIsVoid (PR_TRUE);
+
+ if (info->passwordField)
--- epiphany-browser-2.22.2.orig/debian/patches/11_useragent-weasel.patch
+++ epiphany-browser-2.22.2/debian/patches/11_useragent-weasel.patch
@@ -0,0 +1,18 @@
+Index: epiphany-2.18.3/data/weasel-ua-pref.js.in
+===================================================================
+--- epiphany-2.18.3.orig/data/weasel-ua-pref.js.in 2007-07-04 22:20:08.250260516 +0200
++++ epiphany-2.18.3/data/weasel-ua-pref.js.in 2007-07-04 22:23:24.133423262 +0200
+@@ -1,6 +1,7 @@
+-// Add "Firefox/@WEASEL_UA_VERSION@" to the UA. This fixes
+-// [https://bugzilla.mozilla.org/show_bug.cgi?id=334967]
+-// Same as Camino [https://bugzilla.mozilla.org/show_bug.cgi?id=384721] and
+-// IceApe [https://bugzilla.mozilla.org/show_bug.cgi?id=386113] do.
+-// Also see discussion on [https://bugzilla.mozilla.org/show_bug.cgi?id=385999].
+-pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@");
++
++// The following breaks the UA by adding Firefox to it, but it also
++// fixes interaction with poorly written websites with broken UA checks.
++// See https://bugzilla.mozilla.org/show_bug.cgi?id=384721#c6 to
++// understand why this is a bad idea and isn't enabled in Debian.
++//
++// pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@");
--- epiphany-browser-2.22.2.orig/debian/patches/06_lpi.patch
+++ epiphany-browser-2.22.2/debian/patches/06_lpi.patch
@@ -0,0 +1,43 @@
+diff -Nur epiphany-browser-2.15.4/configure.ac epiphany-browser-2.15.4.new/configure.ac
+--- epiphany-browser-2.15.4/configure.ac 2006-07-11 10:32:09.000000000 +0200
++++ epiphany-browser-2.15.4.new/configure.ac 2006-07-11 10:32:36.000000000 +0200
+@@ -95,6 +95,7 @@
+ libxslt >= $LIBXSLT_REQUIRED
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
+ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
+ gnome-vfs-module-2.0
+diff -Nur epiphany-browser-2.15.4/data/ui/epiphany-ui.xml epiphany-browser-2.15.4.new/data/ui/epiphany-ui.xml
+--- epiphany-browser-2.15.4/data/ui/epiphany-ui.xml 2006-05-05 19:27:30.000000000 +0200
++++ epiphany-browser-2.15.4.new/data/ui/epiphany-ui.xml 2006-07-11 10:32:17.000000000 +0200
+@@ -101,6 +101,7 @@
+
+
+
+diff -Nur epiphany-browser-2.15.4/src/ephy-window.c epiphany-browser-2.15.4.new/src/ephy-window.c
+--- epiphany-browser-2.15.4/src/ephy-window.c 2006-07-10 21:28:01.000000000 +0200
++++ epiphany-browser-2.15.4.new/src/ephy-window.c 2006-07-11 10:32:17.000000000 +0200
+@@ -66,6 +66,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifdef HAVE_X11_XF86KEYSYM_H
+ #include
+@@ -3125,6 +3126,9 @@
+ }
+ #endif
+
++ launchpad_integration_add_ui (window->priv->manager,
++ "ui/menubar/HelpMenu/LaunchpadItems");
++
+ /* Initialize the menus */
+ priv->tabs_menu = ephy_tabs_menu_new (window);
+ priv->enc_menu = ephy_encoding_menu_new (window);
--- epiphany-browser-2.22.2.orig/debian/patches/98a_xul_b5_rc1_api_transition.patch
+++ epiphany-browser-2.22.2/debian/patches/98a_xul_b5_rc1_api_transition.patch
@@ -0,0 +1,47 @@
+---
+ embed/mozilla/ContentHandler.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: epiphany-browser-2.22.1.1/embed/mozilla/ContentHandler.cpp
+===================================================================
+--- epiphany-browser-2.22.1.1.orig/embed/mozilla/ContentHandler.cpp
++++ epiphany-browser-2.22.1.1/embed/mozilla/ContentHandler.cpp
+@@ -124,34 +124,36 @@
+ }
+
+ /* nsILocalFile promptForSaveToFile (in nsISupports aWindowContext, in wstring aDefaultFile, in wstring aSuggestedFileExtension); */
+ NS_IMETHODIMP GContentHandler::PromptForSaveToFile(
+ nsIHelperAppLauncher *aLauncher,
+ nsISupports *aWindowContext,
+ const PRUnichar *aDefaultFile,
+ const PRUnichar *aSuggestedFileExtension,
++ PRBool aForcePrompt,
+ nsILocalFile **_retval)
+ {
+ EphyFileChooser *dialog;
+ int response;
+ char *filename = NULL;
+ nsCString defaultFile;
+
+ NS_UTF16ToCString (nsString (aDefaultFile),
+ NS_CSTRING_ENCODING_UTF8, defaultFile);
+
+- if (mAction != CONTENT_ACTION_SAVEAS)
++ if (!aForcePrompt &&
++ mAction != CONTENT_ACTION_SAVEAS)
+ {
+ return BuildDownloadPath (defaultFile.get(), _retval);
+ }
+ nsCOMPtr parentDOMWindow (do_GetInterface (aWindowContext));
+
+ AutoModalDialog modalDialog (parentDOMWindow, PR_FALSE);
+- if (!modalDialog.ShouldShow ())
++ if (!aForcePrompt && !modalDialog.ShouldShow ())
+ return NS_ERROR_FAILURE;
+
+ GtkWindow *parentWindow = modalDialog.GetParent ();
+
+ dialog = ephy_file_chooser_new (_("Save"), GTK_WIDGET (parentWindow),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ CONF_STATE_SAVE_DIR,
+ EPHY_FILE_FILTER_ALL);
--- epiphany-browser-2.22.2.orig/debian/patches/02_ac_init.patch
+++ epiphany-browser-2.22.2/debian/patches/02_ac_init.patch
@@ -0,0 +1,13 @@
+Index: epiphany-browser-2.21.4/configure.ac
+===================================================================
+--- epiphany-browser-2.21.4.orig/configure.ac 2007-12-16 14:25:57.000000000 +0100
++++ epiphany-browser-2.21.4/configure.ac 2007-12-17 10:43:57.000000000 +0100
+@@ -24,7 +24,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])
+
+ GNOME_COMMON_INIT
+
--- epiphany-browser-2.22.2.orig/debian/patches/00_browser_wrapper_path.patch
+++ epiphany-browser-2.22.2/debian/patches/00_browser_wrapper_path.patch
@@ -0,0 +1,27 @@
+Index: epiphany-2.20.0/data/bme.desktop.in.in
+===================================================================
+--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-08-27 22:19:01.000000000 +0200
++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200
+@@ -3,7 +3,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-2.20.0/data/epiphany.desktop.in.in
+===================================================================
+--- epiphany-2.20.0.orig/data/epiphany.desktop.in.in 2007-08-27 22:19:01.000000000 +0200
++++ epiphany-2.20.0/data/epiphany.desktop.in.in 2007-09-21 14:27:40.254542926 +0200
+@@ -3,7 +3,8 @@
+ _Name=Epiphany Web Browser
+ _GenericName=Web Browser
+ _Comment=Browse the web
+-Exec=epiphany %U
++Exec=epiphany-browser %U
++TryExec=/usr/bin/epiphany-browser
+ StartupNotify=true
+ Terminal=false
+ Type=Application
--- epiphany-browser-2.22.2.orig/debian/patches/01_bookmarks_menu.patch
+++ epiphany-browser-2.22.2/debian/patches/01_bookmarks_menu.patch
@@ -0,0 +1,12 @@
+Index: epiphany-2.20.0/data/bme.desktop.in.in
+===================================================================
+--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200
++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:28:35.273678287 +0200
+@@ -8,6 +8,7 @@
+ Terminal=false
+ Type=Application
+ Icon=epiphany-bookmarks
++NoDisplay=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=epiphany
+ X-GNOME-Bugzilla-Component=BugBuddyBugs
--- epiphany-browser-2.22.2.orig/debian/patches/10_url_double-click.patch
+++ epiphany-browser-2.22.2/debian/patches/10_url_double-click.patch
@@ -0,0 +1,32 @@
+Index: epiphany-2.20.0/lib/widgets/ephy-location-entry.c
+===================================================================
+--- epiphany-2.20.0.orig/lib/widgets/ephy-location-entry.c 2007-08-27 22:19:00.000000000 +0200
++++ epiphany-2.20.0/lib/widgets/ephy-location-entry.c 2007-09-21 14:30:14.987360646 +0200
+@@ -353,18 +353,6 @@
+ }
+
+ static gboolean
+-entry_button_press_cb (GtkWidget *entry, GdkEventButton *event, EphyLocationEntry *le)
+-{
+- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+- {
+- ephy_location_entry_activate (le);
+- return TRUE;
+- }
+-
+- return FALSE;
+-}
+-
+-static gboolean
+ entry_key_press_cb (GtkEntry *entry,
+ GdkEventKey *event,
+ EphyLocationEntry *lentry)
+@@ -923,8 +911,6 @@
+ G_CALLBACK (entry_key_press_after_cb), entry);
+ g_signal_connect_after (priv->icon_entry->entry, "activate",
+ G_CALLBACK (entry_activate_after_cb), entry);
+- g_signal_connect (priv->icon_entry->entry, "button-press-event",
+- G_CALLBACK (entry_button_press_cb), entry);
+ g_signal_connect (priv->icon_entry->entry, "changed",
+ G_CALLBACK (editable_changed_cb), entry);
+ g_signal_connect (priv->icon_entry->entry, "drag-motion",
--- epiphany-browser-2.22.2.orig/debian/patches/98_ephy-boot-xul-early.patch
+++ epiphany-browser-2.22.2/debian/patches/98_ephy-boot-xul-early.patch
@@ -0,0 +1,12 @@
+Index: epiphany-browser-2.21.90/src/ephy-shell.c
+===================================================================
+--- epiphany-browser-2.21.90/src/ephy-shell.c (revision 7927)
++++ epiphany-browser-2.21.90/src/ephy-shell.c (working copy)
+@@ -248,6 +248,7 @@
+ ephy_shell = shell;
+ g_object_add_weak_pointer (G_OBJECT(ephy_shell),
+ (gpointer *)ptr);
++ impl_get_embed_single(EPHY_EMBED_SHELL(shell));
+ }
+
+ static void
--- epiphany-browser-2.22.2.orig/debian/bug/control
+++ epiphany-browser-2.22.2/debian/bug/control
@@ -0,0 +1 @@
+report-with: epiphany-gecko epiphany-webkit
--- epiphany-browser-2.22.2.orig/debian/epiphany.sh
+++ epiphany-browser-2.22.2/debian/epiphany.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec epiphany-browser "$@"
--- epiphany-browser-2.22.2.orig/debian/copyright
+++ epiphany-browser-2.22.2/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Edd Dumbill on 14 Feb 2003.
+
+It was downloaded from
+
+Upstream authors:
+ Marco Pesenti Gritti
+ Xan Lopez
+ Christian Persch
+ Adam Hooper
+ Jean-François Rameau
+ Crispin Flowerday
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2003-2007, the Debian GNOME team
+ and
+is licensed under the GPL, see above.
--- epiphany-browser-2.22.2.orig/debian/epiphany-browser-data.gconf-defaults
+++ epiphany-browser-2.22.2/debian/epiphany-browser-data.gconf-defaults
@@ -0,0 +1,2 @@
+/apps/epiphany/general/homepage file:///usr/share/ubuntu-artwork/home/locales/index-%l.html
+/apps/epiphany/web/language [system]
--- epiphany-browser-2.22.2.orig/debian/watch
+++ epiphany-browser-2.22.2/debian/watch
@@ -0,0 +1,4 @@
+version=2
+http://download.gnome.org/sources/epiphany/([\d\.]+)[02468]/ \
+ epiphany-(.*)\.tar\.gz \
+ debian uupdate
--- epiphany-browser-2.22.2.orig/debian/epiphany-gecko.prerm
+++ epiphany-browser-2.22.2/debian/epiphany-gecko.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+ for alt in epiphany-browser x-www-browser gnome-www-browser; do
+ update-alternatives --remove $alt /usr/bin/epiphany-gecko
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
--- epiphany-browser-2.22.2.orig/debian/epiphany-browser.links
+++ epiphany-browser-2.22.2/debian/epiphany-browser.links
@@ -0,0 +1 @@
+/usr/share/man/man1/epiphany-browser.1.gz /usr/share/man/man1/epiphany.1.gz
--- epiphany-browser-2.22.2.orig/debian/control
+++ epiphany-browser-2.22.2/debian/control
@@ -0,0 +1,114 @@
+Source: epiphany-browser
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team
+XSBC-Original-Maintainer: Josselin Mouette
+Uploaders: Debian GNOME Maintainers
+Build-Depends: debhelper (>= 5),
+ pkg-config,
+ libglib2.0-dev (>= 2.15.6),
+ libgtk2.0-dev (>= 2.11.6),
+ libxml2-dev (>= 2.6.12),
+ libxslt1-dev (>= 1.1.7),
+ libglade2-dev (>= 2.3.1),
+ libgnome2-dev (>= 2.14.0),
+ libgnomeui-dev (>= 2.16.0-2),
+ libgconf2-dev,
+ libgnome-desktop-dev (>= 2.9.91),
+ libstartup-notification0-dev (>= 0.5),
+ libdbus-glib-1-dev (>= 0.60),
+ scrollkeeper,
+ gnome-pkg-tools (>= 0.10),
+ libxml-parser-perl,
+ xulrunner-1.9-dev (>= 1.9~rc),
+ iso-codes (>= 0.35),
+ python-dev (>= 2.3),
+ python-gtk2-dev (>= 2.7.1),
+ python-gnome2-dev (>= 2.6.0),
+ gnome-doc-utils (>= 0.3.2),
+ intltool (>= 0.35.0),
+ x11proto-core-dev,
+ network-manager-dev,
+ quilt,
+ libenchant-dev (>= 1.0),
+ gtk-doc-tools (>= 1.0),
+ liblaunchpad-integration-dev (>= 0.1.17),
+ libavahi-gobject-dev
+Standards-Version: 3.7.2
+
+Package: epiphany-browser
+Architecture: all
+Depends: epiphany-gecko | epiphany-webkit
+Description: Intuitive web browser - dummy package
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This dummy package installs Epiphany with the Gecko backend by default.
+
+Package: epiphany-gecko
+Architecture: any
+Depends: epiphany-browser-data (>= ${gnome:Version}),
+ epiphany-browser-data (<< ${gnome:NextVersion}),
+ ${shlibs:Depends},
+ gnome-icon-theme (>= 2.9.90),
+ dbus,
+ iso-codes,
+ xulrunner-1.9 (>= 1.9~rc),
+ ${misc:Depends}
+Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1)
+Recommends: yelp, epiphany-extensions
+Breaks: epiphany-extensions (<< 2.20.1-2ubuntu3)
+Suggests: mozplugger
+Provides: www-browser, gnome-www-browser
+Description: Intuitive GNOME web browser - Gecko version
+ 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 should not mean less powerful. Standards
+ compliance is achieved on the HTML side by using the Gecko
+ rendering engine, as developed for the Mozilla and Firefox browsers; and
+ on the user interface side by closely following the GNOME Human Interface
+ Guidelines (HIG) and by close integration with the GNOME desktop.
+ .
+ This version uses the Gecko backend to render web pages.
+ .
+ Homepage: http://www.gnome.org/projects/epiphany/
+
+Package: epiphany-browser-data
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: epiphany-browser
+Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1)
+Replaces: epiphany-browser (<< 2.20.1-2ubuntu1)
+Description: Data 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 contains the common files, artwork and translations for
+ Epiphany.
+
+Package: epiphany-browser-dev
+Architecture: all
+Section: devel
+Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2)
+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.
+
+Package: epiphany-browser-dbg
+Architecture: any
+Section: gnome
+Priority: extra
+Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version})
+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.
--- epiphany-browser-2.22.2.orig/debian/epiphany-webkit.menu
+++ epiphany-browser-2.22.2/debian/epiphany-webkit.menu
@@ -0,0 +1,6 @@
+?package(epiphany-webkit):needs="x11" \
+ section="Applications/Network/Web Browsing" \
+ title="Epiphany web browser (Webkit)" \
+ longtitle="Epiphany web browser with Webkit backend" \
+ command="/usr/bin/epiphany-webkit" \
+ hints="Web browsers"
--- epiphany-browser-2.22.2.orig/debian/rules
+++ epiphany-browser-2.22.2/debian/rules
@@ -0,0 +1,178 @@
+#!/usr/bin/make -f
+
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+GNOME_MODULE := epiphany
+
+STAMP_DIR := debian/stamp
+BUILD_DIR := debian/build
+PATCH_DIR := debian/patches
+
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+FLAVORS := gecko
+
+common_configure_flags := \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-dbus \
+ --disable-scrollkeeper \
+ --enable-zeroconf \
+ --enable-python \
+ --enable-network-manager
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
+else
+ common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+gecko_configure_flags := $(common_configure_flags) \
+ --libexecdir=\$${prefix}/lib/epiphany-gecko \
+ --with-engine=mozilla \
+ --with-gecko=libxul-embedding \
+ --enable-gtk-doc \
+ --enable-spell-checker
+
+webkit_configure_flags := $(common_configure_flags) \
+ --libexecdir=\$${prefix}/lib/epiphany-webkit \
+ --with-engine=webkit
+
+patch: $(STAMP_DIR)/patch-stamp
+$(STAMP_DIR)/patch-stamp:
+ dh_testdir
+ mkdir -p $(STAMP_DIR)
+ QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
+ touch $@
+
+builddir = $(BUILD_DIR)/$*
+
+configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS))
+$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp
+ dh_testdir
+ mkdir -p $(builddir)
+ cd $(builddir) && \
+ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ $(CURDIR)/configure $($*_configure_flags)
+ touch $@
+
+build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
+$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
+ dh_testdir
+ $(MAKE) -C $(builddir)
+ touch $@
+ cd po; intltool-update -p
+
+installdir = $(CURDIR)/debian/epiphany-$*
+
+install-clean:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+install-%: $(STAMP_DIR)/build-stamp-%
+ $(MAKE) -C $(builddir) install DESTDIR=$(installdir)
+ cd $(installdir)/usr/bin && mv epiphany epiphany-$*
+ rm -f $(installdir)/usr/lib/epiphany*/*/*/*a
+ echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/epiphany-$*.substvars
+ echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/epiphany-$*.substvars
+
+install: install-clean $(addprefix install-, $(FLAVORS))
+ dh_installdirs
+ mv debian/epiphany-gecko/usr/include debian/epiphany-browser-dev/usr/
+ mv debian/epiphany-gecko/usr/lib/pkgconfig debian/epiphany-browser-dev/usr/lib/
+ cd debian/epiphany-gecko/usr/share && \
+ mv aclocal pygtk gtk-doc $(CURDIR)/debian/epiphany-browser-dev/usr/share/
+ mv debian/epiphany-gecko/etc/* debian/epiphany-browser-data/etc
+ rmdir debian/epiphany-gecko/etc
+ mv debian/epiphany-gecko/usr/share debian/epiphany-browser-data/usr/
+# cd debian/epiphany-webkit && rm -rf etc usr/share usr/lib/pkgconfig usr/include
+ cd debian/epiphany-browser-data/usr/share/epiphany-browser && \
+ mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/
+ cd debian/epiphany-browser-data/usr/share/man/man1 && \
+ mv epiphany.1 epiphany-browser.1
+# Correct help file paths
+ cd debian/epiphany-browser-data/usr/share/omf && mv epiphany epiphany-browser
+ cd debian/epiphany-browser-data/usr/share/gnome/help && mv epiphany epiphany-browser
+ find debian/epiphany-browser-data/usr/share/omf/epiphany-browser/ \
+ -name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-browser/#' {} \;
+
+# Make both epiphanies installable together
+ for f in $(FLAVORS); do \
+ F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \
+ mkdir -p debian/epiphany-$$f/usr/share/applications ; \
+ ( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \
+ debian/epiphany-browser-data/usr/share/applications/epiphany.desktop \
+ | sed "s,epiphany-browser,epiphany-$$f," \
+ | grep -v ^TryExec | grep -v ^MimeType ; \
+ echo NoDisplay=true ) \
+ > debian/epiphany-$$f/usr/share/applications/epiphany-$$f.desktop ; \
+ done
+ dh_install
+ cd debian/epiphany-browser/usr/bin && \
+ mv epiphany.sh epiphany
+
+clean::
+ dh_testdir
+ dh_testroot
+ QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+ rm -rf .pc
+ rm -f po/.intltool-merge-cache
+ rm -f intltool-extract intltool-update intltool-merge
+ -rm -f po/epiphany.pot
+ rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR)
+ dh_clean
+
+binary: binary-arch binary-indep
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i ChangeLog ChangeLog-*
+ dh_installdocs -i
+ dh_installman -i
+ dh_installmenu -i
+ dh_link -i
+ dh_scrollkeeper -i
+ dh_gconf -i
+ dh_desktop -i
+ dh_icons -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -a ChangeLog ChangeLog-*
+ dh_installdocs -a
+ dh_installman -a
+ dh_installmenu -a
+ dh_link -a
+ dh_scrollkeeper -a
+ dh_gconf -a
+ dh_desktop -a
+ dh_icons -a
+ dh_strip -a --dbg-package=epiphany-browser-dbg
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary
--- epiphany-browser-2.22.2.orig/debian/epiphany-browser-dev.dirs
+++ epiphany-browser-2.22.2/debian/epiphany-browser-dev.dirs
@@ -0,0 +1,2 @@
+/usr/lib
+/usr/share
--- epiphany-browser-2.22.2.orig/debian/epiphany-browser.install
+++ epiphany-browser-2.22.2/debian/epiphany-browser.install
@@ -0,0 +1,2 @@
+debian/epiphany.sh /usr/bin/
+debian/bug/control /usr/share/bug/epiphany-browser/
--- epiphany-browser-2.22.2.orig/debian/changelog
+++ epiphany-browser-2.22.2/debian/changelog
@@ -0,0 +1,1559 @@
+epiphany-browser (2.22.2-0ubuntu0.8.04.3) hardy-proposed; urgency=low
+
+ * debian/patches/80_from_upstream_fix_printing_scale.patch:
+ - change from Paul Drain commited upstream to fix the default printing scale
+ (lp: #217151)
+
+ -- Sebastien Bacher Thu, 03 Jul 2008 19:21:17 +0200
+
+epiphany-browser (2.22.2-0ubuntu0.8.04.2) hardy-proposed; urgency=low
+
+ * fix bugs in upstream's remove password code. See regression comments in
+ LP: #236116.
+ - add debian/patches/98b_fix_remove_password_2.22.2.patch
+ - update debian/patches/series
+ * fix bugs in upstream's auto_download code. See regression comments in
+ LP: #236116. New behaviour for "auto-download" enabled: 1. auto open
+ if there is a known mime-type helper app; 2. auto save to Download
+ location if there is no helper.
+ - add debian/patches/98b_fix_autodownload.2.22.2.patch
+ - update debian/patches/series
+
+ -- Alexander Sack Thu, 05 Jun 2008 01:03:15 +0200
+
+epiphany-browser (2.22.2-0ubuntu0.8.04.1) hardy-proposed; urgency=low
+
+ * new stable upstream release v2.22.2 (LP: #236116)
+ * adjust patches for changed upstream codebase
+ - update debian/patches/05_libexecdir.patch
+ - update debian/patches/09_download_dialog.patch
+ - update debian/patches/99_autoreconf.patch
+
+ -- Alexander Sack Fri, 30 May 2008 16:31:14 +0200
+
+epiphany-browser (2.22.1.1-0ubuntu2~8.04.1) hardy-proposed; urgency=low
+
+ * package transition for xulrunner-1.9 RC1 -> raise depends and build-depends
+ bar for real (bump versioned depends in control.in file as well)
+ (LP: #233922)
+ - update debian/control.in
+
+ -- Alexander Sack Fri, 23 May 2008 15:25:30 +0200
+
+epiphany-browser (2.22.1.1-0ubuntu2~8.04.0mt1) hardy; urgency=low
+
+ * package transition for xulrunner-1.9 RC1 -> raise depends and build-depends
+ bar because of ABI breakage introduced by xulrunner b5 to rc1 transition
+ (LP: #233922)
+ - update debian/control
+ * API transition for xulrunner-1.9 - implement new signature for
+ nsIHelperAppLauncherDialog::PromptForSaveToFile
+ - add debian/patches/98a_xul_b5_rc1_api_transition.patch
+ - update debian/patches/series
+
+ -- Alexander Sack Thu, 22 May 2008 09:37:16 +0200
+
+epiphany-browser (2.22.1.1-0ubuntu1) hardy; urgency=low
+
+ * New upstream release 2.22.1.1
+ * update liblaunchpad-integration-dev build-depends to 0.1.17
+ * remove 's from 06_lpi.patch
+ * adjust 05_libexecdir.patch to modified upstream code base
+ * drop 80_from_bugzilla_no_avahi_bookmark_crash.patch applied upstream
+ * drop xulrunner patches from debian/patches and debian/patches/series
+ * disable 98a_nsipromptservice2_workaround.patch patch in quilt series
+ - applied upstream
+ * rerun autoreconf and refresh 99_autoreconf.patch accordingly
+
+ -- Alexander Sack Tue, 08 Apr 2008 23:04:58 +0200
+
+epiphany-browser (2.22.0-0ubuntu5) hardy; urgency=low
+
+ * fix embed/mozilla/FilePicker.cpp because of changed signature of
+ GFilePicker::GetFileURL function (use nsIURI instead nsIFileURL)
+ - add debian/patches/98c_fix_filepicker_function_signature.patch
+ - update debian/patches/series
+ * bump versioned (build-)depends on xulrunner accordingly
+ - update debian/control{.in}
+
+ -- Alexander Sack Thu, 13 Mar 2008 17:51:52 +0100
+
+epiphany-browser (2.22.0-0ubuntu4) hardy; urgency=low
+
+ * debian/patches/07_bookmarks.patch:
+ - updated the bookmarks to ubuntu (lp: #137491)
+ * debian/patches/80_from_bugzilla_no_avahi_bookmark_crash.patch:
+ - change from bugzilla, fix crasher in the avahi bookmark code (lp: #189272)
+
+ -- Sebastien Bacher Thu, 13 Mar 2008 13:41:35 +0100
+
+epiphany-browser (2.22.0-0ubuntu3) hardy; urgency=low
+
+ * debian/control.in:
+ - updated libglib requirement (lp: #201126)
+ * debian/rules:
+ - update translations template
+
+ -- Sebastien Bacher Wed, 12 Mar 2008 11:53:27 +0100
+
+epiphany-browser (2.22.0-0ubuntu2) hardy; urgency=low
+
+ * fix "entering bad url into location bar, just does nothing"
+ - update debian/patches/98a_nsipromptservice2_workaround.patch
+
+ -- Alexander Sack Mon, 10 Mar 2008 11:47:44 +0100
+
+epiphany-browser (2.22.0-0ubuntu1) hardy; urgency=low
+
+ * new upstream release (v. 2.22.0)
+
+ -- Alexander Sack Mon, 10 Mar 2008 11:09:28 +0100
+
+epiphany-browser (2.21.92-0ubuntu1) hardy; urgency=low
+
+ * new upstream tarball 2.21.92
+ * with 98_xulrunner1.9.configure.patch preapplied and autoreconf2.50 in
+ diff.gz
+ - add (not applied) 98_xulrunner1.9.configure.patch
+ * drop gcc 43 patch (applied upstream)
+ - delete debian/patches/12_gxx43.patch
+ - update debian/patches/series
+ * update 98_xulrunner1.9.patch to match new epiphany upstream version
+ - update debian/patches/98_xulrunner1.9.patch
+ * fix personal data manager (LP: #180205) and login auto form-fill
+ - update debian/patches/98_xulrunner1.9.patch
+
+ -- Alexander Sack Mon, 03 Mar 2008 13:32:10 +0000
+
+epiphany-browser (2.21.90-0ubuntu4) hardy; urgency=low
+
+ * fix epiphany build for latest xulrunner-1.9 (beta3)
+ * don't use non-frozen nsIXPCNativeCallContext symbol anymore; it
+ wasn't used in an active code-path anyway and just caused runtime
+ link problems; to achieve this, we just #if 0 IsCalledFromScript
+ in EphyUtils.{h,cpp}
+ - update debian/patches/98_xulrunner1.9.patch
+ * explicitly boot internal glue part in
+ embed/mozilla/mozilla-embed-single.cpp using GTKEmbedGlueStartupInternal
+ - update debian/patches/98_xulrunner1.9.patch
+ * bump build depend to xulrunner-1.9-dev (>= 1.9~b3)
+ - update debian/control.in
+ - update debian/control
+
+ -- Alexander Sack Thu, 14 Feb 2008 10:27:18 +0100
+
+epiphany-browser (2.21.90-0ubuntu3) hardy; urgency=low
+
+ * debian/patches/98_ephy-boot-xul-early.patch:
+ - change from Alexander Sack, load xulrunner earlier
+
+ -- Sebastien Bacher Mon, 11 Feb 2008 14:07:32 +0100
+
+epiphany-browser (2.21.90-0ubuntu2) hardy; urgency=low
+
+ * debian/rules:
+ - use dh_icons so the icon is correctly available after installation
+ (LP: #188468)
+
+ -- Sebastien Bacher Tue, 05 Feb 2008 15:19:04 +0100
+
+epiphany-browser (2.21.90-0ubuntu1) hardy; urgency=low
+
+ * 2.21.90 upstream tarball.
+ * add avahi-gobject-dev to Build-Depends
+ - update debian/control
+ * gnomevfs has been replaced by gio. drop gnomevfs dev package build dep
+ accordingly
+ - update debian/control
+ * disable patch fixed upstream (98b_gtk_nss_dialog_missing_symbol.patch)
+ - update debian/patches/series
+
+ -- Alexander Sack Tue, 29 Jan 2008 12:59:23 +0100
+
+epiphany-browser (2.21.4-0ubuntu5) hardy; urgency=low
+
+ * Revert the 12_gxx43 patch before upload.
+
+ -- Matthias Klose Fri, 25 Jan 2008 13:10:58 +0000
+
+epiphany-browser (2.21.4-0ubuntu4) hardy; urgency=low
+
+ * Fix build failures with g++-4.3.
+
+ -- Matthias Klose Thu, 24 Jan 2008 15:03:42 +0000
+
+epiphany-browser (2.21.4-0ubuntu3) hardy; urgency=low
+
+ * respin against updated xulrunner-1.9 (>= 1.9~b3~) that uses system-nspr
+ nss,cairo:
+ - update debian/control
+ * fix http authentication by implementing nsIPromptService2 as a workaround
+ until xulrunner implements a proper adaptor to nsIPromptService
+ - add debian/patches/98a_nsipromptservice2_workaround.patch
+ - update debian/patches/series
+ * implement missing symbol |DisplayProtectedAuth| recently added to xulrunner
+ trunk
+ - add debian/patches/98b_gtk_nss_dialog_missing_symbol.patch
+ - update debian/patches/series
+
+ -- Alexander Sack Wed, 02 Jan 2008 12:54:28 +0100
+
+epiphany-browser (2.21.4-0ubuntu2) hardy; urgency=low
+
+ * debian/control.in, debian/rules:
+ - build using xulrunner
+ * debian/patches/98_xulrunner1.9_build_changes.patch:
+ - changes from Alexander Sack to build using xulrunner1.9
+ * debian/patches/99_autoreconf.patch:
+ - updated
+
+ -- Sebastien Bacher Tue, 18 Dec 2007 15:22:07 +0100
+
+epiphany-browser (2.21.4-0ubuntu1) hardy; urgency=low
+
+ * New upstream version
+ A big refactoring of the Epiphany internals was done in order to achieve
+ better cross-engine support. It can be roughly separated in two chunks:
+ - EphyTab and its usage of GtkMozEmbed specific signals was transformed
+ into generic code under EphyBaseEmbed with backend-agnostic
+ gobject-properties. Backends are now encouraged to subclass EphyBaseEmbed
+ and update its properties to keep them in sync with the engine state.
+ In turn, the browser chrome will connect to the notify:: signals
+ for the properties to update its UI to reflect those changes.
+ - In some situations the embed/ code will need to know some specific
+ details of the fronted (for example, the active child among all the
+ embed instances in the popup management code). Instead of directly
+ accessing the fronted, an generic EphyEmbedContainer interface
+ has been created, offering all the needed methods.In Epiphany,
+ this interface is implemented by EphyWindow.
+ Bug fixes:
+ - Add saved files to the GtkRecent list. Fixes Bug #148401.
+ - Make cursor be at the end of the URL when selecting entries from the
+ completion popup. Fixes bug #466344.
+ - Fix multihead problems in toolbar editor.
+ - Fix download-icon toolip updates. Fixes bug #343238.
+ - Default to Cancel on Cert dialogues. Fixes bug #163379.
+ - Remove "Add bookmark" and "Save as" from the document context menu.
+ Part of bug #332968.
+ - Fix completion model to show icons for history items too,
+ history/bookmarks/favicon_cache service objects are now stored in the
+ completion priv. Fixes bug #459811.
+ - Sets page header and footer margins to a reasonable value when printing.
+ Workaround for bug #346110.
+ - Adds a check for NULL pointer in ephy-session.c, fixing wrong behaviour
+ when restoring Epiphany in some cases. Fix for bug #488718.
+ - Updates to new NetworkManager API signals for status monitoring.
+ - Take the page orientation from the page setup, not from
+ the print settings. Bug #485670 (see also gtk+ bug #485685).
+ - Makes the Go button behaviour consistent with the "Enter" behaviour. Both
+ actions search for keywords or load the url. Fixes #484178.
+ - EphyContentPolicy::ShouldLoad: use the same content policy for
+ http and https, allowing adblock to work on https. Fixes bug #471583.
+ - Make Epiphany properly remember the last saved location
+ in the FileChooser. Fix for bug #336251.
+ - Make session recovery focus work properly and remember the active tab.
+ Fixes bug #317272.
+ - Fix disable_toolbar_editing lockdown not respected for Remove and Move
+ actions on toolbar buttons. Fixes bug #475641.
+ - Change the hint of the bookmarking properties dialog to DIALOG, instead
+ of NORMAL. Make bookmarking work in fullscreen mode and does not put
+ bookmark properties windows in the taskbar. Fixes bug #478928.
+ - Find toolbar now remembers last pattern searched also when opened with
+ slash or apostrophe. Fixes bug #343337.
+ - Add a somewhat tricky fix for url titles not visible on the completion
+ popup of the location entry when using a dark theme (like Darkilouche).
+ Fixes bug #446898.
+ - Private instances of Epiphany now remove the profile dir on exit.
+ Note that the profile dir won't be deleted if it's a custom path.
+ Fixes bug #329680.
+ - Make "Up" button dropdown menu show titles instead of URLs for already
+ visited pages. Fix for bug #323764.
+ - Remove ellipsis from View -> Page Security Information, as it does not
+ require further user interaction to complete. Fix for bug #483312.
+ - Hide Back/Forward buttons when disable_history lockdown key is enabled.
+ Fixes bug #394795.
+ - Add explanation label to "Only from sites you visit" radio button.
+ Fixes bug 493422.
+ Changes:
+ - Add accessibility theme icons for our apps icon.
+ - Enable printing to PDF file on gecko 1.9, now that moz#367907 is fixed.
+ - Make 'Not found' on find toolbar temporarily bold and sounds the bell
+ signal when searching on a page and no results are found.
+ Fixes bug #363004.
+ - Makes tooltips for Back and Forward buttons display the titles of
+ relative pages. Fixes bug #341400.
+ - Add drag-and-drop of URLs onto "New Tab" and "New Window" buttons in
+ the toolbar. Fixes bug #382383.
+ - Add a broom icon in the search entry of the History window,
+ like in Bookmarks Editor. Fixes bug #476179.
+ - Use friendly display for mailto: links; shows a nice text in status bar
+ when hovering a mailto: link. Fixes bug #339161.
+ - Fix the build of the custom GTK+ filepicker. Add a preview for the
+ FileChooser. The default size is 150x150. Fixes bug #440859.
+ - Make the location entry completion cells smarter, now bookmarks take the
+ full width of the popup. Also make titles of history entries align
+ to the left so it's easier to browse a lot of entries with similar
+ titles. Almost-fixes bug #419475.
+ - Change the "Powered by" name in the About dialog according to the used
+ backend. Fix for bug #478196.
+ - Display "Execute script " string as tooltip for bookmark action
+ instead of the whole javascript code when bookmarking a scriptlet.
+ Fix bug #492695.
+ - Update to latest EggToolbarEditor code.
+ This supports changing the editor's model during runtime and
+ tries to avoid some possibly leaking signal handlers. Fixes bug #493149.
+ - Adds a column in the history window showing the date and the time of the
+ visit, substitutes radiobuttons with checkboxes in the View menu of the
+ window. Fix bug #380156.
+ - Enable a --with-distributor-name configure option, defaulting to Epiphany.
+ Use it on an error page to designate the distributors/developers to
+ contact. Fixes bug #433796.
+ - Add a "Remove all" button to the Personal Data Manager for both the
+ cookies and the passwords. Addresses bug #148314.
+ - Fix a bug in EphyNodeView which caused problems when setting columns
+ as resizable; thanks to Kristian Rietveld for finding out the cause.
+ Make history window columns resizable and bookmarks editor columns
+ resizable and sortable. Fixes bug #132808.
+ * debian/control.in:
+ - use Breaks on epiphany-extensions due to version change
+ * debian/patches/02_ac_init.patch:
+ - updated
+ * debian/patches/08_localized_startup_page.patch:
+ - updated
+ * debian/patches/13_powered-by.patch,
+ debian/patches/14_webkit-scrollbars.patch,
+ debian/patches/15_webkit-gtk-api.patch,
+ debian/patches/16_webkit-missing-methods.patch,
+ debian/patches/17_webkit-signal-emission.patch:
+ - removed, fixed with the new version
+ * debian/patches/99_autoreconf.patch:
+ - updated
+
+ -- Sebastien Bacher <seb128@canonical.com> Mon, 17 Dec 2007 10:32:26 +0100
+
+epiphany-browser (2.20.2-1ubuntu2) hardy; urgency=low
+
+ * debian/control.in:
+ - epiphany-browser-dbg recommends firefox-dbg (LP: #174445)
+ * debian/patches/07_use_correct_program_name.patch:
+ - dropped, not required since there is an epiphany-browser alternative now,
+ and fixes the help directory (LP: #175157)
+ * debian/rules:
+ - use the same gecko directory naming than debian
+
+ -- Sebastien Bacher <seb128@canonical.com> Tue, 11 Dec 2007 12:55:51 +0100
+
+epiphany-browser (2.20.2-1ubuntu1) hardy; urgency=low
+
+ * The webkit variant is not built for now since it's not juged good enough
+ to compete with the gecko one yet and not worth promoting webkit.
+ The package could be maintained to universe as a different source for now.
+ * Sync with Debian
+ * debian/control.in:
+ - Build-Depends on firefox-dev (>= 1.5), liblaunchpad-integration-dev
+ - Depends on firefox (>= 1.5) and not xulrunner-gnome-support
+ - don't build the webkit variant
+ - don't Build-Depends on libxul-dev
+ - don't Recommends xulrunner debug packages
+ - mention Firefox rather than Iceweasel
+ - package maintained by the Ubuntu Desktop Team
+ - update transition version
+ * debian/epiphany-browser-data.gconf-defaults:
+ - change startup page
+ * debian/patches/03_dbus.patch:
+ - don't use hack from Debian to start a private instance when it can't
+ connect to the dbus, changes made while running that mode are not stored
+ (Ubuntu: #74725)
+ * debian/patches/06_lpi.patch:
+ - launchpad integration
+ * debian/patches/07_use_correct_program_name.patch:
+ - use "epiphany" instead of PACKAGE to work with the epiphany-browser name
+ change, fix session storing (Ubuntu: #43130)
+ * debian/patches/08_localized_startup_page.patch:
+ - use the startup page corresponding to the locale used
+ * debian/patches/11_useragent-weasel.patch:
+ - don't use, the change is Debian specific
+ * debian/patches/99_autoreconf.patch:
+ - updated
+ * debian/rules:
+ - build with firefox, not xulrunner
+ - don't build the webkit variant
+ - don't change the gecko build directory
+
+ -- Sebastien Bacher <seb128@canonical.com> Wed, 05 Dec 2007 14:17:00 +0100
+
+epiphany-browser (2.20.2-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * debian/bug/control: ship a bug control file in epiphany-browser to
+ correctly report dependencies of epiphany-{gecko,webkit}.
+
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/patches/18_ephy-session_crash.patch:
+ - Dropped, merged upstream.
+ + debian/patches/02_ac_init.patch:
+ - Updated for the new version.
+ + debian/patches/99_autoreconf.patch:
+ - Regenerated.
+
+ -- Sebastian Dröge <slomo@debian.org> Sat, 01 Dec 2007 17:45:45 +0100
+
+epiphany-browser (2.20.1-2) unstable; urgency=low
+
+ * 18_ephy-session_crash.patch: stolen from upstream SVN. Fixes crash
+ when loading a session. Closes: #449003.
+
+ -- Josselin Mouette <joss@debian.org> Thu, 15 Nov 2007 21:14:29 +0100
+
+epiphany-browser (2.20.1-1) unstable; urgency=low
+
+ [ Nelson A. de Oliveira ]
+ * Fix menu files for epiphany-webkit and epiphany-gecko (Closes: #444066).
+
+ [ Josselin Mouette ]
+ * 13_powered-by.patch: stolen from SVN. Don't display "powered by
+ Gecko" in the webkit version's about dialog. Also fix translations
+ accordingly. Closes: #444999.
+ * 14_webkit-scrollbars.patch: stolen from SVN. Implement size_request
+ for EphyTab, getting scrollbars to work for the webkit engine.
+ Closes: #444044.
+
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/patches/02_ac_init.patch:
+ - Updated for the new version.
+ + debian/patches/12_contentmanager_block_https.patch:
+ - Dropped, merged upstream.
+ * debian/patches/15_webkit-gtk-api.patch:
+ + Update to the latest WebKit/Gtk API. Patch taken from upstream SVN.
+ Closes: #447371.
+ * debian/patches/16_webkit-missing-methods.patch:
+ + Implement some missing methods and add some workarounds for WebKit
+ bugs. Patch taken from upstream SVN. There are more patches in SVN
+ that make the WebKit backened more useful but can't easily be backported
+ because of API changes in epiphany.
+ * debian/patches/17_webkit-signal-emission.patch:
+ + Don't emit signal that we don't have. Patch taken from upstream SVN.
+ * debian/patches/99_autoreconf.patch:
+ + Regenerate autotools stuff for the new version.
+
+ -- Sebastian Dröge <slomo@debian.org> Thu, 01 Nov 2007 06:37:43 +0100
+
+epiphany-browser (2.20.0-2) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Fix typo that lead NoDisplay to be ignored.
+ * Remove MimeType entries from the additional .desktop files.
+ * 12_contentmanager_block_https.patch: use the same content policy for
+ http and https, allowing adblock to work on https. Closes: #439772.
+
+ [ Loic Minier ]
+ * Cleanup whitespaces in control.
+
+ -- Josselin Mouette <joss@debian.org> Sat, 29 Sep 2007 01:28:11 +0200
+
+epiphany-browser (2.20.0-1) unstable; urgency=low
+
+ * epiphany.sh: ship epiphany as a wrapper script for epiphany-browser
+ instead of a symbolic link the other way round. This way all
+ processes should be named epiphany-browser which is recognized by
+ bug-buddy. Closes: #433443.
+ * New upstream release.
+ * Bump required build-dependencies.
+ * Build two flavors of epiphany, one with webkit and one with gecko.
+ * Separate them in two packages installable simultaneously.
+ * 00_browser_wrapper_path.patch: add a TryExec key as the desktop
+ entry is moved to the data package.
+ * Refresh other patches.
+ * 05_libexecdir.patch: use libexecdir for the plugin directory, so
+ that it can be different for both backends.
+ * Introduce a new alternative, epiphany-browser, and register both
+ versions for it.
+ * epiphany-browser.menu: update to the new menu policy.
+ * Enable build of documentation; build-depend on gtk-doc-tools.
+
+ -- Josselin Mouette <joss@debian.org> Fri, 21 Sep 2007 17:10:27 +0200
+
+epiphany-browser (2.18.3-1) unstable; urgency=low
+
+ * Fix copyright (closes: #428099).
+ * New upstream bugfix release.
+ + Refresh patches.
+ * 11_useragent-weasel.patch: comment out the UA breakage that upstream
+ introduces for xulrunner users and explain why we do it.
+
+ -- Josselin Mouette <joss@debian.org> Wed, 04 Jul 2007 22:23:31 +0200
+
+epiphany-browser (2.18.2-1) unstable; urgency=low
+
+ [ Sam Morris ]
+ * Drop 11_spell-checker-for-1.8.0.patch now that xulrunner 1.8.1 is
+ available. Also bump build-depends appropriately. Closes: #414558.
+
+ [ Josselin Mouette ]
+ * Fix watch file.
+ * Split translations and data files in a separate
+ epiphany-browser-data package.
+ + Include gnome-version.mk for ${gnome:Version}.
+ * Ship debugging symbols in epiphany-browser-dbg (closes: #425290).
+ + debian/compat: use debhelper mode 5.
+ + Build-depend on debhelper 5.
+ * Wrap depends and build-depends.
+ * Improve descriptions a bit.
+ * Use ${binary:Version}.
+ * Replace some file moves in debian/rules by correct .install files.
+ * README: removed, obsolete.
+ * New upstream translation and bugfix release.
+ * 02_ac_init.patch: updated.
+ * 04_move_tabs.patch: disabled for the moment, it doesn't work.
+ * 08_load_on_new_tab.patch: ditto.
+ * 99_configure.patch: refreshed.
+
+ -- Josselin Mouette <joss@debian.org> Sat, 02 Jun 2007 11:56:53 +0200
+
+epiphany-browser (2.18.1-3) unstable; urgency=low
+
+ * 09_download_dialog.patch: still kill the download dialog, but
+ reinstate the distinction between download and save for security
+ reasons (closes: #424765). Also improve the preferences dialog to
+ make insensitive the download folder selection when necessary.
+
+ -- Josselin Mouette <joss@debian.org> Sat, 19 May 2007 00:03:32 +0200
+
+epiphany-browser (2.18.1-2) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * epiphany-browser.gconf-defaults: set the default language to
+ "system" so that epiphany uses content negociation by default.
+ Thanks Roland Mas for noticing.
+
+ [ Sebastian Dröge ]
+ * Upload to unstable, drop check-dist include.
+ * Disable 11_spell-checker-for-1.8.0 and update 99_configure. spellchecking
+ support is disabled again in xulrunner for now.
+
+ -- Sebastian Dröge <slomo@debian.org> Wed, 25 Apr 2007 01:08:24 +0200
+
+epiphany-browser (2.18.1-1) experimental; urgency=low
+
+ * Fix changelog and version the libenchant-dev build-dep.
+ * New upstream release
+ - Rename patch 100_spell-checker-for-1.8.0 to 11_spell-checker-for-1.8.0
+ and only patch configure.ac; refresh.
+ - Update patch 99_configure.
+ - Update patch 02_ac_init.
+
+ -- Loic Minier <lool@dooz.org> Mon, 09 Apr 2007 16:05:07 +0200
+
+epiphany-browser (2.18.0-3) experimental; urgency=low
+
+ [ Loic Minier ]
+ * Add a pre-build:: target to workaround a missing nspr.pc in libxul-dev
+ 1.8.0.11-3: symlink xulrunner-nspr.pc as nspr.pc in debian/pkg-config and
+ list debian/pkg-config in PKG_CONFIG_PATH; thanks Sam Morris and
+ Mike Hommey.
+
+ [ Josselin Mouette ]
+ * 10_url_double-click.patch: patch from Sam Hocevar to make the
+ behavior when double-clicking in the URL bar conform to the rest of
+ the desktop (closes: #417836).
+
+ [ Loic Minier ]
+ * Spell checking support:
+ - Build-dep against libxul-dev 1.8.0.11-3 and libenchant-dev.
+ - Pass --enable-spell-checker to configure.
+ - New patch, 100_spell-checker-for-1.8.0, allows using the spell checker
+ with Xulrunner <= 1.8.1.
+
+ -- Loic Minier <lool@dooz.org> Mon, 09 Apr 2007 12:01:07 +0200
+
+epiphany-browser (2.18.0-2) experimental; urgency=low
+
+ [ Josselin Mouette ]
+ * Re-introduce 00_browser_wrapper_path.patch to avoid any issue with
+ the epiphany game package.
+ + Call epiphany-browser explicitly instead of hardcoding the path.
+ * Bump back conflict on epiphany-extensions to << 2.16, as the 2.16
+ series have correct dependencies.
+
+ [ Loic Minier ]
+ * Merge 2.14.3-2 up to 2.14.3-6; SVN r7118:9090.
+ * Drop patch 06_dbus_connection_close, merged upstream.
+ * Drop patch 30_bookmark-editor-crash, merged upstream.
+
+ -- Loic Minier <lool@dooz.org> Sun, 18 Mar 2007 19:01:57 +0100
+
+epiphany-browser (2.18.0-1) experimental; urgency=low
+
+ [ Sam Morris ]
+ * New upstream release.
+ * Refresh patches.
+ * Bump conflict on epiphany-extensions to << 2.18
+ * Drop 00_browser_wrapper_path.patch; seems useless
+
+ [ Loic Minier ]
+ * Drop patch 05_xulrunner; merged upstream.
+ * Include CDBS's utils.
+
+ -- Loic Minier <lool@dooz.org> Mon, 12 Mar 2007 14:21:50 +0100
+
+epiphany-browser (2.16.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * Refresh patches.
+
+ -- Josselin Mouette <joss@debian.org> Thu, 1 Mar 2007 22:12:53 +0100
+
+epiphany-browser (2.16.2-4) experimental; urgency=low
+
+ * Bump the epiphany-browser-dev dep on libgnomeui-dev to 2.16.0-2 as well.
+
+ -- Loic Minier <lool@dooz.org> Sun, 4 Feb 2007 12:30:05 +0100
+
+epiphany-browser (2.16.2-3) experimental; urgency=low
+
+ [ Loic Minier ]
+ * Set GNOME_MODULE to epiphany for get-orig-source.
+
+ [ Josselin Mouette ]
+ * 09_download_dialog.patch: remove the annoying dialog that lets the
+ user choose between "download" and "save as". Also remove the
+ distinction between the gconf keys. Closes: #280280.
+
+ [ Loic Minier ]
+ * Include the new check-dist Makefile to prevent accidental uploads to
+ unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+ * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 as Gtk 2.10 requires it
+ anyway.
+
+ -- Loic Minier <lool@dooz.org> Mon, 22 Jan 2007 11:09:05 +0100
+
+epiphany-browser (2.16.2-2) experimental; urgency=low
+
+ [ Loic Minier ]
+ * Add a get-orig-source target to retrieve the upstream tarball.
+
+ [ Josselin Mouette ]
+ * Depend on xulrunner-gnome-support (closes: #404755).
+ * 06_ssl_weak_ciphers.patch: enable SSL weak ciphers, as epiphany
+ warns about their use anyway, thanks Mike Hommey (closes: #368259).
+ * epiphany-browser.dirs: create /etc/gnome/epiphany.
+ * rules: move default-prefs.js mime-types-permissions.xml to this
+ directory to make them conffiles (closes: #195406).
+ * 07_bookmarks.patch: provide some Debian-related bookmarks by default
+ (closes: #175014).
+ * epiphany-browser.gconf-defaults: set the homepage to the Debian
+ website.
+ * epiphany-browser.links: add a /usr/bin/epiphany-browser link to make
+ session saving work, thanks Håvard Moen (closes: #375003).
+ + Also add a link for the manual page.
+ * 08_load_on_new_tab.patch: patch from Cyril Brulebois to add a gconf
+ key allowing to emulate the mozilla behavior when loading new tabs
+ (closes: #402177).
+
+ -- Josselin Mouette <joss@debian.org> Fri, 12 Jan 2007 12:59:27 +0100
+
+epiphany-browser (2.16.2-1) experimental; urgency=low
+
+ [ Loic Minier ]
+ * Update description to use Iceweasel instead of Firefox.
+
+ [ Josselin Mouette ]
+ * New upstream release.
+ * Refresh patches.
+
+ -- Josselin Mouette <joss@debian.org> Sun, 26 Nov 2006 22:16:38 +0100
+
+epiphany-browser (2.16.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * rules: switch to quilt for patch handling.
+ * Build-depend on quilt.
+ * Update patches for the new version.
+
+ -- Josselin Mouette <joss@debian.org> Sun, 19 Nov 2006 18:08:37 +0100
+
+epiphany-browser (2.16.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * 04_move_tabs.patch: re-enable the ability to move tabs between
+ windows now the bug is fixed in xulrunner (closes: #317724).
+ * 00_browser_wrapper_path.patch: cleanup.
+ * Please Jordi by taking over maintainership of the package.
+ * 01_bookmarks_menu.patch: updated.
+ * 02_ac_init.patch: updated.
+ * 99_configure.patch: updated accordingly.
+ * NEWS: removed, its content is no more relevant.
+ * Update watch file for 2.16.
+ * Build-depend on intltool 0.35.0 and x11proto-core-dev.
+ * Remove useless build-dependencies on liborbit, perl and gnome-print.
+ * Bump requirements on glib, gtk, iso-codes, libgnome and libgnomeui.
+ * Enable network manager by passing --enable-network-manager.
+ + Build-depend on network-manager-dev.
+ * epiphany-browser-dev.install: add /usr/share/pygtk and
+ /use/share/aclocal.
+ * epiphany-browser.install: add /usr/share/dbus-1 and replace
+ /usr/share/pixmaps by /usr/share/icons.
+ * Conflict with epiphany-extensions << 2.16.
+
+ -- Josselin Mouette <joss@debian.org> Sat, 9 Sep 2006 21:49:22 +0200
+
+epiphany-browser (2.14.3-6) unstable; urgency=medium
+
+ * Add a get-orig-source target to retrieve the upstream tarball.
+ * New patch, 30_bookmark-editor-crash, workaround for a crash in the
+ bookmark-editor; GNOME #351814.
+
+ -- Loic Minier <lool@dooz.org> Mon, 26 Feb 2007 11:24:28 +0100
+
+epiphany-browser (2.14.3-5) unstable; urgency=medium
+
+ * 07_bookmarks.patch: provide some Debian-related bookmarks by default
+ (closes: #175014).
+ * epiphany-browser.gconf-defaults: set the homepage to the Debian
+ website.
+ * epiphany-browser.links: add a /usr/bin/epiphany-browser link to make
+ session saving work, thanks Håvard Moen (closes: #375003).
+ * Urgency is medium to get the session fix and the branding changes to
+ etch.
+
+ -- Josselin Mouette <joss@debian.org> Fri, 12 Jan 2007 13:25:07 +0100
+
+epiphany-browser (2.14.3-4) unstable; urgency=medium
+
+ * debian/control.in: depend on xulrunner-gnome-support (closes: #404755).
+
+ -- Jordi Mallach <jordi@debian.org> Thu, 28 Dec 2006 23:54:04 +0100
+
+epiphany-browser (2.14.3-3) unstable; urgency=low
+
+ [ Loic Minier ]
+ * Provide gnome-www-browser.
+ * Suggest mozplugger instead of mozilla-bonobo; thanks Adam C Powell IV;
+ closes: #393981.
+
+ [ Jordi Mallach ]
+ * 06_dbus_connection_close.patch: don't call dbus_connection_close();
+ unref'ing it should be enough. Suggested by Sjoerd.
+
+ -- Jordi Mallach <jordi@debian.org> Wed, 25 Oct 2006 11:22:28 +0200
+
+epiphany-browser (2.14.3-2) unstable; urgency=low
+
+ * 04_move_tabs.patch: re-enable the ability to move tabs between
+ windows now the bug is fixed in xulrunner (closes: #317724).
+ * Conflict with epiphany-extensions << 2.14.
+
+ -- Josselin Mouette <joss@debian.org> Wed, 27 Sep 2006 15:38:53 +0200
+
+epiphany-browser (2.14.3-1) unstable; urgency=low
+
+ * New upstream release.
+ - Update the 02_ac_init and 99_configure patches.
+
+ -- Loic Minier <lool@dooz.org> Mon, 7 Aug 2006 22:28:46 +0200
+
+epiphany-browser (2.14.2.1-3) unstable; urgency=low
+
+ * 03_dbus.patch: add a warning dialog when the dbus session isn't
+ found (closes: #373798).
+
+ -- Josselin Mouette <joss@debian.org> Sun, 18 Jun 2006 12:54:32 +0200
+
+epiphany-browser (2.14.2.1-2) unstable; urgency=low
+
+ * Generate the configure patch with autoconf 2.59a-9 as newer versions
+ require another level of shell expansion to resolve datadir, and hence
+ cause the AM_GLIB_DEFINE_LOCALEDIR macro to fail miserably.
+ [debian/patches/99_configure.patch]
+
+ -- Loic Minier <lool@dooz.org> Sun, 4 Jun 2006 16:22:30 +0200
+
+epiphany-browser (2.14.2.1-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * 03_dbus.patch: fall back on being a private instance when there is no
+ session bus (closes: #361072).
+
+ [ Loic Minier ]
+ * New upstream release.
+ - Update patches.
+ [debian/patches/00_browser_wrapper_path.patch,
+ debian/patches/02_ac_init.patch, debian/patches/03_dbus.patch,
+ debian/patches/99_configure.patch]
+ * Make package binNMU-able by changing the ${Source-Version} dependency of
+ epiphany-browser-dev on epiphany from "=" to ">=".
+ [debian/control, debian/control.in]
+
+ -- Loic Minier <lool@dooz.org> Thu, 1 Jun 2006 11:22:48 +0200
+
+epiphany-browser (2.14.1-3) unstable; urgency=low
+
+ * Brown paper bag release.
+ * Turn the build-dependency on dbus into a dependency.
+
+ -- Guilherme de S. Pastore <gpastore@debian.org> Fri, 12 May 2006 20:46:05 -0300
+
+epiphany-browser (2.14.1-2) unstable; urgency=low
+
+ [ Guilherme de S. Pastore ]
+ * debian/control.in:
+ - added build-dependency on dbus (Closes: #360836).
+ - updated Standards-Version to 3.7.2.
+
+ [ Jordi Mallach ]
+ * debian/control.in: epiphany-browser-dev depends on libgnomeui-dev.
+
+ -- Guilherme de S. Pastore <gpastore@debian.org> Fri, 12 May 2006 19:16:30 -0300
+
+epiphany-browser (2.14.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - debian/patches/{02_ac_init,99_configure}.patch: updated.
+ * Sourceful upload makes it installable again (Closes: #364267).
+
+ -- Guilherme de S. Pastore <gpastore@debian.org> Sat, 22 Apr 2006 15:23:30 -0300
+
+epiphany-browser (2.14.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - no more annoying HOWL compatibility warning (closes: #354761).
+ - fixes slowness of 1.8.x when using xulrunner (closes: #354822).
+ * debian/control.in: Updated build-deps as per configure.ac.
+ * debian/epiphany-browser.install: remove uneeded entries.
+ * debian/watch: updated for 2.14.
+ * debian/patches/00_browser_wrapper_path.patch: update filenames.
+ * debian/patches/01_bookmarks_menu.patch: update to Ubuntu's version.
+ * debian/patches/02_server_path.patch: removed, obsolete.
+ * debian/patches/03_ac_init.patch: updated.
+ * debian/patches/03_ac_init.patch: moved...
+ * debian/patches/02_ac_init.patch: here. Now contains configure.ac changes
+ only.
+ * debian/patches/04_debian_user_agent.patch: removed, xulrunner advertises
+ already.
+ * debian/patches/05_xulrunner.patch: updated.
+ * debian/patches/99_configure.patch: generated with `autoconf && rm -rf
+ autom4te.cache`.
+
+ -- Jordi Mallach <jordi@debian.org> Wed, 29 Mar 2006 23:54:28 +0200
+
+epiphany-browser (1.8.5-2) unstable; urgency=low
+
+ * Remove dependency on xulrunner, it is unuseful now xulrunner is
+ fixed.
+
+ -- Josselin Mouette <joss@debian.org> Tue, 21 Feb 2006 20:36:31 +0100
+
+epiphany-browser (1.8.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Apply patch from Mike Hommey to enable building against the new libxul
+ packages (closes: #351976).
+ - debian/control.in:
+ + Changed Build-deps from mozilla-browser to libxul-dev.
+ + Changed epiphany-browser's dependencies and conflicts accordingly.
+ - debian/rules: Add --with-mozilla=xulrunner to the configure line.
+ - debian/patches/05_xulrunner.patch: Correctly detect libmozjs location.
+ * The above removes epiphany's much hated dependency on mozilla-browser,
+ and closes: #271582).
+ * debian/rules: don't overwrite DEB_CONFIGURE_EXTRA_FLAGS.
+ * debian/control.in:
+ - conflict with epiphany-extensions (<< 1.8.2-5) to ensure we get
+ a xulrunner-enabled build.
+ - temporarily depend on xulrunner, to workaround a bug.
+
+ -- Jordi Mallach <jordi@debian.org> Mon, 20 Feb 2006 20:39:59 +0100
+
+epiphany-browser (1.8.3-4) unstable; urgency=low
+
+ * debian/control.in: Build-Depend on python-dev.
+ * debian/rules: add --enable-python to configure flags (closes: #352236).
+
+ -- Jordi Mallach <jordi@debian.org> Fri, 10 Feb 2006 20:32:28 +0100
+
+epiphany-browser (1.8.3-3) unstable; urgency=low
+
+ * Upload to unstable
+
+ Loic Minier <lool@dooz.org>:
+ * Register and unregister a new gnome-www-browser alternative.
+ [debian/epiphany-browser.postinst, debian/epiphany-browser.prerm]
+
+ Gustavo Noronha:
+ * debian/control.in:
+ - bumped Standards-Version to 3.6.2 with no changes
+
+ -- Gustavo Noronha Silva <kov@debian.org> Sat, 7 Jan 2006 19:06:16 -0200
+
+epiphany-browser (1.8.3-2) experimental; urgency=low
+
+ * Build against dbus >= 0.60
+
+ -- Sjoerd Simons <sjoerd@debian.org> Sun, 18 Dec 2005 22:50:26 +0100
+
+epiphany-browser (1.8.3-1) experimental; urgency=low
+
+ [ Jordi Mallach ]
+ * New upstream release.
+ * 03_ac_init.patch: updated.
+
+ [ Loic Minier ]
+ * Menu transition, part 1 and 2: move from #!/usr/sbin/install-menu to
+ #!/usr/bin/install-menu. [debian/epiphany-browser.install]
+
+ [ Sjoerd Simons ]
+ * Enable zeroconf for bookmarks
+
+ -- Jordi Mallach <jordi@debian.org> Thu, 1 Dec 2005 19:17:12 +0100
+
+epiphany-browser (1.8.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Don't build-depend on gcc-3.4 for amd64 anymore.
+ * 03_ac_init.patch: updated.
+ * Add watch file.
+ * Require orbit2 2.12.4 for ORBIT2_MAYBE_CONST.
+ * Cleanup dependencies.
+ * epiphany-browser.prerm: remove bashism.
+
+ -- Josselin Mouette <joss@debian.org> Sun, 9 Oct 2005 20:09:58 +0200
+
+epiphany-browser (1.8.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Don't build with gcc-3.4 for amd64 anymore
+ * Build with the experimental dbus packages
+ * debian/patches/04_debian_user_agent.patch
+ + Updated
+ * Sync with ubuntu
+ - Also rename omf files from epiphany to epiphany-browser
+ - debian/patches/02_server_path.patch
+ + Updated
+ - debian/patches/03_ac_init.patch
+ + Updated
+
+ -- Sjoerd Simons <sjoerd@debian.org> Thu, 8 Sep 2005 11:29:47 +0200
+
+epiphany-browser (1.6.5-1) experimental; urgency=low
+
+ * New upstream version.
+ * Ondřej Surý:
+ - debian/paches/03_ac_init.patch: updated.
+ * Jordi Mallach:
+ - debian/control: build-depend on mozilla-dev (>= 1.7.10) for C++
+ transition.
+
+ -- Jordi Mallach <jordi@debian.org> Wed, 31 Aug 2005 17:26:26 +0200
+
+epiphany-browser (1.6.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/paches/03_ac_init.patch: updated.
+
+ -- Jordi Mallach <jordi@debian.org> Tue, 5 Jul 2005 14:59:54 +0200
+
+epiphany-browser (1.6.3-2) unstable; urgency=low
+
+ * The "helix, use this cool Desktop and become a real GNOME Woman!"
+ release.
+ * Upload to unstable.
+ * debian/control.in: update Build-Depends (closes: #309195).
+ * The blurry icon for bookmarks editor is gone (closes: #287951).
+ * Ephy no longer shows the "Exit Fullscreen" button on all workspaces
+ (closes: #229622).
+
+ -- Jordi Mallach <jordi@debian.org> Wed, 8 Jun 2005 01:03:16 +0200
+
+epiphany-browser (1.6.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/paches/03_ac_init.patch: updated.
+
+ -- Jordi Mallach <jordi@debian.org> Wed, 27 Apr 2005 16:09:39 +0200
+
+epiphany-browser (1.6.2-1) experimental; urgency=low
+
+ * New upstream version.
+ * debian/patches/03_ac_init.patch:
+ - updated.
+ * debian/patches/05_toolbar_activation.patch:
+ - fixed with the new version.
+
+ -- Sebastien Bacher <seb128@debian.org> Thu, 14 Apr 2005 15:40:31 +0200
+
+epiphany-browser (1.6.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control.in:
+ - update build-depends and add dbus.
+ - depend on gnome-icon-theme and iso-codes.
+ * debian/rules:
+ - enable dbus support.
+ - build with gcc/g++ 3.4 for amd64 (closes: #287642).
+ * debian/patches/03_ac_init.patch: updated.
+ * debian/patches/01_bookmarks_menu.patch: stolen from Hoary; hide the
+ bookmarks manager menu item.
+ * debian/patches/04_debian_user_agent.patch: just identify as "Debian",
+ don't give the full source version.
+ * debian/05_toolbar_activation.patch: patch from CVS to fix toolbar
+ activation.
+
+ -- Jordi Mallach <jordi@debian.org> Sat, 9 Apr 2005 12:33:49 +0200
+
+epiphany-browser (1.4.8-2) unstable; urgency=low
+
+ * debian/control.in: bump mozilla requirements to >= 1.7.6 to fix the
+ IDN domain spoofing security issue (CAN-2005-0238, closes: #294270).
+
+ -- Jordi Mallach <jordi@debian.org> Thu, 24 Mar 2005 17:54:16 +0100
+
+epiphany-browser (1.4.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jordi Mallach <jordi@debian.org> Sun, 27 Feb 2005 17:31:10 +0100
+
+epiphany-browser (1.4.7-3) unstable; urgency=low
+
+ * debian/patches/04_debian_user_agent.patch: add Debian package version to
+ the User-Agent string (thanks Loïc Minier; closes: #268655).
+ * debian/rules: add a define to CXXFLAGS with the Debian source version.
+ * debian/control.in:
+ - add a suggestion on mozilla-bonobo to epiphany-browser
+ (closes: #276492).
+ - recommend epiphany-extensions.
+
+ -- Jordi Mallach <jordi@debian.org> Thu, 10 Feb 2005 23:24:41 +0100
+
+epiphany-browser (1.4.7-2) unstable; urgency=medium
+
+ * Rebuild against mozilla 1.7.5 to fix mouse buttons breakage.
+ * debian/control.in: build-depend and depend on
+ mozilla-browser (>= 2:1.7.5).
+
+ -- Jordi Mallach <jordi@debian.org> Fri, 7 Jan 2005 17:05:05 +0100
+
+epiphany-browser (1.4.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/03_ac_init.patch: update.
+
+ -- Jordi Mallach <jordi@debian.org> Sun, 26 Dec 2004 01:15:41 +0100
+
+epiphany-browser (1.4.6-1) unstable; urgency=low
+
+ * New upstream release.
+ - fix tabs menu ordering when using the tab groups extension
+ (closes: #276916).
+ * debian/patches/03_ac_init.patch: update.
+
+ -- Jordi Mallach <jordi@debian.org> Thu, 2 Dec 2004 00:16:32 +0100
+
+epiphany-browser (1.4.5-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * debian/control.in:
+ - put myself as Maintainer. *shiver*.
+ - remove Mark Howard from uploaders, as he's trying to get galeon
+ adopted.
+ - remove build-dep on libc6-dev.
+ - bump to debhelper (>= 4.2.23).
+
+ -- Jordi Mallach <jordi@debian.org> Fri, 19 Nov 2004 18:34:26 +0100
+
+epiphany-browser (1.4.5-1) experimental; urgency=low
+
+ * GNOME team upload.
+ * New upstream release.
+ * debian/{epiphany.1,epiphany-browser.mapages}: removed, included upstream.
+ * debian/patches/03_ac_init.patch: update.
+
+ -- Jordi Mallach <jordi@debian.org> Tue, 16 Nov 2004 02:35:22 +0100
+
+epiphany-browser (1.4.4-2) experimental; urgency=low
+
+ * debian/control.in:
+ - bump cdbs and debhelper requirements, to register epiphany in the
+ MIME database.
+ - drop libtool build dependency.
+ * debian/postrm: remove, handled by debhelper.
+ * debian/rules: don't relibtoolize on pre-build.
+
+ -- Jordi Mallach <jordi@debian.org> Tue, 9 Nov 2004 20:38:48 +0100
+
+epiphany-browser (1.4.4-1) experimental; urgency=low
+
+ * GNOME team upload.
+ * New upstream release.
+ * debian/rules:
+ + remove extra configure flags which aren't needed anymore.
+ + remove empty /usr/lib/epiphany.
+ * debian/patches/03_ac_init.patch: update.
+
+ -- Jordi Mallach <jordi@debian.org> Wed, 13 Oct 2004 00:23:27 +0200
+
+epiphany-browser (1.4.0-2) experimental; urgency=low
+
+ * GNOME team upload.
+ * debian/rules:
+ + don't install /usr/bin/epiphany as a wrapper anymore, according
+ to Crispin it's not needed anymore (closes: #271986).
+ + configure with --with-mozilla-snapshot=1.7.2 to workaround a build
+ failure.
+ * debian/control.in: tighten mozilla dependencies to 1.7.3.
+
+ -- Jordi Mallach <jordi@debian.org> Fri, 24 Sep 2004 19:28:26 +0200
+
+epiphany-browser (1.4.0-1) experimental; urgency=low
+
+ * GNOME team upload.
+ * New upstream release.
+ * debian/control.in: update build-depends as per configure.in.
+ * debian/patches/03_ac_init.patch: update.
+ * debian/rules: epiphany's binary is now epiphany, not epiphany-bin.
+
+ -- Jordi Mallach <jordi@debian.org> Wed, 15 Sep 2004 23:30:24 +0200
+
+epiphany-browser (1.2.9-2) unstable; urgency=low
+
+ * GNOME team upload.
+ * debian/rules: configure using --with-mozilla-snapshot=1.7.2.
+
+ -- Jordi Mallach <jordi@debian.org> Thu, 21 Oct 2004 11:29:46 +0200
+
+epiphany-browser (1.2.9-1) unstable; urgency=low
+
+ * GNOME team upload, by request of Edd.
+ * New upstream release.
+ * debian/patches/03_ac_init.patch: updated.
+ * debian/epiphany.1: apply patch from Andrew Sobala to remove
+ obsolete/unuseful options from the manpage, thanks! (Closes: #256504)
+ * debian/rules: don't libtoolize the package automatically in pre-build.
+ * debian/control.in: drop build-dependency on libtool.
+
+ -- Jordi Mallach <jordi@debian.org> Thu, 21 Oct 2004 00:13:39 +0200
+
+epiphany-browser (1.2.8-1) unstable; urgency=high
+
+ * New upstream release.
+ * Really build against Mozilla 1.7.2. (Closes: #266265)
+ * High urgency to ensure that middle- and right-mouse clicks
+ work in the version that ships with sarge.
+ * Retire 01_package_name.patch, add 03_ac_init.patch to adjust
+ package name to epiphany-browser.
+
+ -- Edd Dumbill <ejad@debian.org> Mon, 23 Aug 2004 19:19:25 +0100
+
+epiphany-browser (1.2.7-2) unstable; urgency=low
+
+ * Force compile against mozilla 1.7.2, fixes mouse button problems
+ (Closes: #264467)
+
+ -- Edd Dumbill <ejad@debian.org> Mon, 9 Aug 2004 09:43:04 +0100
+
+epiphany-browser (1.2.7-1) unstable; urgency=low
+
+ * New upstream release
+ - build fine with mozilla 1.7.1.
+ * debian/epiphany-browser.postinst:
+ - removed the gconf and scrollkeeper parts, CDBS handles this.
+ * debian/epiphany-browser.postrm:
+ - removed, CDBS handles this too.
+ * debian/patches/01_package_name.patch:
+ - updated.
+ * debian/rules:
+ - changed the rules order to get dh_gconf used.
+ * All the above from Sebastien Bacher <seb128@debian.org>, thanks!
+ (Closes: #263841)
+ * Removed mozilla-xft from Recommends, this now included in
+ mozilla-browser.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 7 Aug 2004 00:47:03 +0100
+
+epiphany-browser (1.2.6-3) unstable; urgency=low
+
+ * Add note to README.Debian to explain about the printing snafu.
+ * Move gtk-doc output into -dev package.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 25 Jun 2004 10:17:53 +0100
+
+epiphany-browser (1.2.6-2) unstable; urgency=low
+
+ * Build against Mozilla 1.7.
+
+ -- Edd Dumbill <ejad@debian.org> Thu, 24 Jun 2004 01:04:15 +0100
+
+epiphany-browser (1.2.6-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixes LD_LIBRARY_PATH setting (Closes: #253443)
+
+ -- Edd Dumbill <ejad@debian.org> Mon, 14 Jun 2004 15:14:48 +0100
+
+epiphany-browser (1.2.5-2) unstable; urgency=low
+
+ * Upload to unstable.
+ - Download behavior fixed (Closes: #223591)
+ - Upload path remembered (Closes: #207829)
+ - Bookmark searches now case insensitive (Closes: #192929)
+ - Toolbars options in fullscreen not an issue now (Closes: #203018)
+ - Import bookmarks dialog offers arbitrary file import (Closes: #209224)
+ - Spinner no longer part of toolbar (Closes: #229548)
+ - Closing windows asks for confirmation if they have unsubmitted form
+ data (Closes: #229588)
+ * Don't break x-www-browser alternative on uninstall (Closes: #241535)
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 28 May 2004 07:55:32 +0100
+
+epiphany-browser (1.2.5-1) experimental; urgency=low
+
+ * New upstream release.
+ * Added Section: devel to control file for the -dev package.
+
+ -- Edd Dumbill <ejad@debian.org> Wed, 5 May 2004 19:58:54 +0100
+
+epiphany-browser (1.2.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * Add missing libxml-parser-perl builddep.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 23 Apr 2004 18:24:54 +0100
+
+epiphany-browser (1.2.2-3) experimental; urgency=low
+
+ * Add missing gnome-pkg-tools builddep (Closes: #244053)
+ * Tighten up libtool builddep.
+
+ -- Edd Dumbill <ejad@debian.org> Tue, 13 Apr 2004 10:11:52 +0100
+
+epiphany-browser (1.2.2-2) experimental; urgency=low
+
+ * Rebuild against gcc-3.3 not 3.4!
+
+ -- Edd Dumbill <ejad@debian.org> Tue, 13 Apr 2004 09:07:02 +0100
+
+epiphany-browser (1.2.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Split into epiphany and epiphany-dev.
+ * Remove alternative in prerm.
+
+ -- Edd Dumbill <ejad@debian.org> Mon, 12 Apr 2004 21:23:52 +0100
+
+epiphany-browser (1.2.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Updated patches for executable path, removed 04_scrollkeeper_omf patch.
+ * Remove libnautilus2-dev dependency for now, disable nautilus view
+ building.
+
+ -- Edd Dumbill <ejad@debian.org> Wed, 24 Mar 2004 15:16:27 +0000
+
+epiphany-browser (1.0.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * Get path right for translated docs (Closes: #231731)
+ * Make x-www-browser alternative greater than that of Mozilla's
+ (Closes: #233607)
+ * Drop yelp to a recommendation (Closes: #229061)
+
+ -- Edd Dumbill <ejad@debian.org> Thu, 18 Mar 2004 13:54:23 +0000
+
+epiphany-browser (1.0.7-3) unstable; urgency=low
+
+ * Add libxml2-dev build-dep (Closes: #222453). Tighten the libbonoboui-dev
+ dependency as well.
+ * Add simple manpage (Closes: #206702, #221710)
+
+ -- Edd Dumbill <ejad@debian.org> Sun, 25 Jan 2004 18:42:59 +0000
+
+epiphany-browser (1.0.7-2) unstable; urgency=low
+
+ * Add libxml-parser-perl as build-dep. Oops.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 23 Jan 2004 11:52:12 +0000
+
+epiphany-browser (1.0.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Compile against Mozilla 1.6 (Closes: #229139)
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 23 Jan 2004 09:59:47 +0000
+
+epiphany-browser (1.0.6-2) unstable; urgency=low
+
+ * Add GNOME team maintainership stuff.
+
+ -- Edd Dumbill <ejad@debian.org> Tue, 18 Nov 2003 12:26:28 +0000
+
+epiphany-browser (1.0.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Retire 05_file_uri_security.patch.
+
+ -- Edd Dumbill <ejad@debian.org> Mon, 17 Nov 2003 15:04:01 +0000
+
+epiphany-browser (1.0.3-3) unstable; urgency=low
+
+ * Added Conflicts: mozilla-browser >= 1.6 to avoid future snafus
+ with Mozilla upgrades.
+
+ -- Edd Dumbill <ejad@debian.org> Wed, 22 Oct 2003 09:54:52 +0100
+
+epiphany-browser (1.0.3-2) unstable; urgency=low
+
+ * Re-libtoolize to get round breakage with Mozilla 1.5. (Thanks
+ to Matt Biddulph for helping chase this down.)
+
+ -- Edd Dumbill <ejad@debian.org> Wed, 22 Oct 2003 00:36:52 +0100
+
+epiphany-browser (1.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Edd Dumbill <ejad@debian.org> Sat, 18 Oct 2003 12:47:51 +0100
+
+epiphany-browser (1.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Edd Dumbill <ejad@debian.org> Mon, 13 Oct 2003 23:10:00 +0100
+
+epiphany-browser (1.0-1) unstable; urgency=low
+
+ * New upstream release. Epiphany goes 1.0!
+ * Add missing libgnome-desktop-dev build-dep (Closes: #211447)
+ * Use perl instead of sed in debian/rules (Closes: #207735)
+ * Remove glib2 autotools workaround, set specific libglib2.0-dev
+ dependency.
+ * Add in security fix from CVS so file:/// URIs can't be loaded
+ by pages retrieved from the network (05_file_uri_security.patch).
+
+ -- Edd Dumbill <ejad@debian.org> Thu, 18 Sep 2003 15:41:56 +0100
+
+epiphany-browser (0.9.2-2) unstable; urgency=low
+
+ * Added Recommends: for mozilla-xft.
+ * Added note about mozilla-xft in README.Debian.
+
+ -- Edd Dumbill <ejad@debian.org> Wed, 17 Sep 2003 09:33:52 +0100
+
+epiphany-browser (0.9.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Depend on gnome-icon-theme >= 1.0.6 now it's released. Thanks Kitame.
+ (Closes: #207368, #206297)
+ * Ensure locale location bugfix won't break when glib 2.0 bug which is the
+ root cause gets fixed.
+
+ -- Edd Dumbill <ejad@debian.org> Thu, 28 Aug 2003 14:45:03 +0100
+
+epiphany-browser (0.8.4-2) unstable; urgency=low
+
+ * Move locale .mo files to the right place (Closes: #205304)
+
+ -- Edd Dumbill <ejad@debian.org> Thu, 14 Aug 2003 08:51:06 +0100
+
+epiphany-browser (0.8.4-1) unstable; urgency=low
+
+ * New upstream release.
+ - New tab doesn't grab focus (Closes: #204829)
+ * Retire patches/05_sign_compile.patch.
+ * Retire gcc-3.2 dependency, compiles OK with 3.3 now.
+
+ -- Edd Dumbill <ejad@debian.org> Wed, 13 Aug 2003 13:49:35 +0100
+
+epiphany-browser (0.8.0-2) unstable; urgency=low
+
+ * Depend on Mozilla 1.4 (Closes: #202069)
+
+ -- Edd Dumbill <ejad@debian.org> Sat, 19 Jul 2003 15:40:03 +0100
+
+epiphany-browser (0.8.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - No more "feeling lucky"
+ * Move debconf notice into NEWS.Debian (Closes: #201477). Updated
+ corresponding debhelper dependency to >= 4.1.51.
+ * Tweak wrapper script to change arguments to simply "$@".
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 18 Jul 2003 17:20:35 +0100
+
+epiphany-browser (0.7.3-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixes segfault on Mozilla bookmark import (Closes: #198556)
+ * Build against Mozilla 1.4 (Closes: #190763)
+
+ -- Edd Dumbill <ejad@debian.org> Mon, 14 Jul 2003 21:52:03 +0100
+
+epiphany-browser (0.7.1-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #198818)
+ - Don't crash on adding bookmark without topics (Closes: #197493)
+ - Search now works after smart bookmark use (Closes: #194208)
+ - Adding bookmark topic now works properly (Closes: #197869)
+ - Copy function works properly (Closes: #195357)
+ - Middle-click paste of keyword now shows proper new URL in
+ location bar (Closes: #195427)
+ - Creating new tab now doesn't destroy X selection (Closes: #197227)
+ * Download directory now remembered (Closes: #196927)
+ * Retire 02_help_dtd_patch as cdbs makes these corrections now
+ (Closes: #198181)
+ * Compile with gcc-3.2, remove -Wno-strict-aliasing (Closes: #197102)
+ I know this isn't the best-ever solution to this problem. Working
+ on sorting it out more permanently.
+ * Retire 05_valist_patch_from_bugzilla.patch, now in upstream
+ * Added debconf note: upstream have reorganized prefs schema, some of your
+ preferences will need resetting.
+ * Depend on gnome-icon-theme >= 1.0.4 (Closes: #197183). If you're still
+ have trouble with the throbber missing, file a bug on the theme, as
+ this seems to be theme dependent.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 27 Jun 2003 16:05:49 +0100
+
+epiphany-browser (0.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixes crash on pause download (Closes: #193672)
+ - Fix smart bookmark non-ASCII problem (Closes: #193981)
+ * Incorporate 05_valist_patch_from_bugzilla.patch, which fixes
+ valist usage problems on several platforms.
+
+ -- Edd Dumbill <ejad@debian.org> Sat, 7 Jun 2003 11:15:12 +0100
+
+epiphany-browser (0.6.1-1) unstable; urgency=low
+
+ * New upstream (Closes: #194423)
+ - adds 'remove toolbar' context menu (Closes: #190817)
+ * Get correct Mozilla dependency (Closes: #193999)
+ * Change menu hint to "Web browsers" (Closes: #193451)
+ * Update standards version to 3.5.9
+ * Retire CVS Colin's Build System in favour of cdbs
+
+ -- Edd Dumbill <ejad@debian.org> Sun, 25 May 2003 16:49:06 +0100
+
+epiphany-browser (0.6.0-3) unstable; urgency=low
+
+ * 05_eel_gconf_ptrsize.patch, add another ia64 fix. Hopefully
+ this is the final one.
+
+ -- Edd Dumbill <ejad@debian.org> Wed, 14 May 2003 16:12:50 +0100
+
+epiphany-browser (0.6.0-2) unstable; urgency=low
+
+ * Moved mozilla-xft dependency to Recommends (Closes: #192895)
+ * Distribute NEWS file (Closes: #192836)
+ * Add 05_eel_gconf_ptrsize.patch from CVS to fix ia64 build error.
+
+ -- Edd Dumbill <ejad@debian.org> Tue, 13 May 2003 09:54:14 +0100
+
+epiphany-browser (0.6.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Remote tab open raises window (Closes: #187663)
+ * Removed 03_guint_fix_from_cvs.patch, obsoleted by new release.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 9 May 2003 14:53:25 +0100
+
+epiphany-browser (0.5.0-rel-4) unstable; urgency=low
+
+ * Really fix path of help docs in .omf file (Closes: #191282)
+
+ -- Edd Dumbill <ejad@debian.org> Sat, 3 May 2003 16:11:28 +0100
+
+epiphany-browser (0.5.0-rel-3) unstable; urgency=low
+
+ * 04_scrollkeeper_omf_path.patch: try to fix path of help file in .omf
+ file
+ * debian/rules: update to latest version of Colin's Build System
+ * debian/rocks: add -fshort-wchar to CXXFLAGS, fixes problem with
+ context menus on images.
+
+ -- Edd Dumbill <ejad@debian.org> Tue, 29 Apr 2003 20:44:06 +0100
+
+epiphany-browser (0.5.0-rel-2) unstable; urgency=low
+
+ * Fix missing bookmark editor icon problem.
+
+ -- Edd Dumbill <ejad@debian.org> Thu, 24 Apr 2003 16:53:58 +0100
+
+epiphany-browser (0.5.0-rel-1) unstable; urgency=low
+
+ * New upstream release. I won't be tracking CVS snapshots any
+ more. (Closes: #189413)
+ * Compile against mozilla rather than mozilla-snapshot. (Closes: #182199)
+ * Changed section to 'gnome'.
+ * Adjusted alternatives priority for x-www-browser to 75.
+ * 64-bit arch compile patch from CVS (Closes: #190011)
+
+ -- Edd Dumbill <ejad@debian.org> Tue, 22 Apr 2003 19:23:57 +0100
+
+epiphany-browser (0.5.0+0.4.99.20030304-1) unstable; urgency=low
+
+ * New CVS export.
+
+ -- Edd Dumbill <ejad@debian.org> Tue, 4 Mar 2003 23:38:46 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030220-3) unstable; urgency=low
+
+ * Exchanged faulty gconf dependency for gconf2.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 21 Feb 2003 23:05:02 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030220-2) unstable; urgency=low
+
+ * Added debian menu entry.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 21 Feb 2003 10:36:03 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030220-1) unstable; urgency=low
+
+ * New CVS export.
+
+ -- Edd Dumbill <ejad@debian.org> Thu, 20 Feb 2003 15:28:02 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030214-6) unstable; urgency=low
+
+ * Added www-browser to Provides:
+ * Added to the x-www-browser alternatives selection.
+
+ -- Edd Dumbill <ejad@debian.org> Wed, 19 Feb 2003 13:07:26 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030214-5) unstable; urgency=low
+
+ * Upload to Debian, co-maintained with Mark Howard (Closes: #173427)
+
+ -- Edd Dumbill <ejad@debian.org> Sun, 16 Feb 2003 21:40:49 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030214-4) unstable; urgency=low
+
+ * Versioned various dependencies.
+ * Added gconf dependency.
+ * Moved epiphany binary to /usr/lib/epiphany/
+ * Revert binary name to 'epiphany'
+ * Clean up after intltool: -extract, -merge, -update
+ * Added in location of CVS source into debian/copyright
+
+ -- Edd Dumbill <ejad@debian.org> Sun, 16 Feb 2003 14:19:01 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030214-3) unstable; urgency=low
+
+ * Added mozilla-psm-snapshot as a dependency.
+
+ -- Edd Dumbill <ejad@debian.org> Sat, 15 Feb 2003 03:41:56 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030214-2) unstable; urgency=low
+
+ * Changed package name to epiphany-browser in the configure
+ script.
+
+ -- Edd Dumbill <ejad@debian.org> Sat, 15 Feb 2003 03:41:56 +0000
+
+epiphany-browser (0.5.0+0.4.99.20030214-1) unstable; urgency=low
+
+ * Initial packaging from CVS.
+
+ -- Edd Dumbill <ejad@debian.org> Fri, 14 Feb 2003 23:05:40 +0000
+
--- epiphany-browser-2.22.2.orig/debian/epiphany-gecko.postinst
+++ epiphany-browser-2.22.2/debian/epiphany-gecko.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+for alt in epiphany-browser x-www-browser gnome-www-browser; do
+ update-alternatives --install \
+ /usr/bin/$alt $alt /usr/bin/epiphany-gecko 85 \
+ --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-gecko.1.gz
+done
+
+#DEBHELPER#
+
+exit 0
--- epiphany-browser-2.22.2.orig/debian/epiphany-browser-data.dirs
+++ epiphany-browser-2.22.2/debian/epiphany-browser-data.dirs
@@ -0,0 +1,2 @@
+/etc/gnome/epiphany
+/usr
--- epiphany-browser-2.22.2.orig/debian/epiphany-webkit.prerm
+++ epiphany-browser-2.22.2/debian/epiphany-webkit.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+ for alt in epiphany-browser x-www-browser gnome-www-browser; do
+ update-alternatives --remove $alt /usr/bin/epiphany-webkit
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
--- epiphany-browser-2.22.2.orig/debian/epiphany-browser-data.links
+++ epiphany-browser-2.22.2/debian/epiphany-browser-data.links
@@ -0,0 +1,2 @@
+/etc/gnome/epiphany/mime-types-permissions.xml /usr/share/epiphany-browser/mime-types-permissions.xml
+/etc/gnome/epiphany/default-prefs.js /usr/share/epiphany-browser/default-prefs.js
--- epiphany-browser-2.22.2.orig/debian/control.in
+++ epiphany-browser-2.22.2/debian/control.in
@@ -0,0 +1,114 @@
+Source: epiphany-browser
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 5),
+ pkg-config,
+ libglib2.0-dev (>= 2.15.6),
+ libgtk2.0-dev (>= 2.11.6),
+ libxml2-dev (>= 2.6.12),
+ libxslt1-dev (>= 1.1.7),
+ libglade2-dev (>= 2.3.1),
+ libgnome2-dev (>= 2.14.0),
+ libgnomeui-dev (>= 2.16.0-2),
+ libgconf2-dev,
+ libgnome-desktop-dev (>= 2.9.91),
+ libstartup-notification0-dev (>= 0.5),
+ libdbus-glib-1-dev (>= 0.60),
+ scrollkeeper,
+ gnome-pkg-tools (>= 0.10),
+ libxml-parser-perl,
+ xulrunner-1.9-dev (>= 1.9~rc),
+ iso-codes (>= 0.35),
+ python-dev (>= 2.3),
+ python-gtk2-dev (>= 2.7.1),
+ python-gnome2-dev (>= 2.6.0),
+ gnome-doc-utils (>= 0.3.2),
+ intltool (>= 0.35.0),
+ x11proto-core-dev,
+ network-manager-dev,
+ quilt,
+ libenchant-dev (>= 1.0),
+ gtk-doc-tools (>= 1.0),
+ liblaunchpad-integration-dev (>= 0.1.17),
+ libavahi-gobject-dev
+Standards-Version: 3.7.2
+
+Package: epiphany-browser
+Architecture: all
+Depends: epiphany-gecko | epiphany-webkit
+Description: Intuitive web browser - dummy package
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This dummy package installs Epiphany with the Gecko backend by default.
+
+Package: epiphany-gecko
+Architecture: any
+Depends: epiphany-browser-data (>= ${gnome:Version}),
+ epiphany-browser-data (<< ${gnome:NextVersion}),
+ ${shlibs:Depends},
+ gnome-icon-theme (>= 2.9.90),
+ dbus,
+ iso-codes,
+ xulrunner-1.9 (>= 1.9~rc),
+ ${misc:Depends}
+Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1)
+Recommends: yelp, epiphany-extensions
+Breaks: epiphany-extensions (<< 2.20.1-2ubuntu3)
+Suggests: mozplugger
+Provides: www-browser, gnome-www-browser
+Description: Intuitive GNOME web browser - Gecko version
+ 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 should not mean less powerful. Standards
+ compliance is achieved on the HTML side by using the Gecko
+ rendering engine, as developed for the Mozilla and Firefox browsers; and
+ on the user interface side by closely following the GNOME Human Interface
+ Guidelines (HIG) and by close integration with the GNOME desktop.
+ .
+ This version uses the Gecko backend to render web pages.
+ .
+ Homepage: http://www.gnome.org/projects/epiphany/
+
+Package: epiphany-browser-data
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: epiphany-browser
+Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1)
+Replaces: epiphany-browser (<< 2.20.1-2ubuntu1)
+Description: Data 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 contains the common files, artwork and translations for
+ Epiphany.
+
+Package: epiphany-browser-dev
+Architecture: all
+Section: devel
+Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2)
+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.
+
+Package: epiphany-browser-dbg
+Architecture: any
+Section: gnome
+Priority: extra
+Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version})
+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.
--- epiphany-browser-2.22.2.orig/debian/epiphany-browser-data.docs
+++ epiphany-browser-2.22.2/debian/epiphany-browser-data.docs
@@ -0,0 +1,4 @@
+NEWS
+README
+TODO
+AUTHORS
--- epiphany-browser-2.22.2.orig/debian/compat
+++ epiphany-browser-2.22.2/debian/compat
@@ -0,0 +1 @@
+5
--- epiphany-browser-2.22.2.orig/debian/epiphany-webkit.postinst
+++ epiphany-browser-2.22.2/debian/epiphany-webkit.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+for alt in epiphany-browser x-www-browser gnome-www-browser; do
+ update-alternatives --install \
+ /usr/bin/$alt $alt /usr/bin/epiphany-webkit 80 \
+ --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-webkit.1.gz
+done
+
+#DEBHELPER#
+
+exit 0
--- epiphany-browser-2.22.2.orig/depcomp
+++ epiphany-browser-2.22.2/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2006-10-15.18
+scriptversion=2007-03-29.01
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -215,34 +215,39 @@
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
- outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
--- epiphany-browser-2.22.2.orig/ltmain.sh
+++ epiphany-browser-2.22.2/ltmain.sh
@@ -2,7 +2,7 @@
# NOTE: Changing this file will not affect anything until you rerun configure.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007 Free Software Foundation, Inc.
+# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -113,15 +113,21 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
save_$lt_var=\$$lt_var
+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
$lt_var=C
export $lt_var
fi"
done
+if test -n "$lt_env"; then
+ lt_env="env $lt_env"
+fi
+
# Make sure IFS has a sensible default
lt_nl='
'
@@ -485,7 +491,7 @@
echo "\
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $?
@@ -788,6 +794,7 @@
*.for) xform=for ;;
*.java) xform=java ;;
*.obj) xform=obj ;;
+ *.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -956,7 +963,7 @@
$run $rm "$lobj" "$output_obj"
$show "$command"
- if $run eval "$command"; then :
+ if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE
@@ -1028,7 +1035,7 @@
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
- if $run eval "$command"; then :
+ if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
exit $EXIT_FAILURE
@@ -1161,6 +1168,7 @@
thread_safe=no
vinfo=
vinfo_number=no
+ single_module="${wl}-single_module"
func_infer_tag $base_compile
@@ -1646,6 +1654,11 @@
continue
;;
+ -multi_module)
+ single_module="${wl}-multi_module"
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -2152,7 +2165,12 @@
continue
fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ if test "$linkmode" = lib; then
+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+ else
+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+ fi
+ for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@@ -2948,12 +2966,18 @@
# we do not want to link against static libs,
# but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
- if test -f "$path/$depdepl" ; then
+ if test -f "$deplibdir/$depdepl" ; then
+ depdepl="$deplibdir/$depdepl"
+ elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
+ else
+ # Can't find it, oh well...
+ depdepl=
fi
# do not add paths which are already there
case " $newlib_search_path " in
@@ -3101,9 +3125,10 @@
case $linkmode in
oldlib)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
- fi
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+ esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -4245,9 +4270,10 @@
;;
obj)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
- fi
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+ esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -6486,7 +6512,7 @@
fi
# Restore saved environment variables
- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
--- epiphany-browser-2.22.2.orig/install-sh
+++ epiphany-browser-2.22.2/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
-posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
+
+ -C) copy_on_change=true;;
- -d) dir_arg=true
- shift
- continue;;
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t) dstarg=$2
- shift
- shift
- continue;;
-
- -T) no_target_directory=true
- shift
- continue;;
+ shift;;
+
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
+ shift;;
+
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -165,21 +170,22 @@
*) break;;
esac
+ shift
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi
@@ -224,7 +230,7 @@
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
@@ -459,41 +458,54 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
trap '' 0
fi
--- epiphany-browser-2.22.2.orig/config.sub
+++ epiphany-browser-2.22.2/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;