--- epiphany-browser-2.21.4.orig/debian/epiphany-gecko.menu
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/patches/05_libexecdir.patch
+++ epiphany-browser-2.21.4/debian/patches/05_libexecdir.patch
@@ -0,0 +1,142 @@
+Index: epiphany-2.20.0/data/epiphany.pc.in
+===================================================================
+--- epiphany-2.20.0.orig/data/epiphany.pc.in	2007-09-21 14:41:49.966965277 +0200
++++ epiphany-2.20.0/data/epiphany.pc.in	2007-09-21 14:45:51.976756629 +0200
+@@ -2,8 +2,8 @@
+ 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
+Index: epiphany-2.20.0/embed/mozilla/Makefile.am
+===================================================================
+--- epiphany-2.20.0.orig/embed/mozilla/Makefile.am	2007-09-21 14:41:35.286128664 +0200
++++ epiphany-2.20.0/embed/mozilla/Makefile.am	2007-09-21 14:44:45.804985715 +0200
+@@ -141,7 +141,7 @@
+ 	-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\"		\
+Index: epiphany-2.20.0/embed/mozilla/Makefile.in
+===================================================================
+--- epiphany-2.20.0.orig/embed/mozilla/Makefile.in	2007-09-21 14:41:35.326130943 +0200
++++ epiphany-2.20.0/embed/mozilla/Makefile.in	2007-09-21 14:44:45.816986398 +0200
+@@ -461,7 +461,7 @@
+ 	-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\"		\
+Index: epiphany-2.20.0/lib/Makefile.am
+===================================================================
+--- epiphany-2.20.0.orig/lib/Makefile.am	2007-09-21 14:41:42.814557684 +0200
++++ epiphany-2.20.0/lib/Makefile.am	2007-09-21 14:44:45.816986398 +0200
+@@ -76,7 +76,7 @@
+ libephymisc_la_CPPFLAGS = \
+ 	-I$(top_builddir)/lib			\
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" 		\
+-	-DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" 	\
++	-DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" 	\
+ 	$(AM_CPPFLAGS)
+ 
+ libephymisc_la_CFLAGS = \
+Index: epiphany-2.20.0/lib/Makefile.in
+===================================================================
+--- epiphany-2.20.0.orig/lib/Makefile.in	2007-09-21 14:41:42.854559964 +0200
++++ epiphany-2.20.0/lib/Makefile.in	2007-09-21 14:44:45.828987082 +0200
+@@ -409,7 +409,7 @@
+ libephymisc_la_CPPFLAGS = \
+ 	-I$(top_builddir)/lib			\
+ 	-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) \
+Index: epiphany-2.20.0/plugins/desktop-file/Makefile.am
+===================================================================
+--- epiphany-2.20.0.orig/plugins/desktop-file/Makefile.am	2007-09-21 14:41:24.741527761 +0200
++++ epiphany-2.20.0/plugins/desktop-file/Makefile.am	2007-09-21 14:44:45.800985487 +0200
+@@ -1,4 +1,4 @@
+-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
+ plugin_LTLIBRARIES = libdesktopfileplugin.la
+ 
+ libdesktopfileplugin_la_SOURCES = \
+Index: epiphany-2.20.0/plugins/desktop-file/Makefile.in
+===================================================================
+--- epiphany-2.20.0.orig/plugins/desktop-file/Makefile.in	2007-09-21 14:41:24.781530041 +0200
++++ epiphany-2.20.0/plugins/desktop-file/Makefile.in	2007-09-21 14:44:45.804985715 +0200
+@@ -295,7 +295,7 @@
+ 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
+Index: epiphany-2.20.0/src/Makefile.am
+===================================================================
+--- epiphany-2.20.0.orig/src/Makefile.am	2007-09-21 14:41:15.096978150 +0200
++++ epiphany-2.20.0/src/Makefile.am	2007-09-21 14:44:45.784984575 +0200
+@@ -112,8 +112,8 @@
+ 	-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)
+@@ -164,8 +164,8 @@
+ 	-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)
+ 
+Index: epiphany-2.20.0/src/Makefile.in
+===================================================================
+--- epiphany-2.20.0.orig/src/Makefile.in	2007-09-21 14:41:15.132980201 +0200
++++ epiphany-2.20.0/src/Makefile.in	2007-09-21 14:44:45.800985487 +0200
+@@ -521,8 +521,8 @@
+ 	-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)
+@@ -560,8 +560,8 @@
+ @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)
+ 
--- epiphany-browser-2.21.4.orig/debian/patches/07_bookmarks.patch
+++ epiphany-browser-2.21.4/debian/patches/07_bookmarks.patch
@@ -0,0 +1,15 @@
+Index: epiphany-browser-2.18.0/src/bookmarks/ephy-bookmarks.c
+===================================================================
+--- epiphany-browser-2.18.0.orig/src/bookmarks/ephy-bookmarks.c	2007-03-06 12:31:26.000000000 +0000
++++ epiphany-browser-2.18.0/src/bookmarks/ephy-bookmarks.c	2007-03-11 21:01:42.000000000 +0000
+@@ -102,6 +102,10 @@
+ 	 * 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_("Planet Debian"), N_("http://planet.debian.org/") },
++	{ N_("Debian Bug Tracking System"), N_("http://bugs.debian.org/%s") },
+ 	{ N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") }
+ };
+ 
--- epiphany-browser-2.21.4.orig/debian/patches/08_load_on_new_tab.patch
+++ epiphany-browser-2.21.4/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 @@
+         </locale>
+       </schema>
+       <schema>
++        <key>/schemas/apps/epiphany/general/load_on_new_tab</key>
++        <applyto>/apps/epiphany/general/load_on_new_tab</applyto>
++        <owner>epiphany</owner>
++        <type>int</type>
++        <default>1</default>
++        <locale name="C">
++        <short>Page to open when opening a new tab</short>
++        <long>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.</long>
++        </locale>
++      </schema>
++      <schema>
+         <key>/schemas/apps/epiphany/general/show_bookmarks_bar</key>
+         <applyto>/apps/epiphany/general/show_bookmarks_bar</applyto>
+         <owner>epiphany</owner>
+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.21.4.orig/debian/patches/99_autoreconf.patch
+++ epiphany-browser-2.21.4/debian/patches/99_autoreconf.patch
@@ -0,0 +1,2005 @@
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/aclocal.m4 epiphany-browser-2.21.4.new/aclocal.m4
+--- epiphany-browser-2.21.4/aclocal.m4	2007-12-16 14:26:10.000000000 +0100
++++ epiphany-browser-2.21.4.new/aclocal.m4	2007-12-18 16:42:01.000000000 +0100
+@@ -682,7 +682,7 @@
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2ubuntu1 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/config.h.in epiphany-browser-2.21.4.new/config.h.in
+--- epiphany-browser-2.21.4/config.h.in	2007-12-16 14:27:01.000000000 +0100
++++ epiphany-browser-2.21.4.new/config.h.in	2007-12-18 16:42:08.000000000 +0100
+@@ -54,6 +54,9 @@
+ /* Define if gecko is a debug build */
+ #undef HAVE_GECKO_DEBUG
+ 
++/* Define if xpcom glue is used */
++#undef HAVE_GECKO_XPCOM_GLUE
++
+ /* Define if the GNU gettext() function is already present or preinstalled. */
+ #undef HAVE_GETTEXT
+ 
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/configure epiphany-browser-2.21.4.new/configure
+--- epiphany-browser-2.21.4/configure	2007-12-16 14:26:26.000000000 +0100
++++ epiphany-browser-2.21.4.new/configure	2007-12-18 16:42:05.000000000 +0100
+@@ -727,7 +727,7 @@
+ 
+ # Identity of this package.
+ PACKAGE_NAME='GNOME Web Browser'
+-PACKAGE_TARNAME='epiphany'
++PACKAGE_TARNAME='epiphany-browser'
+ PACKAGE_VERSION='2.21.4'
+ PACKAGE_STRING='GNOME Web Browser 2.21.4'
+ PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+@@ -921,6 +921,10 @@
+ GCONF_SCHEMAS_INSTALL_FALSE
+ GCONFTOOL
+ with_engine
++HAVE_GECKO_DEBUG_TRUE
++HAVE_GECKO_DEBUG_FALSE
++HAVE_GECKO_XPCOM_GLUE_TRUE
++HAVE_GECKO_XPCOM_GLUE_FALSE
+ GECKO
+ GECKO_FLAVOUR
+ GECKO_INCLUDE_ROOT
+@@ -933,8 +937,6 @@
+ WEASEL_UA_VERSION
+ HAVE_MOZILLA_TOOLKIT_TRUE
+ HAVE_MOZILLA_TOOLKIT_FALSE
+-HAVE_GECKO_DEBUG_TRUE
+-HAVE_GECKO_DEBUG_FALSE
+ HAVE_GECKO_1_7_TRUE
+ HAVE_GECKO_1_7_FALSE
+ HAVE_GECKO_1_8_TRUE
+@@ -943,6 +945,8 @@
+ HAVE_GECKO_1_8_1_FALSE
+ HAVE_GECKO_1_9_TRUE
+ HAVE_GECKO_1_9_FALSE
++HAVE_GECKO_HOME_TRUE
++HAVE_GECKO_HOME_FALSE
+ WITH_GECKO_ENGINE_TRUE
+ WITH_GECKO_ENGINE_FALSE
+ HAVE_XULRUNNER_TRUE
+@@ -1658,7 +1662,7 @@
+   --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]
+@@ -1736,9 +1740,11 @@
+   --with-gconf-schema-file-dir=dir        Directory for installing schema files.
+   --with-engine[=mozilla|webkit|xulrunner]
+                           Which engine to build against [mozilla]
+-  --with-gecko[=mozilla|firefox|seamonkey|xulrunner]
++  --with-gecko[=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul]
+                           Which gecko engine to use (autodetected by default)
+ 
++  --with-gecko-home[=path]
++                          Manually set MOZILLA_FIVE_HOME
+   --with-help-dir=DIR     path to help docs
+   --with-omf-dir=DIR      path to OMF files
+   --with-help-formats=FORMATS
+@@ -2608,7 +2614,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE='epiphany'
++ PACKAGE='epiphany-browser'
+  VERSION='2.21.4'
+ 
+ 
+@@ -4760,7 +4766,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 4763 "configure"' > conftest.$ac_ext
++  echo '#line 4769 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7502,11 +7508,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7505: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7511: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7509: \$? = $ac_status" >&5
++   echo "$as_me:7515: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -7792,11 +7798,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7795: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7801: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7799: \$? = $ac_status" >&5
++   echo "$as_me:7805: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -7896,11 +7902,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7899: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7905: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:7903: \$? = $ac_status" >&5
++   echo "$as_me:7909: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10258,7 +10264,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 10261 "configure"
++#line 10267 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10358,7 +10364,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 10361 "configure"
++#line 10367 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12778,11 +12784,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:12781: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12787: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:12785: \$? = $ac_status" >&5
++   echo "$as_me:12791: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -12882,11 +12888,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:12885: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12891: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:12889: \$? = $ac_status" >&5
++   echo "$as_me:12895: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14459,11 +14465,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14462: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14468: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14466: \$? = $ac_status" >&5
++   echo "$as_me:14472: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -14563,11 +14569,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14566: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14572: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14570: \$? = $ac_status" >&5
++   echo "$as_me:14576: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -16763,11 +16769,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16766: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16772: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16770: \$? = $ac_status" >&5
++   echo "$as_me:16776: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17053,11 +17059,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17056: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17062: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17060: \$? = $ac_status" >&5
++   echo "$as_me:17066: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -17157,11 +17163,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:17160: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17166: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:17164: \$? = $ac_status" >&5
++   echo "$as_me:17170: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -22946,6 +22952,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
+@@ -22962,6 +22969,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
+@@ -22981,6 +22989,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
+@@ -23009,6 +23018,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
+@@ -23025,6 +23035,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
+@@ -23044,6 +23055,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
+@@ -23078,6 +23090,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
+@@ -23095,6 +23108,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
+@@ -23115,6 +23129,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
+@@ -23141,6 +23156,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
+@@ -23872,12 +23888,15 @@
+ gecko_cv_gecko=$with_gecko
+ 
+ # Autodetect gecko
+-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"
++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
+ if test -z "$gecko_cv_gecko"; then
+ 	for lizard in $_geckos; do
+ 		if $PKG_CONFIG --exists $lizard-xpcom; then
+ 			gecko_cv_gecko=$lizard
+ 			break;
++		elif $PKG_CONFIG --exist $lizard; then
++			gecko_cv_gecko=$lizard
++			break;
+ 		fi
+ 	done
+ fi
+@@ -23899,6 +23918,18 @@
+ 	gecko_cv_have_gecko=yes
+ fi
+ 
++{ echo "$as_me:$LINENO: checking manual gecko home set" >&5
++echo $ECHO_N "checking manual gecko home set... $ECHO_C" >&6; }
++
++
++# Check whether --with-gecko-home was given.
++if test "${with_gecko_home+set}" = set; then
++  withval=$with_gecko_home;
++fi
++
++
++gecko_cv_gecko_home=$with_gecko_home
++
+ # ****************
+ # Define variables
+ # ****************
+@@ -23910,13 +23941,24 @@
+ seamonkey) gecko_cv_gecko_flavour=mozilla ;;
+ *firefox) gecko_cv_gecko_flavour=toolkit ;;
+ xulrunner) gecko_cv_gecko_flavour=toolkit ;;
++libxul*) gecko_cv_gecko_flavour=toolkit ;;
+ esac
+ 
+-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
+-
++if $PKG_CONFIG --exists  ${gecko_cv_gecko}-xpcom; then
++	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT"
++	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
++	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
++else
++	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
++	_GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"
++	_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
++	_GECKO_HOME=$with_gecko_home
++	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
++	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
++fi
+ fi # if gecko_cv_have_gecko
+ 
+ if test "$gecko_cv_gecko_flavour" = "toolkit"; then
+@@ -23930,9 +23972,11 @@
+ GECKO=$gecko_cv_gecko
+ GECKO_FLAVOUR=$gecko_cv_gecko_flavour
+ GECKO_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
++GECKO_CFLAGS=$_GECKO_CFLAGS
+ GECKO_LIBDIR=$_GECKO_LIBDIR
+ GECKO_HOME=$_GECKO_HOME
+ GECKO_PREFIX=$_GECKO_PREFIX
++GECKO_NSPR=$_GECKO_NSPR
+ 
+ # **************************************************************
+ # This is really gcc-only
+@@ -24069,7 +24113,7 @@
+ 
+ 
+ _SAVE_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
+ 
+ { echo "$as_me:$LINENO: checking whether we have a gtk 2 gecko build" >&5
+ echo $ECHO_N "checking whether we have a gtk 2 gecko build... $ECHO_C" >&6; }
+@@ -24175,6 +24219,49 @@
+ { echo "$as_me:$LINENO: result: $gecko_cv_have_debug" >&5
+ echo "${ECHO_T}$gecko_cv_have_debug" >&6; }
+ 
++{ echo "$as_me:$LINENO: checking whether we have a xpcom glue" >&5
++echo $ECHO_N "checking whether we have a xpcom glue... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++		  #ifndef XPCOM_GLUE
++		  #error "no xpcom glue found"
++		  #endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  gecko_cv_have_xpcom_glue=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	gecko_cv_have_xpcom_glue=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $gecko_cv_have_xpcom_glue" >&5
++echo "${ECHO_T}$gecko_cv_have_xpcom_glue" >&6; }
++
+ CPPFLAGS="$_SAVE_CPPFLAGS"
+ 
+ ac_ext=c
+@@ -24195,8 +24282,32 @@
+ 
+ fi
+ 
++if test "$gecko_cv_have_xpcom_glue" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GECKO_XPCOM_GLUE 1
++_ACEOF
++
++fi
++
+ fi # if gecko_cv_have_gecko
+ 
++ if test "$gecko_cv_have_debug" = "yes"; then
++  HAVE_GECKO_DEBUG_TRUE=
++  HAVE_GECKO_DEBUG_FALSE='#'
++else
++  HAVE_GECKO_DEBUG_TRUE='#'
++  HAVE_GECKO_DEBUG_FALSE=
++fi
++
++ if test "$gecko_cv_have_xpcom_glue" = "yes"; then
++  HAVE_GECKO_XPCOM_GLUE_TRUE=
++  HAVE_GECKO_XPCOM_GLUE_FALSE='#'
++else
++  HAVE_GECKO_XPCOM_GLUE_TRUE='#'
++  HAVE_GECKO_XPCOM_GLUE_FALSE=
++fi
++
+ 
+ # ***********************
+ # Check for gecko version
+@@ -24212,7 +24323,7 @@
+ 
+ 
+ _SAVE_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS"
+ 
+ { echo "$as_me:$LINENO: checking for gecko version" >&5
+ echo $ECHO_N "checking for gecko version... $ECHO_C" >&6; }
+@@ -24373,8 +24484,11 @@
+ gecko_cv_extra_pkg_dependencies=
+ 
+ if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
+-	gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
+-	gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s"
++	if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then
++		gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
++	else
++		gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
++	fi
+ else
+ 	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
+ fi
+@@ -24413,6 +24527,7 @@
+ 
+ case "$gecko_cv_gecko" in
+ xulrunner) min_version=1.8 ;;
++libxul*) min_version=1.9 ;;
+ *firefox) min_version=1.5 ;;
+ *) { { echo "$as_me:$LINENO: error: Unsupported gecko \"$gecko_cv_gecko\"" >&5
+ echo "$as_me: error: Unsupported gecko \"$gecko_cv_gecko\"" >&2;}
+@@ -24420,6 +24535,7 @@
+ esac
+ 
+ # Added $gecko_cv_gecko-js for debian xulrunner brokenness
++if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GECKO" >&5
+@@ -24430,12 +24546,12 @@
+         pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5
++  ($PKG_CONFIG --exists --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
++  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -24448,12 +24564,12 @@
+         pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5
++  ($PKG_CONFIG --exists --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
++  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -24472,14 +24588,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"`
++	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"`
+         else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"`
++	        GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GECKO_PKG_ERRORS" >&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements ( ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met:
+ 
+ $GECKO_PKG_ERRORS
+ 
+@@ -24490,7 +24606,7 @@
+ and GECKO_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met:
++echo "$as_me: error: Package requirements ( ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met:
+ 
+ $GECKO_PKG_ERRORS
+ 
+@@ -24531,6 +24647,40 @@
+ echo "${ECHO_T}yes" >&6; }
+ 	:
+ fi
++else
++	GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG"
++	GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`"
++fi
++
++{ echo "$as_me:$LINENO: checking nspr in gecko" >&5
++echo $ECHO_N "checking nspr in gecko... $ECHO_C" >&6; }
++if ! test "$GECKO_NSPR" = yes; then
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++	{ echo "$as_me:$LINENO: checking nspr in system" >&5
++echo $ECHO_N "checking nspr in system... $ECHO_C" >&6; }
++	gecko_nspr=
++	if $PKG_CONFIG --exists mozilla-nspr; then
++		gecko_nspr=mozilla-nspr
++	elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then
++		gecko_nspr=${gecko_cv_gecko}-nspr
++	elif $PKG_CONFIG --exists nspr; then
++		gecko_nspr=nspr
++	else
++		{ { echo "$as_me:$LINENO: error: no nspr available" >&5
++echo "$as_me: error: no nspr available" >&2;}
++   { (exit 1); exit 1; }; }
++	fi
++
++	GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`"
++	GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`"
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++fi
++
+ 
+ 
+ 
+@@ -24587,10 +24737,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS=""
+ 
+@@ -24599,9 +24759,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ if test "$cross_compiling" = yes; then
+@@ -24617,11 +24779,17 @@
+ #include <mozilla-config.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#else
+ #include <nsXPCOM.h>
++#endif // XPCOM_GLUE
++
+ #include <nsCOMPtr.h>
+ #include <nsILocalFile.h>
+ #include <nsIServiceManager.h>
+-#ifdef HAVE_GECKO_1_8
++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9)
+ #include <nsStringAPI.h>
+ #else
+ #include <nsString.h>
+@@ -24632,16 +24800,37 @@
+ main ()
+ {
+ 
++
++nsresult rv;
++#ifdef XPCOM_GLUE
++    static const GREVersionRange greVersion = {
++    "1.8", PR_TRUE,
++    "1.9.*", PR_TRUE
++    };
++    char xpcomLocation[4096];
++    rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++    if (NS_FAILED(rv)) {
++        exit(123);
++    }
++
++    // Startup the XPCOM Glue that links us up with XPCOM.
++    XPCOMGlueStartup(xpcomLocation);
++    if (NS_FAILED(rv)) {
++        exit(124);
++    }
++#endif // XPCOM_GLUE
++
+ // redirect unwanted mozilla debug output to the bit bucket
+ freopen ("/dev/null", "w", stdout);
+ 
+-nsresult rv;
+-nsCOMPtr<nsILocalFile> directory;
++nsCOMPtr<nsILocalFile> directory = nsnull;
++#ifndef XPCOM_GLUE
+ rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE,
+ 			    getter_AddRefs (directory));
+ if (NS_FAILED (rv) || !directory) {
+ 	exit (126);
+ }
++#endif
+ 
+ rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
+ if (NS_FAILED (rv)) {
+@@ -24756,10 +24945,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS=""
+ 
+@@ -24768,9 +24967,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ if test "$cross_compiling" = yes; then
+@@ -24786,11 +24987,17 @@
+ #include <mozilla-config.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#else
+ #include <nsXPCOM.h>
++#endif // XPCOM_GLUE
++
+ #include <nsCOMPtr.h>
+ #include <nsILocalFile.h>
+ #include <nsIServiceManager.h>
+-#ifdef HAVE_GECKO_1_8
++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9)
+ #include <nsStringAPI.h>
+ #else
+ #include <nsString.h>
+@@ -24801,16 +25008,37 @@
+ main ()
+ {
+ 
++
++nsresult rv;
++#ifdef XPCOM_GLUE
++    static const GREVersionRange greVersion = {
++    "1.8", PR_TRUE,
++    "1.9.*", PR_TRUE
++    };
++    char xpcomLocation[4096];
++    rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++    if (NS_FAILED(rv)) {
++        exit(123);
++    }
++
++    // Startup the XPCOM Glue that links us up with XPCOM.
++    XPCOMGlueStartup(xpcomLocation);
++    if (NS_FAILED(rv)) {
++        exit(124);
++    }
++#endif // XPCOM_GLUE
++
+ // redirect unwanted mozilla debug output to the bit bucket
+ freopen ("/dev/null", "w", stdout);
+ 
+-nsresult rv;
+-nsCOMPtr<nsILocalFile> directory;
++nsCOMPtr<nsILocalFile> directory = nsnull;
++#ifndef XPCOM_GLUE
+ rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE,
+ 			    getter_AddRefs (directory));
+ if (NS_FAILED (rv) || !directory) {
+ 	exit (126);
+ }
++#endif
+ 
+ rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
+ if (NS_FAILED (rv)) {
+@@ -24932,10 +25160,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS="pipnss"
+ 
+@@ -24944,9 +25182,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ 
+@@ -25188,10 +25428,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS="windowwatcher"
+ 
+@@ -25200,9 +25450,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ 
+@@ -25389,10 +25641,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS="docshell"
+ 
+@@ -25401,9 +25663,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ 
+@@ -25590,10 +25854,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS="necko"
+ 
+@@ -25602,9 +25876,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ 
+@@ -25791,10 +26067,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS="xpcom"
+ 
+@@ -25803,9 +26089,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ 
+@@ -25991,10 +26279,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS="spellchecker"
+ 
+@@ -26003,9 +26301,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ 
+@@ -26214,10 +26514,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS=""
+ 
+@@ -26226,9 +26536,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ if test "$cross_compiling" = yes; then
+@@ -26244,11 +26556,17 @@
+ #include <mozilla-config.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#else
+ #include <nsXPCOM.h>
++#endif // XPCOM_GLUE
++
+ #include <nsCOMPtr.h>
+ #include <nsILocalFile.h>
+ #include <nsIServiceManager.h>
+-#ifdef HAVE_GECKO_1_8
++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9)
+ #include <nsStringAPI.h>
+ #else
+ #include <nsString.h>
+@@ -26261,16 +26579,37 @@
+ main ()
+ {
+ 
++
++nsresult rv;
++#ifdef XPCOM_GLUE
++    static const GREVersionRange greVersion = {
++    "1.8", PR_TRUE,
++    "1.9.*", PR_TRUE
++    };
++    char xpcomLocation[4096];
++    rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++    if (NS_FAILED(rv)) {
++        exit(123);
++    }
++
++    // Startup the XPCOM Glue that links us up with XPCOM.
++    XPCOMGlueStartup(xpcomLocation);
++    if (NS_FAILED(rv)) {
++        exit(124);
++    }
++#endif // XPCOM_GLUE
++
+ // redirect unwanted mozilla debug output to the bit bucket
+ freopen ("/dev/null", "w", stdout);
+ 
+-nsresult rv;
+-nsCOMPtr<nsILocalFile> directory;
++nsCOMPtr<nsILocalFile> directory = nsnull;
++#ifndef XPCOM_GLUE
+ rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE,
+ 			    getter_AddRefs (directory));
+ if (NS_FAILED (rv) || !directory) {
+ 	exit (126);
+ }
++#endif
+ 
+ rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
+ if (NS_FAILED (rv)) {
+@@ -26438,6 +26777,14 @@
+   HAVE_GECKO_1_9_FALSE=
+ fi
+ 
++ if test "x$_GECKO_HOME" != "x"; then
++  HAVE_GECKO_HOME_TRUE=
++  HAVE_GECKO_HOME_FALSE='#'
++else
++  HAVE_GECKO_HOME_TRUE='#'
++  HAVE_GECKO_HOME_FALSE=
++fi
++
+ 
+  if test "$with_engine" = "mozilla"; then
+   WITH_GECKO_ENGINE_TRUE=
+@@ -27761,6 +28108,119 @@
+ echo "${ECHO_T}$enable_desktop_file_plugin" >&6; }
+ 
+ if test "$enable_desktop_file_plugin" = "yes"; then
++	if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for DESKTOP_FILE_PLUGIN_DEP" >&5
++echo $ECHO_N "checking for DESKTOP_FILE_PLUGIN_DEP... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$DESKTOP_FILE_PLUGIN_DEP_CFLAGS"; then
++        pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS="$DESKTOP_FILE_PLUGIN_DEP_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$DESKTOP_FILE_PLUGIN_DEP_LIBS"; then
++        pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS="$DESKTOP_FILE_PLUGIN_DEP_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0"`
++        else
++	        DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS" >&5
++
++	{ { echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0) were not met:
++
++$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS
++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0) were not met:
++
++$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS
++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++   { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS
++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS
++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++	DESKTOP_FILE_PLUGIN_DEP_CFLAGS=$pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS
++	DESKTOP_FILE_PLUGIN_DEP_LIBS=$pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++	:
++fi
++	else
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for DESKTOP_FILE_PLUGIN_DEP" >&5
+@@ -27872,6 +28332,7 @@
+ echo "${ECHO_T}yes" >&6; }
+ 	:
+ fi
++	fi
+ 
+ 
+ fi
+@@ -31142,6 +31603,20 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${HAVE_GECKO_DEBUG_TRUE}" && test -z "${HAVE_GECKO_DEBUG_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_GECKO_DEBUG\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_GECKO_XPCOM_GLUE_TRUE}" && test -z "${HAVE_GECKO_XPCOM_GLUE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${HAVE_MOZILLA_TOOLKIT_TRUE}" && test -z "${HAVE_MOZILLA_TOOLKIT_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"HAVE_MOZILLA_TOOLKIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -31184,6 +31659,13 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${HAVE_GECKO_HOME_TRUE}" && test -z "${HAVE_GECKO_HOME_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_HOME\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_GECKO_HOME\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${WITH_GECKO_ENGINE_TRUE}" && test -z "${WITH_GECKO_ENGINE_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"WITH_GECKO_ENGINE\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -32089,6 +32571,10 @@
+ GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
+ GCONFTOOL!$GCONFTOOL$ac_delim
+ with_engine!$with_engine$ac_delim
++HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim
++HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim
++HAVE_GECKO_XPCOM_GLUE_TRUE!$HAVE_GECKO_XPCOM_GLUE_TRUE$ac_delim
++HAVE_GECKO_XPCOM_GLUE_FALSE!$HAVE_GECKO_XPCOM_GLUE_FALSE$ac_delim
+ GECKO!$GECKO$ac_delim
+ GECKO_FLAVOUR!$GECKO_FLAVOUR$ac_delim
+ GECKO_INCLUDE_ROOT!$GECKO_INCLUDE_ROOT$ac_delim
+@@ -32101,8 +32587,6 @@
+ WEASEL_UA_VERSION!$WEASEL_UA_VERSION$ac_delim
+ HAVE_MOZILLA_TOOLKIT_TRUE!$HAVE_MOZILLA_TOOLKIT_TRUE$ac_delim
+ HAVE_MOZILLA_TOOLKIT_FALSE!$HAVE_MOZILLA_TOOLKIT_FALSE$ac_delim
+-HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim
+-HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim
+ HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim
+ HAVE_GECKO_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$ac_delim
+ HAVE_GECKO_1_8_TRUE!$HAVE_GECKO_1_8_TRUE$ac_delim
+@@ -32111,6 +32595,8 @@
+ HAVE_GECKO_1_8_1_FALSE!$HAVE_GECKO_1_8_1_FALSE$ac_delim
+ HAVE_GECKO_1_9_TRUE!$HAVE_GECKO_1_9_TRUE$ac_delim
+ HAVE_GECKO_1_9_FALSE!$HAVE_GECKO_1_9_FALSE$ac_delim
++HAVE_GECKO_HOME_TRUE!$HAVE_GECKO_HOME_TRUE$ac_delim
++HAVE_GECKO_HOME_FALSE!$HAVE_GECKO_HOME_FALSE$ac_delim
+ WITH_GECKO_ENGINE_TRUE!$WITH_GECKO_ENGINE_TRUE$ac_delim
+ WITH_GECKO_ENGINE_FALSE!$WITH_GECKO_ENGINE_FALSE$ac_delim
+ HAVE_XULRUNNER_TRUE!$HAVE_XULRUNNER_TRUE$ac_delim
+@@ -32127,10 +32613,6 @@
+ LIBXUL_CXXCPPFLAGS!$LIBXUL_CXXCPPFLAGS$ac_delim
+ LIBXUL_CXXFLAGS!$LIBXUL_CXXFLAGS$ac_delim
+ LIBXUL_LDFLAGS!$LIBXUL_LDFLAGS$ac_delim
+-LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim
+-HAVE_LIBXUL_TRUE!$HAVE_LIBXUL_TRUE$ac_delim
+-HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim
+-HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -32172,6 +32654,10 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim
++HAVE_LIBXUL_TRUE!$HAVE_LIBXUL_TRUE$ac_delim
++HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim
++HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim
+ HAVE_LIBXUL_DEBUG_FALSE!$HAVE_LIBXUL_DEBUG_FALSE$ac_delim
+ WITH_XULRUNNER_ENGINE_TRUE!$WITH_XULRUNNER_ENGINE_TRUE$ac_delim
+ WITH_XULRUNNER_ENGINE_FALSE!$WITH_XULRUNNER_ENGINE_FALSE$ac_delim
+@@ -32265,10 +32751,6 @@
+ GNOME_LIBS!$GNOME_LIBS$ac_delim
+ GVFS_CFLAGS!$GVFS_CFLAGS$ac_delim
+ GVFS_LIBS!$GVFS_LIBS$ac_delim
+-HAVE_GVFS_TRUE!$HAVE_GVFS_TRUE$ac_delim
+-HAVE_GVFS_FALSE!$HAVE_GVFS_FALSE$ac_delim
+-LSB_RELEASE!$LSB_RELEASE$ac_delim
+-GGE_VERSION!$GGE_VERSION$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -32310,12 +32792,16 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++HAVE_GVFS_TRUE!$HAVE_GVFS_TRUE$ac_delim
++HAVE_GVFS_FALSE!$HAVE_GVFS_FALSE$ac_delim
++LSB_RELEASE!$LSB_RELEASE$ac_delim
++GGE_VERSION!$GGE_VERSION$ac_delim
+ GGE_API_VERSION!$GGE_API_VERSION$ac_delim
+ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/doc/reference/Makefile.in epiphany-browser-2.21.4.new/doc/reference/Makefile.in
+--- epiphany-browser-2.21.4/doc/reference/Makefile.in	2007-12-16 14:26:19.000000000 +0100
++++ epiphany-browser-2.21.4.new/doc/reference/Makefile.in	2007-12-18 16:42:09.000000000 +0100
+@@ -473,8 +473,8 @@
+ # include $(top_srcdir)/gtk-doc.make
+ # We need to copy/paste this to be able to change LD_LIBRARY_PATH
+ @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+ 
+ # We set GPATH here; this gives us semantics for GNU make
+ # which are more like other make's VPATH, when it comes to
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/embed/Makefile.in epiphany-browser-2.21.4.new/embed/Makefile.in
+--- epiphany-browser-2.21.4/embed/Makefile.in	2007-12-16 14:26:19.000000000 +0100
++++ epiphany-browser-2.21.4.new/embed/Makefile.in	2007-12-18 16:42:09.000000000 +0100
+@@ -462,6 +462,7 @@
+ 	-I$(top_srcdir)/embed/$(with_engine) $(AM_CPPFLAGS) \
+ 	$(am__append_3) $(am__append_4)
+ libephyembedfactory_la_CFLAGS = \
++	$(GECKO_CFLAGS) \
+ 	$(DEPENDENCIES_CFLAGS) 	\
+ 	$(AM_CFLAGS)
+ 
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/embed/mozilla/Makefile.in epiphany-browser-2.21.4.new/embed/mozilla/Makefile.in
+--- epiphany-browser-2.21.4/embed/mozilla/Makefile.in	2007-12-18 16:41:53.000000000 +0100
++++ epiphany-browser-2.21.4.new/embed/mozilla/Makefile.in	2007-12-18 16:42:09.000000000 +0100
+@@ -32,11 +32,21 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@ENABLE_FILEPICKER_TRUE@am__append_1 = \
++
++# XXX asac: 1.9 certificate
++@HAVE_GECKO_1_9_TRUE@am__append_1 = \
++@HAVE_GECKO_1_9_TRUE@	$(NULL)
++
++@HAVE_GECKO_1_9_FALSE@am__append_2 = \
++@HAVE_GECKO_1_9_FALSE@	EphyBadCertRejector.cpp		\
++@HAVE_GECKO_1_9_FALSE@	EphyBadCertRejector.h		\
++@HAVE_GECKO_1_9_FALSE@	$(NULL)
++
++@ENABLE_FILEPICKER_TRUE@am__append_3 = \
+ @ENABLE_FILEPICKER_TRUE@	FilePicker.cpp			\
+ @ENABLE_FILEPICKER_TRUE@	FilePicker.h
+ 
+-@HAVE_MOZILLA_PSM_TRUE@am__append_2 = \
++@HAVE_MOZILLA_PSM_TRUE@am__append_4 = \
+ @HAVE_MOZILLA_PSM_TRUE@	GtkNSSClientAuthDialogs.cpp	\
+ @HAVE_MOZILLA_PSM_TRUE@	GtkNSSClientAuthDialogs.h	\
+ @HAVE_MOZILLA_PSM_TRUE@	GtkNSSDialogs.cpp		\
+@@ -46,11 +56,11 @@
+ @HAVE_MOZILLA_PSM_TRUE@	GtkNSSSecurityWarningDialogs.cpp\
+ @HAVE_MOZILLA_PSM_TRUE@	GtkNSSSecurityWarningDialogs.h
+ 
+-@ENABLE_CERTIFICATE_MANAGER_TRUE@am__append_3 = \
++@ENABLE_CERTIFICATE_MANAGER_TRUE@am__append_5 = \
+ @ENABLE_CERTIFICATE_MANAGER_TRUE@	mozilla-x509-cert.cpp		\
+ @ENABLE_CERTIFICATE_MANAGER_TRUE@	mozilla-x509-cert.h
+ 
+-@ENABLE_SPELLCHECKER_TRUE@am__append_4 = \
++@ENABLE_SPELLCHECKER_TRUE@am__append_6 = \
+ @ENABLE_SPELLCHECKER_TRUE@	GeckoSpellCheckEngine.cpp	\
+ @ENABLE_SPELLCHECKER_TRUE@	GeckoSpellCheckEngine.h
+ 
+@@ -72,8 +82,7 @@
+ am__libephymozillaembed_la_SOURCES_DIST = AutoJSContextStack.cpp \
+ 	AutoJSContextStack.h AutoWindowModalState.cpp \
+ 	AutoWindowModalState.h ContentHandler.cpp ContentHandler.h \
+-	EphyAboutModule.cpp EphyAboutModule.h EphyBadCertRejector.cpp \
+-	EphyBadCertRejector.h EphyContentPolicy.cpp \
++	EphyAboutModule.cpp EphyAboutModule.h EphyContentPolicy.cpp \
+ 	EphyContentPolicy.h EphyDirectoryProvider.cpp \
+ 	EphyDirectoryProvider.h EphyHeaderSniffer.cpp \
+ 	EphyHeaderSniffer.h EphyBrowser.cpp EphyBrowser.h EphyFind.cpp \
+@@ -93,7 +102,8 @@
+ 	mozilla-embed-find.cpp mozilla-embed-find.h \
+ 	mozilla-embed-persist.cpp mozilla-embed-persist.h \
+ 	mozilla-embed-single.cpp mozilla-embed-single.h \
+-	mozilla-notifiers.cpp mozilla-notifiers.h FilePicker.cpp \
++	mozilla-notifiers.cpp mozilla-notifiers.h \
++	EphyBadCertRejector.cpp EphyBadCertRejector.h FilePicker.cpp \
+ 	FilePicker.h GtkNSSClientAuthDialogs.cpp \
+ 	GtkNSSClientAuthDialogs.h GtkNSSDialogs.cpp GtkNSSDialogs.h \
+ 	GtkNSSKeyPairDialogs.cpp GtkNSSKeyPairDialogs.h \
+@@ -101,20 +111,21 @@
+ 	GtkNSSSecurityWarningDialogs.h mozilla-x509-cert.cpp \
+ 	mozilla-x509-cert.h GeckoSpellCheckEngine.cpp \
+ 	GeckoSpellCheckEngine.h
+-@ENABLE_FILEPICKER_TRUE@am__objects_1 =  \
++am__objects_1 =
++@HAVE_GECKO_1_9_FALSE@am__objects_2 = libephymozillaembed_la-EphyBadCertRejector.lo
++@ENABLE_FILEPICKER_TRUE@am__objects_3 =  \
+ @ENABLE_FILEPICKER_TRUE@	libephymozillaembed_la-FilePicker.lo
+-@HAVE_MOZILLA_PSM_TRUE@am__objects_2 = libephymozillaembed_la-GtkNSSClientAuthDialogs.lo \
++@HAVE_MOZILLA_PSM_TRUE@am__objects_4 = libephymozillaembed_la-GtkNSSClientAuthDialogs.lo \
+ @HAVE_MOZILLA_PSM_TRUE@	libephymozillaembed_la-GtkNSSDialogs.lo \
+ @HAVE_MOZILLA_PSM_TRUE@	libephymozillaembed_la-GtkNSSKeyPairDialogs.lo \
+ @HAVE_MOZILLA_PSM_TRUE@	libephymozillaembed_la-GtkNSSSecurityWarningDialogs.lo
+-@ENABLE_CERTIFICATE_MANAGER_TRUE@am__objects_3 = libephymozillaembed_la-mozilla-x509-cert.lo
+-@ENABLE_SPELLCHECKER_TRUE@am__objects_4 = libephymozillaembed_la-GeckoSpellCheckEngine.lo
++@ENABLE_CERTIFICATE_MANAGER_TRUE@am__objects_5 = libephymozillaembed_la-mozilla-x509-cert.lo
++@ENABLE_SPELLCHECKER_TRUE@am__objects_6 = libephymozillaembed_la-GeckoSpellCheckEngine.lo
+ am_libephymozillaembed_la_OBJECTS =  \
+ 	libephymozillaembed_la-AutoJSContextStack.lo \
+ 	libephymozillaembed_la-AutoWindowModalState.lo \
+ 	libephymozillaembed_la-ContentHandler.lo \
+ 	libephymozillaembed_la-EphyAboutModule.lo \
+-	libephymozillaembed_la-EphyBadCertRejector.lo \
+ 	libephymozillaembed_la-EphyContentPolicy.lo \
+ 	libephymozillaembed_la-EphyDirectoryProvider.lo \
+ 	libephymozillaembed_la-EphyHeaderSniffer.lo \
+@@ -141,7 +152,8 @@
+ 	libephymozillaembed_la-mozilla-embed-persist.lo \
+ 	libephymozillaembed_la-mozilla-embed-single.lo \
+ 	libephymozillaembed_la-mozilla-notifiers.lo $(am__objects_1) \
+-	$(am__objects_2) $(am__objects_3) $(am__objects_4)
++	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
++	$(am__objects_5) $(am__objects_6)
+ libephymozillaembed_la_OBJECTS = $(am_libephymozillaembed_la_OBJECTS)
+ libephymozillaembed_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+@@ -419,8 +431,7 @@
+ libephymozillaembed_la_SOURCES = AutoJSContextStack.cpp \
+ 	AutoJSContextStack.h AutoWindowModalState.cpp \
+ 	AutoWindowModalState.h ContentHandler.cpp ContentHandler.h \
+-	EphyAboutModule.cpp EphyAboutModule.h EphyBadCertRejector.cpp \
+-	EphyBadCertRejector.h EphyContentPolicy.cpp \
++	EphyAboutModule.cpp EphyAboutModule.h EphyContentPolicy.cpp \
+ 	EphyContentPolicy.h EphyDirectoryProvider.cpp \
+ 	EphyDirectoryProvider.h EphyHeaderSniffer.cpp \
+ 	EphyHeaderSniffer.h EphyBrowser.cpp EphyBrowser.h EphyFind.cpp \
+@@ -441,7 +452,8 @@
+ 	mozilla-embed-persist.cpp mozilla-embed-persist.h \
+ 	mozilla-embed-single.cpp mozilla-embed-single.h \
+ 	mozilla-notifiers.cpp mozilla-notifiers.h $(am__append_1) \
+-	$(am__append_2) $(am__append_3) $(am__append_4)
++	$(am__append_2) $(am__append_3) $(am__append_4) \
++	$(am__append_5) $(am__append_6)
+ mozilla_include_subdirs = \
+ 	.			\
+ 	caps			\
+@@ -470,6 +482,7 @@
+ 	pipnss			\
+ 	pref			\
+ 	shistory		\
++	string			\
+ 	sidebar			\
+ 	spellchecker		\
+ 	uriloader		\
+@@ -495,6 +508,7 @@
+ 	-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\"		\
+ 	-DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\"	\
+ 	-DALLOW_PRIVATE_API			\
++	-DXPCOM_GLUE_USE_NSPR			\
+ 	$(AM_CPPFLAGS)
+ 
+ libephymozillaembed_la_CXXFLAGS = \
+@@ -641,13 +655,6 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyAboutModule.lo `test -f 'EphyAboutModule.cpp' || echo '$(srcdir)/'`EphyAboutModule.cpp
+ 
+-libephymozillaembed_la-EphyBadCertRejector.lo: EphyBadCertRejector.cpp
+-@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyBadCertRejector.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp
+-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Plo
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EphyBadCertRejector.cpp' object='libephymozillaembed_la-EphyBadCertRejector.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp
+-
+ libephymozillaembed_la-EphyContentPolicy.lo: EphyContentPolicy.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyContentPolicy.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Tpo -c -o libephymozillaembed_la-EphyContentPolicy.lo `test -f 'EphyContentPolicy.cpp' || echo '$(srcdir)/'`EphyContentPolicy.cpp
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Tpo $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Plo
+@@ -830,6 +837,13 @@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-mozilla-notifiers.lo `test -f 'mozilla-notifiers.cpp' || echo '$(srcdir)/'`mozilla-notifiers.cpp
+ 
++libephymozillaembed_la-EphyBadCertRejector.lo: EphyBadCertRejector.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyBadCertRejector.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EphyBadCertRejector.cpp' object='libephymozillaembed_la-EphyBadCertRejector.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp
++
+ libephymozillaembed_la-FilePicker.lo: FilePicker.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-FilePicker.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-FilePicker.Tpo -c -o libephymozillaembed_la-FilePicker.lo `test -f 'FilePicker.cpp' || echo '$(srcdir)/'`FilePicker.cpp
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libephymozillaembed_la-FilePicker.Tpo $(DEPDIR)/libephymozillaembed_la-FilePicker.Plo
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/gtk-doc.make epiphany-browser-2.21.4.new/gtk-doc.make
+--- epiphany-browser-2.21.4/gtk-doc.make	1970-01-01 01:00:00.000000000 +0100
++++ epiphany-browser-2.21.4.new/gtk-doc.make	2007-12-18 16:41:54.000000000 +0100
+@@ -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
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in epiphany-browser-2.21.4.new/plugins/desktop-file/Makefile.in
+--- epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in	2007-12-18 16:41:53.000000000 +0100
++++ epiphany-browser-2.21.4.new/plugins/desktop-file/Makefile.in	2007-12-18 16:42:10.000000000 +0100
+@@ -349,7 +349,6 @@
+ libdesktopfileplugin_la_LDFLAGS = \
+ 	-module -avoid-version \
+ 	-export-symbols $(srcdir)/plugin.symbols \
+-	-R$(GECKO_HOME) \
+ 	$(AM_LDFLAGS)
+ 
+ EXTRA_DIST = \
+@@ -640,6 +639,12 @@
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
+ 
++
++@HAVE_GECKO_XPCOM_GLUE_TRUE@	libdesktopfileplugin_la_LDFLAGS += \
++@HAVE_GECKO_XPCOM_GLUE_TRUE@		$(NULL)
++@HAVE_GECKO_XPCOM_GLUE_FALSE@	libdesktopfileplugin_la_LDFLAGS += \
++@HAVE_GECKO_XPCOM_GLUE_FALSE@		-R$(GECKO_HOME) \
++@HAVE_GECKO_XPCOM_GLUE_FALSE@		$(NULL)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/src/Makefile.in epiphany-browser-2.21.4.new/src/Makefile.in
+--- epiphany-browser-2.21.4/src/Makefile.in	2007-12-18 16:41:53.000000000 +0100
++++ epiphany-browser-2.21.4.new/src/Makefile.in	2007-12-18 16:42:11.000000000 +0100
+@@ -58,6 +58,7 @@
+ @WITH_XULRUNNER_ENGINE_TRUE@	$(top_builddir)/embed/xulrunner/components/libephycomponents.la
+ 
+ @WITH_GECKO_ENGINE_TRUE@am__append_7 = \
++@WITH_GECKO_ENGINE_TRUE@	$(GECKO_LIBS) \
+ @WITH_GECKO_ENGINE_TRUE@	$(top_builddir)/embed/mozilla/libephymozillaembed.la
+ 
+ @WITH_WEBKIT_ENGINE_TRUE@am__append_8 = \
+@@ -65,7 +66,7 @@
+ 
+ @WITH_XULRUNNER_ENGINE_TRUE@am__append_9 = -R$(LIBXUL_LIBDIR)
+ @WITH_XULRUNNER_ENGINE_TRUE@am__append_10 = $(LIBXUL_LIBS) -lxpcomglue
+-@WITH_GECKO_ENGINE_TRUE@am__append_11 = -R$(GECKO_HOME)
++@HAVE_GECKO_XPCOM_GLUE_FALSE@@WITH_GECKO_ENGINE_TRUE@am__append_11 = -R$(GECKO_HOME)
+ @WITH_GECKO_ENGINE_TRUE@am__append_12 = \
+ @WITH_GECKO_ENGINE_TRUE@	$(GECKO_LIBS) \
+ @WITH_GECKO_ENGINE_TRUE@	$(GECKO_EXTRA_LIBS) \
+@@ -196,13 +197,15 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ am_epiphany_OBJECTS = epiphany-ephy-main.$(OBJEXT)
+ epiphany_OBJECTS = $(am_epiphany_OBJECTS)
+-@WITH_XULRUNNER_ENGINE_TRUE@am__DEPENDENCIES_2 =  \
++@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
++@WITH_GECKO_ENGINE_TRUE@	$(top_builddir)/embed/mozilla/libephymozillaembed.la
++@WITH_XULRUNNER_ENGINE_TRUE@am__DEPENDENCIES_3 =  \
+ @WITH_XULRUNNER_ENGINE_TRUE@	$(am__DEPENDENCIES_1)
+-@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
++@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \
+ @WITH_GECKO_ENGINE_TRUE@	$(am__DEPENDENCIES_1) \
+ @WITH_GECKO_ENGINE_TRUE@	$(am__DEPENDENCIES_1)
+-@WITH_WEBKIT_ENGINE_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+-@ENABLE_PYTHON_TRUE@am__DEPENDENCIES_5 = libpyphany.la \
++@WITH_WEBKIT_ENGINE_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
++@ENABLE_PYTHON_TRUE@am__DEPENDENCIES_6 = libpyphany.la \
+ @ENABLE_PYTHON_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_PYTHON_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_PYTHON_TRUE@	$(am__DEPENDENCIES_1) \
+@@ -210,17 +213,18 @@
+ epiphany_DEPENDENCIES = libephymain.la \
+ 	$(top_builddir)/src/bookmarks/libephybookmarks.la \
+ 	$(top_builddir)/embed/libephyembedfactory.la $(am__append_6) \
+-	$(am__append_7) $(am__append_8) \
++	$(am__DEPENDENCIES_2) $(am__append_8) \
+ 	$(top_builddir)/embed/libephyembed.la \
+ 	$(top_builddir)/lib/widgets/libephywidgets.la \
+ 	$(top_builddir)/lib/libephymisc.la \
+-	$(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
++	$(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_3) \
++	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1)
+-epiphany_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(epiphany_CFLAGS) $(CFLAGS) \
+-	$(epiphany_LDFLAGS) $(LDFLAGS) -o $@
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \
++	$(am__DEPENDENCIES_1)
++epiphany_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(epiphany_LDFLAGS) $(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -233,9 +237,18 @@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
+ SOURCES = $(libephymain_la_SOURCES) $(nodist_libephymain_la_SOURCES) \
+ 	$(libpyphany_la_SOURCES) $(nodist_libpyphany_la_SOURCES) \
+-	$(epiphany_SOURCES)
++	$(epiphany_SOURCES) $(nodist_EXTRA_epiphany_SOURCES)
+ DIST_SOURCES = $(am__libephymain_la_SOURCES_DIST) \
+ 	$(am__libpyphany_la_SOURCES_DIST) $(epiphany_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -618,6 +631,11 @@
+ @ENABLE_PYTHON_TRUE@	$(PYTHON_EXTRA_LIBS)			\
+ @ENABLE_PYTHON_TRUE@	$(PYGTK_LIBS)
+ 
++
++# we do this to force c++ linkage if we are using the glue and 
++# are running gecko 1.9 because standalone glue embedders that use
++# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp>
++@HAVE_GECKO_1_9_TRUE@@HAVE_GECKO_XPCOM_GLUE_TRUE@nodist_EXTRA_epiphany_SOURCES = dummy.cpp
+ epiphany_SOURCES = ephy-main.c
+ epiphany_CPPFLAGS = \
+ 	-I$(top_builddir)/lib		\
+@@ -631,6 +649,7 @@
+ 
+ epiphany_CFLAGS = \
+ 	$(DEPENDENCIES_CFLAGS) 	\
++	$(GECKO_CFLAGS) \
+ 	$(DBUS_CFLAGS)		\
+ 	$(AM_CFLAGS)
+ 
+@@ -643,8 +662,9 @@
+ 	$(top_builddir)/lib/widgets/libephywidgets.la \
+ 	$(top_builddir)/lib/libephymisc.la \
+ 	$(top_builddir)/lib/egg/libegg.la $(am__append_10) \
+-	$(am__append_12) $(am__append_13) $(DEPENDENCIES_LIBS) \
+-	$(DBUS_LIBS) $(LIBINTL) $(am__append_14) $(am__append_15)
++	$(am__append_12) $(am__append_13) $(GECKO_LIBS) \
++	$(DEPENDENCIES_LIBS) $(DBUS_LIBS) $(LIBINTL) $(am__append_14) \
++	$(am__append_15)
+ @ENABLE_PYTHON_TRUE@pydefsdir = $(datadir)/pygtk/2.0/defs
+ @ENABLE_PYTHON_TRUE@pydefs_DATA = epiphany.defs
+ BUILT_SOURCES = $(TYPES_SOURCE) ephy-dbus-client-bindings.h \
+@@ -823,7 +843,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ .SUFFIXES:
+-.SUFFIXES: .c .lo .o .obj
++.SUFFIXES: .c .cpp .lo .o .obj
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -904,6 +924,7 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-dummy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-ephy-main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-action-helper.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-activation.Plo@am__quote@
+@@ -1253,6 +1274,41 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -c -o epiphany-ephy-main.obj `if test -f 'ephy-main.c'; then $(CYGPATH_W) 'ephy-main.c'; else $(CYGPATH_W) '$(srcdir)/ephy-main.c'; fi`
+ 
++.cpp.o:
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
++
++.cpp.obj:
++@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.cpp.lo:
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
++
++epiphany-dummy.o: dummy.cpp
++@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT epiphany-dummy.o -MD -MP -MF $(DEPDIR)/epiphany-dummy.Tpo -c -o epiphany-dummy.o `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/epiphany-dummy.Tpo $(DEPDIR)/epiphany-dummy.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dummy.cpp' object='epiphany-dummy.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o epiphany-dummy.o `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp
++
++epiphany-dummy.obj: dummy.cpp
++@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT epiphany-dummy.obj -MD -MP -MF $(DEPDIR)/epiphany-dummy.Tpo -c -o epiphany-dummy.obj `if test -f 'dummy.cpp'; then $(CYGPATH_W) 'dummy.cpp'; else $(CYGPATH_W) '$(srcdir)/dummy.cpp'; fi`
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/epiphany-dummy.Tpo $(DEPDIR)/epiphany-dummy.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dummy.cpp' object='epiphany-dummy.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o epiphany-dummy.obj `if test -f 'dummy.cpp'; then $(CYGPATH_W) 'dummy.cpp'; else $(CYGPATH_W) '$(srcdir)/dummy.cpp'; fi`
++
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 
--- epiphany-browser-2.21.4.orig/debian/patches/series
+++ epiphany-browser-2.21.4/debian/patches/series
@@ -0,0 +1,16 @@
+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
+99_autoreconf.patch
--- epiphany-browser-2.21.4.orig/debian/patches/08_localized_startup_page.patch
+++ epiphany-browser-2.21.4/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 <gtk/gtknotebook.h>
+ #include <dirent.h>
+ #include <unistd.h>
++#include <locale.h>
+ 
+ #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.21.4.orig/debian/patches/98_xulrunner1.9_build_changes.patch
+++ epiphany-browser-2.21.4/debian/patches/98_xulrunner1.9_build_changes.patch
@@ -0,0 +1,1171 @@
+Index: epiphany-browser-2.21.4/m4/gecko.m4
+===================================================================
+--- epiphany-browser-2.21.4/m4/gecko.m4	(revision 7753)
++++ epiphany-browser-2.21.4/m4/gecko.m4	(working copy)
+@@ -32,6 +32,7 @@
+ # VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)
+ # VARIABLE_FLAVOUR: The flavour of the gecko that was found
+ # VARIABLE_HOME:
++# VARIABLE_NSPR: set if nspr is provided by gecko flags
+ # VARIABLE_PREFIX:
+ # VARIABLE_INCLUDE_ROOT:
+ # VARIABLE_VERSION: The version of the gecko that was found
+@@ -51,7 +52,7 @@
+ AC_MSG_CHECKING([which gecko to use])
+ 
+ AC_ARG_WITH([gecko],
+-	AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
++	AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul@:>@],
+ 		       [Which gecko engine to use (autodetected by default)]))
+ 
+ # Backward compat
+@@ -60,12 +61,15 @@
+ gecko_cv_gecko=$with_gecko
+ 
+ # Autodetect gecko
+-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"
++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
+ if test -z "$gecko_cv_gecko"; then
+ 	for lizard in $_geckos; do
+ 		if $PKG_CONFIG --exists $lizard-xpcom; then
+ 			gecko_cv_gecko=$lizard
+ 			break;
++		elif $PKG_CONFIG --exist $lizard; then
++			gecko_cv_gecko=$lizard
++			break;
+ 		fi
+ 	done
+ fi
+@@ -82,6 +86,14 @@
+ 	gecko_cv_have_gecko=yes
+ fi
+ 
++AC_MSG_CHECKING([manual gecko home set])
++
++AC_ARG_WITH([gecko-home],
++	AS_HELP_STRING([--with-gecko-home@<:@=[path]@:>@],
++		       [Manually set MOZILLA_FIVE_HOME]))
++
++gecko_cv_gecko_home=$with_gecko_home
++
+ # ****************
+ # Define variables
+ # ****************
+@@ -93,13 +105,24 @@
+ seamonkey) gecko_cv_gecko_flavour=mozilla ;;
+ *firefox) gecko_cv_gecko_flavour=toolkit ;;
+ xulrunner) gecko_cv_gecko_flavour=toolkit ;;
++libxul*) gecko_cv_gecko_flavour=toolkit ;;
+ esac
+ 
+-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
+-
++if $PKG_CONFIG --exists  ${gecko_cv_gecko}-xpcom; then
++	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT"
++	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
++	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
++else
++	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
++	_GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"
++	_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
++	_GECKO_HOME=$with_gecko_home
++	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
++	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
++fi
+ fi # if gecko_cv_have_gecko
+ 
+ if test "$gecko_cv_gecko_flavour" = "toolkit"; then
+@@ -109,9 +132,11 @@
+ $1[]=$gecko_cv_gecko
+ $1[]_FLAVOUR=$gecko_cv_gecko_flavour
+ $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
++$1[]_CFLAGS=$_GECKO_CFLAGS
+ $1[]_LIBDIR=$_GECKO_LIBDIR
+ $1[]_HOME=$_GECKO_HOME
+ $1[]_PREFIX=$_GECKO_PREFIX
++$1[]_NSPR=$_GECKO_NSPR
+ 
+ # **************************************************************
+ # This is really gcc-only
+@@ -182,7 +207,7 @@
+ AC_LANG_PUSH([C++])
+ 
+ _SAVE_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
+ 
+ AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
+ AC_RUN_IFELSE(
+@@ -215,6 +240,18 @@
+ 	[gecko_cv_have_debug=no])
+ AC_MSG_RESULT([$gecko_cv_have_debug])
+ 
++AC_MSG_CHECKING([[whether we have a xpcom glue]])
++AC_COMPILE_IFELSE(
++	[AC_LANG_SOURCE(
++		[[
++		  #ifndef XPCOM_GLUE
++		  #error "no xpcom glue found"
++		  #endif]]
++	)],
++	[gecko_cv_have_xpcom_glue=yes],
++	[gecko_cv_have_xpcom_glue=no])
++AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])
++
+ CPPFLAGS="$_SAVE_CPPFLAGS"
+ 
+ AC_LANG_POP([C++])
+@@ -226,8 +263,14 @@
+ 	AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build])
+ fi
+ 
++if test "$gecko_cv_have_xpcom_glue" = "yes"; then
++	AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used])
++fi
++
+ fi # if gecko_cv_have_gecko
+ 
++AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
++AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"])
+ 
+ # ***********************
+ # Check for gecko version
+@@ -238,7 +281,7 @@
+ AC_LANG_PUSH([C++])
+ 
+ _SAVE_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS"
+ 
+ AC_CACHE_CHECK([for gecko version],
+ 	[gecko_cv_gecko_version],
+@@ -320,8 +363,11 @@
+ gecko_cv_extra_pkg_dependencies=
+ 
+ if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
+-	gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
+-	gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s"
++	if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then
++		gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
++	else
++		gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
++	fi
+ else
+ 	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
+ fi
+@@ -350,6 +396,7 @@
+ AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"])
+ AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])
+ AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])
++AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"])
+ ])
+ 
+ # ***************************************************************************
+@@ -371,10 +418,20 @@
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS="$2"
+ 
+@@ -383,9 +440,11 @@
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ m4_indir([$1],m4_shiftn(2,$@))
+@@ -438,11 +497,17 @@
+ #include <mozilla-config.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#else
+ #include <nsXPCOM.h>
++#endif // XPCOM_GLUE
++
+ #include <nsCOMPtr.h>
+ #include <nsILocalFile.h>
+ #include <nsIServiceManager.h>
+-#ifdef HAVE_GECKO_1_8
++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9)
+ #include <nsStringAPI.h>
+ #else
+ #include <nsString.h>
+@@ -450,16 +515,37 @@
+ ]]
+ [$1],
+ [[
++
++nsresult rv;
++#ifdef XPCOM_GLUE
++    static const GREVersionRange greVersion = {
++    "1.8", PR_TRUE,
++    "1.9.*", PR_TRUE
++    };
++    char xpcomLocation[4096];
++    rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++    if (NS_FAILED(rv)) {
++        exit(123);
++    }
++
++    // Startup the XPCOM Glue that links us up with XPCOM.
++    XPCOMGlueStartup(xpcomLocation);
++    if (NS_FAILED(rv)) {
++        exit(124);
++    }
++#endif // XPCOM_GLUE
++
+ // redirect unwanted mozilla debug output to the bit bucket
+ freopen ("/dev/null", "w", stdout);
+ 
+-nsresult rv;
+-nsCOMPtr<nsILocalFile> directory;
++nsCOMPtr<nsILocalFile> directory = nsnull;
++#ifndef XPCOM_GLUE
+ rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE,
+ 			    getter_AddRefs (directory));
+ if (NS_FAILED (rv) || !directory) {
+ 	exit (126);
+ }
++#endif
+ 
+ rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
+ if (NS_FAILED (rv)) {
+@@ -607,21 +693,22 @@
+ AC_DEFUN([GECKO_XPIDL],
+ [AC_REQUIRE([GECKO_INIT])dnl
+ 
+-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then
++	_GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin"
++else
++	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++fi
+ 
+ AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
+ 
++if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then
++XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`"
++else
+ XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
+-
+-# Older geckos don't have this variable, see
+-# https://bugzilla.mozilla.org/show_bug.cgi?id=240473
+-
+ if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
+ 	XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`"
+ fi
+-
+ # Some distributions (Gentoo) have it in unusual places
+-
+ if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
+ 	XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"
+ fi
+Index: epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am
+===================================================================
+--- epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am	(revision 7753)
++++ epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am	(working copy)
+@@ -25,8 +25,16 @@
+ libdesktopfileplugin_la_LDFLAGS = \
+ 	-module -avoid-version \
+ 	-export-symbols $(srcdir)/plugin.symbols \
+-	-R$(GECKO_HOME) \
+ 	$(AM_LDFLAGS)
+ 
++if HAVE_GECKO_XPCOM_GLUE
++	libdesktopfileplugin_la_LDFLAGS += \
++		$(NULL)
++else
++	libdesktopfileplugin_la_LDFLAGS += \
++		-R$(GECKO_HOME) \
++		$(NULL)
++endif
++
+ EXTRA_DIST = \
+ 	plugin.symbols
+Index: epiphany-browser-2.21.4/src/Makefile.am
+===================================================================
+--- epiphany-browser-2.21.4/src/Makefile.am	(revision 7753)
++++ epiphany-browser-2.21.4/src/Makefile.am	(working copy)
+@@ -187,6 +187,16 @@
+ 	$(PYGTK_LIBS)
+ endif
+ 
++
++# we do this to force c++ linkage if we are using the glue and 
++# are running gecko 1.9 because standalone glue embedders that use
++# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp>
++if HAVE_GECKO_1_9
++if HAVE_GECKO_XPCOM_GLUE
++nodist_EXTRA_epiphany_SOURCES = dummy.cpp
++endif
++endif
++
+ epiphany_SOURCES = ephy-main.c
+ 
+ epiphany_CPPFLAGS = \
+@@ -201,6 +211,7 @@
+ 
+ epiphany_CFLAGS = \
+ 	$(DEPENDENCIES_CFLAGS) 	\
++	$(GECKO_CFLAGS) \
+ 	$(DBUS_CFLAGS)		\
+ 	$(AM_CFLAGS)
+ 
+@@ -221,6 +232,7 @@
+ 
+ if WITH_GECKO_ENGINE
+ epiphany_LDADD += \
++	$(GECKO_LIBS) \
+ 	$(top_builddir)/embed/mozilla/libephymozillaembed.la
+ endif
+ 
+@@ -241,7 +253,9 @@
+ endif
+ 
+ if WITH_GECKO_ENGINE
++if !HAVE_GECKO_XPCOM_GLUE
+ epiphany_LDFLAGS += -R$(GECKO_HOME)
++endif
+ 
+ epiphany_LDADD += \
+ 	$(GECKO_LIBS) \
+@@ -255,6 +269,7 @@
+ endif
+ 
+ epiphany_LDADD += \
++	$(GECKO_LIBS) \
+ 	$(DEPENDENCIES_LIBS) \
+ 	$(DBUS_LIBS) \
+ 	$(LIBINTL)
+Index: epiphany-browser-2.21.4/configure.ac
+===================================================================
+--- epiphany-browser-2.21.4/configure.ac	(revision 7753)
++++ epiphany-browser-2.21.4/configure.ac	(working copy)
+@@ -1,4 +1,3 @@
+-
+ # Copyright © 2000-2004 Marco Pesenti Gritti
+ # Copyright © 2003, 2004, 2005, 2006, 2007 Christian Persch
+ #
+@@ -226,12 +225,41 @@
+ 
+ case "$gecko_cv_gecko" in
+ xulrunner) min_version=1.8 ;;
++libxul*) min_version=1.9 ;;
+ *firefox) min_version=1.5 ;;
+ *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
+ esac
+ 
+ # Added $gecko_cv_gecko-js for debian xulrunner brokenness
+-PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
++if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then
++	PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
++else
++	GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG"
++	GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`"
++fi
++
++AC_MSG_CHECKING(nspr in gecko)
++if ! test "$GECKO_NSPR" = yes; then
++	AC_MSG_RESULT(no)
++	AC_MSG_CHECKING(nspr in system)
++	gecko_nspr=
++	if $PKG_CONFIG --exists mozilla-nspr; then
++		gecko_nspr=mozilla-nspr
++	elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then
++		gecko_nspr=${gecko_cv_gecko}-nspr
++	elif $PKG_CONFIG --exists nspr; then
++		gecko_nspr=nspr
++	else
++		AC_MSG_ERROR([no nspr available])
++	fi
++
++	GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`"
++	GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`"
++	AC_MSG_RESULT(yes)
++else
++	AC_MSG_RESULT(yes)
++fi
++
+ AC_SUBST([GECKO_CFLAGS])
+ AC_SUBST([GECKO_LIBS])
+ 
+@@ -555,7 +583,11 @@
+ AC_MSG_RESULT([$enable_desktop_file_plugin])
+ 
+ if test "$enable_desktop_file_plugin" = "yes"; then
+-	PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])
++	if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0])
++	else
++		PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0])
++	fi
+ 	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS])
+ 	AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS])
+ fi
+Index: epiphany-browser-2.21.4/embed/mozilla/EphyDirectoryProvider.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/EphyDirectoryProvider.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/EphyDirectoryProvider.cpp	(working copy)
+@@ -40,6 +40,11 @@
+ #include <nsIToolkitChromeRegistry.h>
+ #include <nsNetUtil.h>
+ 
++#ifdef HAVE_GECKO_1_9
++#include <nsIArray.h>
++#include <nsIMutableArray.h>
++#endif
++
+ #include "EphyDirectoryProvider.h"
+ 
+ NS_IMPL_ISUPPORTS2 (EphyDirectoryProvider,
+@@ -88,15 +93,25 @@
+ 				   getter_AddRefs (chromeDir));
+ 		NS_ENSURE_SUCCESS (rv, rv);
+ 
++#ifndef HAVE_GECKO_1_9
+ 		nsCOMPtr<nsISupportsArray> array;
+ 		rv = NS_NewISupportsArray (getter_AddRefs (array));
+ 		NS_ENSURE_SUCCESS (rv, rv);
+-
+ 		rv = array->AppendElement (manifestDir);
+ 		rv |= array->AppendElement (chromeDir);
+-		NS_ENSURE_SUCCESS (rv, rv);
++		rv = NS_NewArrayEnumerator (_retval, array);
++#else // !HAVE_GECKO_1_9
++		nsCOMPtr<nsIMutableArray> array;
++		array = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
++		if(!array)
++			return NS_ERROR_OUT_OF_MEMORY;
++		rv = array->AppendElement (manifestDir, PR_FALSE);
++		rv |= array->AppendElement (chromeDir, PR_FALSE);
++ 		NS_ENSURE_SUCCESS (rv, rv);
+ 
+-		rv = NS_NewArrayEnumerator (_retval, array);
++		rv = array->Enumerate(_retval);
++#endif // HAVE_GECKO_1_9
++
+ 		NS_ENSURE_SUCCESS (rv, rv);
+ 
+ 		rv = NS_SUCCESS_AGGREGATE_RESULT;
+Index: epiphany-browser-2.21.4/embed/mozilla/MozRegisterComponents.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/MozRegisterComponents.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/MozRegisterComponents.cpp	(working copy)
+@@ -137,12 +137,14 @@
+ 		NS_CLIENTAUTHDIALOGS_CONTRACTID,
+ 		GtkNSSClientAuthDialogsConstructor
+ 	},
++#ifndef HAVE_GECKO_1_9
+ 	{
+ 		GTK_NSSDIALOGS_CLASSNAME,
+ 		GTK_NSSDIALOGS_CID,
+ 		NS_BADCERTLISTENER_CONTRACTID,
+ 		GtkNSSDialogsConstructor
+ 	},
++#endif
+ 	{
+ 		GTK_NSSDIALOGS_CLASSNAME,
+ 		GTK_NSSDIALOGS_CID,
+@@ -296,10 +298,16 @@
+ 	for (guint i = 0; i < G_N_ELEMENTS (sAppComps); i++)
+ 	{
+ 		nsCOMPtr<nsIGenericFactory> componentFactory;
+-		rv = NS_NewGenericFactory(getter_AddRefs(componentFactory),
+-					  &(sAppComps[i]));
+-		if (NS_FAILED(rv) || !componentFactory)
++		componentFactory = do_CreateInstance(NS_GENERICFACTORY_CONTRACTID);
++		if(!componentFactory)
+ 		{
++			g_warning ("Failed to create a generic factory for %s\n", sAppComps[i].mDescription);
++			ret = FALSE;
++			continue;
++		}
++		rv = componentFactory->SetComponentInfo(&(sAppComps[i]));
++		if (NS_FAILED(rv))
++		{
+ 			g_warning ("Failed to make a factory for %s\n", sAppComps[i].mDescription);
+ 
+ 			ret = FALSE;
+Index: epiphany-browser-2.21.4/embed/mozilla/GeckoPrintService.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/GeckoPrintService.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/GeckoPrintService.cpp	(working copy)
+@@ -416,7 +416,7 @@
+ 
+   return FALSE;
+ }
+-#endif
++#endif // 0
+ 
+ nsresult
+ GeckoPrintService::PrintUnattended (nsIDOMWindow *aParent,
+@@ -665,7 +665,10 @@
+   aSettings->SetPrintInColor (gtk_print_settings_get_use_color (aGtkSettings));
+ 
+   aSettings->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
++
++#ifndef HAVE_GECKO_1_9
+   aSettings->SetPaperSize (nsIPrintSettings::kPaperSizeDefined);
++#endif
+ 
+   GtkPaperSize *paperSize = gtk_page_setup_get_paper_size (aPageSetup);
+   if (!paperSize) {
+Index: epiphany-browser-2.21.4/embed/mozilla/EphyFind.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/EphyFind.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/EphyFind.cpp	(working copy)
+@@ -48,6 +48,7 @@
+ #include <nsIWebBrowserFocus.h>
+ #include <nsIWebBrowser.h>
+ #include <nsServiceManagerUtils.h>
++#include <nsPIDOMWindow.h>
+ 
+ #ifndef HAVE_GECKO_1_9
+ #include <nsIDocShellTreeItem.h>
+@@ -91,16 +92,26 @@
+ 				   getter_AddRefs (mWebBrowser));
+   NS_ENSURE_TRUE (mWebBrowser, rv);
+ 
+-  nsCOMPtr<nsIDocShell> docShell (do_GetInterface (mWebBrowser, &rv));
++#ifndef HAVE_GECKO_1_9
++  nsCOMPtr<nsIDOMWindow> domWindow;
++  rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow));
+   NS_ENSURE_SUCCESS (rv, rv);
+ 
++  nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv));
++  NS_ENSURE_SUCCESS (rv, rv);
++
++  nsCOMPtr<nsIDocShell> docShell (window->GetDocShell());
++#else
++  nsCOMPtr<nsIDocShell> docShell = do_GetInterface (mWebBrowser);
++#endif
++
+   if (!mFinder) {
+     mFinder = do_CreateInstance (NS_TYPEAHEADFIND_CONTRACTID, &rv);
+     NS_ENSURE_SUCCESS (rv, rv);
+ 
+     rv = mFinder->Init (docShell);
+ #ifdef HAVE_GECKO_1_9
+-//    mFinder->SetSelectionModeAndRepaint (nsISelectionController::SELECTION_ON);
++    mFinder->SetSelectionModeAndRepaint (nsISelectionController::SELECTION_ON);
+ #else
+     mFinder->SetFocusLinks (PR_TRUE);
+ #endif
+Index: epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp	(working copy)
+@@ -110,12 +110,20 @@
+ {
+ }
+ 
++#ifdef HAVE_GECKO_1_9
++NS_IMPL_THREADSAFE_ISUPPORTS4 (GtkNSSDialogs, 
++			       nsICertificateDialogs,
++			       nsITokenPasswordDialogs,
++			       nsITokenDialogs,
++			       nsIDOMCryptoDialogs)
++#else
+ NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs, 
+ 			       nsICertificateDialogs,
+ 			       nsIBadCertListener,
+ 			       nsITokenPasswordDialogs,
+ 			       nsITokenDialogs,
+ 			       nsIDOMCryptoDialogs)
++#endif
+ 
+ /* There's also nsICertPickDialogs which is implemented in mozilla
+  * but has no callers. So we don't implement it.
+@@ -383,7 +391,7 @@
+ 	return NS_OK;
+ }
+   
+-/* nsICertificateDialogs */
++#ifndef HAVE_GECKO_1_9
+ 
+ NS_IMETHODIMP
+ GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
+@@ -600,6 +608,8 @@
+ 	return NS_OK;
+ }
+ 
++#endif // HAVE_GECKO_1_9
++
+ NS_IMETHODIMP 
+ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, 
+ 				    nsIX509Cert *cert,
+@@ -692,7 +702,6 @@
+ 	return NS_OK;
+ }
+ 
+-
+ NS_IMETHODIMP 
+ GtkNSSDialogs::NotifyCACertExists (nsIInterfaceRequestor *ctx)
+ {
+Index: epiphany-browser-2.21.4/embed/mozilla/mozilla-embed-single.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/mozilla-embed-single.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/mozilla-embed-single.cpp	(working copy)
+@@ -33,6 +33,11 @@
+ 
+ #include <nsStringAPI.h>
+ 
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#include <gtkmozembed_glue.cpp>
++#endif
++
+ #include <gtkmozembed.h>
+ #include <gtkmozembed_internal.h>
+ #include <nsComponentManagerUtils.h>
+@@ -577,6 +582,7 @@
+ static gboolean
+ impl_init (EphyEmbedSingle *esingle)
+ {
++  g_warning ("Could not determine locale 111!\n");
+ 	MozillaEmbedSingle *single = MOZILLA_EMBED_SINGLE (esingle);
+ 
+ 	g_setenv ("MOZILLA_POSTSCRIPT_ENABLED", "1", TRUE);
+@@ -591,6 +597,50 @@
+ 	NS_LogInit ();
+ #endif
+ 
++	nsresult rv;
++#ifdef XPCOM_GLUE
++	static const GREVersionRange greVersion = {
++	  "1.9a", PR_TRUE,
++	  "2", PR_TRUE
++	};
++	char xpcomLocation[4096];
++	rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++	if (NS_FAILED (rv))
++	{
++	  g_warning ("Could not determine locale!\n");
++	  return FALSE;
++	}
++
++	// Startup the XPCOM Glue that links us up with XPCOM.
++	rv = XPCOMGlueStartup(xpcomLocation);
++	if (NS_FAILED (rv))
++	{
++	  g_warning ("Could not determine locale!\n");
++	  return FALSE;
++	}
++
++	rv = GTKEmbedGlueStartup();
++	if (NS_FAILED (rv))
++	{
++	  g_warning ("Could not determine locale!\n");
++	  return FALSE;
++	}
++
++	char *lastSlash = strrchr(xpcomLocation, '/');
++	if (lastSlash)
++	  *lastSlash = '\0';
++
++	gtk_moz_embed_set_path(xpcomLocation);
++#else
++#ifdef HAVE_GECKO_1_9
++        gtk_moz_embed_set_path (MOZILLA_HOME);
++#else
++        gtk_moz_embed_set_comp_path (MOZILLA_HOME);
++#endif
++#endif // XPCOM_GLUE
++	/* Fire up the beast */
++	gtk_moz_embed_push_startup ();
++
+ 	/* Pre initialization */
+ 	mozilla_init_plugin_path ();
+ 
+@@ -607,8 +657,6 @@
+ 
+ 	gtk_moz_embed_set_directory_service_provider (dp);
+ 
+-	/* Fire up the beast */
+-	gtk_moz_embed_push_startup ();
+ 	/* FIXME check that it succeeded! */
+ 
+ 	mozilla_register_components ();
+Index: epiphany-browser-2.21.4/embed/mozilla/EphyAboutModule.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/EphyAboutModule.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/EphyAboutModule.cpp	(working copy)
+@@ -30,19 +30,23 @@
+ #include <gtk/gtk.h>
+ 
+ // we need nsEscape which depends on internal strings :(((
++#ifndef HAVE_GECKO_1_9
+ #define MOZILLA_INTERNAL_API 1
+ #include <nsString.h>
++#endif
+ 
+ #include <nsAutoPtr.h>
+ #include <nsCOMPtr.h>
++#ifdef MOZILLA_INTERNAL_API
+ #include <nsEscape.h>
++#endif
+ #include <nsIChannel.h>
+ #include <nsIInputStreamChannel.h>
+ #include <nsIInputStream.h>
+ #include <nsIIOService.h>
+ #include <nsIOutputStream.h>
+ #include <nsIScriptSecurityManager.h>
+-#include <nsIStorageStream.h>
++#include <nsStorageStream.h>
+ #include <nsIURI.h>
+ #include <nsNetCID.h>
+ #include <nsNetUtil.h>
+@@ -149,6 +153,8 @@
+ 			  nsACString &aTitle)
+ {
+ 	/* The page URL is of the form "about:neterror?e=<errorcode>&u=<URL>&c=<charset>&d=<description>" */
++
++	printf (" ===> about module::parse url - %s \n", aURL);
+ 	const char *query = strstr (aURL, "?");
+ 	if (!query) return NS_ERROR_FAILURE;
+ 	
+@@ -167,18 +173,18 @@
+ 		switch (param[0])
+ 		{
+ 			case 'e':
+-				aCode.Assign (nsUnescape (param + 2));
++				aCode.Assign (param + 2);
+ 				break;
+ 			case 'u':
+ 				aRawOriginURL.Assign (param + 2);
+-				aOriginURL.Assign (nsUnescape (param + 2));
++				aOriginURL.Assign (param + 2);
+ 				break;
+ 			case 'c':
+-				aOriginCharset.Assign (nsUnescape (param + 2));
++				aOriginCharset.Assign (param + 2);
+ 				break;
+ 			/* The next one is not used in neterror but recover: */
+ 			case 't':
+-				aTitle.Assign (nsUnescape (param + 2));
++				aTitle.Assign (param + 2);
+ 				break;
+ 			case 'd':
+ 				/* we don't need mozilla's description parameter */
+@@ -187,6 +193,8 @@
+ 		}
+ 	}
+ 
++	printf(" ===> parsed: %s || %s || %s || %s\n", ((nsCString&) aCode).get(),  ((nsCString&) aRawOriginURL).get(), ((nsCString&) aOriginURL).get(), ((nsCString&)aOriginCharset).get());
++
+ 	g_strfreev (params);
+ 
+ 	return NS_OK;
+@@ -451,7 +459,7 @@
+ 		return NS_ERROR_ILLEGAL_VALUE;
+ 	}
+ 
+-	return NS_OK;
++	return NS_ERROR_ILLEGAL_VALUE;
+ }
+ 
+ nsresult
+@@ -472,7 +480,7 @@
+ 	if (error.IsEmpty () || rawurl.IsEmpty () || url.IsEmpty()) return NS_ERROR_FAILURE;
+ 
+ 	nsCOMPtr<nsIURI> uri;
+-	rv = NS_NewURI (getter_AddRefs (uri), url, charset.get());
++	rv = NS_NewURI (getter_AddRefs (uri), nsCString(spec), charset.get());
+ 	/* FIXME can uri be NULL if the original url was invalid? */
+ 	NS_ENSURE_SUCCESS (rv, rv);
+ 
+@@ -493,6 +501,7 @@
+ 		/* remove "about:neterror" part and insert mozilla's error page url */
+ 		newurl.Cut(0, strlen ("about:neterror"));
+ 		newurl.Insert("chrome://global/content/netError.xhtml", 0);
++		printf(" ===> going for netError.xhtml\n");
+ 
+ 		return Redirect (newurl, _retval);
+ 	}
+@@ -573,7 +582,8 @@
+ 
+ 	nsresult rv;
+ 	nsCOMPtr<nsIStorageStream> storageStream;
+-	rv = NS_NewStorageStream (16384, (PRUint32) -1, getter_AddRefs (storageStream));
++	storageStream = do_CreateInstance(NS_STORAGESTREAM_CONTRACTID);
++	rv = storageStream->Init(16384, (PRUint32) -1, nsnull);
+ 	NS_ENSURE_SUCCESS (rv, rv);
+ 
+ 	nsCOMPtr<nsIOutputStream> stream;
+Index: epiphany-browser-2.21.4/embed/mozilla/EphyBrowser.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/EphyBrowser.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/EphyBrowser.cpp	(working copy)
+@@ -1,3 +1,4 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+ /*
+  *  Copyright © 2000-2004 Marco Pesenti Gritti
+  *  Copyright © 2003, 2004, 2005 Christian Persch
+@@ -484,7 +485,6 @@
+ 
+ 	MozillaEmbedEvent *info;
+ 	info = mozilla_embed_event_new (static_cast<gpointer>(aDOMEvent));
+-
+ 	nsresult rv;
+ 	EventContext context;
+ 	context.Init (mOwner);
+@@ -574,6 +574,7 @@
+ 
+ 	gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
+ 					 getter_AddRefs(mWebBrowser));
++
+ 	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+ 
+ 	mWebBrowserFocus = do_QueryInterface (mWebBrowser);
+@@ -613,9 +614,21 @@
+ 	NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
+ 
+ #ifdef HAVE_MOZILLA_PSM
+-	nsCOMPtr<nsIDocShell> docShell (do_GetInterface (mWebBrowser, &rv));
++
++#ifdef HAVE_GECKO_1_9
++	nsCOMPtr<nsIDocShell> docShell = do_GetInterface (mWebBrowser);
++#else
++	nsCOMPtr<nsIDOMWindow> domWindow;
++	rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow));
+ 	NS_ENSURE_SUCCESS (rv, rv);
+ 
++	nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv));
++	NS_ENSURE_SUCCESS (rv, rv);
++
++	nsCOMPtr<nsIDocShell> docShell (window->GetDocShell());
++#endif
++	NS_ENSURE_TRUE (docShell, NS_ERROR_FAILURE);
++
+ 	rv = docShell->GetSecurityUI (getter_AddRefs (mSecurityInfo));
+ 	if (!mSecurityInfo)
+ 	{
+@@ -894,23 +907,37 @@
+ 
+ nsresult EphyBrowser::SetZoom (float aZoom)
+ {
+-	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+-
+-	nsCOMPtr<nsIContentViewer> contentViewer;	
++	nsCOMPtr<nsIContentViewer> contentViewer;
+ 	GetContentViewer (getter_AddRefs(contentViewer));
+ 	NS_ENSURE_TRUE (contentViewer, NS_ERROR_FAILURE);
+ 
+ 	nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(contentViewer);
+ 	NS_ENSURE_TRUE (mdv, NS_ERROR_FAILURE);
+ 
++#ifdef HAVE_GECKO_1_9 
++	return mdv->SetFullZoom (aZoom);
++#else
+ 	return mdv->SetTextZoom (aZoom);
++#endif
+ }
+ 
+ nsresult EphyBrowser::GetContentViewer (nsIContentViewer **aViewer)
+ {
++	nsresult rv;
+ 	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+ 
+-	nsCOMPtr<nsIDocShell> ourDocShell(do_GetInterface(mWebBrowser));
++#ifdef HAVE_GECKO_1_9
++	nsCOMPtr<nsIDOMWindow> domWindow;
++	rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow));
++	NS_ENSURE_SUCCESS (rv, rv);
++
++	nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv));
++	NS_ENSURE_SUCCESS (rv, rv);
++
++	nsCOMPtr<nsIDocShell> ourDocShell (window->GetDocShell());
++#else
++	nsCOMPtr<nsIDocShell> ourDocShell = do_GetInterface (mWebBrowser);
++#endif
+ 	NS_ENSURE_TRUE (ourDocShell, NS_ERROR_FAILURE);
+ 
+ 	return ourDocShell->GetContentViewer(aViewer);
+@@ -918,16 +945,18 @@
+ 
+ nsresult EphyBrowser::GetZoom (float *aZoom)
+ {
+-	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+-
+-	nsCOMPtr<nsIContentViewer> contentViewer;	
++	nsCOMPtr<nsIContentViewer> contentViewer;
+ 	GetContentViewer (getter_AddRefs(contentViewer));
+ 	NS_ENSURE_TRUE (contentViewer, NS_ERROR_FAILURE);
+ 
+ 	nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(contentViewer);
+ 	NS_ENSURE_TRUE (mdv, NS_ERROR_FAILURE);
+ 
++#ifdef HAVE_GECKO_1_9
++	return mdv->GetFullZoom (aZoom);
++#else
+ 	return mdv->GetTextZoom (aZoom);
++#endif
+ }
+ 
+ nsresult
+@@ -1070,9 +1099,22 @@
+ 
+ nsresult EphyBrowser::GetPageDescriptor(nsISupports **aPageDescriptor)
+ {
++	nsresult rv;
+ 	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+ 
++#ifdef HAVE_GECKO_1_9
++	nsCOMPtr<nsIDOMWindow> domWindow;
++	rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow));
++	NS_ENSURE_SUCCESS (rv, rv);
++
++	nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv));
++	NS_ENSURE_SUCCESS (rv, rv);
++
++	nsCOMPtr<nsIDocShell> ds (window->GetDocShell());
++#else
+ 	nsCOMPtr<nsIDocShell> ds = do_GetInterface (mWebBrowser);
++#endif
++	NS_ENSURE_TRUE (ds, NS_ERROR_FAILURE);
+ 
+ 	nsCOMPtr<nsIWebPageDescriptor> wpd = do_QueryInterface (ds);
+ 	NS_ENSURE_TRUE (wpd, NS_ERROR_FAILURE);
+@@ -1423,11 +1465,23 @@
+ 
+ nsresult EphyBrowser::GetHasModifiedForms (PRBool *modified)
+ {
++	nsresult rv;
+ 	*modified = PR_FALSE;
+ 
+ 	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
+ 
++#ifdef HAVE_GECKO_1_9
++	nsCOMPtr<nsIDOMWindow> domWindow;
++	rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow));
++	NS_ENSURE_SUCCESS (rv, rv);
++
++	nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv));
++	NS_ENSURE_SUCCESS (rv, rv);
++
++	nsCOMPtr<nsIDocShell> rootDocShell (window->GetDocShell());
++#else
+ 	nsCOMPtr<nsIDocShell> rootDocShell = do_GetInterface (mWebBrowser);
++#endif
+ 	NS_ENSURE_TRUE (rootDocShell, NS_ERROR_FAILURE);
+ 
+ 	nsCOMPtr<nsISimpleEnumerator> enumerator;
+Index: epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.h
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.h	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.h	(working copy)
+@@ -22,7 +22,9 @@
+ #ifndef GTKNSSDIALOGS_H
+ #define GTKNSSDIALOGS_H 1
+ 
++#ifndef HAVE_GECKO_1_9
+ #include <nsIBadCertListener.h>
++#endif
+ #include <nsICertificateDialogs.h>
+ #include <nsITokenPasswordDialogs.h>
+ #include <nsITokenDialogs.h>
+@@ -37,7 +39,10 @@
+ 
+ #define GTK_NSSDIALOGS_CLASSNAME  "Gtk NSS Dialogs"
+ 
+-class GtkNSSDialogs : public nsIBadCertListener,
++class GtkNSSDialogs : 
++#ifndef HAVE_GECKO_1_9
++                      public nsIBadCertListener,
++#endif
+ 		      public nsICertificateDialogs,
+ 		      public nsITokenPasswordDialogs,
+ 		      public nsITokenDialogs,
+@@ -45,7 +50,9 @@
+ {
+   public:
+     NS_DECL_ISUPPORTS
++#ifndef HAVE_GECKO_1_9
+     NS_DECL_NSIBADCERTLISTENER
++#endif
+     NS_DECL_NSICERTIFICATEDIALOGS
+     NS_DECL_NSITOKENPASSWORDDIALOGS
+     NS_DECL_NSITOKENDIALOGS
+Index: epiphany-browser-2.21.4/embed/mozilla/EphyUtils.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/EphyUtils.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/EphyUtils.cpp	(working copy)
+@@ -39,7 +39,6 @@
+ 
+ #ifdef HAVE_GECKO_1_9
+ #include <nsPIDOMWindow.h>
+-#include <nsDOMJSUtils.h> /* for GetScriptContextFromJSContext */
+ #include <nsIScriptContext.h>
+ #include <nsIScriptGlobalObject.h>
+ #endif
+@@ -187,10 +186,11 @@
+ nsIDOMWindow *
+ EphyJSUtils::GetDOMWindowFromCallContext ()
+ {
+-  /* TODO: We can do this on 1.8 too, but we'd need to use headers which include private string API
++  /* TODO: We could do this on 1.8, but we'd need to use headers which include private string API
+    * so we'll have to move this to MozillaPrivate
+    */
+-#ifdef HAVE_GECKO_1_9
++#if 0
++  // XXX asac: example code that doesn't work
+   nsresult rv;
+   nsCOMPtr<nsIXPConnect> xpc (do_GetService(nsIXPConnect::GetCID(), &rv));
+   NS_ENSURE_SUCCESS (rv, nsnull);
+Index: epiphany-browser-2.21.4/embed/mozilla/Makefile.am
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/Makefile.am	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/Makefile.am	(working copy)
+@@ -9,8 +9,6 @@
+ 	ContentHandler.h		\
+ 	EphyAboutModule.cpp		\
+ 	EphyAboutModule.h		\
+-	EphyBadCertRejector.cpp		\
+-	EphyBadCertRejector.h		\
+ 	EphyContentPolicy.cpp		\
+ 	EphyContentPolicy.h		\
+ 	EphyDirectoryProvider.cpp       \
+@@ -64,6 +62,17 @@
+ 	mozilla-notifiers.cpp		\
+ 	mozilla-notifiers.h
+ 
++# XXX asac: 1.9 certificate
++if HAVE_GECKO_1_9
++libephymozillaembed_la_SOURCES += 	\
++	$(NULL)
++else
++libephymozillaembed_la_SOURCES += 	\
++	EphyBadCertRejector.cpp		\
++	EphyBadCertRejector.h		\
++	$(NULL)
++endif
++
+ if ENABLE_FILEPICKER
+ libephymozillaembed_la_SOURCES += 	\
+ 	FilePicker.cpp			\
+@@ -122,6 +131,7 @@
+ 	pipnss			\
+ 	pref			\
+ 	shistory		\
++	string			\
+ 	sidebar			\
+ 	spellchecker		\
+ 	uriloader		\
+@@ -147,6 +157,7 @@
+ 	-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\"		\
+ 	-DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\"	\
+ 	-DALLOW_PRIVATE_API			\
++	-DXPCOM_GLUE_USE_NSPR			\
+ 	$(AM_CPPFLAGS)
+ 
+ libephymozillaembed_la_CXXFLAGS = \
+Index: epiphany-browser-2.21.4/embed/mozilla/EphyHeaderSniffer.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/EphyHeaderSniffer.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/EphyHeaderSniffer.cpp	(working copy)
+@@ -73,7 +73,9 @@
+ #include "ephy-gui.h"
+ #include "ephy-prefs.h"
+ 
++#ifndef HAVE_GECKO_1_9
+ #include "EphyBadCertRejector.h"
++#endif
+ #include "MozDownload.h"
+ 
+ #include "EphyHeaderSniffer.h"
+@@ -223,6 +225,7 @@
+ NS_IMETHODIMP
+ EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result)
+ {
++#ifndef HAVE_GECKO_1_9 // XXX asac: 1.9 certificate
+ 	if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) &&
+ 	    mEmbedPersist)
+ 	{
+@@ -241,6 +244,7 @@
+ 			return NS_OK;
+ 		}
+ 	}
++#endif
+ 
+ 	return NS_ERROR_NO_INTERFACE;
+ }
+Index: epiphany-browser-2.21.4/embed/mozilla/MozDownload.cpp
+===================================================================
+--- epiphany-browser-2.21.4/embed/mozilla/MozDownload.cpp	(revision 7753)
++++ epiphany-browser-2.21.4/embed/mozilla/MozDownload.cpp	(working copy)
+@@ -69,7 +69,10 @@
+ #include <nsNetError.h>
+ #include <nsServiceManagerUtils.h>
+ 
++#ifndef HAVE_GECKO_1_9
+ #include "EphyBadCertRejector.h"
++#endif
++
+ #include "EphyUtils.h"
+ 
+ #include "eel-gconf-extensions.h"
+@@ -505,6 +508,7 @@
+ NS_IMETHODIMP
+ MozDownload::GetInterface(const nsIID & uuid, void * *result)
+ {
++#ifndef HAVE_GECKO_1_9 // XXX asac: 1.9 certificate
+ 	if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) &&
+ 	    mEmbedPersist)
+ 	{
+@@ -523,7 +527,7 @@
+ 			return NS_OK;
+ 		}
+ 	}
+-
++#endif
+ 	return NS_ERROR_NO_INTERFACE;
+ }
+ 
+Index: epiphany-browser-2.21.4/embed/Makefile.am
+===================================================================
+--- epiphany-browser-2.21.4/embed/Makefile.am	(revision 7753)
++++ epiphany-browser-2.21.4/embed/Makefile.am	(working copy)
+@@ -115,6 +115,7 @@
+ endif
+ 
+ libephyembedfactory_la_CFLAGS = \
++	$(GECKO_CFLAGS) \
+ 	$(DEPENDENCIES_CFLAGS) 	\
+ 	$(AM_CFLAGS)
+ 
--- epiphany-browser-2.21.4.orig/debian/patches/03_dbus.patch
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/patches/04_move_tabs.patch
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/patches/06_ssl_weak_ciphers.patch
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/patches/09_download_dialog.patch
+++ epiphany-browser-2.21.4/debian/patches/09_download_dialog.patch
@@ -0,0 +1,147 @@
+Index: embed/mozilla/ContentHandler.cpp
+===================================================================
+--- embed/mozilla/ContentHandler.cpp.orig	2007-08-27 22:19:02.000000000 +0200
++++ embed/mozilla/ContentHandler.cpp	2007-09-21 14:30:06.194859590 +0200
+@@ -336,8 +336,11 @@
+ 
+ 	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);
+  
+@@ -385,20 +388,16 @@
+ 	}
+ 
+ 	if (auto_downloads)
+-	{
+-		mAction = CONTENT_ACTION_OPEN;
+-	}
++		mAction = mHelperApp ? CONTENT_ACTION_OPEN : CONTENT_ACTION_DOWNLOAD;
+ 	else
+-	{
+-		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 ();
+ 	}
+Index: data/glade/prefs-dialog.glade
+===================================================================
+--- data/glade/prefs-dialog.glade.orig	2007-08-27 22:19:01.000000000 +0200
++++ data/glade/prefs-dialog.glade	2007-09-21 14:30:06.198859818 +0200
+@@ -303,6 +303,25 @@
+ 			      <property name="spacing">6</property>
+ 
+ 			      <child>
++				<widget class="GtkCheckButton" id="automatic_downloads_checkbutton">
++				  <property name="visible">True</property>
++				  <property name="can_focus">True</property>
++				  <property name="label" translatable="yes">A_utomatically download and open files</property>
++				  <property name="use_underline">True</property>
++				  <property name="relief">GTK_RELIEF_NORMAL</property>
++				  <property name="focus_on_click">True</property>
++				  <property name="active">False</property>
++				  <property name="inconsistent">False</property>
++				  <property name="draw_indicator">True</property>
++				</widget>
++				<packing>
++				  <property name="padding">0</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
++				</packing>
++			      </child>
++
++			      <child>
+ 				<widget class="GtkHBox" id="download_button_hbox">
+ 				  <property name="visible">True</property>
+ 				  <property name="homogeneous">False</property>
+@@ -343,25 +362,6 @@
+ 				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+-
+-			      <child>
+-				<widget class="GtkCheckButton" id="automatic_downloads_checkbutton">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="label" translatable="yes">A_utomatically download and open files</property>
+-				  <property name="use_underline">True</property>
+-				  <property name="relief">GTK_RELIEF_NORMAL</property>
+-				  <property name="focus_on_click">True</property>
+-				  <property name="active">False</property>
+-				  <property name="inconsistent">False</property>
+-				  <property name="draw_indicator">True</property>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+ 			    </widget>
+ 			  </child>
+ 			</widget>
+Index: src/prefs-dialog.c
+===================================================================
+--- src/prefs-dialog.c.orig	2007-08-27 22:18:55.000000000 +0200
++++ src/prefs-dialog.c	2007-09-21 14:30:06.198859818 +0200
+@@ -391,6 +391,13 @@
+ }
+ 
+ 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,
+@@ -1525,6 +1532,7 @@
+ 	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;
+@@ -1545,6 +1553,8 @@
+ 		 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,
+@@ -1568,6 +1578,10 @@
+ 	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);
+ 
--- epiphany-browser-2.21.4.orig/debian/patches/11_useragent-weasel.patch
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/patches/06_lpi.patch
+++ epiphany-browser-2.21.4/debian/patches/06_lpi.patch
@@ -0,0 +1,45 @@
+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,9 @@
+ 
+ 		<menu name="HelpMenu" action="Help">
+ 			<menuitem name="HelpContentsMenu" action="HelpContents"/>
++			<separator/>
++			<placeholder name="LaunchpadItems"/>
++			<separator/>
+ 			<menuitem name="HelpAboutMenu" action="HelpAbout"/>
+ 		</menu>
+ 	</menubar>
+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 <gtk/gtktoggleaction.h>
+ #include <gtk/gtkdialog.h>
+ #include <gtk/gtkmessagedialog.h>
++#include <launchpad-integration.h>
+ 
+ #ifdef HAVE_X11_XF86KEYSYM_H
+ #include <X11/XF86keysym.h>
+@@ -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.21.4.orig/debian/patches/02_ac_init.patch
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/patches/00_browser_wrapper_path.patch
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/patches/01_bookmarks_menu.patch
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/patches/10_url_double-click.patch
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/bug/control
+++ epiphany-browser-2.21.4/debian/bug/control
@@ -0,0 +1 @@
+report-with: epiphany-gecko epiphany-webkit
--- epiphany-browser-2.21.4.orig/debian/epiphany.sh
+++ epiphany-browser-2.21.4/debian/epiphany.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec epiphany-browser "$@"
--- epiphany-browser-2.21.4.orig/debian/copyright
+++ epiphany-browser-2.21.4/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Edd Dumbill on 14 Feb 2003.
+
+It was downloaded from <http://ftp.gnome.org/pub/gnome/sources/epiphany>
+
+Upstream authors:
+    Marco Pesenti Gritti <marco@gnome.org>
+    Xan Lopez <xan@gnome.org>
+    Christian Persch <chpe@gnome.org>
+    Adam Hooper <adamh@cvs.gnome.org>
+    Jean-François Rameau <jframeau@cvs.gnome.org>
+    Crispin Flowerday <crispin@flowerday.cx>
+
+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 
+<pkg-gnome-maintainers@lists.alioth.debian.org> and
+is licensed under the GPL, see above.
--- epiphany-browser-2.21.4.orig/debian/epiphany-browser-data.gconf-defaults
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/watch
+++ epiphany-browser-2.21.4/debian/watch
@@ -0,0 +1,4 @@
+version=2
+http://download.gnome.org/sources/epiphany/([\d\.]+)[02468]/ \
+	epiphany-(.*)\.tar\.gz \
+	debian uupdate
--- epiphany-browser-2.21.4.orig/debian/epiphany-gecko.prerm
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/epiphany-browser.links
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/control
+++ epiphany-browser-2.21.4/debian/control
@@ -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: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
+Build-Depends: debhelper (>= 5),
+               pkg-config,
+               libglib2.0-dev (>= 2.13.4),
+               libgtk2.0-dev (>= 2.11.6),
+               libxml2-dev (>= 2.6.12),
+               libxslt1-dev (>= 1.1.7),
+               libglade2-dev (>= 2.3.1),
+               libgnomevfs2-dev (>= 2.9.2),
+               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,
+               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
+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,
+         ${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.21.4.orig/debian/epiphany-webkit.menu
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/rules
+++ epiphany-browser-2.21.4/debian/rules
@@ -0,0 +1,174 @@
+#!/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 $@
+
+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 -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_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_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.21.4.orig/debian/epiphany-browser-dev.dirs
+++ epiphany-browser-2.21.4/debian/epiphany-browser-dev.dirs
@@ -0,0 +1,2 @@
+/usr/lib
+/usr/share
--- epiphany-browser-2.21.4.orig/debian/epiphany-browser.install
+++ epiphany-browser-2.21.4/debian/epiphany-browser.install
@@ -0,0 +1,2 @@
+debian/epiphany.sh /usr/bin/
+debian/bug/control /usr/share/bug/epiphany-browser/
--- epiphany-browser-2.21.4.orig/debian/changelog
+++ epiphany-browser-2.21.4/debian/changelog
@@ -0,0 +1,1359 @@
+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 <seb128@canonical.com>  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 <title>" 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.21.4.orig/debian/epiphany-gecko.postinst
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/epiphany-browser-data.dirs
+++ epiphany-browser-2.21.4/debian/epiphany-browser-data.dirs
@@ -0,0 +1,2 @@
+/etc/gnome/epiphany
+/usr
--- epiphany-browser-2.21.4.orig/debian/epiphany-webkit.prerm
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/epiphany-browser-data.links
+++ epiphany-browser-2.21.4/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.21.4.orig/debian/control.in
+++ epiphany-browser-2.21.4/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.13.4),
+               libgtk2.0-dev (>= 2.11.6),
+               libxml2-dev (>= 2.6.12),
+               libxslt1-dev (>= 1.1.7),
+               libglade2-dev (>= 2.3.1),
+               libgnomevfs2-dev (>= 2.9.2),
+               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,
+               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
+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,
+         ${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.21.4.orig/debian/epiphany-browser-data.docs
+++ epiphany-browser-2.21.4/debian/epiphany-browser-data.docs
@@ -0,0 +1,4 @@
+NEWS
+README
+TODO
+AUTHORS
--- epiphany-browser-2.21.4.orig/debian/compat
+++ epiphany-browser-2.21.4/debian/compat
@@ -0,0 +1 @@
+5
--- epiphany-browser-2.21.4.orig/debian/epiphany-webkit.postinst
+++ epiphany-browser-2.21.4/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