--- epiphany-browser-2.22.3.orig/debian/epiphany-browser.README.Debian +++ epiphany-browser-2.22.3/debian/epiphany-browser.README.Debian @@ -0,0 +1,19 @@ +Epiphany for Debian +=================== + +Currently, two versions of Epiphany are provided in Debian. The default +uses the Gecko engine (in package epiphany-gecko), and another one using +the webkit engine (in package epiphany-webkit) is available as well as a +feature preview. + +Both can be installed at once. In this case, you can switch the default +version, using “update-alternatives --config epiphany-browser”. You can +also enable the icons for one or the other version using the menu editor +(launch “alacarte” or right-click on the main menu and click “Edit the +menus”). + +Beware that you can only have one instance of epiphany launched at once. +If epiphany-gecko is launched and you try to launch epiphany-webkit, it +will only open a new window of epiphany-gecko. + +-- Josselin Mouette , Fri, 20 Jun 2008 10:25:11 +0200 --- epiphany-browser-2.22.3.orig/debian/control +++ epiphany-browser-2.22.3/debian/control @@ -0,0 +1,150 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers +Build-Depends: debhelper (>= 5), + pkg-config, + libglib2.0-dev (>= 2.16.0), + libgtk2.0-dev (>= 2.12.0), + libxml2-dev (>= 2.6.12), + libxslt1-dev (>= 1.1.7), + libglade2-dev (>= 2.3.1), + libgnome2-dev (>= 2.14.0), + libgnomeui-dev (>= 2.16.0-2), + libgnomevfs2-dev (>= 2.9.2), + libgconf2-dev, + libgnome-desktop-dev (>= 2.9.91), + libstartup-notification0-dev (>= 0.5), + libnotify-dev (>= 0.4), + libdbus-glib-1-dev (>= 0.60), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxml-parser-perl, + xulrunner-dev (>= 1.9~rc2-3), + iso-codes (>= 0.35), + python-dev (>= 2.3), + python-gtk2-dev (>= 2.7.1), + python-gnome2-dev (>= 2.6.0), + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.35.0), + x11proto-core-dev, + network-manager-dev | not+linux-gnu, + quilt, + libenchant-dev (>= 1.0), + libavahi-gobject-dev (>= 0.6.22), + libwebkit-dev, + gtk-doc-tools (>= 1.0), + lsb-release, + zip +Standards-Version: 3.8.0 +Homepage: http://www.gnome.org/projects/epiphany/ + +Package: epiphany-browser +Architecture: all +Depends: epiphany-gecko | epiphany-webkit +Description: Intuitive web browser - dummy package + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This dummy package installs Epiphany with the Gecko backend by default. + +Package: epiphany-gecko +Architecture: any +Depends: epiphany-browser-data (>= 2.22.1.1-3), + epiphany-browser-data (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + gnome-icon-theme (>= 2.9.90), + dbus-x11, + iso-codes, + xulrunner-1.9 (>= 1.9~rc2-3), + xulrunner-1.9-gnome-support, + ${misc:Depends} +Conflicts: epiphany-browser (<< 2.20), + epiphany-extensions (<< 2.22.1-3), + python-xpcom +Recommends: yelp, epiphany-extensions +Suggests: mozplugger +Provides: www-browser, gnome-www-browser +Description: Intuitive GNOME web browser - Gecko version + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. Simplicity is achieved by a well designed user interface and + reliance on external applications for performing external tasks (such as + reading email). Simplicity should not mean less powerful. Standards + compliance is achieved on the HTML side by using the Gecko + rendering engine, as developed for the Mozilla and Iceweasel browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Gecko backend to render web pages. + +Package: epiphany-webkit +Architecture: any +Depends: epiphany-browser-data (>= ${gnome:Version}), + epiphany-browser-data (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + gnome-icon-theme (>= 2.9.90), + dbus-x11, + iso-codes, + ${misc:Depends} +Conflicts: epiphany-browser (<< 2.20) +Recommends: yelp +Suggests: mozplugger +Provides: www-browser, gnome-www-browser +Description: Intuitive GNOME web browser - webkit version + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. Simplicity is achieved by a well designed user interface and + reliance on external applications for performing external tasks (such as + reading email). Simplicity should not mean less powerful. Standards + compliance is achieved on the HTML side by using the Gecko + rendering engine, as developed for the Mozilla and Iceweasel browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Webkit backend to render web pages. + . + WARNING: the Webkit backend is still experimental, and while this + version is suitable for basic tasks, many features are missing. For a + complete browsing experience, you should use the epiphany-gecko + package. + +Package: epiphany-browser-data +Architecture: all +Depends: ${misc:Depends} +Recommends: epiphany-browser +Conflicts: epiphany-browser (<< 2.20) +Replaces: epiphany-browser (<< 2.20) +Description: Data files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains the common files, artwork and translations for + Epiphany. + +Package: epiphany-browser-dev +Architecture: all +Section: devel +Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2) +Description: Development files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package is required to develop extensions for Epiphany. + +Package: epiphany-browser-dbg +Architecture: any +Section: gnome +Priority: extra +Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version}) +Recommends: xulrunner-1.9-dbg | libwebkitgtk1d-dbg +Description: Debugging symbols for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains detached debugging symbols. --- epiphany-browser-2.22.3.orig/debian/epiphany-gecko.postinst +++ epiphany-browser-2.22.3/debian/epiphany-gecko.postinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +PRIO=85 +for alt in x-www-browser gnome-www-browser; do + update-alternatives --install \ + /usr/bin/$alt $alt /usr/bin/epiphany-gecko $PRIO \ + --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-browser.1.gz +done +update-alternatives --install /usr/bin/epiphany-browser epiphany-browser /usr/bin/epiphany-gecko $PRIO + +#DEBHELPER# --- epiphany-browser-2.22.3.orig/debian/rules +++ epiphany-browser-2.22.3/debian/rules @@ -0,0 +1,180 @@ +#!/usr/bin/make -f + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := epiphany + +STAMP_DIR := debian/stamp +BUILD_DIR := debian/build +PATCH_DIR := debian/patches + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +FLAVORS := gecko webkit + +QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null + +common_configure_flags := \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dbus \ + --disable-scrollkeeper \ + --enable-zeroconf \ + --enable-python + +ifeq ($(DEB_HOST_ARCH_OS),linux) +common_configure_flags += \ + --enable-network-manager +endif + +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) +else + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +gecko_configure_flags := $(common_configure_flags) \ + --libexecdir=\$${prefix}/lib/epiphany-gecko \ + --with-engine=mozilla \ + --with-gecko=libxul-embedding \ + --enable-gtk-doc \ + --enable-spell-checker + +webkit_configure_flags := $(common_configure_flags) \ + --libexecdir=\$${prefix}/lib/epiphany-webkit \ + --with-engine=webkit + +patch: $(STAMP_DIR)/patch-stamp +$(STAMP_DIR)/patch-stamp: + dh_testdir + mkdir -p $(STAMP_DIR) + $(QUILT) push -a || test $$? = 2 + touch $@ + +builddir = $(BUILD_DIR)/$* + +configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS)) +$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp + dh_testdir + mkdir -p $(builddir) + cd $(builddir) && \ + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + $(CURDIR)/configure $($*_configure_flags) + touch $@ + +build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS)) +$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-% + dh_testdir + $(MAKE) -C $(builddir) + touch $@ + +installdir = $(CURDIR)/debian/epiphany-$* + +install-clean: + dh_testdir + dh_testroot + dh_clean -k + +install-%: $(STAMP_DIR)/build-stamp-% + $(MAKE) -C $(builddir) install DESTDIR=$(installdir) + cd $(installdir)/usr/bin && mv epiphany epiphany-$* + rm -f $(installdir)/usr/lib/epiphany*/*/*/*a + echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/epiphany-$*.substvars + echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/epiphany-$*.substvars + +install: install-clean $(addprefix install-, $(FLAVORS)) + dh_installdirs + mv debian/epiphany-gecko/usr/include debian/epiphany-browser-dev/usr/ + mv debian/epiphany-gecko/usr/lib/pkgconfig debian/epiphany-browser-dev/usr/lib/ + cd debian/epiphany-gecko/usr/share && \ + mv aclocal pygtk gtk-doc $(CURDIR)/debian/epiphany-browser-dev/usr/share/ + mv debian/epiphany-gecko/etc/* debian/epiphany-browser-data/etc + rmdir debian/epiphany-gecko/etc + mv debian/epiphany-gecko/usr/share debian/epiphany-browser-data/usr/ + cd debian/epiphany-webkit && rm -rf etc usr/share usr/lib/pkgconfig usr/include + cd debian/epiphany-browser-data/usr/share/epiphany-browser && \ + mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/ + cd debian/epiphany-browser-data/usr/share/man/man1 && \ + mv epiphany.1 epiphany-browser.1 + # Correct help file paths + cd debian/epiphany-browser-data/usr/share/omf && mv epiphany epiphany-browser + cd debian/epiphany-browser-data/usr/share/gnome/help && mv epiphany epiphany-browser + find debian/epiphany-browser-data/usr/share/omf/epiphany-browser/ \ + -name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-browser/#' {} \; + # Make both epiphanies installable together + for f in $(FLAVORS); do \ + F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \ + mkdir -p debian/epiphany-$$f/usr/share/applications ; \ + ( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \ + debian/epiphany-browser-data/usr/share/applications/epiphany.desktop \ + | sed "s,epiphany-browser,epiphany-$$f," \ + | grep -v ^TryExec | grep -v ^MimeType ; \ + echo NoDisplay=true ) \ + > debian/epiphany-$$f/usr/share/applications/epiphany-$$f.desktop ; \ + done + dh_install + cd debian/epiphany-browser/usr/bin && \ + mv epiphany.sh epiphany + +clean:: + dh_testdir + dh_testroot + $(QUILT) pop -a -R || test $$? = 2 + rm -rf .pc + rm -f po/.intltool-merge-cache + rm -f intltool-extract intltool-update intltool-merge + rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR) + dh_clean + +binary: binary-arch binary-indep + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs -pepiphany-browser-data ChangeLog + dh_installchangelogs -i -Nepiphany-browser-data + dh_installdocs -i + dh_installman -i + dh_installmenu -i + dh_link -i + dh_scrollkeeper -i + dh_gconf -i + dh_desktop -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs -a + dh_installdocs -a + dh_installman -a + dh_installmenu -a + dh_link -a + dh_scrollkeeper -a + dh_gconf -a + dh_desktop -a + dh_strip -a --dbg-package=epiphany-browser-dbg + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary --- epiphany-browser-2.22.3.orig/debian/watch +++ epiphany-browser-2.22.3/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/epiphany/([\d\.]+)[02468]/ \ + epiphany-(.*)\.tar\.gz \ + debian uupdate --- epiphany-browser-2.22.3.orig/debian/changelog +++ epiphany-browser-2.22.3/debian/changelog @@ -0,0 +1,1433 @@ +epiphany-browser (2.22.3-7) unstable; urgency=low + + [ Josselin Mouette ] + * certManager.js: fix JS variable declaration. + + [ Emilio Pozuelo Monfort ] + * debian/control.in: move Homepage field to the source stanza. + + [ Josselin Mouette ] + * 08_python_path.patch: new patch by James Vega. Disable relative + imports in the python code. Closes: #504363. + + -- Josselin Mouette Mon, 10 Nov 2008 15:29:28 +0100 + +epiphany-browser (2.22.3-6) unstable; urgency=low + + * The OMGWTFBBQ release. + * debian/certManager.js: this is a custom version of certManager.js + that doesn’t use deletecert.xul, which doesn’t work because of + broken argument passing. + * 21_chrome_certmanager.patch: override certManager.js with the custom + version. + * epiphany-browser-data.install: install it. + * Closes: #393837. Thanks to Romain Beauxis and Mike Hommey. + + -- Josselin Mouette Tue, 28 Oct 2008 12:17:03 +0100 + +epiphany-browser (2.22.3-5) unstable; urgency=low + + * Fix first changelog entry. Closes: #501357. + * 20_print_garbage.patch: pass UTF-16 to Gecko instead of UTF-8 for + the print headers. Original patch by Vincent Caron. Closes: #492283. + + -- Josselin Mouette Tue, 21 Oct 2008 17:09:31 +0200 + +epiphany-browser (2.22.3-4) unstable; urgency=low + + [ Sam Morris ] + * 18_gnome-vfs-for-helper-display.patch: Use gnome-vfs to display which + helper application a downloaded file will be opened with (closes: + #498913). + * Build-depend on gnome-vfs for the above patch. + * 99_autoreconf.patch: refresh. + + [ Josselin Mouette ] + * 14_zoom-crash.patch: patch from Mike Hommey to fix crash when + changing the zoom factor. Closes: #486744. + * 19_passwords_crash.patch: patch from upstream to fix crash when + viewing passwords. Closes: #494348. The crash used to corrupt + user preferences which triggered another crash, so it also + closes: #486136. + + -- Josselin Mouette Mon, 29 Sep 2008 12:20:49 +0200 + +epiphany-browser (2.22.3-3) unstable; urgency=low + + * Use not+linux-gnu instead of not+linux for non-Linux targets. + Closes: #494312. + + -- Josselin Mouette Fri, 29 Aug 2008 17:30:53 +0200 + +epiphany-browser (2.22.3-2) unstable; urgency=low + + [ Josselin Mouette ] + * Depends on dbus-x11 instead of dbus. Closes: #490345. + * Renamed 12_safetypes_rss.patch to 12_safetypes.patch. + + Add application/xspf+xml as a safe MIME type. Closes: #489827. + + [ Loic Minier ] + * Only enable network-manager integration on linux; thanks Petr Salinger; + closes: #494312. + - Don't build-dep on network-manager-dev on !hurd-i386 !kfreebsd-i386 + !kfreebsd-amd64. + - Only pass --enable-network-manager to configure if DEB_HOST_ARCH_OS is + linux. + + [ Sam Morris ] + * 16_fix-notify-uninit-crash.patch: fix crash on amd64 systems when + downloads complete (closes: #492143). + + [ Sven Arvidsson ] + * 17_print-scaling.patch; use percentage instead of value for print + scaling; GNOME #541168 (closes: 495222). + + [ Josselin Mouette ] + * Add warnings to the epiphany-webkit description explaining it is + still experimental. Closes: #492657. + * Use not+linux instead of specifying the arch list by hand. + + -- Josselin Mouette Fri, 29 Aug 2008 12:46:58 +0200 + +epiphany-browser (2.22.3-1) unstable; urgency=low + + * epiphany-browser.README.Debian: explain how to change the backend. + Closes: #487147. + * 16_embed_passwords.patch: patch from Mike Hommey to fix typos + causing passwords not being correctly removed from the password + manager. Closes: #487160. + * 04_proxy_password.patch: change the patch to still work with gecko + 1.8 so that it is suitable for upstream. + * 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. + * rules, *.links: only ship the upstream changelog in + epiphany-browser-data and link to it, since its size was multiplied + by 30 thanks to upstream using git-svn. + * Standards version is 3.8.0. + + -- Josselin Mouette Wed, 02 Jul 2008 10:48:25 +0200 + +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 Sun, 15 Jun 2008 14:02:35 +0200 + +epiphany-browser (2.22.2-2) unstable; urgency=low + + [ Loic Minier ] + * Cleanup rules and postinsts; fix priority of epiphany-webkit. + + [ Josselin Mouette ] + * 09_download_dialog.patch: + + Fix the logic that got wrong in some cases. This removes some + unnecessary prompts and makes the dialog more consistent. + * Remove the seahorse conflict, it is too much. + * Upload to unstable; drop check-dist include. + * epiphany-browser-dbg recommends xulrunner-1.9-dbg now. + + -- Josselin Mouette Sun, 08 Jun 2008 21:51:41 +0200 + +epiphany-browser (2.22.2-1) experimental; urgency=low + + * Conflict against seahorse < 2.22.1-3. + * Depend on epiphany-browser-data 2.22.1.1-3. Closes: #481153. + * Rebuild against xulrunner 1.9 rc1. Closes: #483122. + * 14_contenthandler_api.patch: new patch, needed because of a change + in the Gecko 1.9 ContentHandler API. Thanks Mike Hommey. + Closes: #482756. + * New upstream release. + + Don't restrict to applications supporting URIs. Closes: #482879. + + Do not crash when the profile directory path is not absolute. + Closes: #467157. + + Fix RDF import. Closes: #479546. + * Refresh patches to apply cleanly. + * 09_download_dialog.patch: order buttons correctly for + CONTENT_ACTION_NONE. Closes: #455720. + + -- Josselin Mouette Tue, 27 May 2008 14:14:39 +0200 + +epiphany-browser (2.22.1.1-3) experimental; urgency=low + + * epiphany-gecko conflicts against python-xpcom, because of + bug#416068. + * 13_extensions_need_xpcom.patch: new patch; ensure that xpcomglue is + initialized before the extensions that could link to gecko are + loaded. + + -- Josselin Mouette Mon, 12 May 2008 14:04:33 +0200 + +epiphany-browser (2.22.1.1-2) experimental; urgency=low + + * Build against xulrunner 1.9: + + Use the libxul-embedding version. + + Build-depend on xulrunner-dev 1.9~b5-3. + + Set explicit dependencies on xulrunner-1.9, thanks to that crap + not using shlibs anymore. + + Conflict against epiphany-extensions << 2.22.1-3. + * 12_safetypes_rss.patch: application/rss+xml is a safe MIME type. + Closes: #461619. + * Relax build-dependency on libwebkit-dev. + + -- Josselin Mouette Sun, 20 Apr 2008 15:30:49 +0200 + +epiphany-browser (2.22.1.1-1) unstable; urgency=low + + [ Sam Morris ] + * New upstream release. + * Build-depend on libglib2.0-dev 2.16. + * Build-depend on lsb-release for distributor name. + * Refresh 02_ac_init.patch, 10_url_double-click.patch, 05_libexecdir.patch, + 09_download_dialog.patch and 99_autoreconf.patch. + * Disable building epiphany-webkit until libwebkitgtk-dev is updated. + * Add flashblock extension to epiphany-browser-data. + - Build-depend on 'zip'. + - Note how to enable this in README.Debian. + + [ Josselin Mouette ] + * Fix installation of manual pages in the alternatives. + Closes: #457975. + * Document the behaviour with NetworkManager, text from Sven + Arvidsson. Closes: #472079. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/99_autoreconf.patch: + - Updated for the new version. + + [ Josselin Mouette ] + * Upload to unstable; drop check-dist include. + * Re-enable epiphany-webkit. + * Drop flashblock for now, it should go in its own package. + * Require libwebkit-dev svn31841. + + -- Josselin Mouette Thu, 17 Apr 2008 21:50:35 +0200 + +epiphany-browser (2.21.90-1) experimental; urgency=low + + [ Sam Morris ] + * New upstream development release. + * refresh 02_ac_init.patch, 05_libexecdir.patch, 06_ssl_weak_ciphers.patch, + 09_download_dialog.patch, 10_url_double-click.patch + * drop 13_powered-by.patch, 15_webkit-gtk-api.patch, + 16_webkit-missing-methods.patch, 17_webkit-signal-emission.patch: merged + upstream. + * drop 14_webkit-scrollbars.patch: EphyTab no longer exists. + + [ Josselin Mouette ] + * Build-depend on libwebkitgtk-dev 0~svn29752. + * New upstream development release. + + Can now resize columns in the history. Closes: #343173. + + Status icon now hides/show the downloads window. Closes: #429404. + + Can now paste with middle click on smart bookmarks. + Closes: #369692. + + URLs from the address bar drop-down can be edited. + Closes: #383851. + * Lots of webkit fixes. + + Fixes session management and tab titles. Closes: #444245. + + Fixes keyboard navigation. Closes: #457001. + + Can now close tabs. Closes: #451202. + + Can now copy and paste in the browser window. Closes: #452759. + + Can now navigate back&forward. Closes: #452765. + * Update build-dependencies accordingly. + * refresh 02_ac_init.patch, 03_dbus.patch, 05_libexecdir.patch, + 07_bookmarks.patch, 09_download_dialog.patch, + 10_url_double-click.patch, 99_autoreconf.patch. + + -- Josselin Mouette Sat, 16 Feb 2008 17:45:29 +0100 + +epiphany-browser (2.20.3-1) unstable; urgency=low + + * New upstream translation and bugfix release. + * Update and refresh patches. + * Use the Homepage field. + * Standards version is 3.7.3. + + -- Josselin Mouette Sat, 12 Jan 2008 02:30:01 +0100 + +epiphany-browser (2.20.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * debian/bug/control: ship a bug control file in epiphany-browser to + correctly report dependencies of epiphany-{gecko,webkit}. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/18_ephy-session_crash.patch: + - Dropped, merged upstream. + + debian/patches/02_ac_init.patch: + - Updated for the new version. + + debian/patches/99_autoreconf.patch: + - Regenerated. + + -- Sebastian Dröge Sat, 01 Dec 2007 17:45:45 +0100 + +epiphany-browser (2.20.1-2) unstable; urgency=low + + * 18_ephy-session_crash.patch: stolen from upstream SVN. Fixes crash + when loading a session. Closes: #449003. + + -- Josselin Mouette Thu, 15 Nov 2007 21:14:29 +0100 + +epiphany-browser (2.20.1-1) unstable; urgency=low + + [ Nelson A. de Oliveira ] + * Fix menu files for epiphany-webkit and epiphany-gecko (Closes: #444066). + + [ Josselin Mouette ] + * 13_powered-by.patch: stolen from SVN. Don't display "powered by + Gecko" in the webkit version's about dialog. Also fix translations + accordingly. Closes: #444999. + * 14_webkit-scrollbars.patch: stolen from SVN. Implement size_request + for EphyTab, getting scrollbars to work for the webkit engine. + Closes: #444044. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/02_ac_init.patch: + - Updated for the new version. + + debian/patches/12_contentmanager_block_https.patch: + - Dropped, merged upstream. + * debian/patches/15_webkit-gtk-api.patch: + + Update to the latest WebKit/Gtk API. Patch taken from upstream SVN. + Closes: #447371. + * debian/patches/16_webkit-missing-methods.patch: + + Implement some missing methods and add some workarounds for WebKit + bugs. Patch taken from upstream SVN. There are more patches in SVN + that make the WebKit backened more useful but can't easily be backported + because of API changes in epiphany. + * debian/patches/17_webkit-signal-emission.patch: + + Don't emit signal that we don't have. Patch taken from upstream SVN. + * debian/patches/99_autoreconf.patch: + + Regenerate autotools stuff for the new version. + + -- Sebastian Dröge Thu, 01 Nov 2007 06:37:43 +0100 + +epiphany-browser (2.20.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * Fix typo that lead NoDisplay to be ignored. + * Remove MimeType entries from the additional .desktop files. + * 12_contentmanager_block_https.patch: use the same content policy for + http and https, allowing adblock to work on https. Closes: #439772. + + [ Loic Minier ] + * Cleanup whitespaces in control. + + -- Josselin Mouette Sat, 29 Sep 2007 01:28:11 +0200 + +epiphany-browser (2.20.0-1) unstable; urgency=low + + * epiphany.sh: ship epiphany as a wrapper script for epiphany-browser + instead of a symbolic link the other way round. This way all + processes should be named epiphany-browser which is recognized by + bug-buddy. Closes: #433443. + * New upstream release. + * Bump required build-dependencies. + * Build two flavors of epiphany, one with webkit and one with gecko. + * Separate them in two packages installable simultaneously. + * 00_browser_wrapper_path.patch: add a TryExec key as the desktop + entry is moved to the data package. + * Refresh other patches. + * 05_libexecdir.patch: use libexecdir for the plugin directory, so + that it can be different for both backends. + * Introduce a new alternative, epiphany-browser, and register both + versions for it. + * epiphany-browser.menu: update to the new menu policy. + * Enable build of documentation; build-depend on gtk-doc-tools. + + -- Josselin Mouette Fri, 21 Sep 2007 17:10:27 +0200 + +epiphany-browser (2.18.3-1) unstable; urgency=low + + * Fix copyright (closes: #428099). + * New upstream bugfix release. + + Refresh patches. + * 11_useragent-weasel.patch: comment out the UA breakage that upstream + introduces for xulrunner users and explain why we do it. + + -- Josselin Mouette Wed, 04 Jul 2007 22:23:31 +0200 + +epiphany-browser (2.18.2-1) unstable; urgency=low + + [ Sam Morris ] + * Drop 11_spell-checker-for-1.8.0.patch now that xulrunner 1.8.1 is + available. Also bump build-depends appropriately. Closes: #414558. + + [ Josselin Mouette ] + * Fix watch file. + * Split translations and data files in a separate + epiphany-browser-data package. + + Include gnome-version.mk for ${gnome:Version}. + * Ship debugging symbols in epiphany-browser-dbg (closes: #425290). + + debian/compat: use debhelper mode 5. + + Build-depend on debhelper 5. + * Wrap depends and build-depends. + * Improve descriptions a bit. + * Use ${binary:Version}. + * Replace some file moves in debian/rules by correct .install files. + * README: removed, obsolete. + * New upstream translation and bugfix release. + * 02_ac_init.patch: updated. + * 04_move_tabs.patch: disabled for the moment, it doesn't work. + * 08_load_on_new_tab.patch: ditto. + * 99_configure.patch: refreshed. + + -- Josselin Mouette Sat, 02 Jun 2007 11:56:53 +0200 + +epiphany-browser (2.18.1-3) unstable; urgency=low + + * 09_download_dialog.patch: still kill the download dialog, but + reinstate the distinction between download and save for security + reasons (closes: #424765). Also improve the preferences dialog to + make insensitive the download folder selection when necessary. + + -- Josselin Mouette Sat, 19 May 2007 00:03:32 +0200 + +epiphany-browser (2.18.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * epiphany-browser.gconf-defaults: set the default language to + "system" so that epiphany uses content negociation by default. + Thanks Roland Mas for noticing. + + [ Sebastian Dröge ] + * Upload to unstable, drop check-dist include. + * Disable 11_spell-checker-for-1.8.0 and update 99_configure. spellchecking + support is disabled again in xulrunner for now. + + -- Sebastian Dröge Wed, 25 Apr 2007 01:08:24 +0200 + +epiphany-browser (2.18.1-1) experimental; urgency=low + + * Fix changelog and version the libenchant-dev build-dep. + * New upstream release + - Rename patch 100_spell-checker-for-1.8.0 to 11_spell-checker-for-1.8.0 + and only patch configure.ac; refresh. + - Update patch 99_configure. + - Update patch 02_ac_init. + + -- Loic Minier Mon, 09 Apr 2007 16:05:07 +0200 + +epiphany-browser (2.18.0-3) experimental; urgency=low + + [ Loic Minier ] + * Add a pre-build:: target to workaround a missing nspr.pc in libxul-dev + 1.8.0.11-3: symlink xulrunner-nspr.pc as nspr.pc in debian/pkg-config and + list debian/pkg-config in PKG_CONFIG_PATH; thanks Sam Morris and + Mike Hommey. + + [ Josselin Mouette ] + * 10_url_double-click.patch: patch from Sam Hocevar to make the + behavior when double-clicking in the URL bar conform to the rest of + the desktop (closes: #417836). + + [ Loic Minier ] + * Spell checking support: + - Build-dep against libxul-dev 1.8.0.11-3 and libenchant-dev. + - Pass --enable-spell-checker to configure. + - New patch, 100_spell-checker-for-1.8.0, allows using the spell checker + with Xulrunner <= 1.8.1. + + -- Loic Minier Mon, 09 Apr 2007 12:01:07 +0200 + +epiphany-browser (2.18.0-2) experimental; urgency=low + + [ Josselin Mouette ] + * Re-introduce 00_browser_wrapper_path.patch to avoid any issue with + the epiphany game package. + + Call epiphany-browser explicitly instead of hardcoding the path. + * Bump back conflict on epiphany-extensions to << 2.16, as the 2.16 + series have correct dependencies. + + [ Loic Minier ] + * Merge 2.14.3-2 up to 2.14.3-6; SVN r7118:9090. + * Drop patch 06_dbus_connection_close, merged upstream. + * Drop patch 30_bookmark-editor-crash, merged upstream. + + -- Loic Minier Sun, 18 Mar 2007 19:01:57 +0100 + +epiphany-browser (2.18.0-1) experimental; urgency=low + + [ Sam Morris ] + * New upstream release. + * Refresh patches. + * Bump conflict on epiphany-extensions to << 2.18 + * Drop 00_browser_wrapper_path.patch; seems useless + + [ Loic Minier ] + * Drop patch 05_xulrunner; merged upstream. + * Include CDBS's utils. + + -- Loic Minier Mon, 12 Mar 2007 14:21:50 +0100 + +epiphany-browser (2.16.3-1) experimental; urgency=low + + * New upstream release. + * Refresh patches. + + -- Josselin Mouette Thu, 1 Mar 2007 22:12:53 +0100 + +epiphany-browser (2.16.2-4) experimental; urgency=low + + * Bump the epiphany-browser-dev dep on libgnomeui-dev to 2.16.0-2 as well. + + -- Loic Minier Sun, 4 Feb 2007 12:30:05 +0100 + +epiphany-browser (2.16.2-3) experimental; urgency=low + + [ Loic Minier ] + * Set GNOME_MODULE to epiphany for get-orig-source. + + [ Josselin Mouette ] + * 09_download_dialog.patch: remove the annoying dialog that lets the + user choose between "download" and "save as". Also remove the + distinction between the gconf keys. Closes: #280280. + + [ Loic Minier ] + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 as Gtk 2.10 requires it + anyway. + + -- Loic Minier Mon, 22 Jan 2007 11:09:05 +0100 + +epiphany-browser (2.16.2-2) experimental; urgency=low + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + [ Josselin Mouette ] + * Depend on xulrunner-gnome-support (closes: #404755). + * 06_ssl_weak_ciphers.patch: enable SSL weak ciphers, as epiphany + warns about their use anyway, thanks Mike Hommey (closes: #368259). + * epiphany-browser.dirs: create /etc/gnome/epiphany. + * rules: move default-prefs.js mime-types-permissions.xml to this + directory to make them conffiles (closes: #195406). + * 07_bookmarks.patch: provide some Debian-related bookmarks by default + (closes: #175014). + * epiphany-browser.gconf-defaults: set the homepage to the Debian + website. + * epiphany-browser.links: add a /usr/bin/epiphany-browser link to make + session saving work, thanks Håvard Moen (closes: #375003). + + Also add a link for the manual page. + * 08_load_on_new_tab.patch: patch from Cyril Brulebois to add a gconf + key allowing to emulate the mozilla behavior when loading new tabs + (closes: #402177). + + -- Josselin Mouette Fri, 12 Jan 2007 12:59:27 +0100 + +epiphany-browser (2.16.2-1) experimental; urgency=low + + [ Loic Minier ] + * Update description to use Iceweasel instead of Firefox. + + [ Josselin Mouette ] + * New upstream release. + * Refresh patches. + + -- Josselin Mouette Sun, 26 Nov 2006 22:16:38 +0100 + +epiphany-browser (2.16.1-1) experimental; urgency=low + + * New upstream release. + * rules: switch to quilt for patch handling. + * Build-depend on quilt. + * Update patches for the new version. + + -- Josselin Mouette Sun, 19 Nov 2006 18:08:37 +0100 + +epiphany-browser (2.16.0-1) experimental; urgency=low + + * New upstream release. + * 04_move_tabs.patch: re-enable the ability to move tabs between + windows now the bug is fixed in xulrunner (closes: #317724). + * 00_browser_wrapper_path.patch: cleanup. + * Please Jordi by taking over maintainership of the package. + * 01_bookmarks_menu.patch: updated. + * 02_ac_init.patch: updated. + * 99_configure.patch: updated accordingly. + * NEWS: removed, its content is no more relevant. + * Update watch file for 2.16. + * Build-depend on intltool 0.35.0 and x11proto-core-dev. + * Remove useless build-dependencies on liborbit, perl and gnome-print. + * Bump requirements on glib, gtk, iso-codes, libgnome and libgnomeui. + * Enable network manager by passing --enable-network-manager. + + Build-depend on network-manager-dev. + * epiphany-browser-dev.install: add /usr/share/pygtk and + /use/share/aclocal. + * epiphany-browser.install: add /usr/share/dbus-1 and replace + /usr/share/pixmaps by /usr/share/icons. + * Conflict with epiphany-extensions << 2.16. + + -- Josselin Mouette Sat, 9 Sep 2006 21:49:22 +0200 + +epiphany-browser (2.14.3-6) unstable; urgency=medium + + * Add a get-orig-source target to retrieve the upstream tarball. + * New patch, 30_bookmark-editor-crash, workaround for a crash in the + bookmark-editor; GNOME #351814. + + -- Loic Minier Mon, 26 Feb 2007 11:24:28 +0100 + +epiphany-browser (2.14.3-5) unstable; urgency=medium + + * 07_bookmarks.patch: provide some Debian-related bookmarks by default + (closes: #175014). + * epiphany-browser.gconf-defaults: set the homepage to the Debian + website. + * epiphany-browser.links: add a /usr/bin/epiphany-browser link to make + session saving work, thanks Håvard Moen (closes: #375003). + * Urgency is medium to get the session fix and the branding changes to + etch. + + -- Josselin Mouette Fri, 12 Jan 2007 13:25:07 +0100 + +epiphany-browser (2.14.3-4) unstable; urgency=medium + + * debian/control.in: depend on xulrunner-gnome-support (closes: #404755). + + -- Jordi Mallach Thu, 28 Dec 2006 23:54:04 +0100 + +epiphany-browser (2.14.3-3) unstable; urgency=low + + [ Loic Minier ] + * Provide gnome-www-browser. + * Suggest mozplugger instead of mozilla-bonobo; thanks Adam C Powell IV; + closes: #393981. + + [ Jordi Mallach ] + * 06_dbus_connection_close.patch: don't call dbus_connection_close(); + unref'ing it should be enough. Suggested by Sjoerd. + + -- Jordi Mallach Wed, 25 Oct 2006 11:22:28 +0200 + +epiphany-browser (2.14.3-2) unstable; urgency=low + + * 04_move_tabs.patch: re-enable the ability to move tabs between + windows now the bug is fixed in xulrunner (closes: #317724). + * Conflict with epiphany-extensions << 2.14. + + -- Josselin Mouette Wed, 27 Sep 2006 15:38:53 +0200 + +epiphany-browser (2.14.3-1) unstable; urgency=low + + * New upstream release. + - Update the 02_ac_init and 99_configure patches. + + -- Loic Minier Mon, 7 Aug 2006 22:28:46 +0200 + +epiphany-browser (2.14.2.1-3) unstable; urgency=low + + * 03_dbus.patch: add a warning dialog when the dbus session isn't + found (closes: #373798). + + -- Josselin Mouette Sun, 18 Jun 2006 12:54:32 +0200 + +epiphany-browser (2.14.2.1-2) unstable; urgency=low + + * Generate the configure patch with autoconf 2.59a-9 as newer versions + require another level of shell expansion to resolve datadir, and hence + cause the AM_GLIB_DEFINE_LOCALEDIR macro to fail miserably. + [debian/patches/99_configure.patch] + + -- Loic Minier Sun, 4 Jun 2006 16:22:30 +0200 + +epiphany-browser (2.14.2.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * 03_dbus.patch: fall back on being a private instance when there is no + session bus (closes: #361072). + + [ Loic Minier ] + * New upstream release. + - Update patches. + [debian/patches/00_browser_wrapper_path.patch, + debian/patches/02_ac_init.patch, debian/patches/03_dbus.patch, + debian/patches/99_configure.patch] + * Make package binNMU-able by changing the ${Source-Version} dependency of + epiphany-browser-dev on epiphany from "=" to ">=". + [debian/control, debian/control.in] + + -- Loic Minier Thu, 1 Jun 2006 11:22:48 +0200 + +epiphany-browser (2.14.1-3) unstable; urgency=low + + * Brown paper bag release. + * Turn the build-dependency on dbus into a dependency. + + -- Guilherme de S. Pastore Fri, 12 May 2006 20:46:05 -0300 + +epiphany-browser (2.14.1-2) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * debian/control.in: + - added build-dependency on dbus (Closes: #360836). + - updated Standards-Version to 3.7.2. + + [ Jordi Mallach ] + * debian/control.in: epiphany-browser-dev depends on libgnomeui-dev. + + -- Guilherme de S. Pastore Fri, 12 May 2006 19:16:30 -0300 + +epiphany-browser (2.14.1-1) unstable; urgency=low + + * New upstream release. + - debian/patches/{02_ac_init,99_configure}.patch: updated. + * Sourceful upload makes it installable again (Closes: #364267). + + -- Guilherme de S. Pastore Sat, 22 Apr 2006 15:23:30 -0300 + +epiphany-browser (2.14.0-1) unstable; urgency=low + + * New upstream release. + - no more annoying HOWL compatibility warning (closes: #354761). + - fixes slowness of 1.8.x when using xulrunner (closes: #354822). + * debian/control.in: Updated build-deps as per configure.ac. + * debian/epiphany-browser.install: remove uneeded entries. + * debian/watch: updated for 2.14. + * debian/patches/00_browser_wrapper_path.patch: update filenames. + * debian/patches/01_bookmarks_menu.patch: update to Ubuntu's version. + * debian/patches/02_server_path.patch: removed, obsolete. + * debian/patches/03_ac_init.patch: updated. + * debian/patches/03_ac_init.patch: moved... + * debian/patches/02_ac_init.patch: here. Now contains configure.ac changes + only. + * debian/patches/04_debian_user_agent.patch: removed, xulrunner advertises + already. + * debian/patches/05_xulrunner.patch: updated. + * debian/patches/99_configure.patch: generated with `autoconf && rm -rf + autom4te.cache`. + + -- Jordi Mallach Wed, 29 Mar 2006 23:54:28 +0200 + +epiphany-browser (1.8.5-2) unstable; urgency=low + + * Remove dependency on xulrunner, it is unuseful now xulrunner is + fixed. + + -- Josselin Mouette Tue, 21 Feb 2006 20:36:31 +0100 + +epiphany-browser (1.8.5-1) unstable; urgency=low + + * New upstream release. + * Apply patch from Mike Hommey to enable building against the new libxul + packages (closes: #351976). + - debian/control.in: + + Changed Build-deps from mozilla-browser to libxul-dev. + + Changed epiphany-browser's dependencies and conflicts accordingly. + - debian/rules: Add --with-mozilla=xulrunner to the configure line. + - debian/patches/05_xulrunner.patch: Correctly detect libmozjs location. + * The above removes epiphany's much hated dependency on mozilla-browser, + and closes: #271582). + * debian/rules: don't overwrite DEB_CONFIGURE_EXTRA_FLAGS. + * debian/control.in: + - conflict with epiphany-extensions (<< 1.8.2-5) to ensure we get + a xulrunner-enabled build. + - temporarily depend on xulrunner, to workaround a bug. + + -- Jordi Mallach Mon, 20 Feb 2006 20:39:59 +0100 + +epiphany-browser (1.8.3-4) unstable; urgency=low + + * debian/control.in: Build-Depend on python-dev. + * debian/rules: add --enable-python to configure flags (closes: #352236). + + -- Jordi Mallach Fri, 10 Feb 2006 20:32:28 +0100 + +epiphany-browser (1.8.3-3) unstable; urgency=low + + * Upload to unstable + + Loic Minier : + * Register and unregister a new gnome-www-browser alternative. + [debian/epiphany-browser.postinst, debian/epiphany-browser.prerm] + + Gustavo Noronha: + * debian/control.in: + - bumped Standards-Version to 3.6.2 with no changes + + -- Gustavo Noronha Silva Sat, 7 Jan 2006 19:06:16 -0200 + +epiphany-browser (1.8.3-2) experimental; urgency=low + + * Build against dbus >= 0.60 + + -- Sjoerd Simons Sun, 18 Dec 2005 22:50:26 +0100 + +epiphany-browser (1.8.3-1) experimental; urgency=low + + [ Jordi Mallach ] + * New upstream release. + * 03_ac_init.patch: updated. + + [ Loic Minier ] + * Menu transition, part 1 and 2: move from #!/usr/sbin/install-menu to + #!/usr/bin/install-menu. [debian/epiphany-browser.install] + + [ Sjoerd Simons ] + * Enable zeroconf for bookmarks + + -- Jordi Mallach Thu, 1 Dec 2005 19:17:12 +0100 + +epiphany-browser (1.8.2-1) experimental; urgency=low + + * New upstream release. + * Don't build-depend on gcc-3.4 for amd64 anymore. + * 03_ac_init.patch: updated. + * Add watch file. + * Require orbit2 2.12.4 for ORBIT2_MAYBE_CONST. + * Cleanup dependencies. + * epiphany-browser.prerm: remove bashism. + + -- Josselin Mouette Sun, 9 Oct 2005 20:09:58 +0200 + +epiphany-browser (1.8.0-1) experimental; urgency=low + + * New upstream release + * Don't build with gcc-3.4 for amd64 anymore + * Build with the experimental dbus packages + * debian/patches/04_debian_user_agent.patch + + Updated + * Sync with ubuntu + - Also rename omf files from epiphany to epiphany-browser + - debian/patches/02_server_path.patch + + Updated + - debian/patches/03_ac_init.patch + + Updated + + -- Sjoerd Simons Thu, 8 Sep 2005 11:29:47 +0200 + +epiphany-browser (1.6.5-1) experimental; urgency=low + + * New upstream version. + * Ondřej Surý: + - debian/paches/03_ac_init.patch: updated. + * Jordi Mallach: + - debian/control: build-depend on mozilla-dev (>= 1.7.10) for C++ + transition. + + -- Jordi Mallach Wed, 31 Aug 2005 17:26:26 +0200 + +epiphany-browser (1.6.4-1) unstable; urgency=low + + * New upstream release. + * debian/paches/03_ac_init.patch: updated. + + -- Jordi Mallach Tue, 5 Jul 2005 14:59:54 +0200 + +epiphany-browser (1.6.3-2) unstable; urgency=low + + * The "helix, use this cool Desktop and become a real GNOME Woman!" + release. + * Upload to unstable. + * debian/control.in: update Build-Depends (closes: #309195). + * The blurry icon for bookmarks editor is gone (closes: #287951). + * Ephy no longer shows the "Exit Fullscreen" button on all workspaces + (closes: #229622). + + -- Jordi Mallach Wed, 8 Jun 2005 01:03:16 +0200 + +epiphany-browser (1.6.3-1) experimental; urgency=low + + * New upstream release. + * debian/paches/03_ac_init.patch: updated. + + -- Jordi Mallach Wed, 27 Apr 2005 16:09:39 +0200 + +epiphany-browser (1.6.2-1) experimental; urgency=low + + * New upstream version. + * debian/patches/03_ac_init.patch: + - updated. + * debian/patches/05_toolbar_activation.patch: + - fixed with the new version. + + -- Sebastien Bacher Thu, 14 Apr 2005 15:40:31 +0200 + +epiphany-browser (1.6.1-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - update build-depends and add dbus. + - depend on gnome-icon-theme and iso-codes. + * debian/rules: + - enable dbus support. + - build with gcc/g++ 3.4 for amd64 (closes: #287642). + * debian/patches/03_ac_init.patch: updated. + * debian/patches/01_bookmarks_menu.patch: stolen from Hoary; hide the + bookmarks manager menu item. + * debian/patches/04_debian_user_agent.patch: just identify as "Debian", + don't give the full source version. + * debian/05_toolbar_activation.patch: patch from CVS to fix toolbar + activation. + + -- Jordi Mallach Sat, 9 Apr 2005 12:33:49 +0200 + +epiphany-browser (1.4.8-2) unstable; urgency=low + + * debian/control.in: bump mozilla requirements to >= 1.7.6 to fix the + IDN domain spoofing security issue (CAN-2005-0238, closes: #294270). + + -- Jordi Mallach Thu, 24 Mar 2005 17:54:16 +0100 + +epiphany-browser (1.4.8-1) unstable; urgency=low + + * New upstream release. + + -- Jordi Mallach Sun, 27 Feb 2005 17:31:10 +0100 + +epiphany-browser (1.4.7-3) unstable; urgency=low + + * debian/patches/04_debian_user_agent.patch: add Debian package version to + the User-Agent string (thanks Loïc Minier; closes: #268655). + * debian/rules: add a define to CXXFLAGS with the Debian source version. + * debian/control.in: + - add a suggestion on mozilla-bonobo to epiphany-browser + (closes: #276492). + - recommend epiphany-extensions. + + -- Jordi Mallach Thu, 10 Feb 2005 23:24:41 +0100 + +epiphany-browser (1.4.7-2) unstable; urgency=medium + + * Rebuild against mozilla 1.7.5 to fix mouse buttons breakage. + * debian/control.in: build-depend and depend on + mozilla-browser (>= 2:1.7.5). + + -- Jordi Mallach Fri, 7 Jan 2005 17:05:05 +0100 + +epiphany-browser (1.4.7-1) unstable; urgency=low + + * New upstream release. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach Sun, 26 Dec 2004 01:15:41 +0100 + +epiphany-browser (1.4.6-1) unstable; urgency=low + + * New upstream release. + - fix tabs menu ordering when using the tab groups extension + (closes: #276916). + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach Thu, 2 Dec 2004 00:16:32 +0100 + +epiphany-browser (1.4.5-2) unstable; urgency=low + + * Upload to unstable. + * debian/control.in: + - put myself as Maintainer. *shiver*. + - remove Mark Howard from uploaders, as he's trying to get galeon + adopted. + - remove build-dep on libc6-dev. + - bump to debhelper (>= 4.2.23). + + -- Jordi Mallach Fri, 19 Nov 2004 18:34:26 +0100 + +epiphany-browser (1.4.5-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/{epiphany.1,epiphany-browser.mapages}: removed, included upstream. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach Tue, 16 Nov 2004 02:35:22 +0100 + +epiphany-browser (1.4.4-2) experimental; urgency=low + + * debian/control.in: + - bump cdbs and debhelper requirements, to register epiphany in the + MIME database. + - drop libtool build dependency. + * debian/postrm: remove, handled by debhelper. + * debian/rules: don't relibtoolize on pre-build. + + -- Jordi Mallach Tue, 9 Nov 2004 20:38:48 +0100 + +epiphany-browser (1.4.4-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/rules: + + remove extra configure flags which aren't needed anymore. + + remove empty /usr/lib/epiphany. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach Wed, 13 Oct 2004 00:23:27 +0200 + +epiphany-browser (1.4.0-2) experimental; urgency=low + + * GNOME team upload. + * debian/rules: + + don't install /usr/bin/epiphany as a wrapper anymore, according + to Crispin it's not needed anymore (closes: #271986). + + configure with --with-mozilla-snapshot=1.7.2 to workaround a build + failure. + * debian/control.in: tighten mozilla dependencies to 1.7.3. + + -- Jordi Mallach Fri, 24 Sep 2004 19:28:26 +0200 + +epiphany-browser (1.4.0-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/control.in: update build-depends as per configure.in. + * debian/patches/03_ac_init.patch: update. + * debian/rules: epiphany's binary is now epiphany, not epiphany-bin. + + -- Jordi Mallach Wed, 15 Sep 2004 23:30:24 +0200 + +epiphany-browser (1.2.9-2) unstable; urgency=low + + * GNOME team upload. + * debian/rules: configure using --with-mozilla-snapshot=1.7.2. + + -- Jordi Mallach Thu, 21 Oct 2004 11:29:46 +0200 + +epiphany-browser (1.2.9-1) unstable; urgency=low + + * GNOME team upload, by request of Edd. + * New upstream release. + * debian/patches/03_ac_init.patch: updated. + * debian/epiphany.1: apply patch from Andrew Sobala to remove + obsolete/unuseful options from the manpage, thanks! (Closes: #256504) + * debian/rules: don't libtoolize the package automatically in pre-build. + * debian/control.in: drop build-dependency on libtool. + + -- Jordi Mallach Thu, 21 Oct 2004 00:13:39 +0200 + +epiphany-browser (1.2.8-1) unstable; urgency=high + + * New upstream release. + * Really build against Mozilla 1.7.2. (Closes: #266265) + * High urgency to ensure that middle- and right-mouse clicks + work in the version that ships with sarge. + * Retire 01_package_name.patch, add 03_ac_init.patch to adjust + package name to epiphany-browser. + + -- Edd Dumbill Mon, 23 Aug 2004 19:19:25 +0100 + +epiphany-browser (1.2.7-2) unstable; urgency=low + + * Force compile against mozilla 1.7.2, fixes mouse button problems + (Closes: #264467) + + -- Edd Dumbill Mon, 9 Aug 2004 09:43:04 +0100 + +epiphany-browser (1.2.7-1) unstable; urgency=low + + * New upstream release + - build fine with mozilla 1.7.1. + * debian/epiphany-browser.postinst: + - removed the gconf and scrollkeeper parts, CDBS handles this. + * debian/epiphany-browser.postrm: + - removed, CDBS handles this too. + * debian/patches/01_package_name.patch: + - updated. + * debian/rules: + - changed the rules order to get dh_gconf used. + * All the above from Sebastien Bacher , thanks! + (Closes: #263841) + * Removed mozilla-xft from Recommends, this now included in + mozilla-browser. + + -- Edd Dumbill Fri, 7 Aug 2004 00:47:03 +0100 + +epiphany-browser (1.2.6-3) unstable; urgency=low + + * Add note to README.Debian to explain about the printing snafu. + * Move gtk-doc output into -dev package. + + -- Edd Dumbill Fri, 25 Jun 2004 10:17:53 +0100 + +epiphany-browser (1.2.6-2) unstable; urgency=low + + * Build against Mozilla 1.7. + + -- Edd Dumbill Thu, 24 Jun 2004 01:04:15 +0100 + +epiphany-browser (1.2.6-1) unstable; urgency=low + + * New upstream release. + - Fixes LD_LIBRARY_PATH setting (Closes: #253443) + + -- Edd Dumbill Mon, 14 Jun 2004 15:14:48 +0100 + +epiphany-browser (1.2.5-2) unstable; urgency=low + + * Upload to unstable. + - Download behavior fixed (Closes: #223591) + - Upload path remembered (Closes: #207829) + - Bookmark searches now case insensitive (Closes: #192929) + - Toolbars options in fullscreen not an issue now (Closes: #203018) + - Import bookmarks dialog offers arbitrary file import (Closes: #209224) + - Spinner no longer part of toolbar (Closes: #229548) + - Closing windows asks for confirmation if they have unsubmitted form + data (Closes: #229588) + * Don't break x-www-browser alternative on uninstall (Closes: #241535) + + -- Edd Dumbill Fri, 28 May 2004 07:55:32 +0100 + +epiphany-browser (1.2.5-1) experimental; urgency=low + + * New upstream release. + * Added Section: devel to control file for the -dev package. + + -- Edd Dumbill Wed, 5 May 2004 19:58:54 +0100 + +epiphany-browser (1.2.3-1) experimental; urgency=low + + * New upstream release. + * Add missing libxml-parser-perl builddep. + + -- Edd Dumbill Fri, 23 Apr 2004 18:24:54 +0100 + +epiphany-browser (1.2.2-3) experimental; urgency=low + + * Add missing gnome-pkg-tools builddep (Closes: #244053) + * Tighten up libtool builddep. + + -- Edd Dumbill Tue, 13 Apr 2004 10:11:52 +0100 + +epiphany-browser (1.2.2-2) experimental; urgency=low + + * Rebuild against gcc-3.3 not 3.4! + + -- Edd Dumbill Tue, 13 Apr 2004 09:07:02 +0100 + +epiphany-browser (1.2.2-1) experimental; urgency=low + + * New upstream release. + * Split into epiphany and epiphany-dev. + * Remove alternative in prerm. + + -- Edd Dumbill Mon, 12 Apr 2004 21:23:52 +0100 + +epiphany-browser (1.2.1-1) experimental; urgency=low + + * New upstream release. + * Updated patches for executable path, removed 04_scrollkeeper_omf patch. + * Remove libnautilus2-dev dependency for now, disable nautilus view + building. + + -- Edd Dumbill Wed, 24 Mar 2004 15:16:27 +0000 + +epiphany-browser (1.0.8-1) unstable; urgency=low + + * New upstream release. + * Get path right for translated docs (Closes: #231731) + * Make x-www-browser alternative greater than that of Mozilla's + (Closes: #233607) + * Drop yelp to a recommendation (Closes: #229061) + + -- Edd Dumbill Thu, 18 Mar 2004 13:54:23 +0000 + +epiphany-browser (1.0.7-3) unstable; urgency=low + + * Add libxml2-dev build-dep (Closes: #222453). Tighten the libbonoboui-dev + dependency as well. + * Add simple manpage (Closes: #206702, #221710) + + -- Edd Dumbill Sun, 25 Jan 2004 18:42:59 +0000 + +epiphany-browser (1.0.7-2) unstable; urgency=low + + * Add libxml-parser-perl as build-dep. Oops. + + -- Edd Dumbill Fri, 23 Jan 2004 11:52:12 +0000 + +epiphany-browser (1.0.7-1) unstable; urgency=low + + * New upstream release. + * Compile against Mozilla 1.6 (Closes: #229139) + + -- Edd Dumbill Fri, 23 Jan 2004 09:59:47 +0000 + +epiphany-browser (1.0.6-2) unstable; urgency=low + + * Add GNOME team maintainership stuff. + + -- Edd Dumbill Tue, 18 Nov 2003 12:26:28 +0000 + +epiphany-browser (1.0.6-1) unstable; urgency=low + + * New upstream release. + * Retire 05_file_uri_security.patch. + + -- Edd Dumbill Mon, 17 Nov 2003 15:04:01 +0000 + +epiphany-browser (1.0.3-3) unstable; urgency=low + + * Added Conflicts: mozilla-browser >= 1.6 to avoid future snafus + with Mozilla upgrades. + + -- Edd Dumbill Wed, 22 Oct 2003 09:54:52 +0100 + +epiphany-browser (1.0.3-2) unstable; urgency=low + + * Re-libtoolize to get round breakage with Mozilla 1.5. (Thanks + to Matt Biddulph for helping chase this down.) + + -- Edd Dumbill Wed, 22 Oct 2003 00:36:52 +0100 + +epiphany-browser (1.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Edd Dumbill Sat, 18 Oct 2003 12:47:51 +0100 + +epiphany-browser (1.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Edd Dumbill Mon, 13 Oct 2003 23:10:00 +0100 + +epiphany-browser (1.0-1) unstable; urgency=low + + * New upstream release. Epiphany goes 1.0! + * Add missing libgnome-desktop-dev build-dep (Closes: #211447) + * Use perl instead of sed in debian/rules (Closes: #207735) + * Remove glib2 autotools workaround, set specific libglib2.0-dev + dependency. + * Add in security fix from CVS so file:/// URIs can't be loaded + by pages retrieved from the network (05_file_uri_security.patch). + + -- Edd Dumbill Thu, 18 Sep 2003 15:41:56 +0100 + +epiphany-browser (0.9.2-2) unstable; urgency=low + + * Added Recommends: for mozilla-xft. + * Added note about mozilla-xft in README.Debian. + + -- Edd Dumbill Wed, 17 Sep 2003 09:33:52 +0100 + +epiphany-browser (0.9.2-1) unstable; urgency=low + + * New upstream release. + * Depend on gnome-icon-theme >= 1.0.6 now it's released. Thanks Kitame. + (Closes: #207368, #206297) + * Ensure locale location bugfix won't break when glib 2.0 bug which is the + root cause gets fixed. + + -- Edd Dumbill Thu, 28 Aug 2003 14:45:03 +0100 + +epiphany-browser (0.8.4-2) unstable; urgency=low + + * Move locale .mo files to the right place (Closes: #205304) + + -- Edd Dumbill Thu, 14 Aug 2003 08:51:06 +0100 + +epiphany-browser (0.8.4-1) unstable; urgency=low + + * New upstream release. + - New tab doesn't grab focus (Closes: #204829) + * Retire patches/05_sign_compile.patch. + * Retire gcc-3.2 dependency, compiles OK with 3.3 now. + + -- Edd Dumbill Wed, 13 Aug 2003 13:49:35 +0100 + +epiphany-browser (0.8.0-2) unstable; urgency=low + + * Depend on Mozilla 1.4 (Closes: #202069) + + -- Edd Dumbill Sat, 19 Jul 2003 15:40:03 +0100 + +epiphany-browser (0.8.0-1) unstable; urgency=low + + * New upstream release. + - No more "feeling lucky" + * Move debconf notice into NEWS.Debian (Closes: #201477). Updated + corresponding debhelper dependency to >= 4.1.51. + * Tweak wrapper script to change arguments to simply "$@". + + -- Edd Dumbill Fri, 18 Jul 2003 17:20:35 +0100 + +epiphany-browser (0.7.3-1) unstable; urgency=low + + * New upstream release. + - Fixes segfault on Mozilla bookmark import (Closes: #198556) + * Build against Mozilla 1.4 (Closes: #190763) + + -- Edd Dumbill Mon, 14 Jul 2003 21:52:03 +0100 + +epiphany-browser (0.7.1-1) unstable; urgency=low + + * New upstream release. (Closes: #198818) + - Don't crash on adding bookmark without topics (Closes: #197493) + - Search now works after smart bookmark use (Closes: #194208) + - Adding bookmark topic now works properly (Closes: #197869) + - Copy function works properly (Closes: #195357) + - Middle-click paste of keyword now shows proper new URL in + location bar (Closes: #195427) + - Creating new tab now doesn't destroy X selection (Closes: #197227) + * Download directory now remembered (Closes: #196927) + * Retire 02_help_dtd_patch as cdbs makes these corrections now + (Closes: #198181) + * Compile with gcc-3.2, remove -Wno-strict-aliasing (Closes: #197102) + I know this isn't the best-ever solution to this problem. Working + on sorting it out more permanently. + * Retire 05_valist_patch_from_bugzilla.patch, now in upstream + * Added debconf note: upstream have reorganized prefs schema, some of your + preferences will need resetting. + * Depend on gnome-icon-theme >= 1.0.4 (Closes: #197183). If you're still + have trouble with the throbber missing, file a bug on the theme, as + this seems to be theme dependent. + + -- Edd Dumbill Fri, 27 Jun 2003 16:05:49 +0100 + +epiphany-browser (0.7.0-1) unstable; urgency=low + + * New upstream release. + - Fixes crash on pause download (Closes: #193672) + - Fix smart bookmark non-ASCII problem (Closes: #193981) + * Incorporate 05_valist_patch_from_bugzilla.patch, which fixes + valist usage problems on several platforms. + + -- Edd Dumbill Sat, 7 Jun 2003 11:15:12 +0100 + +epiphany-browser (0.6.1-1) unstable; urgency=low + + * New upstream (Closes: #194423) + - adds 'remove toolbar' context menu (Closes: #190817) + * Get correct Mozilla dependency (Closes: #193999) + * Change menu hint to "Web browsers" (Closes: #193451) + * Update standards version to 3.5.9 + * Retire CVS Colin's Build System in favour of cdbs + + -- Edd Dumbill Sun, 25 May 2003 16:49:06 +0100 + +epiphany-browser (0.6.0-3) unstable; urgency=low + + * 05_eel_gconf_ptrsize.patch, add another ia64 fix. Hopefully + this is the final one. + + -- Edd Dumbill Wed, 14 May 2003 16:12:50 +0100 + +epiphany-browser (0.6.0-2) unstable; urgency=low + + * Moved mozilla-xft dependency to Recommends (Closes: #192895) + * Distribute NEWS file (Closes: #192836) + * Add 05_eel_gconf_ptrsize.patch from CVS to fix ia64 build error. + + -- Edd Dumbill Tue, 13 May 2003 09:54:14 +0100 + +epiphany-browser (0.6.0-1) unstable; urgency=low + + * New upstream release. + + Remote tab open raises window (Closes: #187663) + * Removed 03_guint_fix_from_cvs.patch, obsoleted by new release. + + -- Edd Dumbill Fri, 9 May 2003 14:53:25 +0100 + +epiphany-browser (0.5.0-rel-4) unstable; urgency=low + + * Really fix path of help docs in .omf file (Closes: #191282) + + -- Edd Dumbill Sat, 3 May 2003 16:11:28 +0100 + +epiphany-browser (0.5.0-rel-3) unstable; urgency=low + + * 04_scrollkeeper_omf_path.patch: try to fix path of help file in .omf + file + * debian/rules: update to latest version of Colin's Build System + * debian/rocks: add -fshort-wchar to CXXFLAGS, fixes problem with + context menus on images. + + -- Edd Dumbill Tue, 29 Apr 2003 20:44:06 +0100 + +epiphany-browser (0.5.0-rel-2) unstable; urgency=low + + * Fix missing bookmark editor icon problem. + + -- Edd Dumbill Thu, 24 Apr 2003 16:53:58 +0100 + +epiphany-browser (0.5.0-rel-1) unstable; urgency=low + + * New upstream release. I won't be tracking CVS snapshots any + more. (Closes: #189413) + * Compile against mozilla rather than mozilla-snapshot. (Closes: #182199) + * Changed section to 'gnome'. + * Adjusted alternatives priority for x-www-browser to 75. + * 64-bit arch compile patch from CVS (Closes: #190011) + + -- Edd Dumbill Tue, 22 Apr 2003 19:23:57 +0100 + +epiphany-browser (0.5.0+0.4.99.20030304-1) unstable; urgency=low + + * New CVS export. + + -- Edd Dumbill Tue, 4 Mar 2003 23:38:46 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-3) unstable; urgency=low + + * Exchanged faulty gconf dependency for gconf2. + + -- Edd Dumbill Fri, 21 Feb 2003 23:05:02 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-2) unstable; urgency=low + + * Added debian menu entry. + + -- Edd Dumbill Fri, 21 Feb 2003 10:36:03 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-1) unstable; urgency=low + + * New CVS export. + + -- Edd Dumbill Thu, 20 Feb 2003 15:28:02 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-6) unstable; urgency=low + + * Added www-browser to Provides: + * Added to the x-www-browser alternatives selection. + + -- Edd Dumbill Wed, 19 Feb 2003 13:07:26 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-5) unstable; urgency=low + + * Upload to Debian, co-maintained with Mark Howard (Closes: #173427) + + -- Edd Dumbill Sun, 16 Feb 2003 21:40:49 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-4) unstable; urgency=low + + * Versioned various dependencies. + * Added gconf dependency. + * Moved epiphany binary to /usr/lib/epiphany/ + * Revert binary name to 'epiphany' + * Clean up after intltool: -extract, -merge, -update + * Added in location of CVS source into debian/copyright + + -- Edd Dumbill Sun, 16 Feb 2003 14:19:01 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-3) unstable; urgency=low + + * Added mozilla-psm-snapshot as a dependency. + + -- Edd Dumbill Sat, 15 Feb 2003 03:41:56 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-2) unstable; urgency=low + + * Changed package name to epiphany-browser in the configure + script. + + -- Edd Dumbill Sat, 15 Feb 2003 03:41:56 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-1) unstable; urgency=low + + * Initial packaging from CVS. + + -- Edd Dumbill Fri, 14 Feb 2003 23:05:40 +0000 --- epiphany-browser-2.22.3.orig/debian/epiphany-webkit.links +++ epiphany-browser-2.22.3/debian/epiphany-webkit.links @@ -0,0 +1 @@ +/usr/share/doc/epiphany-browser-data/changelog.gz /usr/share/doc/epiphany-webkit/changelog.gz --- epiphany-browser-2.22.3.orig/debian/epiphany-webkit.prerm +++ epiphany-browser-2.22.3/debian/epiphany-webkit.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --remove $alt /usr/bin/epiphany-webkit + done +fi + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.22.3.orig/debian/epiphany-browser-data.links +++ epiphany-browser-2.22.3/debian/epiphany-browser-data.links @@ -0,0 +1,2 @@ +/etc/gnome/epiphany/mime-types-permissions.xml /usr/share/epiphany-browser/mime-types-permissions.xml +/etc/gnome/epiphany/default-prefs.js /usr/share/epiphany-browser/default-prefs.js --- epiphany-browser-2.22.3.orig/debian/epiphany-browser.links +++ epiphany-browser-2.22.3/debian/epiphany-browser.links @@ -0,0 +1,2 @@ +/usr/share/man/man1/epiphany-browser.1.gz /usr/share/man/man1/epiphany.1.gz +/usr/share/doc/epiphany-browser-data/changelog.gz /usr/share/doc/epiphany-browser/changelog.gz --- epiphany-browser-2.22.3.orig/debian/certManager.js +++ epiphany-browser-2.22.3/debian/certManager.js @@ -0,0 +1,617 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Bob Lord + * Ian McGreer + * Kai Engert + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +const nsIFilePicker = Components.interfaces.nsIFilePicker; +const nsFilePicker = "@mozilla.org/filepicker;1"; +const nsIX509CertDB = Components.interfaces.nsIX509CertDB; +const nsX509CertDB = "@mozilla.org/security/x509certdb;1"; +const nsIX509Cert = Components.interfaces.nsIX509Cert; +const nsICertTree = Components.interfaces.nsICertTree; +const nsCertTree = "@mozilla.org/security/nsCertTree;1"; +const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock; +const nsDialogParamBlock = "@mozilla.org/embedcomp/dialogparam;1"; +const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock; +const nsPKIParamBlock = "@mozilla.org/security/pkiparamblock;1"; +const nsINSSCertCache = Components.interfaces.nsINSSCertCache; +const nsNSSCertCache = "@mozilla.org/security/nsscertcache;1"; + +var key; + +var selected_certs = []; +var selected_tree_items = []; +var selected_index = []; +var certdb; + +var caTreeView; +var serverTreeView; +var emailTreeView; +var userTreeView; +var orphanTreeView; + +function LoadCerts() +{ + window.crypto.enableSmartCardEvents = true; + document.addEventListener("smartcard-insert", onSmartCardChange, false); + document.addEventListener("smartcard-remove", onSmartCardChange, false); + + certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB); + var certcache = Components.classes[nsNSSCertCache].createInstance(nsINSSCertCache); + + certcache.cacheAllCerts(); + + caTreeView = Components.classes[nsCertTree] + .createInstance(nsICertTree); + caTreeView.loadCertsFromCache(certcache, nsIX509Cert.CA_CERT); + document.getElementById('ca-tree') + .treeBoxObject.view = caTreeView; + + serverTreeView = Components.classes[nsCertTree] + .createInstance(nsICertTree); + serverTreeView.loadCertsFromCache(certcache, nsIX509Cert.SERVER_CERT); + document.getElementById('server-tree') + .treeBoxObject.view = serverTreeView; + + emailTreeView = Components.classes[nsCertTree] + .createInstance(nsICertTree); + emailTreeView.loadCertsFromCache(certcache, nsIX509Cert.EMAIL_CERT); + document.getElementById('email-tree') + .treeBoxObject.view = emailTreeView; + + userTreeView = Components.classes[nsCertTree] + .createInstance(nsICertTree); + userTreeView.loadCertsFromCache(certcache, nsIX509Cert.USER_CERT); + document.getElementById('user-tree') + .treeBoxObject.view = userTreeView; + + orphanTreeView = Components.classes[nsCertTree] + .createInstance(nsICertTree); + orphanTreeView.loadCertsFromCache(certcache, nsIX509Cert.UNKNOWN_CERT); + document.getElementById('orphan-tree') + .treeBoxObject.view = orphanTreeView; + + var rowCnt = userTreeView.rowCount; + var enableBackupAllButton=document.getElementById('mine_backupAllButton'); + if(rowCnt < 1) { + enableBackupAllButton.setAttribute("disabled",true); + } else { + enableBackupAllButton.setAttribute("enabled",true); + } +} + +function getSelectedCerts() +{ + var ca_tab = document.getElementById("ca_tab"); + var mine_tab = document.getElementById("mine_tab"); + var others_tab = document.getElementById("others_tab"); + var websites_tab = document.getElementById("websites_tab"); + var orphan_tab = document.getElementById("orphan_tab"); + var items = null; + if (ca_tab.selected) { + items = caTreeView.selection; + } else if (mine_tab.selected) { + items = userTreeView.selection; + } else if (others_tab.selected) { + items = emailTreeView.selection; + } else if (websites_tab.selected) { + items = serverTreeView.selection; + } else if (orphan_tab.selected) { + items = orphanTreeView.selection; + } + selected_certs = []; + var cert = null; + var nr = 0; + if (items != null) nr = items.getRangeCount(); + if (nr > 0) { + for (var i=0; i 0) { + for (var i=0; i 0) { + for (var i=0; i 0) { + enable_delete = true; + } + + if (count_ranges == 1) { + var o1 = {}; + var o2 = {}; + items.getRangeAt(0, o1, o2); // the first range + if (o1.value == o2.value) { + // only a single item is selected + try { + var ti = serverTreeView.getTreeItem(o1.value); + if (ti) { + if (ti.cert) { + enable_view = true; + } + // Trust editing is not possible for override + // entries that are bound to host:port, + // where the cert is stored for convenince only. + if (!ti.hostPort.length) { + enable_edit = true; + } + } + } + catch (e) { + } + } + } + + var enableViewButton=document.getElementById('websites_viewButton'); + enableViewButton.setAttribute("disabled", !enable_view); + var enableEditButton=document.getElementById('websites_editButton'); + enableEditButton.setAttribute("disabled", !enable_edit); + var enableExportButton=document.getElementById('websites_exportButton'); + enableExportButton.setAttribute("disabled", !enable_view); + var enableDeleteButton=document.getElementById('websites_deleteButton'); + enableDeleteButton.setAttribute("disabled", !enable_delete); +} + +function email_enableButtons() +{ + var items = emailTreeView.selection; + var toggle="false"; + if (items.getRangeCount() == 0) { + toggle="true"; + } + var enableViewButton=document.getElementById('email_viewButton'); + enableViewButton.setAttribute("disabled",toggle); + var enableEditButton=document.getElementById('email_editButton'); + enableEditButton.setAttribute("disabled",toggle); + var enableExportButton=document.getElementById('email_exportButton'); + enableExportButton.setAttribute("disabled",toggle); + var enableDeleteButton=document.getElementById('email_deleteButton'); + enableDeleteButton.setAttribute("disabled",toggle); +} + +function orphan_enableButtons() +{ + var items = orphanTreeView.selection; + var toggle="false"; + if (items.getRangeCount() == 0) { + toggle="true"; + } + var enableViewButton=document.getElementById('orphan_viewButton'); + enableViewButton.setAttribute("disabled",toggle); + var enableExportButton=document.getElementById('orphan_exportButton'); + enableExportButton.setAttribute("disabled",toggle); + var enableDeleteButton=document.getElementById('orphan_deleteButton'); + enableDeleteButton.setAttribute("disabled",toggle); +} + +function backupCerts() +{ + getSelectedCerts(); + var numcerts = selected_certs.length; + if (!numcerts) + return; + var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties"); + var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker); + fp.init(window, + bundle.GetStringFromName("chooseP12BackupFileDialog"), + nsIFilePicker.modeSave); + fp.appendFilter(bundle.GetStringFromName("file_browse_PKCS12_spec"), + "*.p12"); + fp.appendFilters(nsIFilePicker.filterAll); + var rv = fp.show(); + if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) { + certdb.exportPKCS12File(null, fp.file, + selected_certs.length, selected_certs); + } +} + +function backupAllCerts() +{ + // Select all rows, then call doBackup() + var items = userTreeView.selection.selectAll(); + backupCerts(); +} + +function editCerts() +{ + getSelectedCerts(); + var numcerts = selected_certs.length; + if (!numcerts) + return; + for (var t=0; t=0; t--) + { + treeView.deleteEntryObject(selected_index[t]); + } + + selected_tree_items = []; + selected_index = []; + treeView.selection.clearSelection(); + } +} + +function viewCerts() +{ + getSelectedCerts(); + var numcerts = selected_certs.length; + if (!numcerts) + return; + + for (var t=0; t +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + pkg-config, + libglib2.0-dev (>= 2.16.0), + libgtk2.0-dev (>= 2.12.0), + libxml2-dev (>= 2.6.12), + libxslt1-dev (>= 1.1.7), + libglade2-dev (>= 2.3.1), + libgnome2-dev (>= 2.14.0), + libgnomeui-dev (>= 2.16.0-2), + libgnomevfs2-dev (>= 2.9.2), + libgconf2-dev, + libgnome-desktop-dev (>= 2.9.91), + libstartup-notification0-dev (>= 0.5), + libnotify-dev (>= 0.4), + libdbus-glib-1-dev (>= 0.60), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxml-parser-perl, + xulrunner-dev (>= 1.9~rc2-3), + iso-codes (>= 0.35), + python-dev (>= 2.3), + python-gtk2-dev (>= 2.7.1), + python-gnome2-dev (>= 2.6.0), + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.35.0), + x11proto-core-dev, + network-manager-dev | not+linux-gnu, + quilt, + libenchant-dev (>= 1.0), + libavahi-gobject-dev (>= 0.6.22), + libwebkit-dev, + gtk-doc-tools (>= 1.0), + lsb-release, + zip +Standards-Version: 3.8.0 +Homepage: http://www.gnome.org/projects/epiphany/ + +Package: epiphany-browser +Architecture: all +Depends: epiphany-gecko | epiphany-webkit +Description: Intuitive web browser - dummy package + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This dummy package installs Epiphany with the Gecko backend by default. + +Package: epiphany-gecko +Architecture: any +Depends: epiphany-browser-data (>= 2.22.1.1-3), + epiphany-browser-data (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + gnome-icon-theme (>= 2.9.90), + dbus-x11, + iso-codes, + xulrunner-1.9 (>= 1.9~rc2-3), + xulrunner-1.9-gnome-support, + ${misc:Depends} +Conflicts: epiphany-browser (<< 2.20), + epiphany-extensions (<< 2.22.1-3), + python-xpcom +Recommends: yelp, epiphany-extensions +Suggests: mozplugger +Provides: www-browser, gnome-www-browser +Description: Intuitive GNOME web browser - Gecko version + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. Simplicity is achieved by a well designed user interface and + reliance on external applications for performing external tasks (such as + reading email). Simplicity should not mean less powerful. Standards + compliance is achieved on the HTML side by using the Gecko + rendering engine, as developed for the Mozilla and Iceweasel browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Gecko backend to render web pages. + +Package: epiphany-webkit +Architecture: any +Depends: epiphany-browser-data (>= ${gnome:Version}), + epiphany-browser-data (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + gnome-icon-theme (>= 2.9.90), + dbus-x11, + iso-codes, + ${misc:Depends} +Conflicts: epiphany-browser (<< 2.20) +Recommends: yelp +Suggests: mozplugger +Provides: www-browser, gnome-www-browser +Description: Intuitive GNOME web browser - webkit version + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. Simplicity is achieved by a well designed user interface and + reliance on external applications for performing external tasks (such as + reading email). Simplicity should not mean less powerful. Standards + compliance is achieved on the HTML side by using the Gecko + rendering engine, as developed for the Mozilla and Iceweasel browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Webkit backend to render web pages. + . + WARNING: the Webkit backend is still experimental, and while this + version is suitable for basic tasks, many features are missing. For a + complete browsing experience, you should use the epiphany-gecko + package. + +Package: epiphany-browser-data +Architecture: all +Depends: ${misc:Depends} +Recommends: epiphany-browser +Conflicts: epiphany-browser (<< 2.20) +Replaces: epiphany-browser (<< 2.20) +Description: Data files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains the common files, artwork and translations for + Epiphany. + +Package: epiphany-browser-dev +Architecture: all +Section: devel +Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2) +Description: Development files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package is required to develop extensions for Epiphany. + +Package: epiphany-browser-dbg +Architecture: any +Section: gnome +Priority: extra +Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version}) +Recommends: xulrunner-1.9-dbg | libwebkitgtk1d-dbg +Description: Debugging symbols for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains detached debugging symbols. --- epiphany-browser-2.22.3.orig/debian/epiphany-browser-dev.dirs +++ epiphany-browser-2.22.3/debian/epiphany-browser-dev.dirs @@ -0,0 +1,2 @@ +/usr/lib +/usr/share --- epiphany-browser-2.22.3.orig/debian/epiphany-gecko.menu +++ epiphany-browser-2.22.3/debian/epiphany-gecko.menu @@ -0,0 +1,6 @@ +?package(epiphany-gecko):needs="x11" \ + section="Applications/Network/Web Browsing" \ + title="Epiphany web browser (Gecko)" \ + longtitle="Epiphany web browser with Gecko backend" \ + command="/usr/bin/epiphany-gecko" \ + hints="Web browsers" --- epiphany-browser-2.22.3.orig/debian/epiphany-browser-data.dirs +++ epiphany-browser-2.22.3/debian/epiphany-browser-data.dirs @@ -0,0 +1,2 @@ +/etc/gnome/epiphany +/usr --- epiphany-browser-2.22.3.orig/debian/epiphany-browser-data.docs +++ epiphany-browser-2.22.3/debian/epiphany-browser-data.docs @@ -0,0 +1,4 @@ +NEWS +README +TODO +AUTHORS --- epiphany-browser-2.22.3.orig/debian/copyright +++ epiphany-browser-2.22.3/debian/copyright @@ -0,0 +1,80 @@ +This package was debianized by Edd Dumbill on 14 Feb 2003. + +It was downloaded from + +Upstream authors: + Marco Pesenti Gritti + Xan Lopez + Christian Persch + Adam Hooper + Jean-François Rameau + Crispin Flowerday + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +'flashblock.tar' was checked out on Friday April 4th at 18:36 UTC with the +following command: 'cvs -d :pserver:guest@mozdev.org:/cvs co flashblock/source' +(having previous logged in with the password 'guest'. The following license +statement was taken from : + + ***** BEGIN LICENSE BLOCK ***** + Version: MPL 1.1/GPL 2.0/LGPL 2.1 + + The contents of this collection are subject to the Mozilla Public License Version + 1.1 (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" basis, + WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + for the specific language governing rights and limitations under the + License. + + The Original Code is the "Flashblock" extension for Mozilla and Firefox. + + The Initial Developer of the Original Code is + Ted Mielczarek . + + Portions created by the Initial Developer are Copyright (C) 2004 + the Initial Developer. All Rights Reserved. + + Contributor(s): + Ted Drake + Przemyslaw Bialik + Lorenzo Colitti + Philip Chee + + Alternatively, the contents of this file may be used under the terms of + either the GNU General Public License Version 2 or later (the "GPL"), or + the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + in which case the provisions of the GPL or the LGPL are applicable instead + of those above. If you wish to allow use of your version of this file only + under the terms of either the GPL or the LGPL, and not to allow others to + use your version of this file under the terms of the MPL, indicate your + decision by deleting the provisions above and replace them with the notice + and other provisions required by the GPL or the LGPL. If you do not delete + the provisions above, a recipient may use your version of this file under + the terms of any one of the MPL, the GPL or the LGPL. + + ***** END LICENSE BLOCK ***** + +The Debian packaging is (C) 2003-2007, the Debian GNOME team + and +is licensed under the GPL, see above. --- epiphany-browser-2.22.3.orig/debian/epiphany-browser-dev.links +++ epiphany-browser-2.22.3/debian/epiphany-browser-dev.links @@ -0,0 +1 @@ +/usr/share/doc/epiphany-gecko/changelog.gz /usr/share/doc/epiphany-browser-dev/changelog.gz --- epiphany-browser-2.22.3.orig/debian/epiphany-browser-dbg.links +++ epiphany-browser-2.22.3/debian/epiphany-browser-dbg.links @@ -0,0 +1 @@ +/usr/share/doc/epiphany-browser-data/changelog.gz /usr/share/doc/epiphany-browser-dbg/changelog.gz --- epiphany-browser-2.22.3.orig/debian/epiphany-webkit.postinst +++ epiphany-browser-2.22.3/debian/epiphany-webkit.postinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +PRIO=80 +for alt in x-www-browser gnome-www-browser; do + update-alternatives --install \ + /usr/bin/$alt $alt /usr/bin/epiphany-webkit $PRIO \ + --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-browser.1.gz +done +update-alternatives --install /usr/bin/epiphany-browser epiphany-browser /usr/bin/epiphany-webkit $PRIO + +#DEBHELPER# --- epiphany-browser-2.22.3.orig/debian/epiphany-browser.install +++ epiphany-browser-2.22.3/debian/epiphany-browser.install @@ -0,0 +1,2 @@ +debian/epiphany.sh /usr/bin/ +debian/bug/control /usr/share/bug/epiphany-browser/ --- epiphany-browser-2.22.3.orig/debian/bug/control +++ epiphany-browser-2.22.3/debian/bug/control @@ -0,0 +1 @@ +report-with: epiphany-gecko epiphany-webkit --- epiphany-browser-2.22.3.orig/debian/patches/17_print-scaling.patch +++ epiphany-browser-2.22.3/debian/patches/17_print-scaling.patch @@ -0,0 +1,13 @@ +Index: epiphany-browser-2.22.3/embed/mozilla/GeckoPrintService.cpp +=================================================================== +--- epiphany-browser-2.22.3.orig/embed/mozilla/GeckoPrintService.cpp 2008-08-20 21:15:48.000000000 +0200 ++++ epiphany-browser-2.22.3/embed/mozilla/GeckoPrintService.cpp 2008-08-20 21:16:54.000000000 +0200 +@@ -735,7 +735,7 @@ + + /* FIXME: only if GTK_PRINT_CAPABILITY_SCALE is not set? */ + aSettings->SetScaling (gtk_print_settings_get_scale (aGtkSettings) / 100.0); +- gtk_print_settings_set_scale (aGtkSettings, 1.0); ++ gtk_print_settings_set_scale (aGtkSettings, 100.0); + + aSettings->SetShrinkToFit (PR_FALSE); /* FIXME setting */ + --- epiphany-browser-2.22.3.orig/debian/patches/06_ssl_weak_ciphers.patch +++ epiphany-browser-2.22.3/debian/patches/06_ssl_weak_ciphers.patch @@ -0,0 +1,11 @@ +Index: epiphany-browser-2.21.4/data/default-prefs-common.js +=================================================================== +--- epiphany-browser-2.21.4.orig/data/default-prefs-common.js 2007-11-12 10:48:23.000000000 +0000 ++++ epiphany-browser-2.21.4/data/default-prefs-common.js 2008-01-14 21:47:03.000000000 +0000 +@@ -171,3 +171,6 @@ + // set to true for parity with gtk entries + pref("bidi.edit.delete_immediately", true); + ++// enable weak SSL ciphers, as Epiphany warns about them anyway ++pref("security.ssl3.rsa_rc4_40_md5", true); ++pref("security.ssl3.rsa_rc2_40_md5", true); --- epiphany-browser-2.22.3.orig/debian/patches/13_extensions_need_xpcom.patch +++ epiphany-browser-2.22.3/debian/patches/13_extensions_need_xpcom.patch @@ -0,0 +1,14 @@ +Index: epiphany-2.22.1.1/src/ephy-shell.c +=================================================================== +--- epiphany-2.22.1.1.orig/src/ephy-shell.c 2008-05-12 14:02:25.576933713 +0200 ++++ epiphany-2.22.1.1/src/ephy-shell.c 2008-05-12 14:09:14.000934821 +0200 +@@ -708,6 +708,9 @@ ephy_shell_get_extensions_manager (EphyS + + if (es->priv->extensions_manager == NULL) + { ++ /* Ensure Gecko is booted (necessary for the xpcomglue crackpipe) */ ++ ephy_embed_shell_get_embed_single (EPHY_EMBED_SHELL (es)); ++ + /* Instantiate extensions manager */ + es->priv->extensions_manager = + g_object_new (EPHY_TYPE_EXTENSIONS_MANAGER, NULL); --- epiphany-browser-2.22.3.orig/debian/patches/11_useragent-weasel.patch +++ epiphany-browser-2.22.3/debian/patches/11_useragent-weasel.patch @@ -0,0 +1,18 @@ +Index: epiphany-2.18.3/data/weasel-ua-pref.js.in +=================================================================== +--- epiphany-2.18.3.orig/data/weasel-ua-pref.js.in 2007-07-04 22:20:08.250260516 +0200 ++++ epiphany-2.18.3/data/weasel-ua-pref.js.in 2007-07-04 22:23:24.133423262 +0200 +@@ -1,6 +1,7 @@ +-// Add "Firefox/@WEASEL_UA_VERSION@" to the UA. This fixes +-// [https://bugzilla.mozilla.org/show_bug.cgi?id=334967] +-// Same as Camino [https://bugzilla.mozilla.org/show_bug.cgi?id=384721] and +-// IceApe [https://bugzilla.mozilla.org/show_bug.cgi?id=386113] do. +-// Also see discussion on [https://bugzilla.mozilla.org/show_bug.cgi?id=385999]. +-pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@"); ++ ++// The following breaks the UA by adding Firefox to it, but it also ++// fixes interaction with poorly written websites with broken UA checks. ++// See https://bugzilla.mozilla.org/show_bug.cgi?id=384721#c6 to ++// understand why this is a bad idea and isn't enabled in Debian. ++// ++// pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@"); --- epiphany-browser-2.22.3.orig/debian/patches/15_certificates_oldapi.patch +++ epiphany-browser-2.22.3/debian/patches/15_certificates_oldapi.patch @@ -0,0 +1,15 @@ +Enable again the nsIBadCertListener API. + +Index: epiphany-2.22.3/embed/mozilla/MozRegisterComponents.cpp +=================================================================== +--- 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, --- epiphany-browser-2.22.3.orig/debian/patches/20_print_garbage.patch +++ epiphany-browser-2.22.3/debian/patches/20_print_garbage.patch @@ -0,0 +1,20 @@ +Debian #492283 +GNOME #549361 +Original patch by Vincent Caron + +Index: epiphany-2.22.3/embed/mozilla/GeckoPrintService.cpp +=================================================================== +--- epiphany-2.22.3.orig/embed/mozilla/GeckoPrintService.cpp 2008-10-21 17:01:36.703320953 +0200 ++++ epiphany-2.22.3/embed/mozilla/GeckoPrintService.cpp 2008-10-21 17:07:08.200124248 +0200 +@@ -62,7 +62,11 @@ + #define CONF_PRINT_PAGE_TITLE "/apps/epiphany/dialogs/print_page_title" + #define CONF_PRINT_PAGE_URL "/apps/epiphany/dialogs/print_page_url" + ++#ifdef HAVE_GECKO_1_9 ++#define LITERAL(s) NS_ConvertUTF8toUTF16(s).get() ++#else + #define LITERAL(s) reinterpret_cast(NS_L(s)) ++#endif + + /* From nsIDeviceContext.h */ + #define NS_ERROR_GFX_PRINTER_BASE (1) /* adjustable :-) */ --- epiphany-browser-2.22.3.orig/debian/patches/01_bookmarks_menu.patch +++ epiphany-browser-2.22.3/debian/patches/01_bookmarks_menu.patch @@ -0,0 +1,12 @@ +Index: epiphany-2.20.0/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200 ++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:28:35.273678287 +0200 +@@ -8,6 +8,7 @@ + Terminal=false + Type=Application + Icon=epiphany-bookmarks ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=epiphany + X-GNOME-Bugzilla-Component=BugBuddyBugs --- epiphany-browser-2.22.3.orig/debian/patches/19_passwords_crash.patch +++ epiphany-browser-2.22.3/debian/patches/19_passwords_crash.patch @@ -0,0 +1,28 @@ +Debian #494348, probably also causes #486136 +GNOME #542383 +Upstream commits r8375 and r8376. + +Index: epiphany-2.22.3/embed/mozilla/mozilla-embed-single.cpp +=================================================================== +--- epiphany-2.22.3.orig/embed/mozilla/mozilla-embed-single.cpp 2008-09-29 11:58:20.024332003 +0200 ++++ epiphany-2.22.3/embed/mozilla/mozilla-embed-single.cpp 2008-09-29 12:05:55.732012936 +0200 +@@ -925,14 +925,17 @@ impl_list_passwords (EphyPasswordManager + + #ifdef HAVE_GECKO_1_9 + nsILoginInfo **logins = nsnull; +- PRUint32 count,i; ++ PRUint32 count = 0,i; + nsresult rv; + + nsCOMPtr loginManager = + do_GetService (NS_LOGINMANAGER_CONTRACTID); + NS_ENSURE_TRUE (loginManager, NULL); + +- loginManager -> GetAllLogins(&count, &logins); ++ rv = loginManager -> GetAllLogins(&count, &logins); ++ if (NS_FAILED (rv)) ++ return NULL; ++ NS_ENSURE_TRUE (logins, NULL); + + for (i=0; i < count; i++) { + nsString transfer; --- epiphany-browser-2.22.3.orig/debian/patches/99_autoreconf.patch +++ epiphany-browser-2.22.3/debian/patches/99_autoreconf.patch @@ -0,0 +1,1680 @@ +libtoolize --force --copy +aclocal-1.10 -I m4 +automake-1.10 +autoconf +Index: epiphany-2.22.3/aclocal.m4 +=================================================================== +--- epiphany-2.22.3.orig/aclocal.m4 2008-06-30 19:02:16.000000000 +0100 ++++ epiphany-2.22.3/aclocal.m4 2008-09-14 15:54:04.000000000 +0100 +@@ -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 , 1995, 1996 ++# ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 ++# ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 ++# ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 ++# ++# Modified to require ngettext ++# Matthias Clasen 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 ], [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 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 ++], ++ [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 ++], ++ [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 \n" ++"Language-Team: C \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) ++# ----------------------------------------------------------- ++# 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 , 1995, 1996 +-# +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 +-# +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 +-# +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 +-# +-# Modified to require ngettext +-# Matthias Clasen 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 ], [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 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 +-], +- [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 +-], +- [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 \n" +-"Language-Team: C \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.3.orig/configure 2008-06-30 19:02:21.000000000 +0100 ++++ epiphany-2.22.3/configure 2008-09-14 15:54:18.000000000 +0100 +@@ -727,7 +727,7 @@ + + # Identity of this package. + PACKAGE_NAME='GNOME Web Browser' +-PACKAGE_TARNAME='epiphany' ++PACKAGE_TARNAME='epiphany-browser' + PACKAGE_VERSION='2.22.3' + PACKAGE_STRING='GNOME Web Browser 2.22.3' + PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany' +@@ -1638,7 +1638,7 @@ + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany-browser] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] +@@ -2681,7 +2681,7 @@ + + + # Define the identity of the package. +- PACKAGE='epiphany' ++ PACKAGE='epiphany-browser' + VERSION='2.22.3' + + +@@ -23413,6 +23413,7 @@ + LIBXML_REQUIRED=2.6.12 + LIBXSLT_REQUIRED=1.1.7 + LIBGLADE_REQUIRED=2.3.1 ++LIBGNOMEVFS_REQUIRED=2.9.2 + LIBGNOME_REQUIRED=2.14.0 + LIBGNOMEUI_REQUIRED=2.14.0 + GNOME_DESKTOP_REQUIRED=2.9.91 +@@ -23462,6 +23463,8 @@ + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED + libglade-2.0 >= \$LIBGLADE_REQUIRED \\ ++ gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23478,6 +23481,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23497,6 +23502,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23525,6 +23532,8 @@ + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED + libglade-2.0 >= \$LIBGLADE_REQUIRED \\ ++ gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23541,6 +23550,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23560,6 +23571,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23594,6 +23607,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23611,6 +23626,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23631,6 +23648,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +@@ -23657,6 +23676,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +Index: epiphany-2.22.3/embed/mozilla/Makefile.in +=================================================================== +--- epiphany-2.22.3.orig/embed/mozilla/Makefile.in 2008-06-30 19:02:25.000000000 +0100 ++++ epiphany-2.22.3/embed/mozilla/Makefile.in 2008-09-14 15:54:12.000000000 +0100 +@@ -515,7 +515,7 @@ + -I$(top_srcdir)/embed -I$(top_srcdir) $(addprefix \ + -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ ++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ +Index: epiphany-2.22.3/lib/Makefile.in +=================================================================== +--- epiphany-2.22.3.orig/lib/Makefile.in 2008-06-30 19:02:26.000000000 +0100 ++++ epiphany-2.22.3/lib/Makefile.in 2008-09-14 15:54:13.000000000 +0100 +@@ -435,7 +435,7 @@ + -I$(top_builddir)/lib/egg \ + -I$(top_srcdir)/lib/egg \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ + $(AM_CPPFLAGS) + + libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \ +Index: epiphany-2.22.3/ltmain.sh +=================================================================== +--- epiphany-2.22.3.orig/ltmain.sh 2008-02-08 00:54:46.000000000 +0000 ++++ epiphany-2.22.3/ltmain.sh 2008-04-29 22:33:55.000000000 +0100 +@@ -43,7 +43,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-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)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +Index: epiphany-2.22.3/plugins/desktop-file/Makefile.in +=================================================================== +--- epiphany-2.22.3.orig/plugins/desktop-file/Makefile.in 2008-06-30 19:02:27.000000000 +0100 ++++ epiphany-2.22.3/plugins/desktop-file/Makefile.in 2008-09-14 15:54:15.000000000 +0100 +@@ -315,7 +315,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + with_engine = @with_engine@ +-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins ++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins + plugin_LTLIBRARIES = libdesktopfileplugin.la + libdesktopfileplugin_la_SOURCES = \ + plugin.cpp +Index: epiphany-2.22.3/src/Makefile.in +=================================================================== +--- epiphany-2.22.3.orig/src/Makefile.in 2008-06-30 19:02:28.000000000 +0100 ++++ epiphany-2.22.3/src/Makefile.in 2008-09-14 15:54:15.000000000 +0100 +@@ -554,8 +554,8 @@ + -I$(top_srcdir)/lib/egg \ + -I$(top_srcdir)/lib/widgets \ + -I$(top_srcdir)/src/bookmarks \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(pkgdatadir)"\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + $(AM_CPPFLAGS) +@@ -593,8 +593,8 @@ + @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \ + @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \ + @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \ +-@ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +-@ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++@ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++@ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + @ENABLE_PYTHON_TRUE@ -DDATADIR=\""$(datadir)"\" \ + @ENABLE_PYTHON_TRUE@ $(AM_CPPFLAGS) + --- epiphany-browser-2.22.3.orig/debian/patches/07_bookmarks.patch +++ epiphany-browser-2.22.3/debian/patches/07_bookmarks.patch @@ -0,0 +1,15 @@ +Index: epiphany-2.21.90/src/bookmarks/ephy-bookmarks.c +=================================================================== +--- epiphany-2.21.90.orig/src/bookmarks/ephy-bookmarks.c 2008-01-14 23:51:06.000000000 +0100 ++++ epiphany-2.21.90/src/bookmarks/ephy-bookmarks.c 2008-02-18 20:51:27.552884572 +0100 +@@ -108,6 +108,10 @@ static const EphyBookmarksBookmarkInfo d + * For instance in .nl these should be + * "http://www.google.nl" and "http://www.google.nl/search?q=%s" + */ ++ { N_("Debian"), N_("http://www.debian.org/") }, ++ { N_("GNOME"), N_("http://www.gnome.org/") }, ++ { N_("Planet Debian"), N_("http://planet.debian.org/") }, ++ { N_("Debian Bug Tracking System"), N_("http://bugs.debian.org/%s") }, + { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") } + }; + --- epiphany-browser-2.22.3.orig/debian/patches/18_gnome-vfs-for-helper-display.patch +++ epiphany-browser-2.22.3/debian/patches/18_gnome-vfs-for-helper-display.patch @@ -0,0 +1,132 @@ +Index: epiphany-2.22.3/configure.ac +=================================================================== +--- epiphany-2.22.3.orig/configure.ac 2008-09-14 15:47:15.000000000 +0100 ++++ epiphany-2.22.3/configure.ac 2008-09-14 15:48:06.000000000 +0100 +@@ -109,6 +109,7 @@ + LIBXML_REQUIRED=2.6.12 + LIBXSLT_REQUIRED=1.1.7 + LIBGLADE_REQUIRED=2.3.1 ++LIBGNOMEVFS_REQUIRED=2.9.2 + LIBGNOME_REQUIRED=2.14.0 + LIBGNOMEUI_REQUIRED=2.14.0 + GNOME_DESKTOP_REQUIRED=2.9.91 +@@ -135,6 +136,8 @@ + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED + libglade-2.0 >= $LIBGLADE_REQUIRED \ ++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED ++ gnome-vfs-module-2.0 + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED + libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED +Index: epiphany-2.22.3/embed/mozilla/ContentHandler.cpp +=================================================================== +--- epiphany-2.22.3.orig/embed/mozilla/ContentHandler.cpp 2008-09-14 15:48:25.000000000 +0100 ++++ epiphany-2.22.3/embed/mozilla/ContentHandler.cpp 2008-09-14 15:51:47.000000000 +0100 +@@ -25,13 +25,14 @@ + #include "config.h" + + #include +-#include + #include + #include + #include + #include + #include + #include ++#include ++#include + + #include + +@@ -258,7 +259,7 @@ + { + GtkWidget *dialog, *button, *image; + const char *action_label; +- char *mime_description; ++ const char *mime_description; + nsCString file_name; + + nsCOMPtr parentDOMWindow = do_GetInterface (mContext); +@@ -268,12 +269,12 @@ + (mAction == CONTENT_ACTION_OPEN_TMP) ? + GTK_STOCK_OPEN : STOCK_DOWNLOAD; + +- mime_description = g_content_type_get_description (mMimeType.get()); ++ mime_description = gnome_vfs_mime_get_description (mMimeType.get()); + if (mime_description == NULL) + { + /* Translators: The text before the "|" is context to help you decide on + * the correct translation. You MUST OMIT it in the translated string. */ +- mime_description = g_strdup (Q_("File Type:|Unknown")); ++ mime_description = Q_("File Type:|Unknown"); + } + + /* We have one tiny, minor issue, the filename can be empty (""), +@@ -313,7 +314,7 @@ + Second %s is the file name, + Third %s is the application used to open the file */ + _("File Type: “%s”.\n\nYou can open “%s” using “%s” or save it."), +- mime_description, file_name.get(), g_app_info_get_name (mHelperApp)); ++ mime_description, file_name.get(), mHelperApp->name); + } + else + { +@@ -331,8 +332,6 @@ + mime_description, file_name.get()); + } + +- g_free (mime_description); +- + button = gtk_button_new_with_label (_("_Save As...")); + image = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), image); +@@ -373,7 +372,7 @@ + + auto_downloads = eel_gconf_get_boolean (CONF_AUTO_DOWNLOADS); + +- mHelperApp = g_app_info_get_default_for_type (mMimeType.get(), FALSE); ++ mHelperApp = gnome_vfs_mime_get_default_application (mMimeType.get()); + mPermission = ephy_file_check_mime (mMimeType.get()); + + /* HACK! Check that this 'helper application' isn't Epiphany itself, +@@ -381,7 +380,7 @@ + */ + if (mHelperApp) + { +- const char *id = g_app_info_get_id (mHelperApp); ++ const char *id = gnome_vfs_mime_application_get_desktop_id (mHelperApp); + + /* FIXME! menu editing can make this check fail!!!! */ + if (id && strcmp (id, "epiphany.desktop") == 0) +@@ -435,7 +434,7 @@ + g_return_val_if_fail (mHelperApp, NS_ERROR_FAILURE); + + const char *id; +- id = g_app_info_get_id (mHelperApp); ++ id = gnome_vfs_mime_application_get_desktop_id (mHelperApp); + + /* The current time is fine here as the user has just clicked + * a button (it is used as the time for the application opening) +Index: epiphany-2.22.3/embed/mozilla/ContentHandler.h +=================================================================== +--- epiphany-2.22.3.orig/embed/mozilla/ContentHandler.h 2008-09-14 15:48:25.000000000 +0100 ++++ epiphany-2.22.3/embed/mozilla/ContentHandler.h 2008-09-14 15:51:16.000000000 +0100 +@@ -22,7 +22,7 @@ + #ifndef CONTENT_HANDLER_H + #define CONTENT_HANDLER_H + +-#include ++#include + + #include + #include +@@ -70,7 +70,7 @@ + nsCOMPtr mLauncher; + nsCOMPtr mContext; + +- GAppInfo *mHelperApp; ++ GnomeVFSMimeApplication *mHelperApp; + EphyMimePermission mPermission; + + nsCString mUrl; --- epiphany-browser-2.22.3.orig/debian/patches/21_chrome_certmanager.patch +++ epiphany-browser-2.22.3/debian/patches/21_chrome_certmanager.patch @@ -0,0 +1,9 @@ +Index: epiphany-2.22.3/data/chrome/app-chrome.manifest.in +=================================================================== +--- epiphany-2.22.3.orig/data/chrome/app-chrome.manifest.in 2008-10-28 12:07:19.752421675 +0100 ++++ epiphany-2.22.3/data/chrome/app-chrome.manifest.in 2008-10-28 12:06:49.968423011 +0100 +@@ -2,3 +2,4 @@ + override chrome://branding/locale/brand.dtd file://@CHROMEDIR@/branding/brand.dtd + override chrome://global/content/about.xhtml file://@CHROMEDIR@/global/about.xhtml + override chrome://global/locale/netErrorApp.dtd file://@CHROMEDIR@/global/netError.dtd ++override chrome://pippki/content/certManager.js file://@CHROMEDIR@/pippki/certManager.js --- epiphany-browser-2.22.3.orig/debian/patches/08_python_path.patch +++ epiphany-browser-2.22.3/debian/patches/08_python_path.patch @@ -0,0 +1,13 @@ +Index: epiphany-2.22.3/src/ephy-python.c +=================================================================== +--- epiphany-2.22.3.orig/src/ephy-python.c 2008-11-10 15:23:49.875333317 +0100 ++++ epiphany-2.22.3/src/ephy-python.c 2008-11-10 15:23:57.279326702 +0100 +@@ -51,6 +51,8 @@ ephy_python_init (void) + + argv[0] = g_get_prgname (); + PySys_SetArgv (1, argv); ++ /* Sanitize sys.path */ ++ PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)"); + + init_pygobject (); + init_pygtk (); --- epiphany-browser-2.22.3.orig/debian/patches/02_ac_init.patch +++ epiphany-browser-2.22.3/debian/patches/02_ac_init.patch @@ -0,0 +1,13 @@ +Index: epiphany-2.22.2/configure.ac +=================================================================== +--- epiphany-2.22.2.orig/configure.ac 2008-05-27 14:16:28.745651053 +0200 ++++ epiphany-2.22.2/configure.ac 2008-05-27 14:16:32.833154773 +0200 +@@ -25,7 +25,7 @@ m4_define([epiphany_build_id],[20080528] + # This can be either "trunk" or "branches/gnome-x-y" + m4_define([epiphany_branch],["branches/gnome-2-22"]) + +-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) ++AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser]) + + AC_PREREQ([2.59]) + --- epiphany-browser-2.22.3.orig/debian/patches/09_download_dialog.patch +++ epiphany-browser-2.22.3/debian/patches/09_download_dialog.patch @@ -0,0 +1,143 @@ +Index: epiphany-2.22.3/data/glade/prefs-dialog.glade +=================================================================== +--- 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 @@ + 6 + + ++ ++ True ++ True ++ A_utomatically download and open files ++ True ++ GTK_RELIEF_NORMAL ++ True ++ False ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ + + True + False +@@ -343,25 +362,6 @@ + True + + +- +- +- +- True +- True +- A_utomatically download and open files +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 0 +- False +- False +- +- + + + +Index: epiphany-2.22.3/embed/mozilla/ContentHandler.cpp +=================================================================== +--- 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; ++ gboolean confirm = FALSE; + + if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK)) return NS_OK; + +@@ -390,23 +391,18 @@ + } + } + +-#ifndef HAVE_GECKO_1_9 +- if (auto_downloads) ++ if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE) + { +- mAction = CONTENT_ACTION_OPEN; ++ mAction = auto_downloads ? CONTENT_ACTION_DOWNLOAD : CONTENT_ACTION_SAVEAS; ++ confirm = (auto_downloads && mPermission != EPHY_MIME_PERMISSION_SAFE); + } + else +-#endif /* !HAVE_GECKO_1_9 */ + { + mAction = CONTENT_ACTION_OPEN_TMP; ++ confirm = !auto_downloads; + } + +- if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE) +- { +- mAction = CONTENT_ACTION_DOWNLOAD; +- } +- +- if (!auto_downloads || mAction == CONTENT_ACTION_DOWNLOAD) ++ if (confirm) + { + MIMEConfirmAction (); + } +Index: epiphany-2.22.3/src/prefs-dialog.c +=================================================================== +--- 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 ++automatic_downloads_toggled (GtkToggleButton *button, ++ GtkWidget *widget) ++{ ++ g_object_set (widget, "sensitive", gtk_toggle_button_get_active (button), NULL); ++} ++ ++static void + setup_font_combo (EphyDialog *dialog, + const char *type, + const char *code, +@@ -1491,6 +1498,7 @@ + EphyDialog *dialog = EPHY_DIALOG (pd); + EphyEncodings *encodings; + GtkWidget *window, *curr_button, *blank_button; ++ GtkWidget *automatic_downloads_checkbutton, *download_button_hbox; + GtkWidget *clear_cache_button, *font_prefs_button; + GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container; + gboolean sensitive; +@@ -1511,6 +1519,8 @@ + properties[WINDOW_PROP].id, &window, + properties[HOMEPAGE_CURRENT_PROP].id, &curr_button, + properties[HOMEPAGE_BLANK_PROP].id, &blank_button, ++ properties[AUTO_OPEN_PROP].id, &automatic_downloads_checkbutton, ++ properties[DOWNLOAD_PATH_HBOX_PROP].id, &download_button_hbox, + properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button, + properties[CSS_CHECKBOX_PROP].id, &css_checkbox, + properties[CSS_EDIT_BOX_PROP].id, &css_edit_box, +@@ -1534,6 +1544,10 @@ + gtk_widget_set_sensitive (curr_button, sensitive); + gtk_widget_set_sensitive (blank_button, sensitive); + ++ automatic_downloads_toggled (GTK_TOGGLE_BUTTON (automatic_downloads_checkbutton), download_button_hbox); ++ g_signal_connect (automatic_downloads_checkbutton, "toggled", ++ G_CALLBACK (automatic_downloads_toggled), download_button_hbox); ++ + g_signal_connect (font_prefs_button, "clicked", + G_CALLBACK (font_prefs_button_clicked_cb), dialog); + --- epiphany-browser-2.22.3.orig/debian/patches/04_move_tabs.patch +++ epiphany-browser-2.22.3/debian/patches/04_move_tabs.patch @@ -0,0 +1,13 @@ +Index: epiphany-browser-2.18.0/src/ephy-notebook.c +=================================================================== +--- epiphany-browser-2.18.0.orig/src/ephy-notebook.c 2007-03-06 12:31:28.000000000 +0000 ++++ epiphany-browser-2.18.0/src/ephy-notebook.c 2007-03-11 20:57:46.000000000 +0000 +@@ -58,7 +58,7 @@ + #define TOOLTIP_MAX_LENGTH 256 + + /* Until https://bugzilla.mozilla.org/show_bug.cgi?id=296002 is fixed */ +-#define KEEP_TAB_IN_SAME_TOPLEVEL ++#undef KEEP_TAB_IN_SAME_TOPLEVEL + + #define EPHY_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NOTEBOOK, EphyNotebookPrivate)) + --- epiphany-browser-2.22.3.orig/debian/patches/05_libexecdir.patch +++ epiphany-browser-2.22.3/debian/patches/05_libexecdir.patch @@ -0,0 +1,77 @@ +Index: epiphany-2.22.3/data/epiphany.pc.in +=================================================================== +--- 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@ +-extensionsdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/extensions +-loaderdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/loaders ++extensionsdir=@libexecdir@/@EPIPHANY_MAJOR@/extensions ++loaderdir=@libexecdir@/@EPIPHANY_MAJOR@/loaders + datarootdir=@datarootdir@ + datadir=@datadir@ + icondir=@datadir@/@PACKAGE@/icons +Index: epiphany-2.22.3/embed/mozilla/Makefile.am +=================================================================== +--- 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)\" \ +- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ ++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ +Index: epiphany-2.22.3/lib/Makefile.am +=================================================================== +--- 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)\" \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ + $(AM_CPPFLAGS) + + libephymisc_la_CFLAGS = \ +Index: epiphany-2.22.3/plugins/desktop-file/Makefile.am +=================================================================== +--- 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.3/src/Makefile.am +=================================================================== +--- 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 \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(pkgdatadir)"\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + $(AM_CPPFLAGS) +@@ -158,8 +158,8 @@ + -I$(top_builddir)/src \ + -I$(top_builddir)/src/bookmarks \ + $(PYTHON_INCLUDES) \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(datadir)"\" \ + $(AM_CPPFLAGS) + --- epiphany-browser-2.22.3.orig/debian/patches/series +++ epiphany-browser-2.22.3/debian/patches/series @@ -0,0 +1,24 @@ +00_browser_wrapper_path.patch +01_bookmarks_menu.patch +02_ac_init.patch +03_dbus.patch +#04_move_tabs.patch +05_libexecdir.patch +06_ssl_weak_ciphers.patch +07_bookmarks.patch +#08_load_on_new_tab.patch +08_python_path.patch +09_download_dialog.patch +10_url_double-click.patch +11_useragent-weasel.patch +12_safetypes.patch +13_extensions_need_xpcom.patch +14_zoom-crash.patch +15_certificates_oldapi.patch +16_fix-notify-uninit-crash.patch +17_print-scaling.patch +18_gnome-vfs-for-helper-display.patch +19_passwords_crash.patch +20_print_garbage.patch +21_chrome_certmanager.patch +99_autoreconf.patch --- epiphany-browser-2.22.3.orig/debian/patches/12_safetypes.patch +++ epiphany-browser-2.22.3/debian/patches/12_safetypes.patch @@ -0,0 +1,20 @@ +Index: epiphany-2.22.3/data/mime-types-permissions.xml +=================================================================== +--- epiphany-2.22.3.orig/data/mime-types-permissions.xml 2007-09-28 16:36:06.000000000 +0200 ++++ epiphany-2.22.3/data/mime-types-permissions.xml 2008-07-22 13:25:14.764345469 +0200 +@@ -19,6 +19,7 @@ + + + ++ + + + +@@ -206,6 +207,7 @@ + + + ++ + + + --- epiphany-browser-2.22.3.orig/debian/patches/14_zoom-crash.patch +++ epiphany-browser-2.22.3/debian/patches/14_zoom-crash.patch @@ -0,0 +1,58 @@ +Debian #486744 +GNOME #525357 +Mozilla #444894 +Patch from Mike Hommey + +--- epiphany-browser-2.22.3.orig/embed/mozilla/EphyBrowser.h ++++ epiphany-browser-2.22.3/embed/mozilla/EphyBrowser.h +@@ -208,6 +208,7 @@ + nsCOMPtr mWebBrowser; + private: + GtkWidget *mEmbed; ++ float mZoom; + + nsCOMPtr mWebBrowserFocus; + nsCOMPtr mTargetDocument; +--- epiphany-browser-2.22.3.orig/embed/mozilla/EphyBrowser.cpp ++++ epiphany-browser-2.22.3/embed/mozilla/EphyBrowser.cpp +@@ -830,6 +830,7 @@ + #endif + , mContextMenuListener(nsnull) + , mInitialized(PR_FALSE) ++, mZoom(0.0) + { + LOG ("EphyBrowser ctor (%p)", this); + } +@@ -1192,7 +1193,9 @@ + nsCOMPtr mdv = do_QueryInterface(contentViewer); + NS_ENSURE_TRUE (mdv, NS_ERROR_FAILURE); + +- return mdv->SetTextZoom (aZoom); ++ nsresult rv = mdv->SetTextZoom (aZoom); ++ mZoom = aZoom; ++ return rv; + } + + nsresult EphyBrowser::GetContentViewer (nsIContentViewer **aViewer) +@@ -1207,6 +1210,10 @@ + + nsresult EphyBrowser::GetZoom (float *aZoom) + { ++ if (mZoom != 0) { ++ *aZoom = mZoom; ++ return NS_OK; ++ } + NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE); + + nsCOMPtr contentViewer; +@@ -1216,7 +1223,9 @@ + nsCOMPtr mdv = do_QueryInterface(contentViewer); + NS_ENSURE_TRUE (mdv, NS_ERROR_FAILURE); + +- return mdv->GetTextZoom (aZoom); ++ nsresult rv = mdv->GetTextZoom (aZoom); ++ mZoom = *aZoom; ++ return rv; + } + + nsresult --- epiphany-browser-2.22.3.orig/debian/patches/08_load_on_new_tab.patch +++ epiphany-browser-2.22.3/debian/patches/08_load_on_new_tab.patch @@ -0,0 +1,90 @@ +Index: epiphany-browser-2.18.0/data/epiphany.schemas.in +=================================================================== +--- epiphany-browser-2.18.0.orig/data/epiphany.schemas.in 2007-03-06 12:31:58.000000000 +0000 ++++ epiphany-browser-2.18.0/data/epiphany.schemas.in 2007-03-11 21:01:46.000000000 +0000 +@@ -168,6 +168,21 @@ + + + ++ /schemas/apps/epiphany/general/load_on_new_tab ++ /apps/epiphany/general/load_on_new_tab ++ epiphany ++ int ++ 1 ++ ++ Page to open when opening a new tab ++ Page to open when opening a new tab. Allowed values are -1 ++ (browser startup page), 0 (blank page), 1 (homepage), 2 (last visited ++ page), as defined for mozilla's browser.tab.loadOnNewTab about:config ++ option. Both -1 and 1 are implemented the same way; 2 is not ++ implemented. ++ ++ ++ + /schemas/apps/epiphany/general/show_bookmarks_bar + /apps/epiphany/general/show_bookmarks_bar + epiphany +Index: epiphany-browser-2.18.0/lib/ephy-prefs.h +=================================================================== +--- epiphany-browser-2.18.0.orig/lib/ephy-prefs.h 2007-03-06 12:31:55.000000000 +0000 ++++ epiphany-browser-2.18.0/lib/ephy-prefs.h 2007-03-11 21:01:46.000000000 +0000 +@@ -37,6 +37,7 @@ + #define CONF_AUTO_DOWNLOADS "/apps/epiphany/general/automatic_downloads" + #define CONF_DESKTOP_IS_HOME_DIR "/apps/nautilus/preferences/desktop_is_home_dir" + #define CONF_NETWORK_MANAGED "/apps/epiphany/general/managed_network" ++#define CONF_BROWSER_TABS_LOADONNEWTAB "/apps/epiphany/general/load_on_new_tab" + + /* i18n pref */ + #define CONF_GECKO_ENABLE_PANGO "/apps/epiphany/web/enable_pango" +Index: epiphany-browser-2.18.0/src/ephy-shell.c +=================================================================== +--- epiphany-browser-2.18.0.orig/src/ephy-shell.c 2007-03-06 12:31:28.000000000 +0000 ++++ epiphany-browser-2.18.0/src/ephy-shell.c 2007-03-11 21:01:46.000000000 +0000 +@@ -530,14 +530,45 @@ + gtk_window_fullscreen (GTK_WINDOW (window)); + } + +- if (flags & EPHY_NEW_TAB_HOME_PAGE || +- flags & EPHY_NEW_TAB_NEW_PAGE) ++ if (flags & EPHY_NEW_TAB_HOME_PAGE) + { + ephy_tab_set_typed_address (tab, "", + EPHY_TAB_ADDRESS_EXPIRE_NEXT); + ephy_toolbar_activate_location (toolbar); + is_empty = load_homepage (embed); + } ++ else if (flags & EPHY_NEW_TAB_NEW_PAGE) ++ { ++ /* Simulate mozilla's browser.tabs.loadOnNewTab option through ++ * a gconf option. ++ * ++ * Documentation at: http://kb.mozillazine.org/About:config_entries ++ * ++ * To ensure that no blank page is displayed by default, this key ++ * is set to 1 by default in the schema (see data/epiphany.schema.in) ++ */ ++ int load_on_new_tab = eel_gconf_get_integer (CONF_BROWSER_TABS_LOADONNEWTAB); ++ ++ switch (load_on_new_tab) ++ { ++ case 0: /* Blank page */ ++ ephy_embed_load_url (embed, "about:blank"); ++ is_empty = url_is_empty ("about:blank"); ++ break; ++ ++ case 2: /* Last visited */ ++ /* NOT IMPLEMENTED */ ++ ++ case -1: /* Start-up page */ ++ case 1: /* Homepage */ ++ default: ++ /* Same as in the previous 'if' test */ ++ ephy_tab_set_typed_address (tab, "", ++ EPHY_TAB_ADDRESS_EXPIRE_NEXT); ++ ephy_toolbar_activate_location (toolbar); ++ is_empty = load_homepage (embed); ++ } ++ } + else if (flags & EPHY_NEW_TAB_OPEN_PAGE) + { + EphyEmbedLoadFlags load_flags = 0; --- epiphany-browser-2.22.3.orig/debian/patches/10_url_double-click.patch +++ epiphany-browser-2.22.3/debian/patches/10_url_double-click.patch @@ -0,0 +1,32 @@ +Index: epiphany-browser-2.21.92/lib/widgets/ephy-location-entry.c +=================================================================== +--- epiphany-browser-2.21.92.orig/lib/widgets/ephy-location-entry.c 2008-03-01 10:48:28.000000000 +0000 ++++ epiphany-browser-2.21.92/lib/widgets/ephy-location-entry.c 2008-03-01 10:48:50.000000000 +0000 +@@ -362,18 +362,6 @@ + } + + static gboolean +-entry_button_press_cb (GtkWidget *entry, GdkEventButton *event, EphyLocationEntry *le) +-{ +- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) +- { +- ephy_location_entry_activate (le); +- return TRUE; +- } +- +- return FALSE; +-} +- +-static gboolean + entry_key_press_cb (GtkEntry *entry, + GdkEventKey *event, + EphyLocationEntry *lentry) +@@ -900,8 +888,6 @@ + G_CALLBACK (entry_key_press_after_cb), entry); + g_signal_connect_after (priv->icon_entry->entry, "activate", + G_CALLBACK (entry_activate_after_cb), entry); +- g_signal_connect (priv->icon_entry->entry, "button-press-event", +- G_CALLBACK (entry_button_press_cb), entry); + g_signal_connect (priv->icon_entry->entry, "changed", + G_CALLBACK (editable_changed_cb), entry); + g_signal_connect (priv->icon_entry->entry, "drag-motion", --- epiphany-browser-2.22.3.orig/debian/patches/03_dbus.patch +++ epiphany-browser-2.22.3/debian/patches/03_dbus.patch @@ -0,0 +1,23 @@ +Index: epiphany-2.22.2/src/ephy-main.c +=================================================================== +--- epiphany-2.22.2.orig/src/ephy-main.c 2008-05-27 14:16:27.129149514 +0200 ++++ epiphany-2.22.2/src/ephy-main.c 2008-05-27 14:16:48.685655719 +0200 +@@ -643,11 +643,13 @@ main (int argc, + + if (!_ephy_dbus_startup (!private_instance, &error)) + { +- _ephy_dbus_release (); +- +- show_error_message (&error); +- +- exit (1); ++ GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, ++ GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, ++ "Epiphany could not connect to the session message bus. " ++ "Your default settings will not be available."); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ private_instance = TRUE; + } + + /* If we're remoting, no need to start up any further services, --- epiphany-browser-2.22.3.orig/debian/patches/16_fix-notify-uninit-crash.patch +++ epiphany-browser-2.22.3/debian/patches/16_fix-notify-uninit-crash.patch @@ -0,0 +1,65 @@ +3cc902d2fd203127a98e027f42175db35dafa579 +Index: epiphany-2.22.3/embed/downloader-view.c +=================================================================== +--- epiphany-2.22.3.orig/embed/downloader-view.c 2008-06-30 19:08:27.000000000 +0100 ++++ epiphany-2.22.3/embed/downloader-view.c 2008-08-09 12:08:17.000000000 +0100 +@@ -153,11 +153,6 @@ + object_class->finalize = downloader_view_finalize; + + g_type_class_add_private (object_class, sizeof(DownloaderViewPrivate)); +- +-#ifdef HAVE_LIBNOTIFY +- notify_init (PACKAGE); +-#endif +- + } + + static void +@@ -301,13 +296,6 @@ + + G_OBJECT_CLASS (downloader_view_parent_class)->finalize (object); + +-#ifdef HAVE_LIBNOTIFY +- if (notify_is_initted ()) +- { +- notify_uninit (); +- } +-#endif +- + if (idle_unref) + { + ephy_object_idle_unref (embed_shell); +Index: epiphany-2.22.3/src/ephy-main.c +=================================================================== +--- epiphany-2.22.3.orig/src/ephy-main.c 2008-08-09 12:06:28.000000000 +0100 ++++ epiphany-2.22.3/src/ephy-main.c 2008-08-09 12:08:17.000000000 +0100 +@@ -52,6 +52,10 @@ + #include + #include + ++#ifdef HAVE_LIBNOTIFY ++#include ++#endif ++ + static GQuark startup_error_quark = 0; + #define STARTUP_ERROR_QUARK (startup_error_quark) + +@@ -741,9 +745,18 @@ + g_object_weak_ref (G_OBJECT (ephy_shell), shell_weak_notify, NULL); + ephy_object_idle_unref (ephy_shell); + ++#ifdef HAVE_LIBNOTIFY ++ /* Init notifications for the download manager */ ++ notify_init (PACKAGE); ++#endif ++ + gtk_main (); + + /* Shutdown */ ++#ifdef HAVE_LIBNOTIFY ++ if (notify_is_initted ()) ++ notify_uninit (); ++#endif + eel_gconf_monitor_remove ("/apps/epiphany/general"); + gnome_accelerators_sync (); + ephy_state_save (); --- epiphany-browser-2.22.3.orig/debian/patches/00_browser_wrapper_path.patch +++ epiphany-browser-2.22.3/debian/patches/00_browser_wrapper_path.patch @@ -0,0 +1,27 @@ +Index: epiphany-2.20.0/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200 +@@ -3,7 +3,7 @@ + _Name=Epiphany Web Bookmarks + _GenericName=Web Bookmarks + _Comment=Browse and organize your bookmarks +-Exec=epiphany --bookmarks-editor ++Exec=epiphany-browser --bookmarks-editor + StartupNotify=true + Terminal=false + Type=Application +Index: epiphany-2.20.0/data/epiphany.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/epiphany.desktop.in.in 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/epiphany.desktop.in.in 2007-09-21 14:27:40.254542926 +0200 +@@ -3,7 +3,8 @@ + _Name=Epiphany Web Browser + _GenericName=Web Browser + _Comment=Browse the web +-Exec=epiphany %U ++Exec=epiphany-browser %U ++TryExec=/usr/bin/epiphany-browser + StartupNotify=true + Terminal=false + Type=Application