r16284 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in patches/04_proxy_password.patch patches/15_certificates_oldapi.patch patches/99_autoreconf.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Jun 17 09:00:22 UTC 2008
Author: joss
Date: Tue Jun 17 09:00:21 2008
New Revision: 16284
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16284
Log:
* 04_proxy_password.patch: new patch, needed because of a change in
xulrunner 1.9; the string names for obtaining the user login and
password have changed.
* 15_certificates_oldapi.patch: revert the certificates management to
the old API, using nsIBadCertListener that was forward-ported to
xulrunner 1.9. As a side effect, closes: #485657.
* Bump xulrunner deps and build-deps to 1.9~rc2-3 for this change.
Added:
desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch
desktop/unstable/epiphany-browser/debian/patches/15_certificates_oldapi.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/control
desktop/unstable/epiphany-browser/debian/control.in
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=16284&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Tue Jun 17 09:00:21 2008
@@ -1,3 +1,15 @@
+epiphany-browser (2.22.2-3) unstable; urgency=low
+
+ * 04_proxy_password.patch: new patch, needed because of a change in
+ xulrunner 1.9; the string names for obtaining the user login and
+ password have changed.
+ * 15_certificates_oldapi.patch: revert the certificates management to
+ the old API, using nsIBadCertListener that was forward-ported to
+ xulrunner 1.9. As a side effect, closes: #485657.
+ * Bump xulrunner deps and build-deps to 1.9~rc2-3 for this change.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 15 Jun 2008 14:02:35 +0200
+
epiphany-browser (2.22.2-2) unstable; urgency=low
[ Loic Minier ]
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=16284&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control (original)
+++ desktop/unstable/epiphany-browser/debian/control Tue Jun 17 09:00:21 2008
@@ -20,7 +20,7 @@
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- xulrunner-dev (>= 1.9~rc1),
+ xulrunner-dev (>= 1.9~rc2-3),
iso-codes (>= 0.35),
python-dev (>= 2.3),
python-gtk2-dev (>= 2.7.1),
@@ -56,7 +56,7 @@
gnome-icon-theme (>= 2.9.90),
dbus,
iso-codes,
- xulrunner-1.9,
+ xulrunner-1.9 (>= 1.9~rc2-3),
xulrunner-1.9-gnome-support,
${misc:Depends}
Conflicts: epiphany-browser (<< 2.20),
Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=16284&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in (original)
+++ desktop/unstable/epiphany-browser/debian/control.in Tue Jun 17 09:00:21 2008
@@ -20,7 +20,7 @@
scrollkeeper,
gnome-pkg-tools (>= 0.10),
libxml-parser-perl,
- xulrunner-dev (>= 1.9~rc1),
+ xulrunner-dev (>= 1.9~rc2-3),
iso-codes (>= 0.35),
python-dev (>= 2.3),
python-gtk2-dev (>= 2.7.1),
@@ -56,7 +56,7 @@
gnome-icon-theme (>= 2.9.90),
dbus,
iso-codes,
- xulrunner-1.9,
+ xulrunner-1.9 (>= 1.9~rc2-3),
xulrunner-1.9-gnome-support,
${misc:Depends}
Conflicts: epiphany-browser (<< 2.20),
Added: desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch?rev=16284&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/04_proxy_password.patch Tue Jun 17 09:00:21 2008
@@ -1,0 +1,15 @@
+Index: epiphany-2.22.2/embed/mozilla/EphyPromptService.cpp
+===================================================================
+--- epiphany-2.22.2.orig/embed/mozilla/EphyPromptService.cpp 2008-06-15 13:57:15.153819339 +0200
++++ epiphany-2.22.2/embed/mozilla/EphyPromptService.cpp 2008-06-15 14:02:12.030320193 +0200
+@@ -995,8 +995,8 @@ MakeDialogText(nsIChannel* aChannel, nsI
+ displayHost.AppendInt(port);
+ }
+
+- NS_NAMED_LITERAL_STRING(proxyText, "EnterUserPasswordForProxy");
+- NS_NAMED_LITERAL_STRING(originText, "EnterUserPasswordForRealm");
++ NS_NAMED_LITERAL_STRING(proxyText, "EnterLoginForProxy");
++ NS_NAMED_LITERAL_STRING(originText, "EnterLoginForRealm");
+ NS_NAMED_LITERAL_STRING(noRealmText, "EnterUserPasswordFor");
+ NS_NAMED_LITERAL_STRING(passwordText, "EnterPasswordFor");
+
Added: 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=16284&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/15_certificates_oldapi.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/15_certificates_oldapi.patch Tue Jun 17 09:00:21 2008
@@ -1,0 +1,196 @@
+Enable again the nsIBadCertListener API.
+
+Index: epiphany-2.22.2/embed/mozilla/EphyHeaderSniffer.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
+ NS_CLIENTAUTHDIALOGS_CONTRACTID,
+ GtkNSSClientAuthDialogsConstructor
+ },
+-#ifndef HAVE_GECKO_1_9
+ {
+ GTK_NSSDIALOGS_CLASSNAME,
+ GTK_NSSDIALOGS_CID,
+ NS_BADCERTLISTENER_CONTRACTID,
+ GtkNSSDialogsConstructor
+ },
+-#endif
+ {
+ GTK_NSSDIALOGS_CLASSNAME,
+ GTK_NSSDIALOGS_CID,
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=16284&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch Tue Jun 17 09:00:21 2008
@@ -5,7 +5,7 @@
Index: epiphany-2.22.2/aclocal.m4
===================================================================
--- epiphany-2.22.2.orig/aclocal.m4 2008-05-26 19:57:11.000000000 +0200
-+++ epiphany-2.22.2/aclocal.m4 2008-05-27 14:40:08.057648529 +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-*-
@@ -18,7 +18,7 @@
Index: epiphany-2.22.2/configure
===================================================================
--- epiphany-2.22.2.orig/configure 2008-05-26 19:57:22.000000000 +0200
-+++ epiphany-2.22.2/configure 2008-05-27 14:40:15.761147995 +0200
++++ epiphany-2.22.2/configure 2008-06-15 14:17:32.794319249 +0200
@@ -727,7 +727,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
@@ -49,8 +49,128 @@
Index: epiphany-2.22.2/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-05-27 14:40:12.497149359 +0200
-@@ -510,7 +510,7 @@ libephymozillaembed_la_CPPFLAGS = -I$(to
++++ 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
-I$(top_srcdir)/embed -I$(top_srcdir) $(addprefix \
-I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -59,10 +179,38 @@
-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
===================================================================
--- epiphany-2.22.2.orig/lib/Makefile.in 2008-05-26 19:57:18.000000000 +0200
-+++ epiphany-2.22.2/lib/Makefile.in 2008-05-27 14:40:12.973149242 +0200
++++ epiphany-2.22.2/lib/Makefile.in 2008-06-15 14:17:29.550323014 +0200
@@ -433,7 +433,7 @@ libephymisc_la_CPPFLAGS = \
-I$(top_builddir)/lib/egg \
-I$(top_srcdir)/lib/egg \
@@ -248,7 +396,7 @@
Index: epiphany-2.22.2/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-05-27 14:40:13.465148014 +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@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -261,7 +409,7 @@
Index: epiphany-2.22.2/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-05-27 14:40:13.813650548 +0200
++++ epiphany-2.22.2/src/Makefile.in 2008-06-15 14:17:30.798323529 +0200
@@ -552,8 +552,8 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=16284&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Tue Jun 17 09:00:21 2008
@@ -3,6 +3,7 @@
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,4 +14,5 @@
12_safetypes_rss.patch
13_extensions_need_xpcom.patch
14_contenthandler_api.patch
+15_certificates_oldapi.patch
99_autoreconf.patch
More information about the pkg-gnome-commits
mailing list