--- epiphany-browser-2.24.1.orig/debian/epiphany-gecko.menu +++ epiphany-browser-2.24.1/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.24.1.orig/debian/epiphany.sh +++ epiphany-browser-2.24.1/debian/epiphany.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +exec epiphany-browser "$@" --- epiphany-browser-2.24.1.orig/debian/copyright +++ epiphany-browser-2.24.1/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.24.1.orig/debian/epiphany-browser-data.gconf-defaults +++ epiphany-browser-2.24.1/debian/epiphany-browser-data.gconf-defaults @@ -0,0 +1,2 @@ +/apps/epiphany/general/homepage file:///usr/share/ubuntu-artwork/home/locales/index-%l.html +/apps/epiphany/web/language [system] --- epiphany-browser-2.24.1.orig/debian/watch +++ epiphany-browser-2.24.1/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/epiphany/([\d\.]+)[02468]/ \ + epiphany-(.*)\.tar\.gz \ + debian uupdate --- epiphany-browser-2.24.1.orig/debian/epiphany-gecko.prerm +++ epiphany-browser-2.24.1/debian/epiphany-gecko.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --remove $alt /usr/bin/epiphany-gecko + done +fi + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.24.1.orig/debian/epiphany-browser.links +++ epiphany-browser-2.24.1/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.24.1.orig/debian/control +++ epiphany-browser-2.24.1/debian/control @@ -0,0 +1,152 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette +Build-Depends: debhelper (>= 5), + pkg-config, + libglib2.0-dev (>= 2.18.0), + libgtk2.0-dev (>= 2.14.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), + libgconf2-dev, + libgnome-desktop-dev (>= 2.9.91), + libstartup-notification0-dev (>= 0.5), + libcanberra-gtk-dev (>= 0.3), + libnotify-dev (>= 0.4), + libdbus-glib-1-dev (>= 0.60), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxml-parser-perl, + xulrunner-1.9-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.40.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, + liblaunchpad-integration-dev (>= 0.1.17) +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 (>= ${gnome:Version}), + 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 Firefox browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Gecko backend to render web pages. + +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 Firefox browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the 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.24.1.orig/debian/epiphany-webkit.menu +++ epiphany-browser-2.24.1/debian/epiphany-webkit.menu @@ -0,0 +1,6 @@ +?package(epiphany-webkit):needs="x11" \ + section="Applications/Network/Web Browsing" \ + title="Epiphany web browser (Webkit)" \ + longtitle="Epiphany web browser with Webkit backend" \ + command="/usr/bin/epiphany-webkit" \ + hints="Web browsers" --- epiphany-browser-2.24.1.orig/debian/epiphany-gecko.links +++ epiphany-browser-2.24.1/debian/epiphany-gecko.links @@ -0,0 +1 @@ +/usr/share/doc/epiphany-browser-data/changelog.gz /usr/share/doc/epiphany-gecko/changelog.gz --- epiphany-browser-2.24.1.orig/debian/rules +++ epiphany-browser-2.24.1/debian/rules @@ -0,0 +1,185 @@ +#!/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) + +LDFLAGS += -Wl,-O1 -Wl,--as-needed + +FLAVORS := gecko webkit + +QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null + +common_configure_flags := \ + --disable-maintainer-mode \ + --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_icons -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_icons -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.24.1.orig/debian/epiphany-browser-dev.dirs +++ epiphany-browser-2.24.1/debian/epiphany-browser-dev.dirs @@ -0,0 +1,2 @@ +/usr/lib +/usr/share --- epiphany-browser-2.24.1.orig/debian/epiphany-browser.install +++ epiphany-browser-2.24.1/debian/epiphany-browser.install @@ -0,0 +1,2 @@ +debian/epiphany.sh /usr/bin/ +debian/bug/control /usr/share/bug/epiphany-browser/ --- epiphany-browser-2.24.1.orig/debian/changelog +++ epiphany-browser-2.24.1/debian/changelog @@ -0,0 +1,1491 @@ +epiphany-browser (2.24.1-1ubuntu2) jaunty; urgency=low + + * debian/patches/22_retrict_xul_to_1.9_only.patch: + - only use xulrunner 1.9.0.* (not 1.9.1 or higer) as embedded + gecko. (LP: #302859) + + -- Fabien Tassin Thu, 27 Nov 2008 21:58:45 +0100 + +epiphany-browser (2.24.1-1ubuntu1) jaunty; urgency=low + + * Sync on debian + * debian/control.in: + - build-depends on liblaunchpad-integration-dev (>= 0.1.17) + - updated description to mention firefox rather than iceweasel + - updated to the ubuntu xulrunner naming + * debian/epiphany-browser-data.gconf-defaults: + - change startup page + * debian/patches/03_dbus.patch: + - don't use hack from Debian to start a private instance when it can't + connect to the dbus, changes made while running that mode are not stored + (Ubuntu: #74725) + * debian/patches/06_lpi.patch: + - launchpad integration + * debian/patches/08_localized_startup_page.patch: + - use the startup page corresponding to the locale used + * debian/patches/11_useragent-weasel.patch: + - don't use, the change is Debian specific + * debian/rules: + - use dh_icons so the icon is correctly available after installation + + -- Sebastien Bacher Mon, 17 Nov 2008 12:40:22 +0100 + +epiphany-browser (2.24.1-1) experimental; urgency=low + + * New upstream release. + + Fixes Danish translation. Closes: #469559. + + Hopefully fixes the loss of component registration. + Closes: #494058. + * Pass --disable-maintainer-mode. + * Update build-dependencies. + * Remove 2.22 specificities (from the gecko 1.9 migration) in + dependencies. + * Remove patches merged upstream: + + 10_url_double-click.patch + + 14_zoom-crash.patch + + 15_certificates_oldapi.patch + + 16_fix-notify-uninit-crash.patch + + 17_print-scaling.patch + + 19_passwords_crash.patch + * Remove 18_gnome-vfs-for-helper-display.patch and drop gnome-vfs + build dependency; gio is now the default method. + * Refresh and update other patches. + * Regenerate 99_autoreconf.patch. + * Pass --as-needed to LDFLAGS. Closes: #479427. + + Introduce 99_ltmain_as-needed.patch. + + -- Josselin Mouette Fri, 14 Nov 2008 00:21:27 +0100 + +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.24.1.orig/debian/epiphany-browser-dev.links +++ epiphany-browser-2.24.1/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.24.1.orig/debian/certManager.js +++ epiphany-browser-2.24.1/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, Fri, 20 Jun 2008 10:25:11 +0200 --- epiphany-browser-2.24.1.orig/debian/epiphany-browser-data.install +++ epiphany-browser-2.24.1/debian/epiphany-browser-data.install @@ -0,0 +1 @@ +debian/certManager.js /usr/share/epiphany-browser/chrome/pippki/ --- epiphany-browser-2.24.1.orig/debian/control.in +++ epiphany-browser-2.24.1/debian/control.in @@ -0,0 +1,152 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + pkg-config, + libglib2.0-dev (>= 2.18.0), + libgtk2.0-dev (>= 2.14.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), + libgconf2-dev, + libgnome-desktop-dev (>= 2.9.91), + libstartup-notification0-dev (>= 0.5), + libcanberra-gtk-dev (>= 0.3), + libnotify-dev (>= 0.4), + libdbus-glib-1-dev (>= 0.60), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxml-parser-perl, + xulrunner-1.9-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.40.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, + liblaunchpad-integration-dev (>= 0.1.17) +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 (>= ${gnome:Version}), + 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 Firefox browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Gecko backend to render web pages. + +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 Firefox browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the 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.24.1.orig/debian/epiphany-browser-data.docs +++ epiphany-browser-2.24.1/debian/epiphany-browser-data.docs @@ -0,0 +1,4 @@ +NEWS +README +TODO +AUTHORS --- epiphany-browser-2.24.1.orig/debian/compat +++ epiphany-browser-2.24.1/debian/compat @@ -0,0 +1 @@ +5 --- epiphany-browser-2.24.1.orig/debian/epiphany-webkit.postinst +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/05_libexecdir.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/07_bookmarks.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/08_load_on_new_tab.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/99_autoreconf.patch +++ epiphany-browser-2.24.1/debian/patches/99_autoreconf.patch @@ -0,0 +1,180 @@ +libtoolize --force --copy +aclocal-1.10 -I m4 +automake-1.10 +autoconf +Index: epiphany-browser-2.24.1/configure +=================================================================== +--- epiphany-browser-2.24.1.orig/configure 2008-10-19 14:53:41.000000000 +0200 ++++ epiphany-browser-2.24.1/configure 2008-10-21 10:13:20.000000000 +0200 +@@ -727,7 +727,7 @@ + + # Identity of this package. + PACKAGE_NAME='GNOME Web Browser' +-PACKAGE_TARNAME='epiphany' ++PACKAGE_TARNAME='epiphany-browser' + PACKAGE_VERSION='2.24.1' + PACKAGE_STRING='GNOME Web Browser 2.24.1' + 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] +@@ -2684,7 +2684,7 @@ + + + # Define the identity of the package. +- PACKAGE='epiphany' ++ PACKAGE='epiphany-browser' + VERSION='2.24.1' + + +@@ -23657,6 +23657,7 @@ + libxslt >= \$LIBXSLT_REQUIRED + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= \$LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED +@@ -23674,6 +23675,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +@@ -23694,6 +23696,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +@@ -23723,6 +23726,7 @@ + libxslt >= \$LIBXSLT_REQUIRED + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= \$LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED +@@ -23740,6 +23744,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +@@ -23760,6 +23765,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +@@ -23795,6 +23801,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +@@ -23813,6 +23820,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +@@ -23834,6 +23842,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +@@ -23861,6 +23870,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +Index: epiphany-browser-2.24.1/embed/mozilla/Makefile.in +=================================================================== +--- epiphany-browser-2.24.1.orig/embed/mozilla/Makefile.in 2008-10-19 14:53:36.000000000 +0200 ++++ epiphany-browser-2.24.1/embed/mozilla/Makefile.in 2008-10-21 10:13:09.000000000 +0200 +@@ -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-browser-2.24.1/lib/Makefile.in +=================================================================== +--- epiphany-browser-2.24.1.orig/lib/Makefile.in 2008-10-19 14:53:37.000000000 +0200 ++++ epiphany-browser-2.24.1/lib/Makefile.in 2008-10-21 10:13:09.000000000 +0200 +@@ -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-browser-2.24.1/plugins/desktop-file/Makefile.in +=================================================================== +--- epiphany-browser-2.24.1.orig/plugins/desktop-file/Makefile.in 2008-10-19 14:53:38.000000000 +0200 ++++ epiphany-browser-2.24.1/plugins/desktop-file/Makefile.in 2008-10-21 10:13:09.000000000 +0200 +@@ -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-browser-2.24.1/src/Makefile.in +=================================================================== +--- epiphany-browser-2.24.1.orig/src/Makefile.in 2008-10-19 14:53:38.000000000 +0200 ++++ epiphany-browser-2.24.1/src/Makefile.in 2008-10-21 10:13:09.000000000 +0200 +@@ -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.24.1.orig/debian/patches/series +++ epiphany-browser-2.24.1/debian/patches/series @@ -0,0 +1,18 @@ +00_browser_wrapper_path.patch +01_bookmarks_menu.patch +02_ac_init.patch +#04_move_tabs.patch +05_libexecdir.patch +06_lpi.patch +06_ssl_weak_ciphers.patch +07_bookmarks.patch +#08_load_on_new_tab.patch +08_python_path.patch +09_download_dialog.patch +12_safetypes.patch +13_extensions_need_xpcom.patch +20_print_garbage.patch +21_chrome_certmanager.patch +22_retrict_xul_to_1.9_only.patch +99_autoreconf.patch +99_ltmain_as-needed.patch --- epiphany-browser-2.24.1.orig/debian/patches/08_localized_startup_page.patch +++ epiphany-browser-2.24.1/debian/patches/08_localized_startup_page.patch @@ -0,0 +1,212 @@ +Index: epiphany-browser-2.22.3/src/ephy-home-action.c +=================================================================== +--- epiphany-browser-2.22.3.orig/src/ephy-home-action.c 2008-03-28 14:59:49.000000000 +0000 ++++ epiphany-browser-2.22.3/src/ephy-home-action.c 2008-07-14 17:49:03.000000000 +0100 +@@ -155,16 +155,95 @@ + } + } + ++static char * ++escape_homepage (char *homepage, char *languages) ++{ ++ const char *inptr, *start; ++ GString *page; ++ ++ languages = g_strdelimit (languages, ".@:", '\0'); ++ ++ page = g_string_new (NULL); ++ ++ start = inptr = homepage; ++ while ((inptr = strchr (inptr, '%')) != NULL) { ++ g_string_append_len (page, start, inptr - start); ++ inptr++; ++ switch (*inptr) { ++ case 'l': ++ g_string_append (page, languages); ++ break; ++ case '%': ++ g_string_append_c (page, '%'); ++ break; ++ default: ++ g_string_append_c (page, '%'); ++ if (*inptr) ++ g_string_append_c (page, *inptr); ++ break; ++ } ++ ++ if (*inptr) ++ inptr++; ++ start = inptr; ++ } ++ ++ g_string_append (page, start); ++ ++ return g_string_free (page, FALSE); ++} ++ + static void + ephy_home_action_activate (GtkAction *action) + { + char *action_name; + char *address; ++ const char * const * languages; ++ char *homepage; + + g_object_get (G_OBJECT (action), "name", &action_name, NULL); + + address = eel_gconf_get_string (CONF_GENERAL_HOMEPAGE); + ++ if (address != NULL && address[0] != '\0' && (*address == '/' || !strncmp(address, "file://", 7))) ++ { ++ languages = g_get_language_names (); ++ if (languages) ++ { ++ int i; ++ gboolean page_set = FALSE; ++ ++ for (i = 0; languages[i] != NULL; i++) ++ { ++ if (page_set) ++ break; ++ ++ homepage = escape_homepage (address, languages[i]); ++ ++ if (!strncmp(address, "file://", 7)) ++ { ++ char *path; ++ path = homepage + 7; ++ ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ ++ } ++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ } ++ ++ if (!page_set) ++ homepage = escape_homepage (address, "C"); ++ } ++ else ++ homepage = escape_homepage (address, "C"); ++ ++ g_free (address); ++ address = g_strdup (homepage); ++ g_free (homepage); ++ } ++ + action_name_association (action, action_name, address, FALSE); + + g_free (address); +Index: epiphany-browser-2.22.3/src/ephy-shell.c +=================================================================== +--- epiphany-browser-2.22.3.orig/src/ephy-shell.c 2008-03-28 14:59:49.000000000 +0000 ++++ epiphany-browser-2.22.3/src/ephy-shell.c 2008-07-14 17:49:03.000000000 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "ephy-shell.h" + #include "ephy-type-builtins.h" +@@ -364,6 +365,44 @@ + return ephy_shell; + } + ++static char * ++escape_homepage (char *homepage, char *languages) ++{ ++ const char *inptr, *start; ++ GString *page; ++ ++ languages = g_strdelimit (languages, ".@:", '\0'); ++ ++ page = g_string_new (NULL); ++ ++ start = inptr = homepage; ++ while ((inptr = strchr (inptr, '%')) != NULL) { ++ g_string_append_len (page, start, inptr - start); ++ inptr++; ++ switch (*inptr) { ++ case 'l': ++ g_string_append (page, languages); ++ break; ++ case '%': ++ g_string_append_c (page, '%'); ++ break; ++ default: ++ g_string_append_c (page, '%'); ++ if (*inptr) ++ g_string_append_c (page, *inptr); ++ break; ++ } ++ ++ if (*inptr) ++ inptr++; ++ start = inptr; ++ } ++ ++ g_string_append (page, start); ++ ++ return g_string_free (page, FALSE); ++} ++ + static gboolean + url_is_empty (const char *location) + { +@@ -381,7 +420,8 @@ + static gboolean + load_homepage (EphyEmbed *embed) + { +- char *home; ++ const char * const * languages; ++ char *homepage, *home; + gboolean is_empty; + + home = eel_gconf_get_string(CONF_GENERAL_HOMEPAGE); +@@ -392,6 +432,44 @@ + + home = g_strdup ("about:blank"); + } ++ else if (*home == '/' || !strncmp(home, "file://", 7)) ++ { ++ languages = g_get_language_names (); ++ if (languages) ++ { ++ int i; ++ gboolean page_set = FALSE; ++ ++ for (i = 0; languages[i] != NULL; i++) ++ { ++ if (page_set) ++ break; ++ ++ homepage = escape_homepage (home, languages[i]); ++ ++ if (!strncmp(home, "file://", 7)) ++ { ++ char *path; ++ path = homepage + 7; ++ ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ ++ } ++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ } ++ ++ if (!page_set) ++ homepage = escape_homepage (home, "C"); ++ } ++ else ++ homepage = escape_homepage (home, "C"); ++ ++ g_free (home); ++ home = g_strdup (homepage); ++ g_free (homepage); ++ } + + is_empty = url_is_empty (home); + --- epiphany-browser-2.24.1.orig/debian/patches/12_safetypes.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/04_move_tabs.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/20_print_garbage.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/06_ssl_weak_ciphers.patch +++ epiphany-browser-2.24.1/debian/patches/06_ssl_weak_ciphers.patch @@ -0,0 +1,12 @@ +Index: epiphany-2.24.1/data/default-prefs-common.js +=================================================================== +--- epiphany-2.24.1.orig/data/default-prefs-common.js 2008-10-19 14:58:21.000000000 +0200 ++++ epiphany-2.24.1/data/default-prefs-common.js 2008-11-14 00:30:11.513240091 +0100 +@@ -195,3 +195,7 @@ pref("places.frecency.tempRedirectVisitB + pref("places.frecency.defaultVisitBonus", 0); + pref("places.frecency.unvisitedBookmarkBonus", 0); + pref("places.frecency.unvisitedTypedBonus", 0); ++ ++// 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.24.1.orig/debian/patches/09_download_dialog.patch +++ epiphany-browser-2.24.1/debian/patches/09_download_dialog.patch @@ -0,0 +1,143 @@ +Index: epiphany-2.24.1/data/glade/prefs-dialog.glade +=================================================================== +--- epiphany-2.24.1.orig/data/glade/prefs-dialog.glade 2008-09-22 20:38:32.000000000 +0200 ++++ epiphany-2.24.1/data/glade/prefs-dialog.glade 2008-11-14 00:30:49.210988479 +0100 +@@ -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.24.1/embed/mozilla/ContentHandler.cpp +=================================================================== +--- epiphany-2.24.1.orig/embed/mozilla/ContentHandler.cpp 2008-08-31 13:38:12.000000000 +0200 ++++ epiphany-2.24.1/embed/mozilla/ContentHandler.cpp 2008-11-14 00:30:49.210988479 +0100 +@@ -372,6 +372,7 @@ NS_METHOD GContentHandler::MIMEConfirmAc + 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; + +@@ -394,23 +395,18 @@ NS_METHOD GContentHandler::MIMEInitiateA + } + } + +-#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.24.1/src/prefs-dialog.c +=================================================================== +--- epiphany-2.24.1.orig/src/prefs-dialog.c 2008-08-03 14:23:09.000000000 +0200 ++++ epiphany-2.24.1/src/prefs-dialog.c 2008-11-14 00:30:49.210988479 +0100 +@@ -345,6 +345,13 @@ prefs_dialog_show_help (EphyDialog *dial + } + + 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, +@@ -1474,6 +1481,7 @@ prefs_dialog_init (PrefsDialog *pd) + 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; +@@ -1494,6 +1502,8 @@ prefs_dialog_init (PrefsDialog *pd) + 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, +@@ -1517,6 +1527,10 @@ prefs_dialog_init (PrefsDialog *pd) + 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.24.1.orig/debian/patches/08_python_path.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/06_lpi.patch +++ epiphany-browser-2.24.1/debian/patches/06_lpi.patch @@ -0,0 +1,38 @@ +Index: epiphany-browser-2.23.91/configure.ac +=================================================================== +--- epiphany-browser-2.23.91.orig/configure.ac 2008-09-02 16:20:39.000000000 +0200 ++++ epiphany-browser-2.23.91/configure.ac 2008-09-02 16:21:00.000000000 +0200 +@@ -141,6 +141,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED + gconf-2.0 + gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED +Index: epiphany-browser-2.23.91/data/ui/epiphany-ui.xml +=================================================================== +--- epiphany-browser-2.23.91.orig/data/ui/epiphany-ui.xml 2008-03-28 15:59:45.000000000 +0100 ++++ epiphany-browser-2.23.91/data/ui/epiphany-ui.xml 2008-09-02 16:20:42.000000000 +0200 +@@ -102,6 +102,7 @@ + + + ++ + + + +Index: epiphany-browser-2.23.91/src/ephy-window.c +=================================================================== +--- epiphany-browser-2.23.91.orig/src/ephy-window.c 2008-08-03 14:23:09.000000000 +0200 ++++ epiphany-browser-2.23.91/src/ephy-window.c 2008-09-02 16:20:42.000000000 +0200 +@@ -3385,6 +3385,9 @@ + } + #endif + ++ launchpad_integration_add_ui (window->priv->manager, ++ "ui/menubar/HelpMenu/LaunchpadItems"); ++ + /* Initialize the menus */ + priv->tabs_menu = ephy_tabs_menu_new (window); + priv->enc_menu = ephy_encoding_menu_new (window); --- epiphany-browser-2.24.1.orig/debian/patches/02_ac_init.patch +++ epiphany-browser-2.24.1/debian/patches/02_ac_init.patch @@ -0,0 +1,13 @@ +Index: epiphany-2.24.1/configure.ac +=================================================================== +--- epiphany-2.24.1.orig/configure.ac 2008-10-19 14:52:49.000000000 +0200 ++++ epiphany-2.24.1/configure.ac 2008-11-14 00:28:34.598987162 +0100 +@@ -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-24"]) + +-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.24.1.orig/debian/patches/00_browser_wrapper_path.patch +++ epiphany-browser-2.24.1/debian/patches/00_browser_wrapper_path.patch @@ -0,0 +1,27 @@ +Index: epiphany-2.20.0/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200 +@@ -3,7 +3,7 @@ + _Name=Epiphany Web Bookmarks + _GenericName=Web Bookmarks + _Comment=Browse and organize your bookmarks +-Exec=epiphany --bookmarks-editor ++Exec=epiphany-browser --bookmarks-editor + StartupNotify=true + Terminal=false + Type=Application +Index: epiphany-2.20.0/data/epiphany.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/epiphany.desktop.in.in 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/epiphany.desktop.in.in 2007-09-21 14:27:40.254542926 +0200 +@@ -3,7 +3,8 @@ + _Name=Epiphany Web Browser + _GenericName=Web Browser + _Comment=Browse the web +-Exec=epiphany %U ++Exec=epiphany-browser %U ++TryExec=/usr/bin/epiphany-browser + StartupNotify=true + Terminal=false + Type=Application --- epiphany-browser-2.24.1.orig/debian/patches/01_bookmarks_menu.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/21_chrome_certmanager.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/patches/22_retrict_xul_to_1.9_only.patch +++ epiphany-browser-2.24.1/debian/patches/22_retrict_xul_to_1.9_only.patch @@ -0,0 +1,32 @@ +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/epiphany-browser/+bug/302859 +# Upstream: none +# Description: Don't try to use a Gecko higher than 1.9.0.* +# +--- + embed/mozilla/mozilla-embed-single.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: epiphany-browser-2.24.1/embed/mozilla/mozilla-embed-single.cpp +=================================================================== +--- epiphany-browser-2.24.1.orig/embed/mozilla/mozilla-embed-single.cpp ++++ epiphany-browser-2.24.1/embed/mozilla/mozilla-embed-single.cpp +@@ -585,17 +585,17 @@ + + #ifdef HAVE_GECKO_1_9 + NS_LogInit (); + #endif + + #ifdef XPCOM_GLUE + static const GREVersionRange greVersion = { + "1.9a", PR_TRUE, +- "2", PR_TRUE ++ "1.9.0.*", PR_TRUE + }; + char xpcomLocation[4096]; + nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation)); + if (NS_FAILED (rv)) + { + g_warning ("Could not find a suitable GRE!\n"); + return FALSE; + } --- epiphany-browser-2.24.1.orig/debian/patches/99_ltmain_as-needed.patch +++ epiphany-browser-2.24.1/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,32 @@ +Index: bug-buddy-2.24.1/ltmain.sh +=================================================================== +--- bug-buddy-2.24.1.orig/ltmain.sh 2008-11-13 16:38:58.930987388 +0100 ++++ bug-buddy-2.24.1/ltmain.sh 2008-11-13 16:39:01.278988042 +0100 +@@ -1807,6 +1807,11 @@ EOF + arg=`$echo "X$arg" | $Xsed -e "s/^ //"` + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` + arg= +@@ -2150,6 +2155,15 @@ EOF + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- epiphany-browser-2.24.1.orig/debian/patches/13_extensions_need_xpcom.patch +++ epiphany-browser-2.24.1/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.24.1.orig/debian/bug/control +++ epiphany-browser-2.24.1/debian/bug/control @@ -0,0 +1 @@ +report-with: epiphany-gecko epiphany-webkit