r16427 - in /desktop/unstable/epiphany-browser/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Jul 2 08:48:31 UTC 2008
Author: joss
Date: Wed Jul 2 08:48:31 2008
New Revision: 16427
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16427
Log:
* New upstream release.
+ 04_proxy_password.patch, 14_contenthandler_api.patch,
16_embed_passwords.patch: dropped, merged upstream.
+ 05_libexecdir.patch, 09_download_dialog.patch: refreshed.
+ 15_certificates_oldapi.patch: only keep the MozRegisterComponents
part, others are integrated upstream. Update it to match the
change.
+ 99_autoreconf.patch: regenerated.
Removed:
desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch
desktop/unstable/epiphany-browser/debian/patches/14_contenthandler_api.patch
desktop/unstable/epiphany-browser/debian/patches/16_embed_passwords.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch
desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch
desktop/unstable/epiphany-browser/debian/patches/15_certificates_oldapi.patch
desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
desktop/unstable/epiphany-browser/debian/patches/series
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=16427&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Wed Jul 2 08:48:31 2008
@@ -1,4 +1,4 @@
-epiphany-browser (2.22.2-4) UNRELEASED; urgency=low
+epiphany-browser (2.22.3-1) unstable; urgency=low
* epiphany-browser.README.Debian: explain how to change the backend.
Closes: #487147.
@@ -7,8 +7,16 @@
manager. Closes: #487160.
* 04_proxy_password.patch: change the patch to still work with gecko
1.8 so that it is suitable for upstream.
-
- -- Josselin Mouette <joss at debian.org> Sat, 21 Jun 2008 10:45:08 +0200
+ * New upstream release.
+ + 04_proxy_password.patch, 14_contenthandler_api.patch,
+ 16_embed_passwords.patch: dropped, merged upstream.
+ + 05_libexecdir.patch, 09_download_dialog.patch: refreshed.
+ + 15_certificates_oldapi.patch: only keep the MozRegisterComponents
+ part, others are integrated upstream. Update it to match the
+ change.
+ + 99_autoreconf.patch: regenerated.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 02 Jul 2008 10:48:25 +0200
epiphany-browser (2.22.2-3) unstable; urgency=low
Modified: desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch?rev=16427&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/05_libexecdir.patch Wed Jul 2 08:48:31 2008
@@ -1,8 +1,8 @@
-Index: epiphany-2.22.2/data/epiphany.pc.in
+Index: epiphany-2.22.3/data/epiphany.pc.in
===================================================================
---- epiphany-2.22.2.orig/data/epiphany.pc.in 2008-03-05 19:59:29.000000000 +0100
-+++ epiphany-2.22.2/data/epiphany.pc.in 2008-05-27 14:16:52.689150716 +0200
-@@ -2,8 +2,8 @@ prefix=@prefix@
+--- epiphany-2.22.3.orig/data/epiphany.pc.in 2008-03-28 15:59:45.000000000 +0100
++++ epiphany-2.22.3/data/epiphany.pc.in 2008-07-02 10:28:57.799092667 +0200
+@@ -2,8 +2,8 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
@@ -13,11 +13,11 @@
datarootdir=@datarootdir@
datadir=@datadir@
icondir=@datadir@/@PACKAGE@/icons
-Index: epiphany-2.22.2/embed/mozilla/Makefile.am
+Index: epiphany-2.22.3/embed/mozilla/Makefile.am
===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/Makefile.am 2008-05-26 19:56:35.000000000 +0200
-+++ epiphany-2.22.2/embed/mozilla/Makefile.am 2008-05-27 14:16:52.689150716 +0200
-@@ -153,7 +153,7 @@ libephymozillaembed_la_CPPFLAGS = \
+--- epiphany-2.22.3.orig/embed/mozilla/Makefile.am 2008-06-30 20:01:36.000000000 +0200
++++ epiphany-2.22.3/embed/mozilla/Makefile.am 2008-07-02 10:28:57.799092667 +0200
+@@ -158,7 +158,7 @@
-I$(top_srcdir) \
$(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -26,11 +26,11 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-Index: epiphany-2.22.2/lib/Makefile.am
+Index: epiphany-2.22.3/lib/Makefile.am
===================================================================
---- epiphany-2.22.2.orig/lib/Makefile.am 2008-03-05 19:59:28.000000000 +0100
-+++ epiphany-2.22.2/lib/Makefile.am 2008-05-27 14:16:52.689150716 +0200
-@@ -80,7 +80,7 @@ libephymisc_la_CPPFLAGS = \
+--- epiphany-2.22.3.orig/lib/Makefile.am 2008-03-28 15:59:46.000000000 +0100
++++ epiphany-2.22.3/lib/Makefile.am 2008-07-02 10:28:57.799092667 +0200
+@@ -80,7 +80,7 @@
-I$(top_builddir)/lib/egg \
-I$(top_srcdir)/lib/egg \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -39,21 +39,21 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = \
-Index: epiphany-2.22.2/plugins/desktop-file/Makefile.am
+Index: epiphany-2.22.3/plugins/desktop-file/Makefile.am
===================================================================
---- epiphany-2.22.2.orig/plugins/desktop-file/Makefile.am 2008-03-31 23:55:01.000000000 +0200
-+++ epiphany-2.22.2/plugins/desktop-file/Makefile.am 2008-05-27 14:16:52.693150317 +0200
+--- epiphany-2.22.3.orig/plugins/desktop-file/Makefile.am 2008-03-28 16:02:20.000000000 +0100
++++ epiphany-2.22.3/plugins/desktop-file/Makefile.am 2008-07-02 10:28:57.799092667 +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.22.2/src/Makefile.am
+Index: epiphany-2.22.3/src/Makefile.am
===================================================================
---- epiphany-2.22.2.orig/src/Makefile.am 2008-03-31 23:55:02.000000000 +0200
-+++ epiphany-2.22.2/src/Makefile.am 2008-05-27 14:16:52.693150317 +0200
-@@ -106,8 +106,8 @@ libephymain_la_CPPFLAGS = \
+--- epiphany-2.22.3.orig/src/Makefile.am 2008-03-28 16:02:20.000000000 +0100
++++ epiphany-2.22.3/src/Makefile.am 2008-07-02 10:28:57.803111823 +0200
+@@ -106,8 +106,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -64,7 +64,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -158,8 +158,8 @@ libpyphany_la_CPPFLAGS = \
+@@ -158,8 +158,8 @@
-I$(top_builddir)/src \
-I$(top_builddir)/src/bookmarks \
$(PYTHON_INCLUDES) \
Modified: desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch?rev=16427&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch Wed Jul 2 08:48:31 2008
@@ -1,7 +1,7 @@
-Index: epiphany-2.22.2/data/glade/prefs-dialog.glade
+Index: epiphany-2.22.3/data/glade/prefs-dialog.glade
===================================================================
---- epiphany-2.22.2.orig/data/glade/prefs-dialog.glade 2008-05-27 22:55:51.665652339 +0200
-+++ epiphany-2.22.2/data/glade/prefs-dialog.glade 2008-05-27 22:55:53.697150685 +0200
+--- epiphany-2.22.3.orig/data/glade/prefs-dialog.glade 2007-11-12 12:44:38.000000000 +0100
++++ epiphany-2.22.3/data/glade/prefs-dialog.glade 2008-07-02 10:29:42.732947528 +0200
@@ -303,6 +303,25 @@
<property name="spacing">6</property>
@@ -54,11 +54,11 @@
</widget>
</child>
</widget>
-Index: epiphany-2.22.2/embed/mozilla/ContentHandler.cpp
+Index: epiphany-2.22.3/embed/mozilla/ContentHandler.cpp
===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/ContentHandler.cpp 2008-05-27 22:55:51.697653543 +0200
-+++ epiphany-2.22.2/embed/mozilla/ContentHandler.cpp 2008-05-27 23:28:41.941154532 +0200
-@@ -365,6 +365,7 @@ NS_METHOD GContentHandler::MIMEConfirmAc
+--- epiphany-2.22.3.orig/embed/mozilla/ContentHandler.cpp 2008-06-30 12:30:32.000000000 +0200
++++ epiphany-2.22.3/embed/mozilla/ContentHandler.cpp 2008-07-02 10:29:42.732947528 +0200
+@@ -368,6 +368,7 @@
NS_METHOD GContentHandler::MIMEInitiateAction (void)
{
gboolean auto_downloads;
@@ -66,7 +66,7 @@
if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK)) return NS_OK;
-@@ -387,23 +388,18 @@ NS_METHOD GContentHandler::MIMEInitiateA
+@@ -390,23 +391,18 @@
}
}
@@ -95,11 +95,11 @@
{
MIMEConfirmAction ();
}
-Index: epiphany-2.22.2/src/prefs-dialog.c
+Index: epiphany-2.22.3/src/prefs-dialog.c
===================================================================
---- epiphany-2.22.2.orig/src/prefs-dialog.c 2008-05-27 22:55:51.641650336 +0200
-+++ epiphany-2.22.2/src/prefs-dialog.c 2008-05-27 22:55:53.701154196 +0200
-@@ -362,6 +362,13 @@ prefs_dialog_show_help (EphyDialog *dial
+--- epiphany-2.22.3.orig/src/prefs-dialog.c 2008-03-28 15:59:50.000000000 +0100
++++ epiphany-2.22.3/src/prefs-dialog.c 2008-07-02 10:29:42.732947528 +0200
+@@ -362,6 +362,13 @@
}
static void
@@ -113,7 +113,7 @@
setup_font_combo (EphyDialog *dialog,
const char *type,
const char *code,
-@@ -1491,6 +1498,7 @@ prefs_dialog_init (PrefsDialog *pd)
+@@ -1491,6 +1498,7 @@
EphyDialog *dialog = EPHY_DIALOG (pd);
EphyEncodings *encodings;
GtkWidget *window, *curr_button, *blank_button;
@@ -121,7 +121,7 @@
GtkWidget *clear_cache_button, *font_prefs_button;
GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
gboolean sensitive;
-@@ -1511,6 +1519,8 @@ prefs_dialog_init (PrefsDialog *pd)
+@@ -1511,6 +1519,8 @@
properties[WINDOW_PROP].id, &window,
properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
@@ -130,7 +130,7 @@
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,
-@@ -1534,6 +1544,10 @@ prefs_dialog_init (PrefsDialog *pd)
+@@ -1534,6 +1544,10 @@
gtk_widget_set_sensitive (curr_button, sensitive);
gtk_widget_set_sensitive (blank_button, sensitive);
Modified: desktop/unstable/epiphany-browser/debian/patches/15_certificates_oldapi.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/15_certificates_oldapi.patch?rev=16427&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/15_certificates_oldapi.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/15_certificates_oldapi.patch Wed Jul 2 08:48:31 2008
@@ -1,196 +1,15 @@
Enable again the nsIBadCertListener API.
-Index: epiphany-2.22.2/embed/mozilla/EphyHeaderSniffer.cpp
+Index: epiphany-2.22.3/embed/mozilla/MozRegisterComponents.cpp
===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/EphyHeaderSniffer.cpp 2008-06-15 14:11:03.877820575 +0200
-+++ epiphany-2.22.2/embed/mozilla/EphyHeaderSniffer.cpp 2008-06-15 14:11:45.014322910 +0200
-@@ -72,9 +72,7 @@
- #include "ephy-gui.h"
- #include "ephy-prefs.h"
-
--#ifndef HAVE_GECKO_1_9
- #include "EphyBadCertRejector.h"
--#endif
- #include "MozDownload.h"
-
- #include "EphyHeaderSniffer.h"
-@@ -224,7 +222,6 @@ EphyHeaderSniffer::OnSecurityChange (nsI
- NS_IMETHODIMP
- EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result)
- {
--#ifndef HAVE_GECKO_1_9
- if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) &&
- mEmbedPersist)
- {
-@@ -243,7 +240,6 @@ EphyHeaderSniffer::GetInterface(const ns
- return NS_OK;
- }
- }
--#endif
-
- return NS_ERROR_NO_INTERFACE;
- }
-Index: epiphany-2.22.2/embed/mozilla/GtkNSSDialogs.cpp
-===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/GtkNSSDialogs.cpp 2008-06-15 14:11:53.210318838 +0200
-+++ epiphany-2.22.2/embed/mozilla/GtkNSSDialogs.cpp 2008-06-15 15:01:18.673819227 +0200
-@@ -110,20 +110,12 @@ GtkNSSDialogs::~GtkNSSDialogs ()
- {
- }
-
--#ifdef HAVE_GECKO_1_9
--NS_IMPL_THREADSAFE_ISUPPORTS4 (GtkNSSDialogs,
-- nsITokenPasswordDialogs,
-- nsICertificateDialogs,
-- nsITokenDialogs,
-- nsIDOMCryptoDialogs)
--#else
- NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs,
- nsITokenPasswordDialogs,
- nsIBadCertListener,
- nsICertificateDialogs,
- nsITokenDialogs,
- nsIDOMCryptoDialogs)
--#endif
-
- /* There's also nsICertPickDialogs which is implemented in mozilla
- * but has no callers. So we don't implement it.
-@@ -217,7 +209,6 @@ higgy_setup_dialog (GtkDialog *dialog, c
- }
- }
-
--#ifndef HAVE_GECKO_1_9
- /**
- * Display a dialog box, showing 'View Certificate', 'Cancel',
- * and 'Accept' buttons. Optionally a checkbox can be shown,
-@@ -321,7 +312,6 @@ display_cert_warning_box (nsIInterfaceRe
- gtk_widget_destroy (dialog);
- return res;
- }
--#endif /* HAVE_GECKO_1_9 */
-
- /* Helper functions */
-
-@@ -389,8 +379,6 @@ GtkNSSDialogs::GetTokenAndSlotFromName (
- return NS_OK;
- }
-
--#ifndef HAVE_GECKO_1_9
--
- NS_IMETHODIMP
- GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
- const nsACString &targetURL,
-@@ -606,8 +594,6 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsII
- return NS_OK;
- }
-
--#endif /* HAVE_GECKO_1_9 */
--
- NS_IMETHODIMP
- GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
- nsIX509Cert *cert,
-Index: epiphany-2.22.2/embed/mozilla/GtkNSSDialogs.h
-===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/GtkNSSDialogs.h 2008-06-15 14:12:59.785819426 +0200
-+++ epiphany-2.22.2/embed/mozilla/GtkNSSDialogs.h 2008-06-15 14:13:17.805822736 +0200
-@@ -22,9 +22,7 @@
- #ifndef GTKNSSDIALOGS_H
- #define GTKNSSDIALOGS_H 1
-
--#ifndef HAVE_GECKO_1_9
- #include <nsIBadCertListener.h>
--#endif
- #include <nsICertificateDialogs.h>
- #include <nsITokenPasswordDialogs.h>
- #include <nsITokenDialogs.h>
-@@ -40,9 +38,7 @@ class nsIPKCS11Slot;
- #define GTK_NSSDIALOGS_CLASSNAME "Gtk NSS Dialogs"
-
- class GtkNSSDialogs : public nsICertificateDialogs,
--#ifndef HAVE_GECKO_1_9
- public nsIBadCertListener,
--#endif
- public nsITokenPasswordDialogs,
- public nsITokenDialogs,
- public nsIDOMCryptoDialogs
-@@ -50,9 +46,7 @@ class GtkNSSDialogs : public nsICertific
- public:
- NS_DECL_ISUPPORTS
- NS_DECL_NSICERTIFICATEDIALOGS
--#ifndef HAVE_GECKO_1_9
- NS_DECL_NSIBADCERTLISTENER
--#endif
- NS_DECL_NSITOKENPASSWORDDIALOGS
- NS_DECL_NSITOKENDIALOGS
- NS_DECL_NSIDOMCRYPTODIALOGS
-Index: epiphany-2.22.2/embed/mozilla/Makefile.am
-===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/Makefile.am 2008-06-15 14:10:34.590322721 +0200
-+++ epiphany-2.22.2/embed/mozilla/Makefile.am 2008-06-15 14:10:45.893821979 +0200
-@@ -11,6 +11,8 @@ libephymozillaembed_la_SOURCES = \
- ContentHandler.h \
- EphyAboutModule.cpp \
- EphyAboutModule.h \
-+ EphyBadCertRejector.cpp \
-+ EphyBadCertRejector.h \
- EphyContentPolicy.cpp \
- EphyContentPolicy.h \
- EphyHeaderSniffer.cpp \
-@@ -73,8 +75,6 @@ endif
-
- if !HAVE_GECKO_1_9
- libephymozillaembed_la_SOURCES += \
-- EphyBadCertRejector.cpp \
-- EphyBadCertRejector.h \
- EphyDirectoryProvider.cpp \
- EphyDirectoryProvider.h \
- $(NULL)
-Index: epiphany-2.22.2/embed/mozilla/MozDownload.cpp
-===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/MozDownload.cpp 2008-06-15 14:13:26.202320825 +0200
-+++ epiphany-2.22.2/embed/mozilla/MozDownload.cpp 2008-06-15 14:13:49.318321183 +0200
-@@ -71,9 +71,7 @@
- #include <nsNetError.h>
- #include <nsServiceManagerUtils.h>
-
--#ifndef HAVE_GECKO_1_9
- #include "EphyBadCertRejector.h"
--#endif
-
- #include "EphyUtils.h"
-
-@@ -533,7 +531,6 @@ MozDownload::OnSecurityChange (nsIWebPro
- NS_IMETHODIMP
- MozDownload::GetInterface(const nsIID & uuid, void * *result)
- {
--#ifndef HAVE_GECKO_1_9
- if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) &&
- mEmbedPersist)
- {
-@@ -552,7 +549,6 @@ MozDownload::GetInterface(const nsIID &
- return NS_OK;
- }
- }
--#endif
- return NS_ERROR_NO_INTERFACE;
- }
-
-Index: epiphany-2.22.2/embed/mozilla/MozRegisterComponents.cpp
-===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/MozRegisterComponents.cpp 2008-06-15 14:15:13.909819124 +0200
-+++ epiphany-2.22.2/embed/mozilla/MozRegisterComponents.cpp 2008-06-15 14:15:22.053819758 +0200
-@@ -152,14 +152,12 @@ static const nsModuleComponentInfo sAppC
+--- epiphany-2.22.3.orig/embed/mozilla/MozRegisterComponents.cpp 2008-05-18 15:46:49.000000000 +0200
++++ epiphany-2.22.3/embed/mozilla/MozRegisterComponents.cpp 2008-07-02 10:38:33.623108708 +0200
+@@ -152,7 +152,7 @@
NS_CLIENTAUTHDIALOGS_CONTRACTID,
GtkNSSClientAuthDialogsConstructor
},
-#ifndef HAVE_GECKO_1_9
++#ifdef HAVE_NSIBADCERTLISTENER_H
{
GTK_NSSDIALOGS_CLASSNAME,
GTK_NSSDIALOGS_CID,
- NS_BADCERTLISTENER_CONTRACTID,
- GtkNSSDialogsConstructor
- },
--#endif
- {
- GTK_NSSDIALOGS_CLASSNAME,
- GTK_NSSDIALOGS_CID,
Modified: desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch?rev=16427&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch Wed Jul 2 08:48:31 2008
@@ -2,33 +2,1489 @@
aclocal-1.10 -I m4
automake-1.10
autoconf
-Index: epiphany-2.22.2/aclocal.m4
+Index: epiphany-2.22.3/aclocal.m4
===================================================================
---- epiphany-2.22.2.orig/aclocal.m4 2008-05-26 19:57:11.000000000 +0200
-+++ epiphany-2.22.2/aclocal.m4 2008-06-15 14:17:05.802319777 +0200
-@@ -684,7 +684,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
+--- epiphany-2.22.3.orig/aclocal.m4 2008-06-30 20:02:16.000000000 +0200
++++ epiphany-2.22.3/aclocal.m4 2008-07-02 10:47:15.935097663 +0200
+@@ -59,322 +59,755 @@
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+ ])
+
+-# gnome-common.m4
+-#
+-
+-dnl GNOME_COMMON_INIT
++# Copyright (C) 1995-2002 Free Software Foundation, Inc.
++# Copyright (C) 2001-2003,2004 Red Hat, Inc.
++#
++# This file is free software, distributed under the terms of the GNU
++# General Public License. As a special exception to the GNU General
++# Public License, this file may be distributed as part of a program
++# that contains a configuration script generated by Autoconf, under
++# the same distribution terms as the rest of that program.
++#
++# This file can be copied and used freely without restrictions. It can
++# be used in projects which are not available under the GNU Public License
++# but which still want to provide support for the GNU gettext functionality.
++#
++# Macro to add for using GNU gettext.
++# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
++#
++# Modified to never use included libintl.
++# Owen Taylor <otaylor at redhat.com>, 12/15/1998
++#
++# Major rework to remove unused code
++# Owen Taylor <otaylor at redhat.com>, 12/11/2002
++#
++# Added better handling of ALL_LINGUAS from GNU gettext version
++# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
++#
++# Modified to require ngettext
++# Matthias Clasen <mclasen at redhat.com> 08/06/2004
++#
++# We need this here as well, since someone might use autoconf-2.5x
++# to configure GLib then an older version to configure a package
++# using AM_GLIB_GNU_GETTEXT
++AC_PREREQ(2.53)
+
+-AC_DEFUN([GNOME_COMMON_INIT],
+-[
+- dnl this macro should come after AC_CONFIG_MACRO_DIR
+- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
++dnl
++dnl We go to great lengths to make sure that aclocal won't
++dnl try to pull in the installed version of these macros
++dnl when running aclocal in the glib directory.
++dnl
++m4_copy([AC_DEFUN],[glib_DEFUN])
++m4_copy([AC_REQUIRE],[glib_REQUIRE])
++dnl
++dnl At the end, if we're not within glib, we'll define the public
++dnl definitions in terms of our private definitions.
++dnl
+
+- dnl ensure that when the Automake generated makefile calls aclocal,
+- dnl it honours the $ACLOCAL_FLAGS environment variable
+- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+- if test -n "$ac_macro_dir"; then
+- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+- fi
++# GLIB_LC_MESSAGES
++#--------------------
++glib_DEFUN([GLIB_LC_MESSAGES],
++ [AC_CHECK_HEADERS([locale.h])
++ if test $ac_cv_header_locale_h = yes; then
++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
++ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
++ if test $am_cv_val_LC_MESSAGES = yes; then
++ AC_DEFINE(HAVE_LC_MESSAGES, 1,
++ [Define if your <locale.h> file defines LC_MESSAGES.])
++ fi
++ fi])
+
+- AC_SUBST([ACLOCAL_AMFLAGS])
++# GLIB_PATH_PROG_WITH_TEST
++#----------------------------
++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
++[# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL(ac_cv_path_$1,
++[case "[$]$1" in
++ /*)
++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in ifelse([$5], , $PATH, [$5]); do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if [$3]; then
++ ac_cv_path_$1="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++dnl If no 4th arg is given, leave the cache variable unset,
++dnl so AC_PATH_PROGS will keep looking.
++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
++])dnl
++ ;;
++esac])dnl
++$1="$ac_cv_path_$1"
++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
++ AC_MSG_RESULT([$]$1)
++else
++ AC_MSG_RESULT(no)
++fi
++AC_SUBST($1)dnl
+ ])
+
+-AC_DEFUN([GNOME_DEBUG_CHECK],
+-[
+- AC_ARG_ENABLE([debug],
+- AC_HELP_STRING([--enable-debug],
+- [turn on debugging]),,
+- [enable_debug=no])
++# GLIB_WITH_NLS
++#-----------------
++glib_DEFUN([GLIB_WITH_NLS],
++ dnl NLS is obligatory
++ [USE_NLS=yes
++ AC_SUBST(USE_NLS)
+
+- if test x$enable_debug = xyes ; then
+- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
+- [Enable additional debugging at the expense of performance and size])
+- fi
+-])
++ gt_cv_have_gettext=no
+
+-dnl GNOME_MAINTAINER_MODE_DEFINES ()
+-dnl define DISABLE_DEPRECATED
+-dnl
+-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+-[
+- AC_REQUIRE([AM_MAINTAINER_MODE])
++ CATOBJEXT=NONE
++ XGETTEXT=:
++ INTLLIBS=
+
+- if test $USE_MAINTAINER_MODE = yes; then
+- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
+- else
+- DISABLE_DEPRECATED=""
+- fi
+- AC_SUBST(DISABLE_DEPRECATED)
+-])
++ AC_CHECK_HEADER(libintl.h,
++ [gt_cv_func_dgettext_libintl="no"
++ libintl_extra_libs=""
+
+-dnl GNOME_COMPILE_WARNINGS
+-dnl Turn on many useful compiler warnings
+-dnl For now, only works on GCC
+-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+- dnl ******************************
+- dnl More compiler warnings
+- dnl ******************************
++ #
++ # First check in libc
++ #
++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
++ [AC_TRY_LINK([
++#include <libintl.h>
++],
++ [return !ngettext ("","", 1)],
++ gt_cv_func_ngettext_libc=yes,
++ gt_cv_func_ngettext_libc=no)
++ ])
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
++ [AC_TRY_LINK([
++#include <libintl.h>
++],
++ [return !dgettext ("","")],
++ gt_cv_func_dgettext_libc=yes,
++ gt_cv_func_dgettext_libc=no)
++ ])
++ fi
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ fi
+
+- AC_ARG_ENABLE(compile-warnings,
+- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+- [Turn on compiler warnings]),,
+- [enable_compile_warnings="m4_default([$1],[yes])"])
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dgettext,
++ gt_cv_func_dgettext_libintl=yes)])])
+
+- warnCFLAGS=
+- if test "x$GCC" != xyes; then
+- enable_compile_warnings=no
+- fi
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ AC_MSG_CHECKING([if -liconv is needed to use gettext])
++ AC_MSG_RESULT([])
++ AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dcgettext,
++ [gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv],
++ :,-liconv)],
++ :,-liconv)
++ fi
+
+- warning_flags=
+- realsave_CFLAGS="$CFLAGS"
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ LIBS="$glib_save_LIBS"
+
+- case "$enable_compile_warnings" in
+- no)
+- warning_flags=
+- ;;
+- minimum)
+- warning_flags="-Wall"
+- ;;
+- yes)
+- warning_flags="-Wall -Wmissing-prototypes"
+- ;;
+- maximum|error)
+- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+- CFLAGS="$warning_flags $CFLAGS"
+- for option in -Wno-sign-compare; do
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS $option"
+- AC_MSG_CHECKING([whether gcc understands $option])
+- AC_TRY_COMPILE([], [],
+- has_option=yes,
+- has_option=no,)
+- CFLAGS="$SAVE_CFLAGS"
+- AC_MSG_RESULT($has_option)
+- if test $has_option = yes; then
+- warning_flags="$warning_flags $option"
+- fi
+- unset has_option
+- unset SAVE_CFLAGS
+- done
+- unset option
+- if test "$enable_compile_warnings" = "error" ; then
+- warning_flags="$warning_flags -Werror"
+- fi
+- ;;
+- *)
+- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+- ;;
+- esac
+- CFLAGS="$realsave_CFLAGS"
+- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+- AC_MSG_RESULT($warning_flags)
+-
+- AC_ARG_ENABLE(iso-c,
+- AC_HELP_STRING([--enable-iso-c],
+- [Try to warn if code is not ISO C ]),,
+- [enable_iso_c=no])
++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
+
+- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+- complCFLAGS=
+- if test "x$enable_iso_c" != "xno"; then
+- if test "x$GCC" = "xyes"; then
+- case " $CFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) complCFLAGS="$complCFLAGS -ansi" ;;
+- esac
+- case " $CFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCFLAGS="$complCFLAGS -pedantic" ;;
+- esac
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ gt_cv_have_gettext=yes
++ fi
++
++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ INTLLIBS="-lintl $libintl_extra_libs"
++ fi
++
++ if test "$gt_cv_have_gettext" = "yes"; then
++ AC_DEFINE(HAVE_GETTEXT,1,
++ [Define if the GNU gettext() function is already present or preinstalled.])
++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
++ if test "$MSGFMT" != "no"; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS $INTLLIBS"
++ AC_CHECK_FUNCS(dcgettext)
++ MSGFMT_OPTS=
++ AC_MSG_CHECKING([if msgfmt accepts -c])
++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo at bar.xx>\n"
++"Language-Team: C <LL at li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
++ AC_SUBST(MSGFMT_OPTS)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr],
++ [CATOBJEXT=.gmo
++ DATADIRNAME=share],
++ [case $host in
++ *-*-solaris*)
++ dnl On Solaris, if bind_textdomain_codeset is in libc,
++ dnl GNU format message catalog is always supported,
++ dnl since both are added to the libc all together.
++ dnl Hence, we'd like to go with DATADIRNAME=share and
++ dnl and CATOBJEXT=.gmo in this case.
++ AC_CHECK_FUNC(bind_textdomain_codeset,
++ [CATOBJEXT=.gmo
++ DATADIRNAME=share],
++ [CATOBJEXT=.mo
++ DATADIRNAME=lib])
++ ;;
++ *)
++ CATOBJEXT=.mo
++ DATADIRNAME=lib
++ ;;
++ esac])
++ LIBS="$glib_save_LIBS"
++ INSTOBJEXT=.mo
++ else
++ gt_cv_have_gettext=no
+ fi
++ fi
++ ])
++
++ if test "$gt_cv_have_gettext" = "yes" ; then
++ AC_DEFINE(ENABLE_NLS, 1,
++ [always defined to indicate that i18n is enabled])
+ fi
+- AC_MSG_RESULT($complCFLAGS)
+
+- WARN_CFLAGS="$warning_flags $complCFLAGS"
+- AC_SUBST(WARN_CFLAGS)
+-])
++ dnl Test whether we really found GNU xgettext.
++ if test "$XGETTEXT" != ":"; then
++ dnl If it is not GNU xgettext we define it as : so that the
++ dnl Makefiles still can work.
++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++ : ;
++ else
++ AC_MSG_RESULT(
++ [found xgettext program is not GNU xgettext; ignore it])
++ XGETTEXT=":"
++ fi
++ fi
+
+-dnl For C++, do basically the same thing.
++ # We need to process the po/ directory.
++ POSUB=po
+
+-AC_DEFUN([GNOME_CXX_WARNINGS],[
+- AC_ARG_ENABLE(cxx-warnings,
+- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+- [Turn on compiler warnings.]),,
+- [enable_cxx_warnings="m4_default([$1],[minimum])"])
++ AC_OUTPUT_COMMANDS(
++ [case "$CONFIG_FILES" in *po/Makefile.in*)
++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
++ esac])
+
+- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+- warnCXXFLAGS=
+- if test "x$GXX" != xyes; then
+- enable_cxx_warnings=no
+- fi
+- if test "x$enable_cxx_warnings" != "xno"; then
+- if test "x$GXX" = "xyes"; then
+- case " $CXXFLAGS " in
+- *[\ \ ]-Wall[\ \ ]*) ;;
+- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+- esac
++ dnl These rules are solely for the distribution goal. While doing this
++ dnl we only have to keep exactly one list of the available catalogs
++ dnl in configure.in.
++ for lang in $ALL_LINGUAS; do
++ GMOFILES="$GMOFILES $lang.gmo"
++ POFILES="$POFILES $lang.po"
++ done
+
+- ## -W is not all that useful. And it cannot be controlled
+- ## with individual -Wno-xxx flags, unlike -Wall
+- if test "x$enable_cxx_warnings" = "xyes"; then
+- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+- fi
+- fi
+- fi
+- AC_MSG_RESULT($warnCXXFLAGS)
++ dnl Make all variables we use known to autoconf.
++ AC_SUBST(CATALOGS)
++ AC_SUBST(CATOBJEXT)
++ AC_SUBST(DATADIRNAME)
++ AC_SUBST(GMOFILES)
++ AC_SUBST(INSTOBJEXT)
++ AC_SUBST(INTLLIBS)
++ AC_SUBST(PO_IN_DATADIR_TRUE)
++ AC_SUBST(PO_IN_DATADIR_FALSE)
++ AC_SUBST(POFILES)
++ AC_SUBST(POSUB)
++ ])
+
+- AC_ARG_ENABLE(iso-cxx,
+- AC_HELP_STRING([--enable-iso-cxx],
+- [Try to warn if code is not ISO C++ ]),,
+- [enable_iso_cxx=no])
++# AM_GLIB_GNU_GETTEXT
++# -------------------
++# Do checks necessary for use of gettext. If a suitable implementation
++# of gettext is found in either in libintl or in the C library,
++# it will set INTLLIBS to the libraries needed for use of gettext
++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
++# on various variables needed by the Makefile.in.in installed by
++# glib-gettextize.
++dnl
++glib_DEFUN([GLIB_GNU_GETTEXT],
++ [AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_HEADER_STDC])dnl
++
++ GLIB_LC_MESSAGES
++ GLIB_WITH_NLS
+
+- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+- complCXXFLAGS=
+- if test "x$enable_iso_cxx" != "xno"; then
+- if test "x$GXX" = "xyes"; then
+- case " $CXXFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+- esac
++ if test "$gt_cv_have_gettext" = "yes"; then
++ if test "x$ALL_LINGUAS" = "x"; then
++ LINGUAS=
++ else
++ AC_MSG_CHECKING(for catalogs to be installed)
++ NEW_LINGUAS=
++ for presentlang in $ALL_LINGUAS; do
++ useit=no
++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
++ desiredlanguages="$LINGUAS"
++ else
++ desiredlanguages="$ALL_LINGUAS"
++ fi
++ for desiredlang in $desiredlanguages; do
++ # Use the presentlang catalog if desiredlang is
++ # a. equal to presentlang, or
++ # b. a variant of presentlang (because in this case,
++ # presentlang can be used as a fallback for messages
++ # which are not translated in the desiredlang catalog).
++ case "$desiredlang" in
++ "$presentlang"*) useit=yes;;
++ esac
++ done
++ if test $useit = yes; then
++ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
++ fi
++ done
++ LINGUAS=$NEW_LINGUAS
++ AC_MSG_RESULT($LINGUAS)
++ fi
+
+- case " $CXXFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+- esac
++ dnl Construct list of names of catalog files to be constructed.
++ if test -n "$LINGUAS"; then
++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
+- AC_MSG_RESULT($complCXXFLAGS)
+-
+- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+- AC_SUBST(WARN_CXXFLAGS)
+-])
+-
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-
-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+
++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
++ dnl Try to locate is.
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++ AC_SUBST(MKINSTALLDIRS)
+
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+- [],
+- [m4_define([AC_PROVIDE_IFELSE],
+- [m4_ifdef([AC_PROVIDE_$1],
+- [$2], [$3])])])
++ dnl Generate list of files to be processed by xgettext which will
++ dnl be included in po/Makefile.
++ test -d po || mkdir po
++ if test "x$srcdir" != "x."; then
++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++ posrcprefix="$srcdir/"
++ else
++ posrcprefix="../$srcdir/"
++ fi
++ else
++ posrcprefix="../"
++ fi
++ rm -f po/POTFILES
++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++ < $srcdir/po/POTFILES.in > po/POTFILES
++ ])
+
++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
++# -------------------------------
++# Define VARIABLE to the location where catalog files will
++# be installed by po/Makefile.
++glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
++glib_save_prefix="$prefix"
++glib_save_exec_prefix="$exec_prefix"
++glib_save_datarootdir="$datarootdir"
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++datarootdir=`eval echo "${datarootdir}"`
++if test "x$CATOBJEXT" = "x.mo" ; then
++ localedir=`eval echo "${libdir}/locale"`
++else
++ localedir=`eval echo "${datadir}/locale"`
++fi
++prefix="$glib_save_prefix"
++exec_prefix="$glib_save_exec_prefix"
++datarootdir="$glib_save_datarootdir"
++AC_DEFINE_UNQUOTED($1, "$localedir",
++ [Define the location where the catalogs will be installed])
++])
+
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+- AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [AC_LIBTOOL_CXX],
+- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+- ])])
+-dnl And a similar setup for Fortran 77 support
+- AC_PROVIDE_IFELSE([AC_PROG_F77],
+- [AC_LIBTOOL_F77],
+- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
++dnl
++dnl Now the definitions that aclocal will find
++dnl
++ifdef(glib_configure_in,[],[
++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
++])dnl
+
+-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+- [AC_LIBTOOL_GCJ],
+- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+- [AC_LIBTOOL_GCJ],
+- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+- [AC_LIBTOOL_GCJ],
+- [ifdef([AC_PROG_GCJ],
+- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+- ifdef([A][M_PROG_GCJ],
+- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+- ifdef([LT_AC_PROG_GCJ],
+- [define([LT_AC_PROG_GCJ],
+- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+-])])# AC_PROG_LIBTOOL
++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
++#
++# Create a temporary file with TEST-FILE as its contents and pass the
++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
++# 0 and perform ACTION-IF-FAIL for any other exit status.
++AC_DEFUN([GLIB_RUN_PROG],
++[cat >conftest.foo <<_ACEOF
++$2
++_ACEOF
++if AC_RUN_LOG([$1 conftest.foo]); then
++ m4_ifval([$3], [$3], [:])
++m4_ifvaln([$4], [else $4])dnl
++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
++fi])
+
+
+-# _AC_PROG_LIBTOOL
+-# ----------------
+-AC_DEFUN([_AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++# gnome-common.m4
++#
+
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++dnl GNOME_COMMON_INIT
+
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
++AC_DEFUN([GNOME_COMMON_INIT],
++[
++ dnl this macro should come after AC_CONFIG_MACRO_DIR
++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
++ dnl ensure that when the Automake generated makefile calls aclocal,
++ dnl it honours the $ACLOCAL_FLAGS environment variable
++ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
++ if test -n "$ac_macro_dir"; then
++ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
++ fi
+
++ AC_SUBST([ACLOCAL_AMFLAGS])
++])
+
+-# AC_LIBTOOL_SETUP
+-# ----------------
+-AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
++AC_DEFUN([GNOME_DEBUG_CHECK],
++[
++ AC_ARG_ENABLE([debug],
++ AC_HELP_STRING([--enable-debug],
++ [turn on debugging]),,
++ [enable_debug=no])
+
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
++ if test x$enable_debug = xyes ; then
++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
++ [Enable additional debugging at the expense of performance and size])
++ fi
++])
++
++dnl GNOME_MAINTAINER_MODE_DEFINES ()
++dnl define DISABLE_DEPRECATED
+ dnl
+-AC_LIBTOOL_SYS_MAX_CMD_LEN
+-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-AC_LIBTOOL_OBJDIR
++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
++[
++ AC_REQUIRE([AM_MAINTAINER_MODE])
+
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
++ if test $USE_MAINTAINER_MODE = yes; then
++ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
++ else
++ DISABLE_DEPRECATED=""
++ fi
++ AC_SUBST(DISABLE_DEPRECATED)
++])
+
+-case $host_os in
+-aix3*)
+- # AIX sometimes has problems with the GCC collect2 program. For some
+- # reason, if we set the COLLECT_NAMES environment variable, the problems
+- # vanish in a puff of smoke.
+- if test "X${COLLECT_NAMES+set}" != Xset; then
+- COLLECT_NAMES=
+- export COLLECT_NAMES
+- fi
+- ;;
+-esac
++dnl GNOME_COMPILE_WARNINGS
++dnl Turn on many useful compiler warnings
++dnl For now, only works on GCC
++AC_DEFUN([GNOME_COMPILE_WARNINGS],[
++ dnl ******************************
++ dnl More compiler warnings
++ dnl ******************************
+
+-# Sed substitution that helps us do robust quoting. It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
+-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++ AC_ARG_ENABLE(compile-warnings,
++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++ [Turn on compiler warnings]),,
++ [enable_compile_warnings="m4_default([$1],[yes])"])
+
+-# Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++ warnCFLAGS=
++ if test "x$GCC" != xyes; then
++ enable_compile_warnings=no
++ fi
+
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++ warning_flags=
++ realsave_CFLAGS="$CFLAGS"
+
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
++ case "$enable_compile_warnings" in
++ no)
++ warning_flags=
++ ;;
++ minimum)
++ warning_flags="-Wall"
++ ;;
++ yes)
++ warning_flags="-Wall -Wmissing-prototypes"
++ ;;
++ maximum|error)
++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
++ CFLAGS="$warning_flags $CFLAGS"
++ for option in -Wno-sign-compare; do
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $option"
++ AC_MSG_CHECKING([whether gcc understands $option])
++ AC_TRY_COMPILE([], [],
++ has_option=yes,
++ has_option=no,)
++ CFLAGS="$SAVE_CFLAGS"
++ AC_MSG_RESULT($has_option)
++ if test $has_option = yes; then
++ warning_flags="$warning_flags $option"
++ fi
++ unset has_option
++ unset SAVE_CFLAGS
++ done
++ unset option
++ if test "$enable_compile_warnings" = "error" ; then
++ warning_flags="$warning_flags -Werror"
++ fi
++ ;;
++ *)
++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
++ ;;
++ esac
++ CFLAGS="$realsave_CFLAGS"
++ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
++ AC_MSG_RESULT($warning_flags)
+
+-# Constants:
+-rm="rm -f"
++ AC_ARG_ENABLE(iso-c,
++ AC_HELP_STRING([--enable-iso-c],
++ [Try to warn if code is not ISO C ]),,
++ [enable_iso_c=no])
++
++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
++ complCFLAGS=
++ if test "x$enable_iso_c" != "xno"; then
++ if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -ansi" ;;
++ esac
++ case " $CFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCFLAGS)
++
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
++ AC_SUBST(WARN_CFLAGS)
++])
++
++dnl For C++, do basically the same thing.
++
++AC_DEFUN([GNOME_CXX_WARNINGS],[
++ AC_ARG_ENABLE(cxx-warnings,
++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
++ [Turn on compiler warnings.]),,
++ [enable_cxx_warnings="m4_default([$1],[minimum])"])
++
++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
++ warnCXXFLAGS=
++ if test "x$GXX" != xyes; then
++ enable_cxx_warnings=no
++ fi
++ if test "x$enable_cxx_warnings" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
++ esac
++
++ ## -W is not all that useful. And it cannot be controlled
++ ## with individual -Wno-xxx flags, unlike -Wall
++ if test "x$enable_cxx_warnings" = "xyes"; then
++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
++ fi
++ fi
++ fi
++ AC_MSG_RESULT($warnCXXFLAGS)
++
++ AC_ARG_ENABLE(iso-cxx,
++ AC_HELP_STRING([--enable-iso-cxx],
++ [Try to warn if code is not ISO C++ ]),,
++ [enable_iso_cxx=no])
++
++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
++ complCXXFLAGS=
++ if test "x$enable_iso_cxx" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
++ esac
++
++ case " $CXXFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCXXFLAGS)
++
++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
++ AC_SUBST(WARN_CXXFLAGS)
++])
++
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-Index: epiphany-2.22.2/configure
++
++
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++ [],
++ [m4_define([AC_PROVIDE_IFELSE],
++ [m4_ifdef([AC_PROVIDE_$1],
++ [$2], [$3])])])
++
++
++# AC_PROG_LIBTOOL
++# ---------------
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++ AC_PROVIDE_IFELSE([AC_PROG_CXX],
++ [AC_LIBTOOL_CXX],
++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++ ])])
++dnl And a similar setup for Fortran 77 support
++ AC_PROVIDE_IFELSE([AC_PROG_F77],
++ [AC_LIBTOOL_F77],
++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
++
++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [ifdef([AC_PROG_GCJ],
++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++ ifdef([A][M_PROG_GCJ],
++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++ ifdef([LT_AC_PROG_GCJ],
++ [define([LT_AC_PROG_GCJ],
++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])# AC_PROG_LIBTOOL
++
++
++# _AC_PROG_LIBTOOL
++# ----------------
++AC_DEFUN([_AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
++
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])# _AC_PROG_LIBTOOL
++
++
++# AC_LIBTOOL_SETUP
++# ----------------
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.50)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
++
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
++
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++_LT_AC_PROG_ECHO_BACKSLASH
++
++case $host_os in
++aix3*)
++ # AIX sometimes has problems with the GCC collect2 program. For some
++ # reason, if we set the COLLECT_NAMES environment variable, the problems
++ # vanish in a puff of smoke.
++ if test "X${COLLECT_NAMES+set}" != Xset; then
++ COLLECT_NAMES=
++ export COLLECT_NAMES
++ fi
++ ;;
++esac
++
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e 1s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Constants:
++rm="rm -f"
+
+ # Global variables:
+ default_ofile=libtool
+@@ -8139,439 +8572,6 @@
+ AC_SUBST([am__untar])
+ ]) # _AM_PROG_TAR
+
+-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+-#
+-# This file is free software, distributed under the terms of the GNU
+-# General Public License. As a special exception to the GNU General
+-# Public License, this file may be distributed as part of a program
+-# that contains a configuration script generated by Autoconf, under
+-# the same distribution terms as the rest of that program.
+-#
+-# This file can be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
+-# but which still want to provide support for the GNU gettext functionality.
+-#
+-# Macro to add for using GNU gettext.
+-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+-#
+-# Modified to never use included libintl.
+-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+-#
+-# Major rework to remove unused code
+-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+-#
+-# Added better handling of ALL_LINGUAS from GNU gettext version
+-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+-#
+-# Modified to require ngettext
+-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+-#
+-# We need this here as well, since someone might use autoconf-2.5x
+-# to configure GLib then an older version to configure a package
+-# using AM_GLIB_GNU_GETTEXT
+-AC_PREREQ(2.53)
+-
+-dnl
+-dnl We go to great lengths to make sure that aclocal won't
+-dnl try to pull in the installed version of these macros
+-dnl when running aclocal in the glib directory.
+-dnl
+-m4_copy([AC_DEFUN],[glib_DEFUN])
+-m4_copy([AC_REQUIRE],[glib_REQUIRE])
+-dnl
+-dnl At the end, if we're not within glib, we'll define the public
+-dnl definitions in terms of our private definitions.
+-dnl
+-
+-# GLIB_LC_MESSAGES
+-#--------------------
+-glib_DEFUN([GLIB_LC_MESSAGES],
+- [AC_CHECK_HEADERS([locale.h])
+- if test $ac_cv_header_locale_h = yes; then
+- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+- if test $am_cv_val_LC_MESSAGES = yes; then
+- AC_DEFINE(HAVE_LC_MESSAGES, 1,
+- [Define if your <locale.h> file defines LC_MESSAGES.])
+- fi
+- fi])
+-
+-# GLIB_PATH_PROG_WITH_TEST
+-#----------------------------
+-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+-[# Extract the first word of "$2", so it can be a program name with args.
+-set dummy $2; ac_word=[$]2
+-AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
+-[case "[$]$1" in
+- /*)
+- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+- ;;
+- *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in ifelse([$5], , $PATH, [$5]); do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- if [$3]; then
+- ac_cv_path_$1="$ac_dir/$ac_word"
+- break
+- fi
+- fi
+- done
+- IFS="$ac_save_ifs"
+-dnl If no 4th arg is given, leave the cache variable unset,
+-dnl so AC_PATH_PROGS will keep looking.
+-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+-])dnl
+- ;;
+-esac])dnl
+-$1="$ac_cv_path_$1"
+-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+- AC_MSG_RESULT([$]$1)
+-else
+- AC_MSG_RESULT(no)
+-fi
+-AC_SUBST($1)dnl
+-])
+-
+-# GLIB_WITH_NLS
+-#-----------------
+-glib_DEFUN([GLIB_WITH_NLS],
+- dnl NLS is obligatory
+- [USE_NLS=yes
+- AC_SUBST(USE_NLS)
+-
+- gt_cv_have_gettext=no
+-
+- CATOBJEXT=NONE
+- XGETTEXT=:
+- INTLLIBS=
+-
+- AC_CHECK_HEADER(libintl.h,
+- [gt_cv_func_dgettext_libintl="no"
+- libintl_extra_libs=""
+-
+- #
+- # First check in libc
+- #
+- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+- [AC_TRY_LINK([
+-#include <libintl.h>
+-],
+- [return !ngettext ("","", 1)],
+- gt_cv_func_ngettext_libc=yes,
+- gt_cv_func_ngettext_libc=no)
+- ])
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+- [AC_TRY_LINK([
+-#include <libintl.h>
+-],
+- [return !dgettext ("","")],
+- gt_cv_func_dgettext_libc=yes,
+- gt_cv_func_dgettext_libc=no)
+- ])
+- fi
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- AC_CHECK_FUNCS(bind_textdomain_codeset)
+- fi
+-
+- #
+- # If we don't have everything we want, check in libintl
+- #
+- if test "$gt_cv_func_dgettext_libc" != "yes" \
+- || test "$gt_cv_func_ngettext_libc" != "yes" \
+- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+-
+- AC_CHECK_LIB(intl, bindtextdomain,
+- [AC_CHECK_LIB(intl, ngettext,
+- [AC_CHECK_LIB(intl, dgettext,
+- gt_cv_func_dgettext_libintl=yes)])])
+-
+- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- AC_MSG_CHECKING([if -liconv is needed to use gettext])
+- AC_MSG_RESULT([])
+- AC_CHECK_LIB(intl, ngettext,
+- [AC_CHECK_LIB(intl, dcgettext,
+- [gt_cv_func_dgettext_libintl=yes
+- libintl_extra_libs=-liconv],
+- :,-liconv)],
+- :,-liconv)
+- fi
+-
+- #
+- # If we found libintl, then check in it for bind_textdomain_codeset();
+- # we'll prefer libc if neither have bind_textdomain_codeset(),
+- # and both have dgettext and ngettext
+- #
+- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+- glib_save_LIBS="$LIBS"
+- LIBS="$LIBS -lintl $libintl_extra_libs"
+- unset ac_cv_func_bind_textdomain_codeset
+- AC_CHECK_FUNCS(bind_textdomain_codeset)
+- LIBS="$glib_save_LIBS"
+-
+- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+- gt_cv_func_dgettext_libc=no
+- else
+- if test "$gt_cv_func_dgettext_libc" = "yes" \
+- && test "$gt_cv_func_ngettext_libc" = "yes"; then
+- gt_cv_func_dgettext_libintl=no
+- fi
+- fi
+- fi
+- fi
+-
+- if test "$gt_cv_func_dgettext_libc" = "yes" \
+- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- gt_cv_have_gettext=yes
+- fi
+-
+- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS="-lintl $libintl_extra_libs"
+- fi
+-
+- if test "$gt_cv_have_gettext" = "yes"; then
+- AC_DEFINE(HAVE_GETTEXT,1,
+- [Define if the GNU gettext() function is already present or preinstalled.])
+- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+- if test "$MSGFMT" != "no"; then
+- glib_save_LIBS="$LIBS"
+- LIBS="$LIBS $INTLLIBS"
+- AC_CHECK_FUNCS(dcgettext)
+- MSGFMT_OPTS=
+- AC_MSG_CHECKING([if msgfmt accepts -c])
+- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+-msgid ""
+-msgstr ""
+-"Content-Type: text/plain; charset=UTF-8\n"
+-"Project-Id-Version: test 1.0\n"
+-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+-"Last-Translator: test <foo at bar.xx>\n"
+-"Language-Team: C <LL at li.org>\n"
+-"MIME-Version: 1.0\n"
+-"Content-Transfer-Encoding: 8bit\n"
+-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+- AC_SUBST(MSGFMT_OPTS)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr],
+- [CATOBJEXT=.gmo
+- DATADIRNAME=share],
+- [case $host in
+- *-*-solaris*)
+- dnl On Solaris, if bind_textdomain_codeset is in libc,
+- dnl GNU format message catalog is always supported,
+- dnl since both are added to the libc all together.
+- dnl Hence, we'd like to go with DATADIRNAME=share and
+- dnl and CATOBJEXT=.gmo in this case.
+- AC_CHECK_FUNC(bind_textdomain_codeset,
+- [CATOBJEXT=.gmo
+- DATADIRNAME=share],
+- [CATOBJEXT=.mo
+- DATADIRNAME=lib])
+- ;;
+- *)
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
+- ;;
+- esac])
+- LIBS="$glib_save_LIBS"
+- INSTOBJEXT=.mo
+- else
+- gt_cv_have_gettext=no
+- fi
+- fi
+- ])
+-
+- if test "$gt_cv_have_gettext" = "yes" ; then
+- AC_DEFINE(ENABLE_NLS, 1,
+- [always defined to indicate that i18n is enabled])
+- fi
+-
+- dnl Test whether we really found GNU xgettext.
+- if test "$XGETTEXT" != ":"; then
+- dnl If it is not GNU xgettext we define it as : so that the
+- dnl Makefiles still can work.
+- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+- : ;
+- else
+- AC_MSG_RESULT(
+- [found xgettext program is not GNU xgettext; ignore it])
+- XGETTEXT=":"
+- fi
+- fi
+-
+- # We need to process the po/ directory.
+- POSUB=po
+-
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
+-
+- dnl These rules are solely for the distribution goal. While doing this
+- dnl we only have to keep exactly one list of the available catalogs
+- dnl in configure.in.
+- for lang in $ALL_LINGUAS; do
+- GMOFILES="$GMOFILES $lang.gmo"
+- POFILES="$POFILES $lang.po"
+- done
+-
+- dnl Make all variables we use known to autoconf.
+- AC_SUBST(CATALOGS)
+- AC_SUBST(CATOBJEXT)
+- AC_SUBST(DATADIRNAME)
+- AC_SUBST(GMOFILES)
+- AC_SUBST(INSTOBJEXT)
+- AC_SUBST(INTLLIBS)
+- AC_SUBST(PO_IN_DATADIR_TRUE)
+- AC_SUBST(PO_IN_DATADIR_FALSE)
+- AC_SUBST(POFILES)
+- AC_SUBST(POSUB)
+- ])
+-
+-# AM_GLIB_GNU_GETTEXT
+-# -------------------
+-# Do checks necessary for use of gettext. If a suitable implementation
+-# of gettext is found in either in libintl or in the C library,
+-# it will set INTLLIBS to the libraries needed for use of gettext
+-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+-# on various variables needed by the Makefile.in.in installed by
+-# glib-gettextize.
+-dnl
+-glib_DEFUN([GLIB_GNU_GETTEXT],
+- [AC_REQUIRE([AC_PROG_CC])dnl
+- AC_REQUIRE([AC_HEADER_STDC])dnl
+-
+- GLIB_LC_MESSAGES
+- GLIB_WITH_NLS
+-
+- if test "$gt_cv_have_gettext" = "yes"; then
+- if test "x$ALL_LINGUAS" = "x"; then
+- LINGUAS=
+- else
+- AC_MSG_CHECKING(for catalogs to be installed)
+- NEW_LINGUAS=
+- for presentlang in $ALL_LINGUAS; do
+- useit=no
+- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+- desiredlanguages="$LINGUAS"
+- else
+- desiredlanguages="$ALL_LINGUAS"
+- fi
+- for desiredlang in $desiredlanguages; do
+- # Use the presentlang catalog if desiredlang is
+- # a. equal to presentlang, or
+- # b. a variant of presentlang (because in this case,
+- # presentlang can be used as a fallback for messages
+- # which are not translated in the desiredlang catalog).
+- case "$desiredlang" in
+- "$presentlang"*) useit=yes;;
+- esac
+- done
+- if test $useit = yes; then
+- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+- fi
+- done
+- LINGUAS=$NEW_LINGUAS
+- AC_MSG_RESULT($LINGUAS)
+- fi
+-
+- dnl Construct list of names of catalog files to be constructed.
+- if test -n "$LINGUAS"; then
+- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+- fi
+- fi
+-
+- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+- dnl Try to locate is.
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+- AC_SUBST(MKINSTALLDIRS)
+-
+- dnl Generate list of files to be processed by xgettext which will
+- dnl be included in po/Makefile.
+- test -d po || mkdir po
+- if test "x$srcdir" != "x."; then
+- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+- posrcprefix="$srcdir/"
+- else
+- posrcprefix="../$srcdir/"
+- fi
+- else
+- posrcprefix="../"
+- fi
+- rm -f po/POTFILES
+- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+- < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
+-
+-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+-# -------------------------------
+-# Define VARIABLE to the location where catalog files will
+-# be installed by po/Makefile.
+-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+-glib_save_prefix="$prefix"
+-glib_save_exec_prefix="$exec_prefix"
+-glib_save_datarootdir="$datarootdir"
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+- localedir=`eval echo "${libdir}/locale"`
+-else
+- localedir=`eval echo "${datadir}/locale"`
+-fi
+-prefix="$glib_save_prefix"
+-exec_prefix="$glib_save_exec_prefix"
+-datarootdir="$glib_save_datarootdir"
+-AC_DEFINE_UNQUOTED($1, "$localedir",
+- [Define the location where the catalogs will be installed])
+-])
+-
+-dnl
+-dnl Now the definitions that aclocal will find
+-dnl
+-ifdef(glib_configure_in,[],[
+-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+-])dnl
+-
+-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+-#
+-# Create a temporary file with TEST-FILE as its contents and pass the
+-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+-# 0 and perform ACTION-IF-FAIL for any other exit status.
+-AC_DEFUN([GLIB_RUN_PROG],
+-[cat >conftest.foo <<_ACEOF
+-$2
+-_ACEOF
+-if AC_RUN_LOG([$1 conftest.foo]); then
+- m4_ifval([$3], [$3], [:])
+-m4_ifvaln([$4], [else $4])dnl
+-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+-fi])
+-
+-
+ m4_include([m4/gecko.m4])
+ m4_include([m4/gnome-doc-utils.m4])
+ m4_include([m4/gtk-doc.m4])
+Index: epiphany-2.22.3/configure
===================================================================
---- epiphany-2.22.2.orig/configure 2008-05-26 19:57:22.000000000 +0200
-+++ epiphany-2.22.2/configure 2008-06-15 14:17:32.794319249 +0200
-@@ -727,7 +727,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
+--- epiphany-2.22.3.orig/configure 2008-06-30 20:02:21.000000000 +0200
++++ epiphany-2.22.3/configure 2008-07-02 10:47:22.771107686 +0200
+@@ -727,7 +727,7 @@
# Identity of this package.
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-browser'
- PACKAGE_VERSION='2.22.2'
- PACKAGE_STRING='GNOME Web Browser 2.22.2'
+ PACKAGE_VERSION='2.22.3'
+ PACKAGE_STRING='GNOME Web Browser 2.22.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
-@@ -1634,7 +1634,7 @@ Fine tuning of the installation director
+@@ -1638,7 +1638,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -37,140 +1493,20 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -2677,7 +2677,7 @@ fi
+@@ -2681,7 +2681,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-browser'
- VERSION='2.22.2'
-
-
-Index: epiphany-2.22.2/embed/mozilla/Makefile.in
+ VERSION='2.22.3'
+
+
+Index: epiphany-2.22.3/embed/mozilla/Makefile.in
===================================================================
---- epiphany-2.22.2.orig/embed/mozilla/Makefile.in 2008-05-26 19:57:18.000000000 +0200
-+++ epiphany-2.22.2/embed/mozilla/Makefile.in 2008-06-15 14:17:28.998322901 +0200
-@@ -39,8 +39,6 @@ host_triplet = @host@
- @HAVE_GECKO_1_9_TRUE@ $(NULL)
-
- @HAVE_GECKO_1_9_FALSE at am__append_2 = \
-- at HAVE_GECKO_1_9_FALSE@ EphyBadCertRejector.cpp \
-- at HAVE_GECKO_1_9_FALSE@ EphyBadCertRejector.h \
- @HAVE_GECKO_1_9_FALSE@ EphyDirectoryProvider.cpp \
- @HAVE_GECKO_1_9_FALSE@ EphyDirectoryProvider.h \
- @HAVE_GECKO_1_9_FALSE@ $(NULL)
-@@ -90,39 +88,38 @@ am__libephymozillaembed_la_SOURCES_DIST
- AutoJSContextStack.h AutoModalDialog.cpp AutoModalDialog.h \
- AutoWindowModalState.cpp AutoWindowModalState.h \
- ContentHandler.cpp ContentHandler.h EphyAboutModule.cpp \
-- EphyAboutModule.h EphyContentPolicy.cpp EphyContentPolicy.h \
-- EphyHeaderSniffer.cpp EphyHeaderSniffer.h EphyBrowser.cpp \
-- EphyBrowser.h EphyFind.cpp EphyFind.h EphyHistoryListener.cpp \
-- EphyHistoryListener.h EphyPromptService.cpp \
-- EphyPromptService.h EphyRedirectChannel.cpp \
-- EphyRedirectChannel.h EphySidebar.cpp EphySidebar.h \
-- EphySingle.cpp EphySingle.h EphyUtils.cpp EphyUtils.h \
-- EventContext.cpp EventContext.h GeckoCookiePromptService.cpp \
-- GeckoCookiePromptService.h GeckoFormSigningDialog.cpp \
-- GeckoFormSigningDialog.h GeckoPrintService.cpp \
-- GeckoPrintService.h GeckoPrintSession.cpp GeckoPrintSession.h \
-- GlobalHistory.cpp GlobalHistory.h MozDownload.cpp \
-- MozDownload.h MozRegisterComponents.cpp \
-- MozRegisterComponents.h mozilla-download.cpp \
-- mozilla-download.h mozilla-embed.cpp mozilla-embed.h \
-- mozilla-embed-event.cpp mozilla-embed-event.h \
-+ EphyAboutModule.h EphyBadCertRejector.cpp \
-+ EphyBadCertRejector.h EphyContentPolicy.cpp \
-+ EphyContentPolicy.h EphyHeaderSniffer.cpp EphyHeaderSniffer.h \
-+ EphyBrowser.cpp EphyBrowser.h EphyFind.cpp EphyFind.h \
-+ EphyHistoryListener.cpp EphyHistoryListener.h \
-+ EphyPromptService.cpp EphyPromptService.h \
-+ EphyRedirectChannel.cpp EphyRedirectChannel.h EphySidebar.cpp \
-+ EphySidebar.h EphySingle.cpp EphySingle.h EphyUtils.cpp \
-+ EphyUtils.h EventContext.cpp EventContext.h \
-+ GeckoCookiePromptService.cpp GeckoCookiePromptService.h \
-+ GeckoFormSigningDialog.cpp GeckoFormSigningDialog.h \
-+ GeckoPrintService.cpp GeckoPrintService.h \
-+ GeckoPrintSession.cpp GeckoPrintSession.h GlobalHistory.cpp \
-+ GlobalHistory.h MozDownload.cpp MozDownload.h \
-+ MozRegisterComponents.cpp MozRegisterComponents.h \
-+ mozilla-download.cpp mozilla-download.h mozilla-embed.cpp \
-+ mozilla-embed.h mozilla-embed-event.cpp mozilla-embed-event.h \
- mozilla-embed-find.cpp mozilla-embed-find.h \
- mozilla-embed-persist.cpp mozilla-embed-persist.h \
- mozilla-embed-single.cpp mozilla-embed-single.h \
- mozilla-history-item.cpp mozilla-history-item.h \
- mozilla-notifiers.cpp mozilla-notifiers.h EphyXULAppInfo.cpp \
-- EphyXULAppInfo.h EphyBadCertRejector.cpp EphyBadCertRejector.h \
-- EphyDirectoryProvider.cpp EphyDirectoryProvider.h \
-- FilePicker.cpp FilePicker.h GtkNSSClientAuthDialogs.cpp \
-- GtkNSSClientAuthDialogs.h GtkNSSDialogs.cpp GtkNSSDialogs.h \
-- GtkNSSKeyPairDialogs.cpp GtkNSSKeyPairDialogs.h \
-- GtkNSSSecurityWarningDialogs.cpp \
-+ EphyXULAppInfo.h EphyDirectoryProvider.cpp \
-+ EphyDirectoryProvider.h FilePicker.cpp FilePicker.h \
-+ GtkNSSClientAuthDialogs.cpp GtkNSSClientAuthDialogs.h \
-+ GtkNSSDialogs.cpp GtkNSSDialogs.h GtkNSSKeyPairDialogs.cpp \
-+ GtkNSSKeyPairDialogs.h GtkNSSSecurityWarningDialogs.cpp \
- GtkNSSSecurityWarningDialogs.h GeckoSpellCheckEngine.cpp \
- GeckoSpellCheckEngine.h
- @HAVE_GECKO_1_9_TRUE at am__objects_1 = \
- @HAVE_GECKO_1_9_TRUE@ libephymozillaembed_la-EphyXULAppInfo.lo
-- at HAVE_GECKO_1_9_FALSE@am__objects_2 = libephymozillaembed_la-EphyBadCertRejector.lo \
-- at HAVE_GECKO_1_9_FALSE@ libephymozillaembed_la-EphyDirectoryProvider.lo
-+ at HAVE_GECKO_1_9_FALSE@am__objects_2 = libephymozillaembed_la-EphyDirectoryProvider.lo
- @ENABLE_FILEPICKER_TRUE at am__objects_3 = \
- @ENABLE_FILEPICKER_TRUE@ libephymozillaembed_la-FilePicker.lo
- @HAVE_MOZILLA_PSM_TRUE at am__objects_4 = libephymozillaembed_la-GtkNSSClientAuthDialogs.lo \
-@@ -136,6 +133,7 @@ am_libephymozillaembed_la_OBJECTS = \
- libephymozillaembed_la-AutoWindowModalState.lo \
- libephymozillaembed_la-ContentHandler.lo \
- libephymozillaembed_la-EphyAboutModule.lo \
-+ libephymozillaembed_la-EphyBadCertRejector.lo \
- libephymozillaembed_la-EphyContentPolicy.lo \
- libephymozillaembed_la-EphyHeaderSniffer.lo \
- libephymozillaembed_la-EphyBrowser.lo \
-@@ -441,22 +439,23 @@ libephymozillaembed_la_SOURCES = AutoJSC
- AutoJSContextStack.h AutoModalDialog.cpp AutoModalDialog.h \
- AutoWindowModalState.cpp AutoWindowModalState.h \
- ContentHandler.cpp ContentHandler.h EphyAboutModule.cpp \
-- EphyAboutModule.h EphyContentPolicy.cpp EphyContentPolicy.h \
-- EphyHeaderSniffer.cpp EphyHeaderSniffer.h EphyBrowser.cpp \
-- EphyBrowser.h EphyFind.cpp EphyFind.h EphyHistoryListener.cpp \
-- EphyHistoryListener.h EphyPromptService.cpp \
-- EphyPromptService.h EphyRedirectChannel.cpp \
-- EphyRedirectChannel.h EphySidebar.cpp EphySidebar.h \
-- EphySingle.cpp EphySingle.h EphyUtils.cpp EphyUtils.h \
-- EventContext.cpp EventContext.h GeckoCookiePromptService.cpp \
-- GeckoCookiePromptService.h GeckoFormSigningDialog.cpp \
-- GeckoFormSigningDialog.h GeckoPrintService.cpp \
-- GeckoPrintService.h GeckoPrintSession.cpp GeckoPrintSession.h \
-- GlobalHistory.cpp GlobalHistory.h MozDownload.cpp \
-- MozDownload.h MozRegisterComponents.cpp \
-- MozRegisterComponents.h mozilla-download.cpp \
-- mozilla-download.h mozilla-embed.cpp mozilla-embed.h \
-- mozilla-embed-event.cpp mozilla-embed-event.h \
-+ EphyAboutModule.h EphyBadCertRejector.cpp \
-+ EphyBadCertRejector.h EphyContentPolicy.cpp \
-+ EphyContentPolicy.h EphyHeaderSniffer.cpp EphyHeaderSniffer.h \
-+ EphyBrowser.cpp EphyBrowser.h EphyFind.cpp EphyFind.h \
-+ EphyHistoryListener.cpp EphyHistoryListener.h \
-+ EphyPromptService.cpp EphyPromptService.h \
-+ EphyRedirectChannel.cpp EphyRedirectChannel.h EphySidebar.cpp \
-+ EphySidebar.h EphySingle.cpp EphySingle.h EphyUtils.cpp \
-+ EphyUtils.h EventContext.cpp EventContext.h \
-+ GeckoCookiePromptService.cpp GeckoCookiePromptService.h \
-+ GeckoFormSigningDialog.cpp GeckoFormSigningDialog.h \
-+ GeckoPrintService.cpp GeckoPrintService.h \
-+ GeckoPrintSession.cpp GeckoPrintSession.h GlobalHistory.cpp \
-+ GlobalHistory.h MozDownload.cpp MozDownload.h \
-+ MozRegisterComponents.cpp MozRegisterComponents.h \
-+ mozilla-download.cpp mozilla-download.h mozilla-embed.cpp \
-+ mozilla-embed.h mozilla-embed-event.cpp mozilla-embed-event.h \
- mozilla-embed-find.cpp mozilla-embed-find.h \
- mozilla-embed-persist.cpp mozilla-embed-persist.h \
- mozilla-embed-single.cpp mozilla-embed-single.h \
-@@ -510,7 +509,7 @@ libephymozillaembed_la_CPPFLAGS = -I$(to
+--- epiphany-2.22.3.orig/embed/mozilla/Makefile.in 2008-06-30 20:02:25.000000000 +0200
++++ epiphany-2.22.3/embed/mozilla/Makefile.in 2008-07-02 10:47:20.147092623 +0200
+@@ -515,7 +515,7 @@
-I$(top_srcdir)/embed -I$(top_srcdir) $(addprefix \
-I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -179,39 +1515,11 @@
-DMOZILLA_HOME=\"$(GECKO_HOME)\" \
-DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-@@ -672,6 +671,13 @@ libephymozillaembed_la-EphyAboutModule.l
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyAboutModule.lo `test -f 'EphyAboutModule.cpp' || echo '$(srcdir)/'`EphyAboutModule.cpp
-
-+libephymozillaembed_la-EphyBadCertRejector.lo: EphyBadCertRejector.cpp
-+ at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyBadCertRejector.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp
-+ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Plo
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='EphyBadCertRejector.cpp' object='libephymozillaembed_la-EphyBadCertRejector.lo' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp
-+
- libephymozillaembed_la-EphyContentPolicy.lo: EphyContentPolicy.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyContentPolicy.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Tpo -c -o libephymozillaembed_la-EphyContentPolicy.lo `test -f 'EphyContentPolicy.cpp' || echo '$(srcdir)/'`EphyContentPolicy.cpp
- @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Tpo $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Plo
-@@ -861,13 +867,6 @@ libephymozillaembed_la-EphyXULAppInfo.lo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyXULAppInfo.lo `test -f 'EphyXULAppInfo.cpp' || echo '$(srcdir)/'`EphyXULAppInfo.cpp
-
--libephymozillaembed_la-EphyBadCertRejector.lo: EphyBadCertRejector.cpp
-- at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyBadCertRejector.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp
-- at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Plo
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='EphyBadCertRejector.cpp' object='libephymozillaembed_la-EphyBadCertRejector.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp
--
- libephymozillaembed_la-EphyDirectoryProvider.lo: EphyDirectoryProvider.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyDirectoryProvider.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyDirectoryProvider.Tpo -c -o libephymozillaembed_la-EphyDirectoryProvider.lo `test -f 'EphyDirectoryProvider.cpp' || echo '$(srcdir)/'`EphyDirectoryProvider.cpp
- @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libephymozillaembed_la-EphyDirectoryProvider.Tpo $(DEPDIR)/libephymozillaembed_la-EphyDirectoryProvider.Plo
-Index: epiphany-2.22.2/lib/Makefile.in
+Index: epiphany-2.22.3/lib/Makefile.in
===================================================================
---- epiphany-2.22.2.orig/lib/Makefile.in 2008-05-26 19:57:18.000000000 +0200
-+++ epiphany-2.22.2/lib/Makefile.in 2008-06-15 14:17:29.550323014 +0200
-@@ -433,7 +433,7 @@ libephymisc_la_CPPFLAGS = \
+--- epiphany-2.22.3.orig/lib/Makefile.in 2008-06-30 20:02:26.000000000 +0200
++++ epiphany-2.22.3/lib/Makefile.in 2008-07-02 10:47:20.588092456 +0200
+@@ -435,7 +435,7 @@
-I$(top_builddir)/lib/egg \
-I$(top_srcdir)/lib/egg \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -220,184 +1528,24 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-Index: epiphany-2.22.2/ltmain.sh
+Index: epiphany-2.22.3/ltmain.sh
===================================================================
---- epiphany-2.22.2.orig/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
-+++ epiphany-2.22.2/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
-@@ -2,7 +2,7 @@
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
--# 2007 Free Software Foundation, Inc.
-+# 2007, 2008 Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -43,8 +43,8 @@ EXIT_FAILURE=1
+--- epiphany-2.22.3.orig/ltmain.sh 2008-02-08 01:54:46.000000000 +0100
++++ epiphany-2.22.3/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
+@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
--TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+-VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
+VERSION="1.5.26 Debian 1.5.26-4"
-+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+ TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -113,15 +113,21 @@ esac
- # These must not be set unconditionally because not all systems understand
- # e.g. LANG=C (notably SCO).
- # We save the old values to restore during execute mode.
--for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+lt_env=
-+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
-+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
- $lt_var=C
- export $lt_var
- fi"
- done
-
-+if test -n "$lt_env"; then
-+ lt_env="env $lt_env"
-+fi
-+
- # Make sure IFS has a sensible default
- lt_nl='
- '
-@@ -485,7 +491,7 @@ do
- echo "\
- $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-
--Copyright (C) 2007 Free Software Foundation, Inc.
-+Copyright (C) 2008 Free Software Foundation, Inc.
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
-@@ -788,6 +794,7 @@ if test -z "$show_help"; then
- *.for) xform=for ;;
- *.java) xform=java ;;
- *.obj) xform=obj ;;
-+ *.sx) xform=sx ;;
- esac
-
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -956,7 +963,7 @@ EOF
- $run $rm "$lobj" "$output_obj"
-
- $show "$command"
-- if $run eval "$command"; then :
-+ if $run eval $lt_env "$command"; then :
- else
- test -n "$output_obj" && $run $rm $removelist
- exit $EXIT_FAILURE
-@@ -1028,7 +1035,7 @@ EOF
- command="$command$suppress_output"
- $run $rm "$obj" "$output_obj"
- $show "$command"
-- if $run eval "$command"; then :
-+ if $run eval $lt_env "$command"; then :
- else
- $run $rm $removelist
- exit $EXIT_FAILURE
-@@ -1161,6 +1168,7 @@ EOF
- thread_safe=no
- vinfo=
- vinfo_number=no
-+ single_module="${wl}-single_module"
-
- func_infer_tag $base_compile
-
-@@ -1646,6 +1654,11 @@ EOF
- continue
- ;;
-
-+ -multi_module)
-+ single_module="${wl}-multi_module"
-+ continue
-+ ;;
-+
- -module)
- module=yes
- continue
-@@ -2152,7 +2165,12 @@ EOF
- continue
- fi
- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ if test "$linkmode" = lib; then
-+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-+ else
-+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-+ fi
-+ for searchdir in $searchdirs; do
- for search_ext in .la $std_shrext .so .a; do
- # Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
-@@ -2948,12 +2966,18 @@ EOF
- # we do not want to link against static libs,
- # but need to link against shared
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
- depdepl=$tmp
- done
-- if test -f "$path/$depdepl" ; then
-+ if test -f "$deplibdir/$depdepl" ; then
-+ depdepl="$deplibdir/$depdepl"
-+ elif test -f "$path/$depdepl" ; then
- depdepl="$path/$depdepl"
-+ else
-+ # Can't find it, oh well...
-+ depdepl=
- fi
- # do not add paths which are already there
- case " $newlib_search_path " in
-@@ -3101,9 +3125,10 @@ EOF
-
- case $linkmode in
- oldlib)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-- fi
-+ case " $deplibs" in
-+ *\ -l* | *\ -L*)
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
-+ esac
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-@@ -4245,9 +4270,10 @@ EOF
- ;;
-
- obj)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-- fi
-+ case " $deplibs" in
-+ *\ -l* | *\ -L*)
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
-+ esac
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-@@ -6486,7 +6512,7 @@ relink_command=\"$relink_command\""
- fi
-
- # Restore saved environment variables
-- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- do
- eval "if test \"\${save_$lt_var+set}\" = set; then
- $lt_var=\$save_$lt_var; export $lt_var
-Index: epiphany-2.22.2/plugins/desktop-file/Makefile.in
+Index: epiphany-2.22.3/plugins/desktop-file/Makefile.in
===================================================================
---- epiphany-2.22.2.orig/plugins/desktop-file/Makefile.in 2008-05-26 19:57:19.000000000 +0200
-+++ epiphany-2.22.2/plugins/desktop-file/Makefile.in 2008-06-15 14:17:30.270321018 +0200
-@@ -313,7 +313,7 @@ target_alias = @target_alias@
+--- epiphany-2.22.3.orig/plugins/desktop-file/Makefile.in 2008-06-30 20:02:27.000000000 +0200
++++ epiphany-2.22.3/plugins/desktop-file/Makefile.in 2008-07-02 10:47:21.020123273 +0200
+@@ -315,7 +315,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_engine = @with_engine@
@@ -406,11 +1554,11 @@
plugin_LTLIBRARIES = libdesktopfileplugin.la
libdesktopfileplugin_la_SOURCES = \
plugin.cpp
-Index: epiphany-2.22.2/src/Makefile.in
+Index: epiphany-2.22.3/src/Makefile.in
===================================================================
---- epiphany-2.22.2.orig/src/Makefile.in 2008-05-26 19:57:20.000000000 +0200
-+++ epiphany-2.22.2/src/Makefile.in 2008-06-15 14:17:30.798323529 +0200
-@@ -552,8 +552,8 @@ libephymain_la_CPPFLAGS = \
+--- epiphany-2.22.3.orig/src/Makefile.in 2008-06-30 20:02:28.000000000 +0200
++++ epiphany-2.22.3/src/Makefile.in 2008-07-02 10:47:21.399109429 +0200
+@@ -554,8 +554,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -421,7 +1569,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -591,8 +591,8 @@ libephymain_la_CFLAGS = \
+@@ -593,8 +593,8 @@
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
@ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
@ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=16427&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Wed Jul 2 08:48:31 2008
@@ -3,7 +3,6 @@
02_ac_init.patch
03_dbus.patch
#04_move_tabs.patch
-04_proxy_password.patch
05_libexecdir.patch
06_ssl_weak_ciphers.patch
07_bookmarks.patch
@@ -13,7 +12,5 @@
11_useragent-weasel.patch
12_safetypes_rss.patch
13_extensions_need_xpcom.patch
-14_contenthandler_api.patch
15_certificates_oldapi.patch
-16_embed_passwords.patch
99_autoreconf.patch
More information about the pkg-gnome-commits
mailing list