--- epiphany-browser-2.20.2.orig/debian/bug/control
+++ epiphany-browser-2.20.2/debian/bug/control
@@ -0,0 +1 @@
+report-with: epiphany-gecko epiphany-webkit
--- epiphany-browser-2.20.2.orig/debian/patches/series
+++ epiphany-browser-2.20.2/debian/patches/series
@@ -0,0 +1,20 @@
+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
+13_powered-by.patch
+14_webkit-scrollbars.patch
+15_webkit-gtk-api.patch
+16_webkit-missing-methods.patch
+17_webkit-signal-emission.patch
+99_autoreconf.patch
--- epiphany-browser-2.20.2.orig/debian/patches/05_libexecdir.patch
+++ epiphany-browser-2.20.2/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.20.2.orig/debian/patches/13_powered-by.patch
+++ epiphany-browser-2.20.2/debian/patches/13_powered-by.patch
@@ -0,0 +1,983 @@
+Index: epiphany-2.20.0/src/window-commands.c
+===================================================================
+--- epiphany-2.20.0.orig/src/window-commands.c 2007-08-27 22:18:55.000000000 +0200
++++ epiphany-2.20.0/src/window-commands.c 2007-10-02 14:52:31.508502320 +0200
+@@ -824,8 +824,8 @@
+ single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (shell));
+
+ comments = g_strdup_printf (_("Lets you view web pages and find information on the internet.\n"
+- "Powered by Gecko %s"),
+- ephy_embed_single_get_backend_name (single) + strlen ("gecko-"));
++ "Powered by %s"), ephy_embed_single_get_backend_name (single) );
++
+ licence = g_strjoin ("\n\n",
+ _(licence_part[0]),
+ _(licence_part[1]),
+Index: epiphany-2.20.0/po/ar.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ar.po 2007-10-02 14:58:47.869949937 +0200
++++ epiphany-2.20.0/po/ar.po 2007-10-02 14:59:56.649869481 +0200
+@@ -4078,10 +4078,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "يمَكّنُك من عرض صفحات الويب و إيجاد المعلومات على الإنترنت.\n"
+-"يستعمل Gecko %s"
++"يستعمل %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/be.po
+===================================================================
+--- epiphany-2.20.0.orig/po/be.po 2007-10-02 14:58:47.945954268 +0200
++++ epiphany-2.20.0/po/be.po 2007-10-02 14:59:56.701872444 +0200
+@@ -4063,10 +4063,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Дазваляе Вам праглядаць старонкі й шукаць зьвесткі ў інтэрнэце.\n"
+-"Заснаваны на рухавіку Gecko %s"
++"Заснаваны на рухавіку %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/bg.po
+===================================================================
+--- epiphany-2.20.0.orig/po/bg.po 2007-10-02 14:58:47.985956547 +0200
++++ epiphany-2.20.0/po/bg.po 2007-10-02 14:59:56.729874040 +0200
+@@ -4337,10 +4337,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Позволява ви да разглеждате уеб-страници и намирате информация в Интернет.\n"
+-"Задвижван от Gecko %s"
++"Задвижван от %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/bn_IN.po
+===================================================================
+--- epiphany-2.20.0.orig/po/bn_IN.po 2007-10-02 14:58:48.025958827 +0200
++++ epiphany-2.20.0/po/bn_IN.po 2007-10-02 14:59:56.761875864 +0200
+@@ -4247,7 +4247,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/ca.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ca.po 2007-10-02 14:58:48.145965666 +0200
++++ epiphany-2.20.0/po/ca.po 2007-10-02 14:59:56.845880651 +0200
+@@ -4337,10 +4337,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Us permet visualitzar pàgines web i cercar informació a Internet.\n"
+-"Funciona amb el Gecko %s"
++"Funciona amb el %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/cs.po
+===================================================================
+--- epiphany-2.20.0.orig/po/cs.po 2007-10-02 14:58:48.181967717 +0200
++++ epiphany-2.20.0/po/cs.po 2007-10-02 14:59:56.869882019 +0200
+@@ -4265,10 +4265,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Umožňuje prohlížet webové stránky a hledat informace na internetu.\n"
+-"Založeno na jádře Gecko %s"
++"Založeno na jádře %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/da.po
+===================================================================
+--- epiphany-2.20.0.orig/po/da.po 2007-10-02 14:58:48.261972277 +0200
++++ epiphany-2.20.0/po/da.po 2007-10-02 14:59:56.925885210 +0200
+@@ -4342,11 +4342,11 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Giver dig mulighed for at læse internetsider og søge information på "
+ "internettet.\n"
+-"Bygger på Gecko %s"
++"Bygger på %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/de.po
+===================================================================
+--- epiphany-2.20.0.orig/po/de.po 2007-10-02 14:58:48.301974556 +0200
++++ epiphany-2.20.0/po/de.po 2007-10-02 14:59:56.961887262 +0200
+@@ -4376,10 +4376,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Lässt Sie Webseiten betrachten und Informationen im Internet finden.\n"
+-"Verwendet Gecko %s"
++"Verwendet %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/dz.po
+===================================================================
+--- epiphany-2.20.0.orig/po/dz.po 2007-10-02 14:58:48.341976836 +0200
++++ epiphany-2.20.0/po/dz.po 2007-10-02 14:59:57.001889541 +0200
+@@ -4050,7 +4050,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "ཁྱོད་ལུ་ཝེབ་ཤོག་ལེབ་བལྟ་ནི་དི་ ཨིན་ཊར་ནེཊི་ནང་ བརྡ་དོན་འཚོལ་བཅུགཔ་ཨིན། \n"
+ "གེཀ་ཀོ་%sགིས་ནུས་ཤུགས་བྱིནམ་ཨིན།"
+Index: epiphany-2.20.0/po/el.po
+===================================================================
+--- epiphany-2.20.0.orig/po/el.po 2007-10-02 14:58:48.381979115 +0200
++++ epiphany-2.20.0/po/el.po 2007-10-02 14:59:57.033891365 +0200
+@@ -4289,10 +4289,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Προβολή ιστοσελίδων και εύρεση πληροφοριών στο διαδίκτυο.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/en_CA.po
+===================================================================
+--- epiphany-2.20.0.orig/po/en_CA.po 2007-10-02 14:58:48.421981395 +0200
++++ epiphany-2.20.0/po/en_CA.po 2007-10-02 14:59:57.061892961 +0200
+@@ -4280,10 +4280,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/en_GB.po
+===================================================================
+--- epiphany-2.20.0.orig/po/en_GB.po 2007-10-02 14:58:48.461983675 +0200
++++ epiphany-2.20.0/po/en_GB.po 2007-10-02 14:59:57.093894784 +0200
+@@ -4048,10 +4048,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/es.po
+===================================================================
+--- epiphany-2.20.0.orig/po/es.po 2007-10-02 14:58:48.501985954 +0200
++++ epiphany-2.20.0/po/es.po 2007-10-02 14:59:57.125896608 +0200
+@@ -4315,10 +4315,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Le permite ver páginas web y encontrar información en Internet.\n"
+-"Basado en Gecko %s"
++"Basado en %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/et.po
+===================================================================
+--- epiphany-2.20.0.orig/po/et.po 2007-10-02 14:58:48.537988006 +0200
++++ epiphany-2.20.0/po/et.po 2007-10-02 14:59:57.153898204 +0200
+@@ -4325,10 +4325,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Veebilehtede vaatamine ja andmete otsimine internetist.\n"
+-"Põhineb Gecko %s mootoril"
++"Põhineb %s mootoril"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/eu.po
+===================================================================
+--- epiphany-2.20.0.orig/po/eu.po 2007-10-02 14:58:48.577990285 +0200
++++ epiphany-2.20.0/po/eu.po 2007-10-02 14:59:57.185900027 +0200
+@@ -4296,10 +4296,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Web orrialdeak ikusteko eta interneten informazioa aurkitzeko.\n"
+-"Gecko %s indarrarekin"
++"%s indarrarekin"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/fa.po
+===================================================================
+--- epiphany-2.20.0.orig/po/fa.po 2007-10-02 14:58:48.617992565 +0200
++++ epiphany-2.20.0/po/fa.po 2007-10-02 14:59:57.217901851 +0200
+@@ -4196,7 +4196,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/fi.po
+===================================================================
+--- epiphany-2.20.0.orig/po/fi.po 2007-10-02 14:58:48.657994845 +0200
++++ epiphany-2.20.0/po/fi.po 2007-10-02 14:59:57.249903675 +0200
+@@ -4319,7 +4319,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Mahdollistaa www-sivujen katselun ja tiedon etsimisen Internetistä.\n"
+ "Käyttää Gecko-moottoria %s"
+Index: epiphany-2.20.0/po/fr.po
+===================================================================
+--- epiphany-2.20.0.orig/po/fr.po 2007-10-02 14:58:48.697997124 +0200
++++ epiphany-2.20.0/po/fr.po 2007-10-02 14:59:57.277905270 +0200
+@@ -4375,11 +4375,11 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Vous permet de consulter des pages Web et de trouver des informations sur "
+ "Internet.\n"
+-"Propulsé par Gecko %s"
++"Propulsé par %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/gl.po
+===================================================================
+--- epiphany-2.20.0.orig/po/gl.po 2007-10-02 14:58:48.778001683 +0200
++++ epiphany-2.20.0/po/gl.po 2007-10-02 14:59:57.329908234 +0200
+@@ -4272,10 +4272,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Permítelle ver páxinas web e buscar información en internet.\n"
+-"Baseado en Gecko %s"
++"Baseado en %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/gu.po
+===================================================================
+--- epiphany-2.20.0.orig/po/gu.po 2007-10-02 14:58:48.818003963 +0200
++++ epiphany-2.20.0/po/gu.po 2007-10-02 14:59:57.365910286 +0200
+@@ -4306,10 +4306,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "તમને વેબ પાનાંઓ જોવા માટે અને ઈન્ટરનેટ પર જાણકારી શોધવા માટે પરવાનગી આપે છે.\n"
+-"Gecko %s દ્વારા સમર્થિત છે"
++"%s દ્વારા સમર્થિત છે"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/he.po
+===================================================================
+--- epiphany-2.20.0.orig/po/he.po 2007-10-02 14:58:48.854006015 +0200
++++ epiphany-2.20.0/po/he.po 2007-10-02 14:59:57.397912109 +0200
+@@ -4232,10 +4232,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "מאפשר למצוא מידע ולצפות בדפי אינטרנט.\n"
+-"מופעל על ידי Gecko %s"
++"מופעל על ידי %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/hi.po
+===================================================================
+--- epiphany-2.20.0.orig/po/hi.po 2007-10-02 14:58:48.894008294 +0200
++++ epiphany-2.20.0/po/hi.po 2007-10-02 14:59:57.433914161 +0200
+@@ -4248,7 +4248,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ # Translator credits
+Index: epiphany-2.20.0/po/hu.po
+===================================================================
+--- epiphany-2.20.0.orig/po/hu.po 2007-10-02 14:58:48.974012853 +0200
++++ epiphany-2.20.0/po/hu.po 2007-10-02 14:59:57.485917124 +0200
+@@ -4312,11 +4312,11 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Lehetővé teszi weboldalak megjelenítését és információk keresését az "
+ "interneten.\n"
+-"A Gecko %s működteti"
++"A %s működteti"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/id.po
+===================================================================
+--- epiphany-2.20.0.orig/po/id.po 2007-10-02 14:58:49.014015133 +0200
++++ epiphany-2.20.0/po/id.po 2007-10-02 14:59:57.517918948 +0200
+@@ -4232,11 +4232,11 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Supaya anda dapat menampilkan halaman web dan menemukan informasi di "
+ "internet.\n"
+-"Diperkuat oleh Gecko %s"
++"Diperkuat oleh %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/it.po
+===================================================================
+--- epiphany-2.20.0.orig/po/it.po 2007-10-02 14:58:49.094019692 +0200
++++ epiphany-2.20.0/po/it.po 2007-10-02 14:59:57.569921912 +0200
+@@ -4380,11 +4380,11 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Permette di visualizzare le pagine web e di trovare informazioni su "
+ "internet.\n"
+-"Basato su Gecko %s"
++"Basato su %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/ja.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ja.po 2007-10-02 14:58:49.134021972 +0200
++++ epiphany-2.20.0/po/ja.po 2007-10-02 14:59:57.597923507 +0200
+@@ -4316,7 +4316,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "ウェブページを表示して、インターネット上の情報を見つけ出します。\n"
+ "使用している Gecko エンジン: %s"
+Index: epiphany-2.20.0/po/ko.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ko.po 2007-10-02 14:58:49.214026531 +0200
++++ epiphany-2.20.0/po/ko.po 2007-10-02 14:59:57.661927155 +0200
+@@ -4251,7 +4251,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "인터넷에서 웹페이지를 보고 정보를 찾습니다.\n"
+ "게코 %s 엔진을 사용합니다"
+Index: epiphany-2.20.0/po/ku.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ku.po 2007-10-02 14:58:49.250028583 +0200
++++ epiphany-2.20.0/po/ku.po 2007-10-02 14:59:57.685928522 +0200
+@@ -3982,7 +3982,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/lt.po
+===================================================================
+--- epiphany-2.20.0.orig/po/lt.po 2007-10-02 14:58:49.330033142 +0200
++++ epiphany-2.20.0/po/lt.po 2007-10-02 14:59:57.745931942 +0200
+@@ -4299,10 +4299,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Leidžia Jums peržiūrėti žiniatinklio svetaines ir rasti informaciją\n"
+-"Internete. Sukurta Gecko %s pagrindu."
++"Internete. Sukurta %s pagrindu."
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/lv.po
+===================================================================
+--- epiphany-2.20.0.orig/po/lv.po 2007-10-02 14:58:49.370035422 +0200
++++ epiphany-2.20.0/po/lv.po 2007-10-02 14:59:57.777933765 +0200
+@@ -4224,10 +4224,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Ļauj jums aplīkot tīmekļa vietnes un meklēt informāciju internetā.\n"
+-"Darbina Gecko %s"
++"Darbina %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/mg.po
+===================================================================
+--- epiphany-2.20.0.orig/po/mg.po 2007-10-02 14:58:49.410037701 +0200
++++ epiphany-2.20.0/po/mg.po 2007-10-02 14:59:57.805935361 +0200
+@@ -4117,7 +4117,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/mk.po
+===================================================================
+--- epiphany-2.20.0.orig/po/mk.po 2007-10-02 14:58:49.482041804 +0200
++++ epiphany-2.20.0/po/mk.po 2007-10-02 14:59:57.857938325 +0200
+@@ -4313,10 +4313,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Овозможува прегледување на веб страници и барање на информации на интернет.\n"
+-"Базиран на Gecko %s"
++"Базиран на %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/ml.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ml.po 2007-10-02 14:58:49.506043172 +0200
++++ epiphany-2.20.0/po/ml.po 2007-10-02 14:59:57.893940376 +0200
+@@ -4190,7 +4190,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr "നിങ്ങളെ വെബ് താളുകള് കാണുന്നതിനും ഇന്റര്നെറ്റില് വിവരങ്ങള് കണ്ടുപിടിയ്ക്കുന്നതിനും കഴിവുള്ളതാക്കുന്നു.\n"
+ "ഗെക്കോ %s ന്റെ ശക്തി"
+
+Index: epiphany-2.20.0/po/mn.po
+===================================================================
+--- epiphany-2.20.0.orig/po/mn.po 2007-10-02 14:58:49.526044312 +0200
++++ epiphany-2.20.0/po/mn.po 2007-10-02 14:59:57.925942200 +0200
+@@ -4192,7 +4192,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/mr.po
+===================================================================
+--- epiphany-2.20.0.orig/po/mr.po 2007-10-02 14:58:49.550045680 +0200
++++ epiphany-2.20.0/po/mr.po 2007-10-02 14:59:57.953943796 +0200
+@@ -4163,7 +4163,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/ms.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ms.po 2007-10-02 14:58:49.574047047 +0200
++++ epiphany-2.20.0/po/ms.po 2007-10-02 14:59:57.985945619 +0200
+@@ -4353,7 +4353,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/nb.po
+===================================================================
+--- epiphany-2.20.0.orig/po/nb.po 2007-10-02 14:58:49.594048187 +0200
++++ epiphany-2.20.0/po/nb.po 2007-10-02 14:59:58.013947215 +0200
+@@ -4076,10 +4076,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Lar deg se nettsider og finne informasjon på internett.\n"
+-" Bruker Gecko %s"
++" Bruker %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/nl.po
+===================================================================
+--- epiphany-2.20.0.orig/po/nl.po 2007-10-02 14:58:49.642050923 +0200
++++ epiphany-2.20.0/po/nl.po 2007-10-02 14:59:58.085951318 +0200
+@@ -4972,10 +4972,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Stelt u in staat webpagina's en informatie op het internet te vinden.\n"
+-"Op basis van Gecko %s"
++"Op basis van %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/nn.po
+===================================================================
+--- epiphany-2.20.0.orig/po/nn.po 2007-10-02 14:58:49.662052063 +0200
++++ epiphany-2.20.0/po/nn.po 2007-10-02 14:59:58.113952914 +0200
+@@ -4223,10 +4223,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Let deg lesa nettsider og finna informasjon på internettet.\n"
+-"Driven av Gecko %s"
++"Driven av %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/oc.po
+===================================================================
+--- epiphany-2.20.0.orig/po/oc.po 2007-10-02 14:58:49.686053430 +0200
++++ epiphany-2.20.0/po/oc.po 2007-10-02 14:59:58.137954282 +0200
+@@ -4106,7 +4106,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/or.po
+===================================================================
+--- epiphany-2.20.0.orig/po/or.po 2007-10-02 14:58:49.710054798 +0200
++++ epiphany-2.20.0/po/or.po 2007-10-02 14:59:58.161955650 +0200
+@@ -4062,7 +4062,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/pa.po
+===================================================================
+--- epiphany-2.20.0.orig/po/pa.po 2007-10-02 14:58:49.734056166 +0200
++++ epiphany-2.20.0/po/pa.po 2007-10-02 14:59:58.197957701 +0200
+@@ -4281,7 +4281,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਵੈੱਬ ਸਫ਼ੇ ਵੇਖਣ ਅਤੇ ਜਾਣਕਾਰੀ ਲੱਭਣ ਦਿੰਦਾ ਹੈ।\n"
+ "ਗੀਕੋ %s ਉੱਤੇ ਅਧਾਰਿਤ ਹੈ।"
+Index: epiphany-2.20.0/po/pl.po
+===================================================================
+--- epiphany-2.20.0.orig/po/pl.po 2007-10-02 14:58:49.754057306 +0200
++++ epiphany-2.20.0/po/pl.po 2007-10-02 14:59:58.225959297 +0200
+@@ -4347,10 +4347,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Umożliwia przeglądanie stron i wyszukiwanie informacji w internecie.\n"
+-"Napędzane przez Gecko %s"
++"Napędzane przez %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/pt.po
+===================================================================
+--- epiphany-2.20.0.orig/po/pt.po 2007-10-02 14:58:49.802060041 +0200
++++ epiphany-2.20.0/po/pt.po 2007-10-02 14:59:58.293963172 +0200
+@@ -4333,10 +4333,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Permite-lhe visualizar páginas web e procurar informação na internet.\n"
+-"Utiliza o Motor de Parseamento Gecko %s"
++"Utiliza o Motor de Parseamento %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/pt_BR.po
+===================================================================
+--- epiphany-2.20.0.orig/po/pt_BR.po 2007-10-02 14:58:49.778058673 +0200
++++ epiphany-2.20.0/po/pt_BR.po 2007-10-02 14:59:58.257961121 +0200
+@@ -4332,10 +4332,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Permite que você veja páginas da web e encontre informação na internet.\n"
+-"Baseado no Gecko %s"
++"Baseado no %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/ru.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ru.po 2007-10-02 14:58:49.846062549 +0200
++++ epiphany-2.20.0/po/ru.po 2007-10-02 14:59:58.353966592 +0200
+@@ -4326,10 +4326,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Позволяет просматривать веб-страницы и искать информацию в Интернет.\n"
+-"Использует Gecko %s"
++"Использует %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/si.po
+===================================================================
+--- epiphany-2.20.0.orig/po/si.po 2007-10-02 14:58:49.894065284 +0200
++++ epiphany-2.20.0/po/si.po 2007-10-02 14:59:58.409969783 +0200
+@@ -4238,7 +4238,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/sl.po
+===================================================================
+--- epiphany-2.20.0.orig/po/sl.po 2007-10-02 14:58:49.938067792 +0200
++++ epiphany-2.20.0/po/sl.po 2007-10-02 14:59:58.465972975 +0200
+@@ -4322,10 +4322,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Omogoča ogled spletnih strani in iskanje informacij na spletu.\n"
+-"Poganja ga Gecko %s"
++"Poganja ga %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/sq.po
+===================================================================
+--- epiphany-2.20.0.orig/po/sq.po 2007-10-02 14:58:49.962069160 +0200
++++ epiphany-2.20.0/po/sq.po 2007-10-02 14:59:58.493974570 +0200
+@@ -4321,11 +4321,11 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Ju mundëson shfaqjen e faqeve web dhe kërkimin e informacioneve\n"
+ "në internet.\n"
+-"Fuqizuar nga Gecko %s"
++"Fuqizuar nga %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/sr.po
+===================================================================
+--- epiphany-2.20.0.orig/po/sr.po 2007-10-02 14:58:50.006071667 +0200
++++ epiphany-2.20.0/po/sr.po 2007-10-02 14:59:58.573979130 +0200
+@@ -4332,10 +4332,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Омогућава ти преглед страница на вебу и претрагу информација на интернету.\n"
+-"Реализовано уз Gecko %s"
++"Реализовано уз %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/sr@Latn.po
+===================================================================
+--- epiphany-2.20.0.orig/po/sr@Latn.po 2007-10-02 14:58:49.982070299 +0200
++++ epiphany-2.20.0/po/sr@Latn.po 2007-10-02 14:59:58.533976850 +0200
+@@ -4332,10 +4332,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Omogućava ti pregled stranica na vebu i pretragu informacija na internetu.\n"
+-"Realizovano uz Gecko %s"
++"Realizovano uz %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/sv.po
+===================================================================
+--- epiphany-2.20.0.orig/po/sv.po 2007-10-02 14:58:50.030073035 +0200
++++ epiphany-2.20.0/po/sv.po 2007-10-02 14:59:58.605980953 +0200
+@@ -4082,10 +4082,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Låter dig se webbsidor och hitta information på Internet.\n"
+-"Drivs av Gecko %s"
++"Drivs av %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/ta.po
+===================================================================
+--- epiphany-2.20.0.orig/po/ta.po 2007-10-02 14:58:50.054074403 +0200
++++ epiphany-2.20.0/po/ta.po 2007-10-02 14:59:58.641983005 +0200
+@@ -4259,7 +4259,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "இணைய பக்கங்களை காணவும் உலகவலையில் தகவல் சேகரிக்கவும் பயன்படும்.\n"
+ " கெக்கோ ஆல் இயக்கப்படுகிறது %s "
+Index: epiphany-2.20.0/po/te.po
+===================================================================
+--- epiphany-2.20.0.orig/po/te.po 2007-10-02 14:58:50.074075542 +0200
++++ epiphany-2.20.0/po/te.po 2007-10-02 14:59:58.677985056 +0200
+@@ -4143,7 +4143,7 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/th.po
+===================================================================
+--- epiphany-2.20.0.orig/po/th.po 2007-10-02 14:58:50.098076910 +0200
++++ epiphany-2.20.0/po/th.po 2007-10-02 14:59:58.717987336 +0200
+@@ -4241,10 +4241,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "ให้คุณเข้าชมหน้าเว็บต่างๆ และค้นหาข้อมูลในอินเทอร์เน็ต\n"
+-"ขับเคลื่อนโดย Gecko %s"
++"ขับเคลื่อนโดย %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/tr.po
+===================================================================
+--- epiphany-2.20.0.orig/po/tr.po 2007-10-02 14:58:50.146079646 +0200
++++ epiphany-2.20.0/po/tr.po 2007-10-02 14:59:58.765990072 +0200
+@@ -4232,11 +4232,11 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Web sayfalarını görüntülemeye ve İnternet üzerinde bilgi bulmanıza olanak "
+ "sağlar.\n"
+-"Gecko %s ile güçlendirilmiştir"
++"%s ile güçlendirilmiştir"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/uk.po
+===================================================================
+--- epiphany-2.20.0.orig/po/uk.po 2007-10-02 14:58:50.166080786 +0200
++++ epiphany-2.20.0/po/uk.po 2007-10-02 14:59:58.801992123 +0200
+@@ -4320,10 +4320,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Дозволяє переглядати веб-сторінки та шукати інформацію у Інтернет.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/vi.po
+===================================================================
+--- epiphany-2.20.0.orig/po/vi.po 2007-10-02 14:58:50.190082153 +0200
++++ epiphany-2.20.0/po/vi.po 2007-10-02 14:59:58.829993719 +0200
+@@ -4327,10 +4327,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "Cho bạn khả năng xem trang Web và tìm thông tin qua Internet.\n"
+-"Được hỗ trợ bởi Gecko %s"
++"Được hỗ trợ bởi %s"
+
+ #: ../src/window-commands.c:852
+ #. Translators: This is a special message that shouldn't be translated
+Index: epiphany-2.20.0/po/zh_CN.po
+===================================================================
+--- epiphany-2.20.0.orig/po/zh_CN.po 2007-10-02 14:58:50.238084889 +0200
++++ epiphany-2.20.0/po/zh_CN.po 2007-10-02 14:59:58.877996454 +0200
+@@ -4211,10 +4211,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "让您浏览网页并从 Internet 上查找信息。\n"
+-"引擎由 Gecko %s 提供"
++"引擎由 %s 提供"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/zh_HK.po
+===================================================================
+--- epiphany-2.20.0.orig/po/zh_HK.po 2007-10-02 14:58:50.262086257 +0200
++++ epiphany-2.20.0/po/zh_HK.po 2007-10-02 14:59:58.909998278 +0200
+@@ -4107,10 +4107,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "讓你在互聯網上瀏覽網頁及尋找資訊。\n"
+-"基於 Gecko %s"
++"基於 %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
+Index: epiphany-2.20.0/po/zh_TW.po
+===================================================================
+--- epiphany-2.20.0.orig/po/zh_TW.po 2007-10-02 14:58:50.282087396 +0200
++++ epiphany-2.20.0/po/zh_TW.po 2007-10-02 14:59:58.937999874 +0200
+@@ -4165,10 +4165,10 @@
+ #, c-format
+ msgid ""
+ "Lets you view web pages and find information on the internet.\n"
+-"Powered by Gecko %s"
++"Powered by %s"
+ msgstr ""
+ "讓您在網際網路上瀏覽網頁及尋找資訊。\n"
+-"基於 Gecko %s"
++"基於 %s"
+
+ #. Translators: This is a special message that shouldn't be translated
+ #. * literally. It is used in the about box to give credits to
--- epiphany-browser-2.20.2.orig/debian/patches/07_bookmarks.patch
+++ epiphany-browser-2.20.2/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.20.2.orig/debian/patches/08_load_on_new_tab.patch
+++ epiphany-browser-2.20.2/debian/patches/08_load_on_new_tab.patch
@@ -0,0 +1,90 @@
+Index: epiphany-browser-2.18.0/data/epiphany.schemas.in
+===================================================================
+--- epiphany-browser-2.18.0.orig/data/epiphany.schemas.in 2007-03-06 12:31:58.000000000 +0000
++++ epiphany-browser-2.18.0/data/epiphany.schemas.in 2007-03-11 21:01:46.000000000 +0000
+@@ -168,6 +168,21 @@
+
+
+
++ /schemas/apps/epiphany/general/load_on_new_tab
++ /apps/epiphany/general/load_on_new_tab
++ epiphany
++ int
++ 1
++
++ Page to open when opening a new tab
++ Page to open when opening a new tab. Allowed values are -1
++ (browser startup page), 0 (blank page), 1 (homepage), 2 (last visited
++ page), as defined for mozilla's browser.tab.loadOnNewTab about:config
++ option. Both -1 and 1 are implemented the same way; 2 is not
++ implemented.
++
++
++
+ /schemas/apps/epiphany/general/show_bookmarks_bar
+ /apps/epiphany/general/show_bookmarks_bar
+ epiphany
+Index: epiphany-browser-2.18.0/lib/ephy-prefs.h
+===================================================================
+--- epiphany-browser-2.18.0.orig/lib/ephy-prefs.h 2007-03-06 12:31:55.000000000 +0000
++++ epiphany-browser-2.18.0/lib/ephy-prefs.h 2007-03-11 21:01:46.000000000 +0000
+@@ -37,6 +37,7 @@
+ #define CONF_AUTO_DOWNLOADS "/apps/epiphany/general/automatic_downloads"
+ #define CONF_DESKTOP_IS_HOME_DIR "/apps/nautilus/preferences/desktop_is_home_dir"
+ #define CONF_NETWORK_MANAGED "/apps/epiphany/general/managed_network"
++#define CONF_BROWSER_TABS_LOADONNEWTAB "/apps/epiphany/general/load_on_new_tab"
+
+ /* i18n pref */
+ #define CONF_GECKO_ENABLE_PANGO "/apps/epiphany/web/enable_pango"
+Index: epiphany-browser-2.18.0/src/ephy-shell.c
+===================================================================
+--- epiphany-browser-2.18.0.orig/src/ephy-shell.c 2007-03-06 12:31:28.000000000 +0000
++++ epiphany-browser-2.18.0/src/ephy-shell.c 2007-03-11 21:01:46.000000000 +0000
+@@ -530,14 +530,45 @@
+ gtk_window_fullscreen (GTK_WINDOW (window));
+ }
+
+- if (flags & EPHY_NEW_TAB_HOME_PAGE ||
+- flags & EPHY_NEW_TAB_NEW_PAGE)
++ if (flags & EPHY_NEW_TAB_HOME_PAGE)
+ {
+ ephy_tab_set_typed_address (tab, "",
+ EPHY_TAB_ADDRESS_EXPIRE_NEXT);
+ ephy_toolbar_activate_location (toolbar);
+ is_empty = load_homepage (embed);
+ }
++ else if (flags & EPHY_NEW_TAB_NEW_PAGE)
++ {
++ /* Simulate mozilla's browser.tabs.loadOnNewTab option through
++ * a gconf option.
++ *
++ * Documentation at: http://kb.mozillazine.org/About:config_entries
++ *
++ * To ensure that no blank page is displayed by default, this key
++ * is set to 1 by default in the schema (see data/epiphany.schema.in)
++ */
++ int load_on_new_tab = eel_gconf_get_integer (CONF_BROWSER_TABS_LOADONNEWTAB);
++
++ switch (load_on_new_tab)
++ {
++ case 0: /* Blank page */
++ ephy_embed_load_url (embed, "about:blank");
++ is_empty = url_is_empty ("about:blank");
++ break;
++
++ case 2: /* Last visited */
++ /* NOT IMPLEMENTED */
++
++ case -1: /* Start-up page */
++ case 1: /* Homepage */
++ default:
++ /* Same as in the previous 'if' test */
++ ephy_tab_set_typed_address (tab, "",
++ EPHY_TAB_ADDRESS_EXPIRE_NEXT);
++ ephy_toolbar_activate_location (toolbar);
++ is_empty = load_homepage (embed);
++ }
++ }
+ else if (flags & EPHY_NEW_TAB_OPEN_PAGE)
+ {
+ EphyEmbedLoadFlags load_flags = 0;
--- epiphany-browser-2.20.2.orig/debian/patches/99_autoreconf.patch
+++ epiphany-browser-2.20.2/debian/patches/99_autoreconf.patch
@@ -0,0 +1,3923 @@
+Index: epiphany-browser-2.20.2/aclocal.m4
+===================================================================
+--- epiphany-browser-2.20.2.orig/aclocal.m4 2007-11-27 00:37:29.000000000 +0100
++++ epiphany-browser-2.20.2/aclocal.m4 2007-12-05 14:37:58.000000000 +0100
+@@ -682,7 +682,7 @@
+
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -845,7 +845,7 @@
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+
+@@ -932,8 +932,9 @@
+ # Check for compiler boilerplate output or warnings with
+ # the simple compiler test code.
+ AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -945,8 +946,9 @@
+ # Check for linker boilerplate output or warnings with
+ # the simple link test code.
+ AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -962,12 +964,20 @@
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+
+@@ -1198,13 +1208,17 @@
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+@@ -1221,6 +1235,9 @@
+ ;;
+ *64-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+@@ -1292,7 +1309,7 @@
+ AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -1333,11 +1350,12 @@
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -1451,24 +1469,27 @@
+ fi
+ ;;
+ *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+- new_result=`expr "X$teststring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- teststring=$teststring$teststring
+- done
+- teststring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+ ])
+@@ -1695,7 +1716,8 @@
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -1703,7 +1725,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -1843,6 +1865,7 @@
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+@@ -1860,7 +1883,8 @@
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -1874,20 +1898,58 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
+ if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -2044,12 +2106,8 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -2103,7 +2161,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -2166,7 +2224,7 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[[3-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -2237,7 +2295,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -2343,6 +2401,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -2448,7 +2510,8 @@
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+ [include additional configurations @<:@automatic@:>@])],
+ [tagnames="$withval"])
+@@ -2709,7 +2772,7 @@
+
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -2772,7 +2835,7 @@
+
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -2919,7 +2982,7 @@
+ # how to check for library dependencies
+ # -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -2958,9 +3021,15 @@
+
+ mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ else
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
+ ;;
+
+ darwin* | rhapsody*)
+@@ -3005,7 +3074,7 @@
+ esac
+ ;;
+
+-interix3*)
++interix[[3-9]]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+ ;;
+@@ -3055,6 +3124,10 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++rdos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3107,7 +3180,7 @@
+ lt_cv_path_NM="$NM"
+ else
+ lt_nm_to_check="${ac_tool_prefix}nm"
+- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+@@ -3323,10 +3396,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
+ _LT_AC_SYS_COMPILER
+
+@@ -3428,10 +3501,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -3577,7 +3650,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -3736,10 +3809,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -3822,9 +3895,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- ;;
++ hppa*64*|ia64*) ;;
+ *)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+@@ -3892,7 +3963,7 @@
+ ;;
+ esac
+ ;;
+- interix3*)
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+@@ -4012,6 +4083,29 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ lynxos*)
+@@ -4050,16 +4144,20 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+- output_verbose_link_cmd='echo'
+ ;;
+ osf3*)
+ case $cc_basename in
+@@ -4221,15 +4319,10 @@
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker. We must also pass each convience library through
+- # to the system linker between allextract/defaultextract.
+- # The C++ compiler will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -4276,6 +4369,12 @@
+ fi
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
+ ;;
+ esac
+@@ -4519,7 +4618,7 @@
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+-interix3*)
++interix[[3-9]]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ _LT_AC_TAGVAR(predep_objects,$1)=
+@@ -4527,13 +4626,46 @@
+ _LT_AC_TAGVAR(postdeps,$1)=
+ ;;
+
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
+ solaris*)
+ case $cc_basename in
+ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
+ ;;
+ esac
+ ;;
+@@ -4582,10 +4714,17 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -4664,10 +4803,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -4720,7 +4859,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -4809,6 +4948,7 @@
+ _LT_AC_TAGVAR(module_cmds, $1) \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
+ _LT_AC_TAGVAR(include_expsyms, $1); do
+
+@@ -4855,7 +4995,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -5180,7 +5320,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -5263,6 +5403,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -5489,12 +5630,14 @@
+ # like `-m68040'.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+ darwin* | rhapsody*)
+@@ -5506,7 +5649,7 @@
+ # DJGPP does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+- interix3*)
++ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -5642,6 +5785,14 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
++ esac
+ ;;
+ esac
+ ;;
+@@ -5762,13 +5913,15 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+
+@@ -5778,7 +5931,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
+- interix3*)
++ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -5836,7 +5989,7 @@
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -5888,6 +6041,22 @@
+ # All Alpha code is PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -5897,6 +6066,10 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
++ rdos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
++
+ solaris*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -5991,7 +6164,8 @@
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -6008,7 +6182,7 @@
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw*)
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+@@ -6150,7 +6324,7 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -6168,7 +6342,7 @@
+ fi
+ ;;
+
+- interix3*)
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+@@ -6183,7 +6357,7 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+@@ -6201,13 +6375,22 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+@@ -6248,7 +6431,7 @@
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+@@ -6367,7 +6550,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -6460,7 +6643,7 @@
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+@@ -6502,10 +6685,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -6667,24 +6850,28 @@
+ ;;
+
+ openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- ;;
+- *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- ;;
+- esac
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+@@ -6743,17 +6930,16 @@
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+- *)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -6810,7 +6996,7 @@
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -6885,7 +7071,7 @@
+ # to ld, don't add -lc before -lgcc.
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+@@ -6988,6 +7174,30 @@
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ # NOTE: This macro has been submitted for inclusion into #
+ # GNU Autoconf as AC_PROG_SED. When it is available in #
+ # a released version of Autoconf we should remove this #
+@@ -7008,12 +7218,13 @@
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -7046,6 +7257,7 @@
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+
+Index: epiphany-browser-2.20.2/configure
+===================================================================
+--- epiphany-browser-2.20.2.orig/configure 2007-11-27 00:37:35.000000000 +0100
++++ epiphany-browser-2.20.2/configure 2007-12-05 14:38:03.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.20.2'
+ PACKAGE_STRING='GNOME Web Browser 2.20.2'
+ PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
+@@ -859,6 +859,7 @@
+ CCDEPMODE
+ am__fastdepCC_TRUE
+ am__fastdepCC_FALSE
++SED
+ GREP
+ EGREP
+ LN_S
+@@ -1606,7 +1607,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]
+@@ -2527,7 +2528,7 @@
+
+
+ # Define the identity of the package.
+- PACKAGE='epiphany'
++ PACKAGE='epiphany-browser'
+ VERSION='2.20.2'
+
+
+@@ -4040,12 +4041,13 @@
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -4080,6 +4082,7 @@
+ fi
+
+ SED=$lt_cv_path_SED
++
+ { echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6; }
+
+@@ -4441,8 +4444,8 @@
+ echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4483,9 +4486,15 @@
+
+ mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ else
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
+ ;;
+
+ darwin* | rhapsody*)
+@@ -4530,7 +4539,7 @@
+ esac
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
+@@ -4580,6 +4589,10 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++rdos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -4667,7 +4680,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 4670 "configure"' > conftest.$ac_ext
++ echo '#line 4683 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -4702,7 +4715,8 @@
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -4713,6 +4727,9 @@
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+@@ -4729,6 +4746,9 @@
+ ;;
+ *64-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+@@ -6521,24 +6541,27 @@
+ fi
+ ;;
+ *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+- new_result=`expr "X$teststring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- teststring=$teststring$teststring
+- done
+- teststring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+
+@@ -6555,6 +6578,7 @@
+
+
+
++
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+@@ -7143,7 +7167,7 @@
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+
+@@ -7343,10 +7367,10 @@
+ objext=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
+
+ # If no C compiler was specified, use CC.
+@@ -7361,13 +7385,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -7387,7 +7411,7 @@
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -7398,11 +7422,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:7401: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7425: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7405: \$? = $ac_status" >&5
++ echo "$as_me:7429: \$? = $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.
+@@ -7453,13 +7477,15 @@
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ ;;
+
+@@ -7469,7 +7495,7 @@
+ lt_prog_compiler_pic='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -7527,7 +7553,7 @@
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -7579,6 +7605,22 @@
+ # All Alpha code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -7588,6 +7630,10 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+@@ -7655,7 +7701,7 @@
+ else
+ lt_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -7666,11 +7712,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:7669: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7715: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7673: \$? = $ac_status" >&5
++ echo "$as_me:7719: \$? = $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.
+@@ -7719,7 +7765,7 @@
+ lt_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -7759,7 +7805,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -7770,11 +7816,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:7773: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7819: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:7777: \$? = $ac_status" >&5
++ echo "$as_me:7823: \$? = $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
+@@ -7966,7 +8012,7 @@
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -7984,7 +8030,7 @@
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+@@ -7999,7 +8045,7 @@
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+@@ -8017,13 +8063,22 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs=no
+ else
+@@ -8183,7 +8238,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+@@ -8257,11 +8312,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8316,11 +8378,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8374,7 +8443,7 @@
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_From_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes=yes
+ ;;
+@@ -8416,10 +8485,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -8581,24 +8650,28 @@
+ ;;
+
+ openbsd*)
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ *)
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- ;;
+- *)
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs=no
+ fi
+ ;;
+
+@@ -8657,17 +8730,16 @@
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs=yes
+ ;;
+@@ -8724,7 +8796,7 @@
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+@@ -8801,7 +8873,7 @@
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -8859,17 +8931,55 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
+ if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[lt_foo]++; }
++ if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -9029,12 +9139,8 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -9088,7 +9194,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -9151,7 +9257,7 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -9222,7 +9328,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -9328,6 +9434,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -9481,6 +9591,7 @@
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ else
+@@ -10067,7 +10178,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -11186,7 +11298,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_CXX=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_CXX=unsupported
+@@ -11260,11 +11372,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11320,11 +11439,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11443,10 +11569,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -11529,9 +11655,7 @@
+ hardcode_libdir_separator_CXX=:
+
+ case $host_cpu in
+- hppa*64*|ia64*)
+- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+- ;;
++ hppa*64*|ia64*) ;;
+ *)
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ ;;
+@@ -11599,7 +11723,7 @@
+ ;;
+ esac
+ ;;
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+@@ -11719,6 +11843,29 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ no_undefined_flag_CXX=' -zdefs'
++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ hardcode_libdir_flag_spec_CXX='-R$libdir'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ lynxos*)
+@@ -11757,16 +11904,20 @@
+ ld_shlibs_CXX=no
+ ;;
+ openbsd*)
+- hardcode_direct_CXX=yes
+- hardcode_shlibpath_var_CXX=no
+- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+- export_dynamic_flag_spec_CXX='${wl}-E'
+- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_CXX=yes
++ hardcode_shlibpath_var_CXX=no
++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ export_dynamic_flag_spec_CXX='${wl}-E'
++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ ld_shlibs_CXX=no
+ fi
+- output_verbose_link_cmd='echo'
+ ;;
+ osf3*)
+ case $cc_basename in
+@@ -11928,15 +12079,10 @@
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker. We must also pass each convience library through
+- # to the system linker between allextract/defaultextract.
+- # The C++ compiler will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ link_all_deplibs_CXX=yes
+@@ -11983,6 +12129,12 @@
+ fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[0-5] | solaris2.[0-5].*) ;;
++ *)
++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
+ ;;
+ esac
+@@ -12174,7 +12326,7 @@
+
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+-interix3*)
++interix[3-9]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ predep_objects_CXX=
+@@ -12182,13 +12334,46 @@
+ postdeps_CXX=
+ ;;
+
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ postdeps_CXX='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
+ solaris*)
+ case $cc_basename in
+ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+- postdeps_CXX='-lCstd -lCrun'
++ if test "$solaris_use_stlport4" != yes; then
++ postdeps_CXX='-library=Cstd -library=Crun'
++ fi
+ ;;
+ esac
+ ;;
+@@ -12225,12 +12410,14 @@
+ # like `-m68040'.
+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ ;;
+ darwin* | rhapsody*)
+@@ -12242,7 +12429,7 @@
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
+ ;;
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -12378,6 +12565,14 @@
+ lt_prog_compiler_static_CXX='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ lt_prog_compiler_pic_CXX='-KPIC'
++ lt_prog_compiler_static_CXX='-Bstatic'
++ lt_prog_compiler_wl_CXX='-Qoption ld '
++ ;;
++ esac
+ ;;
+ esac
+ ;;
+@@ -12492,7 +12687,7 @@
+ else
+ lt_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -12503,11 +12698,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:12506: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12701: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:12510: \$? = $ac_status" >&5
++ echo "$as_me:12705: \$? = $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.
+@@ -12556,7 +12751,7 @@
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -12596,7 +12791,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -12607,11 +12802,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:12610: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12805: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:12614: \$? = $ac_status" >&5
++ echo "$as_me:12809: \$? = $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
+@@ -12677,7 +12872,7 @@
+ export_symbols_cmds_CXX="$ltdll_cmds"
+ ;;
+ cygwin* | mingw*)
+- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
+@@ -12711,7 +12906,7 @@
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -12769,20 +12964,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -12939,12 +13121,7 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -12998,7 +13175,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -13061,7 +13238,7 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -13132,7 +13309,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -13238,6 +13415,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -13432,6 +13613,7 @@
+ module_cmds_CXX \
+ module_expsym_cmds_CXX \
+ lt_cv_prog_compiler_c_o_CXX \
++ fix_srcfile_path_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
+
+@@ -13752,7 +13934,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+@@ -13843,10 +14025,17 @@
+ objext_F77=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -13862,13 +14051,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -13955,13 +14144,15 @@
+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+ ;;
+
+@@ -13971,7 +14162,7 @@
+ lt_prog_compiler_pic_F77='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -14029,7 +14220,7 @@
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+@@ -14081,6 +14272,22 @@
+ # All Alpha code is PIC.
+ lt_prog_compiler_static_F77='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic_F77='-KPIC'
++ lt_prog_compiler_static_F77='-Bstatic'
++ lt_prog_compiler_wl_F77='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic_F77='-KPIC'
++ lt_prog_compiler_static_F77='-Bstatic'
++ lt_prog_compiler_wl_F77=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -14090,6 +14297,10 @@
+ lt_prog_compiler_static_F77='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static_F77='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -14157,7 +14368,7 @@
+ else
+ lt_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -14168,11 +14379,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:14171: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14382: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14175: \$? = $ac_status" >&5
++ echo "$as_me:14386: \$? = $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.
+@@ -14221,7 +14432,7 @@
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -14261,7 +14472,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -14272,11 +14483,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:14275: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14486: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14279: \$? = $ac_status" >&5
++ echo "$as_me:14490: \$? = $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
+@@ -14468,7 +14679,7 @@
+ allow_undefined_flag_F77=unsupported
+ always_export_symbols_F77=no
+ enable_shared_with_static_runtimes_F77=yes
+- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -14486,7 +14697,7 @@
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+@@ -14501,7 +14712,7 @@
+ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+@@ -14519,13 +14730,22 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs_F77=no
+ else
+@@ -14685,7 +14905,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_F77=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_F77=unsupported
+@@ -14749,11 +14969,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14798,11 +15025,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14856,7 +15090,7 @@
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_From_new_cmds_F77='true'
+ # FIXME: Should let the user specify the lib program.
+- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_F77=yes
+ ;;
+@@ -14898,10 +15132,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -15063,24 +15297,28 @@
+ ;;
+
+ openbsd*)
+- hardcode_direct_F77=yes
+- hardcode_shlibpath_var_F77=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec_F77='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_F77=yes
++ hardcode_shlibpath_var_F77=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_F77='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_F77='-R$libdir'
++ ;;
++ *)
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_F77='-R$libdir'
+- ;;
+- *)
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs_F77=no
+ fi
+ ;;
+
+@@ -15139,17 +15377,16 @@
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs_F77=yes
+ ;;
+@@ -15206,7 +15443,7 @@
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_F77='${wl}-z,text'
+ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
+@@ -15283,7 +15520,7 @@
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -15341,20 +15578,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -15511,12 +15735,7 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -15570,7 +15789,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -15633,7 +15852,7 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -15704,7 +15923,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -15810,6 +16029,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -16004,6 +16227,7 @@
+ module_cmds_F77 \
+ module_expsym_cmds_F77 \
+ lt_cv_prog_compiler_c_o_F77 \
++ fix_srcfile_path_F77 \
+ exclude_expsyms_F77 \
+ include_expsyms_F77; do
+
+@@ -16324,7 +16548,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_F77
+@@ -16382,10 +16606,10 @@
+ objext_GCJ=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -16401,13 +16625,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -16448,7 +16672,7 @@
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -16459,11 +16683,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:16462: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16686: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16466: \$? = $ac_status" >&5
++ echo "$as_me:16690: \$? = $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.
+@@ -16514,13 +16738,15 @@
+ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+ ;;
+
+@@ -16530,7 +16756,7 @@
+ lt_prog_compiler_pic_GCJ='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -16588,7 +16814,7 @@
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+@@ -16640,6 +16866,22 @@
+ # All Alpha code is PIC.
+ lt_prog_compiler_static_GCJ='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic_GCJ='-KPIC'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic_GCJ='-KPIC'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ lt_prog_compiler_wl_GCJ=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -16649,6 +16891,10 @@
+ lt_prog_compiler_static_GCJ='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static_GCJ='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -16716,7 +16962,7 @@
+ else
+ lt_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -16727,11 +16973,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:16730: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16976: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16734: \$? = $ac_status" >&5
++ echo "$as_me:16980: \$? = $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.
+@@ -16780,7 +17026,7 @@
+ lt_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -16820,7 +17066,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -16831,11 +17077,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:16834: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17080: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16838: \$? = $ac_status" >&5
++ echo "$as_me:17084: \$? = $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
+@@ -17027,7 +17273,7 @@
+ allow_undefined_flag_GCJ=unsupported
+ always_export_symbols_GCJ=no
+ enable_shared_with_static_runtimes_GCJ=yes
+- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -17045,7 +17291,7 @@
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+@@ -17060,7 +17306,7 @@
+ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+@@ -17078,13 +17324,22 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs_GCJ=no
+ else
+@@ -17244,7 +17499,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_GCJ=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_GCJ=unsupported
+@@ -17318,11 +17573,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -17377,11 +17639,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -17435,7 +17704,7 @@
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_From_new_cmds_GCJ='true'
+ # FIXME: Should let the user specify the lib program.
+- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_GCJ=yes
+ ;;
+@@ -17477,10 +17746,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -17642,24 +17911,28 @@
+ ;;
+
+ openbsd*)
+- hardcode_direct_GCJ=yes
+- hardcode_shlibpath_var_GCJ=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec_GCJ='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_GCJ=yes
++ hardcode_shlibpath_var_GCJ=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_GCJ='-R$libdir'
++ ;;
++ *)
++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_GCJ='-R$libdir'
+- ;;
+- *)
+- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+@@ -17718,17 +17991,16 @@
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs_GCJ=yes
+ ;;
+@@ -17785,7 +18057,7 @@
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_GCJ='${wl}-z,text'
+ archive_cmds_need_lc_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+@@ -17862,7 +18134,7 @@
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -17920,20 +18192,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -18090,12 +18349,7 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -18149,7 +18403,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -18212,7 +18466,7 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -18283,7 +18537,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -18389,6 +18643,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -18583,6 +18841,7 @@
+ module_cmds_GCJ \
+ module_expsym_cmds_GCJ \
+ lt_cv_prog_compiler_c_o_GCJ \
++ fix_srcfile_path_GCJ \
+ exclude_expsyms_GCJ \
+ include_expsyms_GCJ; do
+
+@@ -18903,7 +19162,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_GCJ
+@@ -18960,7 +19219,7 @@
+ objext_RC=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -18979,13 +19238,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -19063,6 +19322,7 @@
+ module_cmds_RC \
+ module_expsym_cmds_RC \
+ lt_cv_prog_compiler_c_o_RC \
++ fix_srcfile_path_RC \
+ exclude_expsyms_RC \
+ include_expsyms_RC; do
+
+@@ -19383,7 +19643,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_RC
+@@ -22546,6 +22806,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
+@@ -22562,6 +22823,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
+@@ -22581,6 +22843,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
+@@ -22609,6 +22872,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
+@@ -22625,6 +22889,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
+@@ -22644,6 +22909,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
+@@ -22678,6 +22944,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
+@@ -22695,6 +22962,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
+@@ -22715,6 +22983,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
+@@ -22741,6 +23010,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
+@@ -26094,12 +26364,12 @@
+ pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGdk\"") >&5
+- ($PKG_CONFIG --exists --print-errors "WebKitGdk") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGtk\"") >&5
++ ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "WebKitGdk" 2>/dev/null`
++ pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "WebKitGtk" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -26112,12 +26382,12 @@
+ pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGdk\"") >&5
+- ($PKG_CONFIG --exists --print-errors "WebKitGdk") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGtk\"") >&5
++ ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "WebKitGdk" 2>/dev/null`
++ pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "WebKitGtk" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -26136,14 +26406,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "WebKitGdk"`
++ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "WebKitGtk"`
+ else
+- WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "WebKitGdk"`
++ WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "WebKitGtk"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$WEBKIT_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements (WebKitGdk) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (WebKitGtk) were not met:
+
+ $WEBKIT_PKG_ERRORS
+
+@@ -26154,7 +26424,7 @@
+ and WEBKIT_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 (WebKitGdk) were not met:
++echo "$as_me: error: Package requirements (WebKitGtk) were not met:
+
+ $WEBKIT_PKG_ERRORS
+
+@@ -30198,13 +30468,13 @@
+ CCDEPMODE!$CCDEPMODE$ac_delim
+ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++SED!$SED$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+ LN_S!$LN_S$ac_delim
+ ECHO!$ECHO$ac_delim
+ AR!$AR$ac_delim
+ RANLIB!$RANLIB$ac_delim
+-CPP!$CPP$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -30246,6 +30516,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++CPP!$CPP$ac_delim
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+ ac_ct_CXX!$ac_ct_CXX$ac_delim
+@@ -30342,7 +30613,6 @@
+ pkgpythondir!$pkgpythondir$ac_delim
+ pyexecdir!$pyexecdir$ac_delim
+ pkgpyexecdir!$pkgpyexecdir$ac_delim
+-PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -30384,6 +30654,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
+ PYTHON_LIBS!$PYTHON_LIBS$ac_delim
+ PYTHON_LIB_LOC!$PYTHON_LIB_LOC$ac_delim
+ PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim
+@@ -30448,7 +30719,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+Index: epiphany-browser-2.20.2/data/art/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/data/art/Makefile.in 2007-11-27 00:37:37.000000000 +0100
++++ epiphany-browser-2.20.2/data/art/Makefile.in 2007-12-05 14:38:05.000000000 +0100
+@@ -200,6 +200,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/data/chrome/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/data/chrome/Makefile.in 2007-11-27 00:37:38.000000000 +0100
++++ epiphany-browser-2.20.2/data/chrome/Makefile.in 2007-12-05 14:38:05.000000000 +0100
+@@ -203,6 +203,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/data/glade/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/data/glade/Makefile.in 2007-11-27 00:37:38.000000000 +0100
++++ epiphany-browser-2.20.2/data/glade/Makefile.in 2007-12-05 14:38:05.000000000 +0100
+@@ -202,6 +202,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/data/icons/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/data/icons/Makefile.in 2007-11-27 00:37:38.000000000 +0100
++++ epiphany-browser-2.20.2/data/icons/Makefile.in 2007-12-05 14:38:05.000000000 +0100
+@@ -191,6 +191,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/data/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/data/Makefile.in 2007-11-27 00:37:37.000000000 +0100
++++ epiphany-browser-2.20.2/data/Makefile.in 2007-12-05 14:38:05.000000000 +0100
+@@ -231,6 +231,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/data/ui/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/data/ui/Makefile.in 2007-11-27 00:37:38.000000000 +0100
++++ epiphany-browser-2.20.2/data/ui/Makefile.in 2007-12-05 14:38:05.000000000 +0100
+@@ -199,6 +199,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/doc/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/doc/Makefile.in 2007-11-27 00:37:38.000000000 +0100
++++ epiphany-browser-2.20.2/doc/Makefile.in 2007-12-05 14:38:05.000000000 +0100
+@@ -205,6 +205,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/doc/reference/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/doc/reference/Makefile.in 2007-11-27 00:37:38.000000000 +0100
++++ epiphany-browser-2.20.2/doc/reference/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -205,6 +205,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/embed/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/embed/Makefile.in 2007-11-27 00:37:39.000000000 +0100
++++ epiphany-browser-2.20.2/embed/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -290,6 +290,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/embed/mozilla/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/embed/mozilla/Makefile.in 2007-12-05 14:37:48.000000000 +0100
++++ epiphany-browser-2.20.2/embed/mozilla/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -315,6 +315,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/embed/webkit/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/embed/webkit/Makefile.in 2007-11-27 00:37:40.000000000 +0100
++++ epiphany-browser-2.20.2/embed/webkit/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -221,6 +221,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/gtk-doc.make
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ epiphany-browser-2.20.2/gtk-doc.make 2007-12-05 14:37:48.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
+Index: epiphany-browser-2.20.2/help/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/help/Makefile.in 2007-11-27 00:37:40.000000000 +0100
++++ epiphany-browser-2.20.2/help/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -214,6 +214,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/lib/egg/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/lib/egg/Makefile.in 2007-11-27 00:37:41.000000000 +0100
++++ epiphany-browser-2.20.2/lib/egg/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -223,6 +223,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/lib/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/lib/Makefile.in 2007-12-05 14:37:48.000000000 +0100
++++ epiphany-browser-2.20.2/lib/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -281,6 +281,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/lib/widgets/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/lib/widgets/Makefile.in 2007-11-27 00:37:41.000000000 +0100
++++ epiphany-browser-2.20.2/lib/widgets/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -221,6 +221,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/Makefile.in 2007-11-27 00:37:43.000000000 +0100
++++ epiphany-browser-2.20.2/Makefile.in 2007-12-05 14:38:07.000000000 +0100
+@@ -216,6 +216,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/plugins/desktop-file/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/plugins/desktop-file/Makefile.in 2007-12-05 14:37:48.000000000 +0100
++++ epiphany-browser-2.20.2/plugins/desktop-file/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -223,6 +223,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/plugins/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/plugins/Makefile.in 2007-11-27 00:37:41.000000000 +0100
++++ epiphany-browser-2.20.2/plugins/Makefile.in 2007-12-05 14:38:06.000000000 +0100
+@@ -201,6 +201,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/src/bookmarks/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/src/bookmarks/Makefile.in 2007-11-27 00:37:43.000000000 +0100
++++ epiphany-browser-2.20.2/src/bookmarks/Makefile.in 2007-12-05 14:38:07.000000000 +0100
+@@ -247,6 +247,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
+Index: epiphany-browser-2.20.2/src/Makefile.in
+===================================================================
+--- epiphany-browser-2.20.2.orig/src/Makefile.in 2007-12-05 14:37:48.000000000 +0100
++++ epiphany-browser-2.20.2/src/Makefile.in 2007-12-05 14:38:07.000000000 +0100
+@@ -393,6 +393,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SPELLCHECKER_CFLAGS = @SPELLCHECKER_CFLAGS@
--- epiphany-browser-2.20.2.orig/debian/patches/17_webkit-signal-emission.patch
+++ epiphany-browser-2.20.2/debian/patches/17_webkit-signal-emission.patch
@@ -0,0 +1,21 @@
+--- trunk/embed/webkit/webkit-embed.cpp 2007/10/06 19:21:14 7517
++++ trunk/embed/webkit/webkit-embed.cpp 2007/10/06 19:46:44 7518
+@@ -105,8 +105,7 @@
+ * without changing location or change location without changing title
+ */
+
+- g_signal_emit_by_name (embed, "ge-location", location, NULL);
+- g_signal_emit_by_name (embed, "title", title, NULL);
++ g_signal_emit_by_name (embed, "ge-location", location);
+ }
+
+ static void
+@@ -176,8 +175,6 @@
+ wembed->priv->load_state = WEBKIT_EMBED_LOAD_STOPPED;
+
+ update_load_state (wembed, page);
+-
+- g_signal_emit_by_name (embed, "net-stop", NULL);
+ }
+
+ static void
--- epiphany-browser-2.20.2.orig/debian/patches/15_webkit-gtk-api.patch
+++ epiphany-browser-2.20.2/debian/patches/15_webkit-gtk-api.patch
@@ -0,0 +1,128 @@
+--- trunk/embed/webkit/webkit-embed.cpp 2007/08/16 20:46:43 7281
++++ trunk/embed/webkit/webkit-embed.cpp 2007/10/03 17:44:21 7514
+@@ -41,8 +41,8 @@
+ static void ephy_embed_iface_init (EphyEmbedIface *iface);
+
+ #if 0
+-static void load_started_cb (WebKitGtkPage *page,
+- WebKitGtkFrame *frame,
++static void load_started_cb (WebKitPage *page,
++ WebKitFrame *frame,
+ WebKitEmbed *wembed);
+
+ static void webkit_embed_location_changed_cb (GtkMozEmbed *embed,
+@@ -80,7 +80,7 @@
+
+ struct WebKitEmbedPrivate
+ {
+- WebKitGtkPage *page;
++ WebKitPage *page;
+ WebKitEmbedLoadState load_state;
+ };
+
+@@ -141,7 +141,7 @@
+ static void
+ webkit_embed_init (WebKitEmbed *embed)
+ {
+- WebKitGtkPage *page;
++ WebKitPage *page;
+
+ embed->priv = WEBKIT_EMBED_GET_PRIVATE (embed);
+
+@@ -150,8 +150,8 @@
+
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (embed),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+- webkit_gtk_init ();
+- page = WEBKIT_GTK_PAGE (webkit_gtk_page_new ());
++ webkit_init ();
++ page = WEBKIT_PAGE (webkit_page_new ());
+ embed->priv->page = page;
+ gtk_container_add (GTK_CONTAINER (embed), GTK_WIDGET (page));
+ gtk_widget_show (GTK_WIDGET (page));
+@@ -180,8 +180,8 @@
+
+ #if 0
+ static void
+-load_started_cb (WebKitGtkPage *page,
+- WebKitGtkFrame *frame,
++load_started_cb (WebKitPage *page,
++ WebKitFrame *frame,
+ WebKitEmbed *wembed)
+ {
+ g_debug("load-started, emitting ge_location with www.google.com as location");
+@@ -197,7 +197,7 @@
+
+ g_debug ("a url %s", url);
+
+- webkit_gtk_page_open (wembed->priv->page, url);
++ webkit_page_open (wembed->priv->page, url);
+ }
+
+ static char * impl_get_location (EphyEmbed *embed, gboolean toplevel);
+@@ -211,25 +211,25 @@
+ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
+
+ g_debug ("url %s", url);
+- webkit_gtk_page_open (wembed->priv->page, url);
++ webkit_page_open (wembed->priv->page, url);
+ }
+
+ static void
+ impl_stop_load (EphyEmbed *embed)
+ {
+- webkit_gtk_page_stop_loading (WEBKIT_EMBED (embed)->priv->page);
++ webkit_page_stop_loading (WEBKIT_EMBED (embed)->priv->page);
+ }
+
+ static gboolean
+ impl_can_go_back (EphyEmbed *embed)
+ {
+- return webkit_gtk_page_can_go_backward (WEBKIT_EMBED (embed)->priv->page);
++ return webkit_page_can_go_backward (WEBKIT_EMBED (embed)->priv->page);
+ }
+
+ static gboolean
+ impl_can_go_forward (EphyEmbed *embed)
+ {
+- return webkit_gtk_page_can_go_forward (WEBKIT_EMBED (embed)->priv->page);
++ return webkit_page_can_go_forward (WEBKIT_EMBED (embed)->priv->page);
+ }
+
+ static gboolean
+@@ -247,13 +247,13 @@
+ static void
+ impl_go_back (EphyEmbed *embed)
+ {
+- webkit_gtk_page_go_backward (WEBKIT_EMBED (embed)->priv->page);
++ webkit_page_go_backward (WEBKIT_EMBED (embed)->priv->page);
+ }
+
+ static void
+ impl_go_forward (EphyEmbed *embed)
+ {
+- webkit_gtk_page_go_forward (WEBKIT_EMBED (embed)->priv->page);
++ webkit_page_go_forward (WEBKIT_EMBED (embed)->priv->page);
+ }
+
+ static void
+@@ -290,7 +290,7 @@
+ impl_reload (EphyEmbed *embed,
+ gboolean force)
+ {
+- webkit_gtk_page_reload (WEBKIT_EMBED (embed)->priv->page);
++ webkit_page_reload (WEBKIT_EMBED (embed)->priv->page);
+ }
+
+ static void
+--- trunk/configure.ac.old 2007-11-01 07:05:04.000000000 +0100
++++ trunk/configure.ac 2007-11-01 07:05:56.000000000 +0100
+@@ -354,7 +354,7 @@
+ AM_CONDITIONAL([WITH_WEBKIT_ENGINE], test "$with_engine" = "webkit")
+ if test "$with_engine" = "webkit" ; then
+ AC_DEFINE([WITH_WEBKIT_ENGINE],[1],[Define if you wish to enable webkit engine])
+- PKG_CHECK_MODULES([WEBKIT], WebKitGdk)
++ PKG_CHECK_MODULES([WEBKIT], WebKitGtk)
+ AC_SUBST([WEBKIT_CFLAGS])
+ AC_SUBST([WEBKIT_LIBS])
+ fi # with_engine = webkit
--- epiphany-browser-2.20.2.orig/debian/patches/08_localized_startup_page.patch
+++ epiphany-browser-2.20.2/debian/patches/08_localized_startup_page.patch
@@ -0,0 +1,211 @@
+diff -Nur epiphany-browser-2.17.2/src/ephy-home-action.c epiphany-browser-2.17.2.new/src/ephy-home-action.c
+--- epiphany-browser-2.17.2/src/ephy-home-action.c 2006-10-17 13:56:00.000000000 -0700
++++ epiphany-browser-2.17.2.new/src/ephy-home-action.c 2006-11-06 14:53:33.000000000 -0800
+@@ -99,16 +99,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);
++ }
++
+ if (strcmp (action_name, "GoHome") == 0)
+ {
+
+diff -Nur epiphany-browser-2.17.2/src/ephy-shell.c epiphany-browser-2.17.2.new/src/ephy-shell.c
+--- epiphany-browser-2.17.2/src/ephy-shell.c 2006-10-28 15:08:30.000000000 -0700
++++ epiphany-browser-2.17.2.new/src/ephy-shell.c 2006-11-06 14:53:33.000000000 -0800
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "ephy-shell.h"
+ #include "ephy-type-builtins.h"
+@@ -394,6 +395,44 @@
+ return ephy_shell;
+ }
+
++static char *
++escape_homepage (char *homepage, char *languages)
++{
++ const char *inptr, *start;
++ GString *page;
++
++ languages = g_strdelimit (languages, ".@:", '\0');
++
++ page = g_string_new (NULL);
++
++ start = inptr = homepage;
++ while ((inptr = strchr (inptr, '%')) != NULL) {
++ g_string_append_len (page, start, inptr - start);
++ inptr++;
++ switch (*inptr) {
++ case 'l':
++ g_string_append (page, languages);
++ break;
++ case '%':
++ g_string_append_c (page, '%');
++ break;
++ default:
++ g_string_append_c (page, '%');
++ if (*inptr)
++ g_string_append_c (page, *inptr);
++ break;
++ }
++
++ if (*inptr)
++ inptr++;
++ start = inptr;
++ }
++
++ g_string_append (page, start);
++
++ return g_string_free (page, FALSE);
++}
++
+ static gboolean
+ url_is_empty (const char *location)
+ {
+@@ -411,7 +450,8 @@
+ static gboolean
+ load_homepage (EphyEmbed *embed)
+ {
+- char *home;
++ const char * const * languages;
++ char *homepage, *home;
+ gboolean is_empty;
+
+ home = eel_gconf_get_string(CONF_GENERAL_HOMEPAGE);
+@@ -422,6 +462,44 @@
+
+ home = g_strdup ("about:blank");
+ }
++ else if (*home == '/' || !strncmp(home, "file://", 7))
++ {
++ languages = g_get_language_names ();
++ if (languages)
++ {
++ int i;
++ gboolean page_set = FALSE;
++
++ for (i = 0; languages[i] != NULL; i++)
++ {
++ if (page_set)
++ break;
++
++ homepage = escape_homepage (home, languages[i]);
++
++ if (!strncmp(home, "file://", 7))
++ {
++ char *path;
++ path = homepage + 7;
++
++ if (g_file_test (path, G_FILE_TEST_EXISTS))
++ page_set = TRUE;
++
++ }
++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS))
++ page_set = TRUE;
++ }
++
++ if (!page_set)
++ homepage = escape_homepage (home, "C");
++ }
++ else
++ homepage = escape_homepage (home, "C");
++
++ g_free (home);
++ home = g_strdup (homepage);
++ g_free (homepage);
++ }
+
+ is_empty = url_is_empty (home);
+
--- epiphany-browser-2.20.2.orig/debian/patches/03_dbus.patch
+++ epiphany-browser-2.20.2/debian/patches/03_dbus.patch
@@ -0,0 +1,23 @@
+Index: epiphany-2.20.0/src/ephy-main.c
+===================================================================
+--- epiphany-2.20.0.orig/src/ephy-main.c 2007-09-21 14:46:15.134076289 +0200
++++ epiphany-2.20.0/src/ephy-main.c 2007-09-21 14:47:40.806958509 +0200
+@@ -624,11 +624,13 @@
+
+ if (!_ephy_dbus_startup (!private_instance, &error))
+ {
+- _ephy_dbus_release ();
+-
+- show_error_message (&error);
+-
+- exit (1);
++ GtkWidget *dialog = gtk_message_dialog_new (NULL, 0,
++ GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
++ "Epiphany could not connect to the session message bus. "
++ "Your default settings will not be available.");
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++ private_instance = TRUE;
+ }
+
+ /* If we're remoting, no need to start up any further services,
--- epiphany-browser-2.20.2.orig/debian/patches/04_move_tabs.patch
+++ epiphany-browser-2.20.2/debian/patches/04_move_tabs.patch
@@ -0,0 +1,13 @@
+Index: epiphany-browser-2.18.0/src/ephy-notebook.c
+===================================================================
+--- epiphany-browser-2.18.0.orig/src/ephy-notebook.c 2007-03-06 12:31:28.000000000 +0000
++++ epiphany-browser-2.18.0/src/ephy-notebook.c 2007-03-11 20:57:46.000000000 +0000
+@@ -58,7 +58,7 @@
+ #define TOOLTIP_MAX_LENGTH 256
+
+ /* Until https://bugzilla.mozilla.org/show_bug.cgi?id=296002 is fixed */
+-#define KEEP_TAB_IN_SAME_TOPLEVEL
++#undef KEEP_TAB_IN_SAME_TOPLEVEL
+
+ #define EPHY_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NOTEBOOK, EphyNotebookPrivate))
+
--- epiphany-browser-2.20.2.orig/debian/patches/14_webkit-scrollbars.patch
+++ epiphany-browser-2.20.2/debian/patches/14_webkit-scrollbars.patch
@@ -0,0 +1,38 @@
+Index: /home/joss/src/epiphany/src/ephy-tab.c
+===================================================================
+--- epiphany/src/ephy-tab.c (révision 7506)
++++ epiphany/src/ephy-tab.c (révision 7507)
+@@ -320,7 +320,25 @@
+ }
+ }
+
++
+ static void
++ephy_tab_size_request (GtkWidget *widget,
++ GtkRequisition *requisition)
++{
++ GtkWidget *child;
++
++ GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
++
++ child = GTK_BIN (widget)->child;
++
++ if (child && GTK_WIDGET_VISIBLE (child))
++ {
++ GtkRequisition child_requisition;
++ gtk_widget_size_request (GTK_WIDGET (child), &child_requisition);
++ }
++}
++
++static void
+ ephy_tab_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+ {
+@@ -387,6 +405,7 @@
+ object_class->set_property = ephy_tab_set_property;
+
+ widget_class->size_allocate = ephy_tab_size_allocate;
++ widget_class->size_request = ephy_tab_size_request;
+ widget_class->map = ephy_tab_map;
+ widget_class->grab_focus = ephy_tab_grab_focus;
+
--- epiphany-browser-2.20.2.orig/debian/patches/06_ssl_weak_ciphers.patch
+++ epiphany-browser-2.20.2/debian/patches/06_ssl_weak_ciphers.patch
@@ -0,0 +1,11 @@
+Index: epiphany-2.20.0/data/default-prefs-common.js
+===================================================================
+--- epiphany-2.20.0.orig/data/default-prefs-common.js 2007-08-27 22:19:01.000000000 +0200
++++ epiphany-2.20.0/data/default-prefs-common.js 2007-09-21 14:29:58.022393868 +0200
+@@ -163,3 +163,6 @@
+ // set to true for parity with gtk entries
+ pref("bidi.edit.delete_immediately", true);
+
++// enable weak SSL ciphers, as Epiphany warns about them anyway
++pref("security.ssl3.rsa_rc4_40_md5", true);
++pref("security.ssl3.rsa_rc2_40_md5", true);
--- epiphany-browser-2.20.2.orig/debian/patches/16_webkit-missing-methods.patch
+++ epiphany-browser-2.20.2/debian/patches/16_webkit-missing-methods.patch
@@ -0,0 +1,270 @@
+--- trunk/embed/webkit/webkit-embed.cpp 2007/10/03 17:44:21 7514
++++ trunk/embed/webkit/webkit-embed.cpp 2007/10/06 19:21:14 7517
+@@ -27,6 +27,7 @@
+ #include "ephy-string.h"
+ #include "ephy-embed-event.h"
+
++#include
+ #include
+ #include
+ #include
+@@ -40,34 +41,6 @@
+ static void webkit_embed_finalize (GObject *object);
+ static void ephy_embed_iface_init (EphyEmbedIface *iface);
+
+-#if 0
+-static void load_started_cb (WebKitPage *page,
+- WebKitFrame *frame,
+- WebKitEmbed *wembed);
+-
+-static void webkit_embed_location_changed_cb (GtkMozEmbed *embed,
+- WebKitEmbed *membed);
+-static void webkit_embed_net_state_all_cb (GtkMozEmbed *embed,
+- const char *aURI,
+- gint state,
+- guint status,
+- WebKitEmbed *membed);
+-static gboolean webkit_embed_dom_mouse_click_cb(GtkMozEmbed *embed,
+- gpointer dom_event,
+- WebKitEmbed *membed);
+-static gboolean webkit_embed_dom_mouse_down_cb (GtkMozEmbed *embed,
+-
+-
+- WebKitEmbed *membed);
+-static gboolean webkit_embed_dom_key_press_cb (GtkMozEmbed *embed,
+- gpointer dom_event,
+- WebKitEmbed *membed);
+-static void webkit_embed_new_window_cb (GtkMozEmbed *embed,
+- GtkMozEmbed **newEmbed,
+- guint chrome_mask,
+- WebKitEmbed *membed);
+-#endif
+-
+ #define WEBKIT_EMBED_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED, WebKitEmbedPrivate))
+
+ typedef enum
+@@ -82,6 +55,7 @@
+ {
+ WebKitPage *page;
+ WebKitEmbedLoadState load_state;
++ char *loading_uri;
+ };
+
+ static void
+@@ -121,14 +95,98 @@
+ }
+
+ static void
++webkit_embed_title_changed_cb (WebKitFrame *frame,
++ gchar *title,
++ gchar *location,
++ EphyEmbed *embed)
++{
++ /* FIXME: We emit ge-location signal here, but it should really belong
++ * to a "location_changed" signal by WebKit, as we can change title
++ * without changing location or change location without changing title
++ */
++
++ g_signal_emit_by_name (embed, "ge-location", location, NULL);
++ g_signal_emit_by_name (embed, "title", title, NULL);
++}
++
++static void
++update_load_state (WebKitEmbed *embed, WebKitPage *page)
++{
++ EphyEmbedNetState estate = EPHY_EMBED_STATE_UNKNOWN;
++
++ if (embed->priv->load_state == WEBKIT_EMBED_LOAD_STARTED)
++ estate = (EphyEmbedNetState) (estate |
++ EPHY_EMBED_STATE_START |
++ EPHY_EMBED_STATE_NEGOTIATING |
++ EPHY_EMBED_STATE_IS_REQUEST |
++ EPHY_EMBED_STATE_IS_NETWORK);
++
++ if (embed->priv->load_state == WEBKIT_EMBED_LOAD_LOADING)
++ estate = (EphyEmbedNetState) (estate |
++ EPHY_EMBED_STATE_TRANSFERRING |
++ EPHY_EMBED_STATE_IS_REQUEST |
++ EPHY_EMBED_STATE_IS_NETWORK);
++
++ if (embed->priv->load_state == WEBKIT_EMBED_LOAD_STOPPED)
++ estate = (EphyEmbedNetState) (estate |
++ EPHY_EMBED_STATE_STOP |
++ EPHY_EMBED_STATE_IS_DOCUMENT |
++ EPHY_EMBED_STATE_IS_NETWORK);
++
++ g_signal_emit_by_name (EPHY_EMBED (embed), "ge_net_state",
++ embed->priv->loading_uri, estate);
++}
++
++static void
++webkit_embed_load_started_cb (WebKitPage *page,
++ WebKitFrame *frame,
++ EphyEmbed *embed)
++{
++ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
++ wembed->priv->load_state = WEBKIT_EMBED_LOAD_STARTED;
++
++ update_load_state (wembed, page);
++}
++
++static void
++webkit_embed_load_progress_changed_cb (WebKitPage *page,
++ int progress,
++ EphyEmbed *embed)
++{
++ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
++
++ if (wembed->priv->load_state == WEBKIT_EMBED_LOAD_STARTED)
++ wembed->priv->load_state = WEBKIT_EMBED_LOAD_LOADING;
++
++ /* FIXME: EphyTab seems to have a strange way of calculating progress,
++ * and it's not compatible with the simple integer value WebKit emits.
++ * EphyTab IMHO should use "progress" signal from GtkMozEmbed. That way,
++ * we could use the same functions for WebKit too.
++ */
++
++ update_load_state (wembed, page);
++}
++
++static void
++webkit_embed_load_finished_cb (WebKitPage *page,
++ WebKitFrame *frame,
++ EphyEmbed *embed)
++{
++ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
++ wembed->priv->load_state = WEBKIT_EMBED_LOAD_STOPPED;
++
++ update_load_state (wembed, page);
++
++ g_signal_emit_by_name (embed, "net-stop", NULL);
++}
++
++static void
+ webkit_embed_class_init (WebKitEmbedClass *klass)
+ {
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+- webkit_embed_parent_class = (GObjectClass *) g_type_class_peek_parent (klass);
+-
+ object_class->finalize = webkit_embed_finalize;
+
+ gtk_object_class->destroy = webkit_embed_destroy;
+@@ -144,6 +202,7 @@
+ WebKitPage *page;
+
+ embed->priv = WEBKIT_EMBED_GET_PRIVATE (embed);
++ embed->priv->loading_uri = NULL;
+
+ gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (embed), NULL);
+ gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (embed), NULL);
+@@ -156,14 +215,14 @@
+ gtk_container_add (GTK_CONTAINER (embed), GTK_WIDGET (page));
+ gtk_widget_show (GTK_WIDGET (page));
+
+-#if 0
+ g_signal_connect (G_OBJECT (page), "load-started",
+- G_CALLBACK (load_started_cb), embed);
++ G_CALLBACK (webkit_embed_load_started_cb), embed);
++ g_signal_connect (G_OBJECT (page), "load_finished",
++ G_CALLBACK (webkit_embed_load_finished_cb), embed);
+ g_signal_connect (G_OBJECT (page), "title-changed",
+- G_CALLBACK (title_changed_cb), page);
++ G_CALLBACK (webkit_embed_title_changed_cb), embed);
+ g_signal_connect (G_OBJECT (page), "load-progress-changed",
+- G_CALLBACK (load_progress_changed), page);
+-#endif
++ G_CALLBACK (webkit_embed_load_progress_changed_cb), embed);
+ }
+
+ static void
+@@ -175,19 +234,12 @@
+ static void
+ webkit_embed_finalize (GObject *object)
+ {
+- G_OBJECT_CLASS (webkit_embed_parent_class)->finalize (object);
+-}
++ WebKitEmbed *wembed = WEBKIT_EMBED (object);
+
+-#if 0
+-static void
+-load_started_cb (WebKitPage *page,
+- WebKitFrame *frame,
+- WebKitEmbed *wembed)
+-{
+- g_debug("load-started, emitting ge_location with www.google.com as location");
+- g_signal_emit_by_name (wembed, "ge_location", "www.google.com");
++ g_free (wembed->priv->loading_uri);
++
++ G_OBJECT_CLASS (webkit_embed_parent_class)->finalize (object);
+ }
+-#endif
+
+ static void
+ impl_load_url (EphyEmbed *embed,
+@@ -195,13 +247,9 @@
+ {
+ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
+
+- g_debug ("a url %s", url);
+-
+ webkit_page_open (wembed->priv->page, url);
+ }
+
+-static char * impl_get_location (EphyEmbed *embed, gboolean toplevel);
+-
+ static void
+ impl_load (EphyEmbed *embed,
+ const char *url,
+@@ -209,9 +257,27 @@
+ EphyEmbed *preview_embed)
+ {
+ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
++ char *effective_url = NULL;
+
+- g_debug ("url %s", url);
+- webkit_page_open (wembed->priv->page, url);
++ /* FIXME: WebKit has some strange bug for which there must be
++ * protocol prefix into the parsed URL, or it will not show images
++ * and lock badly. I copied this function from WebKit's
++ * GdkLauncher.
++ */
++ if (strncmp ("http://", url, 7) != 0 &&
++ strncmp ("https://", url, 8) != 0 &&
++ strncmp ("file://", url, 7) != 0 &&
++ strncmp ("ftp://", url, 6) != 0)
++ effective_url = g_strconcat ("http://", url, NULL);
++ else
++ effective_url = g_strdup (url);
++
++ g_free (wembed->priv->loading_uri);
++ wembed->priv->loading_uri = g_strdup (effective_url);
++
++ webkit_page_open (wembed->priv->page, effective_url);
++
++ g_free (effective_url);
+ }
+
+ static void
+@@ -264,7 +330,8 @@
+ static char *
+ impl_get_title (EphyEmbed *embed)
+ {
+- return NULL;
++ WebKitFrame *frame = webkit_page_get_main_frame (WEBKIT_EMBED (embed)->priv->page);
++ return g_strdup (webkit_frame_get_title (frame));
+ }
+
+ static char *
+@@ -283,7 +350,8 @@
+ impl_get_location (EphyEmbed *embed,
+ gboolean toplevel)
+ {
+- return NULL;
++ WebKitFrame *frame = webkit_page_get_main_frame (WEBKIT_EMBED (embed)->priv->page);
++ return g_strdup (webkit_frame_get_location (frame));
+ }
+
+ static void
--- epiphany-browser-2.20.2.orig/debian/patches/09_download_dialog.patch
+++ epiphany-browser-2.20.2/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 @@
+ 6
+
+
++
++ True
++ True
++ A_utomatically download and open files
++ True
++ GTK_RELIEF_NORMAL
++ True
++ False
++ False
++ True
++
++
++ 0
++ False
++ False
++
++
++
++
+
+ True
+ False
+@@ -343,25 +362,6 @@
+ True
+
+
+-
+-
+-
+- True
+- True
+- A_utomatically download and open files
+- True
+- GTK_RELIEF_NORMAL
+- True
+- False
+- False
+- True
+-
+-
+- 0
+- False
+- False
+-
+-
+
+
+
+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.20.2.orig/debian/patches/11_useragent-weasel.patch
+++ epiphany-browser-2.20.2/debian/patches/11_useragent-weasel.patch
@@ -0,0 +1,18 @@
+Index: epiphany-2.18.3/data/weasel-ua-pref.js.in
+===================================================================
+--- epiphany-2.18.3.orig/data/weasel-ua-pref.js.in 2007-07-04 22:20:08.250260516 +0200
++++ epiphany-2.18.3/data/weasel-ua-pref.js.in 2007-07-04 22:23:24.133423262 +0200
+@@ -1,6 +1,7 @@
+-// Add "Firefox/@WEASEL_UA_VERSION@" to the UA. This fixes
+-// [https://bugzilla.mozilla.org/show_bug.cgi?id=334967]
+-// Same as Camino [https://bugzilla.mozilla.org/show_bug.cgi?id=384721] and
+-// IceApe [https://bugzilla.mozilla.org/show_bug.cgi?id=386113] do.
+-// Also see discussion on [https://bugzilla.mozilla.org/show_bug.cgi?id=385999].
+-pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@");
++
++// The following breaks the UA by adding Firefox to it, but it also
++// fixes interaction with poorly written websites with broken UA checks.
++// See https://bugzilla.mozilla.org/show_bug.cgi?id=384721#c6 to
++// understand why this is a bad idea and isn't enabled in Debian.
++//
++// pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@");
--- epiphany-browser-2.20.2.orig/debian/patches/06_lpi.patch
+++ epiphany-browser-2.20.2/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 @@
+
+
+
+diff -Nur epiphany-browser-2.15.4/src/ephy-window.c epiphany-browser-2.15.4.new/src/ephy-window.c
+--- epiphany-browser-2.15.4/src/ephy-window.c 2006-07-10 21:28:01.000000000 +0200
++++ epiphany-browser-2.15.4.new/src/ephy-window.c 2006-07-11 10:32:17.000000000 +0200
+@@ -66,6 +66,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifdef HAVE_X11_XF86KEYSYM_H
+ #include
+@@ -3125,6 +3126,9 @@
+ }
+ #endif
+
++ launchpad_integration_add_ui (window->priv->manager,
++ "ui/menubar/HelpMenu/LaunchpadItems");
++
+ /* Initialize the menus */
+ priv->tabs_menu = ephy_tabs_menu_new (window);
+ priv->enc_menu = ephy_encoding_menu_new (window);
--- epiphany-browser-2.20.2.orig/debian/patches/02_ac_init.patch
+++ epiphany-browser-2.20.2/debian/patches/02_ac_init.patch
@@ -0,0 +1,13 @@
+Index: epiphany-2.20.0/configure.ac
+===================================================================
+--- epiphany-2.20.0.orig/configure.ac 2007-09-10 23:22:03.000000000 +0200
++++ epiphany-2.20.0/configure.ac 2007-09-21 14:29:47.765809378 +0200
+@@ -15,7 +15,7 @@
+ # with this program; if not, write to the Free Software Foundation, Inc.,
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+-AC_INIT([GNOME Web Browser],[2.20.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
++AC_INIT([GNOME Web Browser],[2.20.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
+
+ GNOME_COMMON_INIT
+
--- epiphany-browser-2.20.2.orig/debian/patches/00_browser_wrapper_path.patch
+++ epiphany-browser-2.20.2/debian/patches/00_browser_wrapper_path.patch
@@ -0,0 +1,27 @@
+Index: epiphany-2.20.0/data/bme.desktop.in.in
+===================================================================
+--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-08-27 22:19:01.000000000 +0200
++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200
+@@ -3,7 +3,7 @@
+ _Name=Epiphany Web Bookmarks
+ _GenericName=Web Bookmarks
+ _Comment=Browse and organize your bookmarks
+-Exec=epiphany --bookmarks-editor
++Exec=epiphany-browser --bookmarks-editor
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+Index: epiphany-2.20.0/data/epiphany.desktop.in.in
+===================================================================
+--- epiphany-2.20.0.orig/data/epiphany.desktop.in.in 2007-08-27 22:19:01.000000000 +0200
++++ epiphany-2.20.0/data/epiphany.desktop.in.in 2007-09-21 14:27:40.254542926 +0200
+@@ -3,7 +3,8 @@
+ _Name=Epiphany Web Browser
+ _GenericName=Web Browser
+ _Comment=Browse the web
+-Exec=epiphany %U
++Exec=epiphany-browser %U
++TryExec=/usr/bin/epiphany-browser
+ StartupNotify=true
+ Terminal=false
+ Type=Application
--- epiphany-browser-2.20.2.orig/debian/patches/01_bookmarks_menu.patch
+++ epiphany-browser-2.20.2/debian/patches/01_bookmarks_menu.patch
@@ -0,0 +1,12 @@
+Index: epiphany-2.20.0/data/bme.desktop.in.in
+===================================================================
+--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200
++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:28:35.273678287 +0200
+@@ -8,6 +8,7 @@
+ Terminal=false
+ Type=Application
+ Icon=epiphany-bookmarks
++NoDisplay=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=epiphany
+ X-GNOME-Bugzilla-Component=BugBuddyBugs
--- epiphany-browser-2.20.2.orig/debian/patches/10_url_double-click.patch
+++ epiphany-browser-2.20.2/debian/patches/10_url_double-click.patch
@@ -0,0 +1,32 @@
+Index: epiphany-2.20.0/lib/widgets/ephy-location-entry.c
+===================================================================
+--- epiphany-2.20.0.orig/lib/widgets/ephy-location-entry.c 2007-08-27 22:19:00.000000000 +0200
++++ epiphany-2.20.0/lib/widgets/ephy-location-entry.c 2007-09-21 14:30:14.987360646 +0200
+@@ -353,18 +353,6 @@
+ }
+
+ static gboolean
+-entry_button_press_cb (GtkWidget *entry, GdkEventButton *event, EphyLocationEntry *le)
+-{
+- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+- {
+- ephy_location_entry_activate (le);
+- return TRUE;
+- }
+-
+- return FALSE;
+-}
+-
+-static gboolean
+ entry_key_press_cb (GtkEntry *entry,
+ GdkEventKey *event,
+ EphyLocationEntry *lentry)
+@@ -923,8 +911,6 @@
+ G_CALLBACK (entry_key_press_after_cb), entry);
+ g_signal_connect_after (priv->icon_entry->entry, "activate",
+ G_CALLBACK (entry_activate_after_cb), entry);
+- g_signal_connect (priv->icon_entry->entry, "button-press-event",
+- G_CALLBACK (entry_button_press_cb), entry);
+ g_signal_connect (priv->icon_entry->entry, "changed",
+ G_CALLBACK (editable_changed_cb), entry);
+ g_signal_connect (priv->icon_entry->entry, "drag-motion",
--- epiphany-browser-2.20.2.orig/debian/changelog
+++ epiphany-browser-2.20.2/debian/changelog
@@ -0,0 +1,1226 @@
+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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Mon, 12 Mar 2007 14:21:50 +0100
+
+epiphany-browser (2.16.3-1) experimental; urgency=low
+
+ * New upstream release.
+ * Refresh patches.
+
+ -- Josselin Mouette 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 10 Feb 2006 20:32:28 +0100
+
+epiphany-browser (1.8.3-3) unstable; urgency=low
+
+ * Upload to unstable
+
+ Loic Minier :
+ * 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 Sat, 7 Jan 2006 19:06:16 -0200
+
+epiphany-browser (1.8.3-2) experimental; urgency=low
+
+ * Build against dbus >= 0.60
+
+ -- Sjoerd Simons 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 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 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 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 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 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 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 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 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 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 Thu, 24 Mar 2005 17:54:16 +0100
+
+epiphany-browser (1.4.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jordi Mallach 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 , thanks!
+ (Closes: #263841)
+ * Removed mozilla-xft from Recommends, this now included in
+ mozilla-browser.
+
+ -- Edd Dumbill 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 Fri, 25 Jun 2004 10:17:53 +0100
+
+epiphany-browser (1.2.6-2) unstable; urgency=low
+
+ * Build against Mozilla 1.7.
+
+ -- Edd Dumbill 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 23 Jan 2004 09:59:47 +0000
+
+epiphany-browser (1.0.6-2) unstable; urgency=low
+
+ * Add GNOME team maintainership stuff.
+
+ -- Edd Dumbill 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 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 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 Wed, 22 Oct 2003 00:36:52 +0100
+
+epiphany-browser (1.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Edd Dumbill Sat, 18 Oct 2003 12:47:51 +0100
+
+epiphany-browser (1.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Edd Dumbill 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 14 Feb 2003 23:05:40 +0000
+
--- epiphany-browser-2.20.2.orig/debian/epiphany-gecko.menu
+++ epiphany-browser-2.20.2/debian/epiphany-gecko.menu
@@ -0,0 +1,6 @@
+?package(epiphany-gecko):needs="x11" \
+ section="Applications/Network/Web Browsing" \
+ title="Epiphany web browser (Gecko)" \
+ longtitle="Epiphany web browser with Gecko backend" \
+ command="/usr/bin/epiphany-gecko" \
+ hints="Web browsers"
--- epiphany-browser-2.20.2.orig/debian/rules
+++ epiphany-browser-2.20.2/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=firefox \
+ --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.20.2.orig/debian/epiphany.sh
+++ epiphany-browser-2.20.2/debian/epiphany.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec epiphany-browser "$@"
--- epiphany-browser-2.20.2.orig/debian/control.in
+++ epiphany-browser-2.20.2/debian/control.in
@@ -0,0 +1,114 @@
+Source: epiphany-browser
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team
+XSBC-Original-Maintainer: Josselin Mouette
+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,
+ firefox-dev (>= 1.5),
+ 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,
+ firefox (>= 1.5),
+ ${misc:Depends}
+Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1)
+Recommends: yelp, epiphany-extensions
+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})
+Recommends: firefox-dbg
+Description: Debugging symbols for the GNOME web browser
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This package contains detached debugging symbols.
--- epiphany-browser-2.20.2.orig/debian/copyright
+++ epiphany-browser-2.20.2/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Edd Dumbill on 14 Feb 2003.
+
+It was downloaded from
+
+Upstream authors:
+ Marco Pesenti Gritti
+ Xan Lopez
+ Christian Persch
+ Adam Hooper
+ Jean-François Rameau
+ Crispin Flowerday
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2003-2007, the Debian GNOME team
+ and
+is licensed under the GPL, see above.
--- epiphany-browser-2.20.2.orig/debian/epiphany-browser-data.gconf-defaults
+++ epiphany-browser-2.20.2/debian/epiphany-browser-data.gconf-defaults
@@ -0,0 +1,2 @@
+/apps/epiphany/general/homepage file:///usr/share/ubuntu-artwork/home/locales/index-%l.html
+/apps/epiphany/web/language [system]
--- epiphany-browser-2.20.2.orig/debian/watch
+++ epiphany-browser-2.20.2/debian/watch
@@ -0,0 +1,4 @@
+version=2
+http://download.gnome.org/sources/epiphany/([\d\.]+)[02468]/ \
+ epiphany-(.*)\.tar\.gz \
+ debian uupdate
--- epiphany-browser-2.20.2.orig/debian/epiphany-gecko.prerm
+++ epiphany-browser-2.20.2/debian/epiphany-gecko.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+ for alt in epiphany-browser x-www-browser gnome-www-browser; do
+ update-alternatives --remove $alt /usr/bin/epiphany-gecko
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
--- epiphany-browser-2.20.2.orig/debian/epiphany-browser.links
+++ epiphany-browser-2.20.2/debian/epiphany-browser.links
@@ -0,0 +1 @@
+/usr/share/man/man1/epiphany-browser.1.gz /usr/share/man/man1/epiphany.1.gz
--- epiphany-browser-2.20.2.orig/debian/control
+++ epiphany-browser-2.20.2/debian/control
@@ -0,0 +1,114 @@
+Source: epiphany-browser
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team
+XSBC-Original-Maintainer: Josselin Mouette
+Uploaders: Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge
+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,
+ firefox-dev (>= 1.5),
+ 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,
+ firefox (>= 1.5),
+ ${misc:Depends}
+Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1)
+Recommends: yelp, epiphany-extensions
+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})
+Recommends: firefox-dbg
+Description: Debugging symbols for the GNOME web browser
+ Epiphany is a simple yet powerful GNOME web browser targeted at
+ non-technical users. Its principles are simplicity and standards
+ compliance.
+ .
+ This package contains detached debugging symbols.
--- epiphany-browser-2.20.2.orig/debian/epiphany-webkit.menu
+++ epiphany-browser-2.20.2/debian/epiphany-webkit.menu
@@ -0,0 +1,6 @@
+?package(epiphany-webkit):needs="x11" \
+ section="Applications/Network/Web Browsing" \
+ title="Epiphany web browser (Webkit)" \
+ longtitle="Epiphany web browser with Webkit backend" \
+ command="/usr/bin/epiphany-webkit" \
+ hints="Web browsers"
--- epiphany-browser-2.20.2.orig/debian/epiphany-browser-dev.dirs
+++ epiphany-browser-2.20.2/debian/epiphany-browser-dev.dirs
@@ -0,0 +1,2 @@
+/usr/lib
+/usr/share
--- epiphany-browser-2.20.2.orig/debian/epiphany-browser.install
+++ epiphany-browser-2.20.2/debian/epiphany-browser.install
@@ -0,0 +1,2 @@
+debian/epiphany.sh /usr/bin/
+debian/bug/control /usr/share/bug/epiphany-browser/
--- epiphany-browser-2.20.2.orig/debian/epiphany-gecko.postinst
+++ epiphany-browser-2.20.2/debian/epiphany-gecko.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+for alt in epiphany-browser x-www-browser gnome-www-browser; do
+ update-alternatives --install \
+ /usr/bin/$alt $alt /usr/bin/epiphany-gecko 85 \
+ --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-gecko.1.gz
+done
+
+#DEBHELPER#
+
+exit 0
--- epiphany-browser-2.20.2.orig/debian/epiphany-browser-data.dirs
+++ epiphany-browser-2.20.2/debian/epiphany-browser-data.dirs
@@ -0,0 +1,2 @@
+/etc/gnome/epiphany
+/usr
--- epiphany-browser-2.20.2.orig/debian/epiphany-webkit.prerm
+++ epiphany-browser-2.20.2/debian/epiphany-webkit.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+ for alt in epiphany-browser x-www-browser gnome-www-browser; do
+ update-alternatives --remove $alt /usr/bin/epiphany-webkit
+ done
+fi
+
+#DEBHELPER#
+
+exit 0
--- epiphany-browser-2.20.2.orig/debian/epiphany-browser-data.links
+++ epiphany-browser-2.20.2/debian/epiphany-browser-data.links
@@ -0,0 +1,2 @@
+/etc/gnome/epiphany/mime-types-permissions.xml /usr/share/epiphany-browser/mime-types-permissions.xml
+/etc/gnome/epiphany/default-prefs.js /usr/share/epiphany-browser/default-prefs.js
--- epiphany-browser-2.20.2.orig/debian/epiphany-browser-data.docs
+++ epiphany-browser-2.20.2/debian/epiphany-browser-data.docs
@@ -0,0 +1,4 @@
+NEWS
+README
+TODO
+AUTHORS
--- epiphany-browser-2.20.2.orig/debian/compat
+++ epiphany-browser-2.20.2/debian/compat
@@ -0,0 +1 @@
+5
--- epiphany-browser-2.20.2.orig/debian/epiphany-webkit.postinst
+++ epiphany-browser-2.20.2/debian/epiphany-webkit.postinst
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+for alt in epiphany-browser x-www-browser gnome-www-browser; do
+ update-alternatives --install \
+ /usr/bin/$alt $alt /usr/bin/epiphany-webkit 80 \
+ --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-webkit.1.gz
+done
+
+#DEBHELPER#
+
+exit 0