--- epiphany-browser-2.16.1.orig/debian/control.in +++ epiphany-browser-2.16.1/debian/control.in @@ -0,0 +1,33 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Jordi Mallach +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 4.2.22), liborbit2-dev (>= 2.12.4), pkg-config, libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.10.1), libgtk2.0-dev (>= 2.10.0), libgconf2-dev, libgnomevfs2-dev (>= 2.9.2), libstartup-notification0-dev (>= 0.5), libpango1.0-dev (>= 1.8.0), scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev (>= 2.9.91), perl, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.1.7), gnome-pkg-tools, libxml-parser-perl, libgnome2-dev (>= 2.10.0), libgnomeui-dev (>= 2.6), iso-codes, gnome-icon-theme (>= 2.9.90), libdbus-glib-1-dev (>= 0.60), python-dev (>= 2.3), python-gtk2-dev (>= 2.7.1), python-gnome2-dev (>= 2.6.0), gnome-doc-utils (>= 0.3.2), firefox-dev (>= 1.5), liblaunchpad-integration-dev +Standards-Version: 3.7.2 + +Package: epiphany-browser +Architecture: any +Depends: ${shlibs:Depends}, firefox (>= 1.5), gnome-icon-theme (>= 2.9.90), dbus, iso-codes, ${misc:Depends} +Conflicts: epiphany-extensions (<< 1.8.2-5) +Recommends: yelp, epiphany-extensions +Suggests: mozilla-bonobo +Provides: www-browser +Description: Intuitive GNOME web browser + 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. + +Package: epiphany-browser-dev +Architecture: all +Section: devel +Depends: epiphany-browser (>= ${Source-Version}), libgnomeui-dev (>= 2.6.0) +Description: Development files for Epiphany web browser + This package is required to develop extensions for the GNOME Epiphany + web browser. --- epiphany-browser-2.16.1.orig/debian/changelog +++ epiphany-browser-2.16.1/debian/changelog @@ -0,0 +1,928 @@ +epiphany-browser (2.16.1-0ubuntu1) edgy; urgency=low + + * New upstream version: + - middle click on the "home" toolbar button open a new tab (Ubuntu: #53150) + - fix throbber glitchs with new icon theme (Ubuntu: #54274) + * debian/patches/02_ac_init.patch: + - updated + * debian/patches/99_configure.patch: + - updated + + -- Sebastien Bacher Tue, 3 Oct 2006 01:26:46 +0200 + +epiphany-browser (2.16.0-0ubuntu1) edgy; urgency=low + + * New upstream version + * debian/patches/02_ac_init.patch: + - updated + * debian/watch: + - updated + + -- Sebastien Bacher Sun, 3 Sep 2006 21:46:30 +0200 + +epiphany-browser (2.15.91-0ubuntu2) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Thu, 24 Aug 2006 17:36:10 +0200 + +epiphany-browser (2.15.91-0ubuntu1) edgy; urgency=low + + * New upstream version: + Changes: + - Spell check support using the gecko 'spellchecker' extension. + No corrections context menu or language switching yet. The default + dictionary is based on applicable locale names. + - Add page security info dialogue from Certificates extension. + - Drop libgnomeprint[ui] and use gtk printing. Add our options in + a custom tab in the print dialogue. Print settings and page setup + persist now. + - Add methods to EphyNode to set typed properties. This change improves the + Python API so it should be easy now to play with bookmarks. + Add https and ftp local bookmarks. + Bug fixes: + - Misc fixes: #337913, #312869, #345934, #346662, #339548, #347022, + #344848, #343592. + - Add a way to turn off password remembering + - Don't crash when adding zeroconf bookmarks while bookmarks are locked + down + - Fix middle-click and ctrl-enter in the location entry autocompletion + drop-down. + - Make the crash recovery dialog appear on the taskbar + - copy history over when opening link in new tab/win using context menu + - Don't crash on error from zeroconf bookmarks + - Don't set cookies from favicon downloads + - Allow cookie list to be sorted + - Fix crash when moving zoom widget on toolbar + - Display the find bar for "Find Next" and "Find Previous" if it wasn't + visible already. Entry focus is handlded with care so that use cases + like incremental search work as expected + - Remove Shift+Ctrl+T accelerator, it was pressed accidentally + too often and people would lose their toolbars + Documentation: + - Manpage update + * debian/patches/02_ac_init.patch: + - updated + * debian/patches/99_configure.patch: + - updated + + -- Sebastien Bacher Tue, 8 Aug 2006 00:50:06 +0200 + +epiphany-browser (2.15.4-0ubuntu1) edgy; urgency=low + + * New upstream version: + - don't use too much CPU when downloading an unknown sized file + (Ubuntu: #29402) + - use GTK printing instead of libgnomeprint, libgnomeprintui + * debian/control.in: + - don't Build-Depends on , libgnomeprint2.2-dev (>= 2.4.0), + libgnomeprintui2.2-dev (>= 2.4.0) + * debian/patches/02_ac_init.patch: + - updated + * debian/patches/06_lpi.patch: + - updated + * debian/patches/99_configure.patch: + - updated + + -- Sebastien Bacher Tue, 11 Jul 2006 10:22:12 +0200 + +epiphany-browser (2.15.3-0ubuntu2) edgy; urgency=low + + * debian/epiphany-browser.install: + - there is no pixmaps directory to install with the new version + + -- Sebastien Bacher Fri, 7 Jul 2006 19:57:23 +0200 + +epiphany-browser (2.15.3-0ubuntu1) edgy; urgency=low + + * Sync with Debian + * New upstream version: + * debian/control.in: + - Build-Depends on firefox-dev (>= 1.5), liblaunchpad-integration-dev, + libgnome2-dev + - Depends on firefox (>= 1.5) + - don't Build-Depends on libxul-dev + - updated requirements on glib and gtk + * debian/epiphany-browser.gconf-defaults: + - change startup page and download place + * debian/epiphany-browser.postinst: + - fix symlink creation on upgrade (Ubuntu: #38953) + * debian/patches/00_browser_wrapper_path.patch: + - not required, it works fine without that + * debian/patches/02_ac_init.patch: + - updated + * debian/patches/05_xulrunner.patch: + - Ubuntu doesn't use xulrunner yet + * debian/patches/06_lpi.patch: + - launchpad integration + * debian/patches/07_use_correct_program_name.patch: + - use "epiphany" instead of PACKAGE to work with the epiphany-browser name + change, fix session storing (Ubuntu: #43130) + * debian/patches/08_localized_startup_page.patch: + - use the startup page corresponding to the locale used + * debian/patches/99_configure.patch: + - updated + * debian/rules: + - build with firefox, not xulrunner + - don't rename the yelp documentation directory but create a link to it, + it doesn't conflict with the epiphany package and fix other programs that + don't expect a rename (Ubuntu: #37933) + + -- Sebastien Bacher Thu, 6 Jul 2006 14:21:21 +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.16.1.orig/debian/rules +++ epiphany-browser-2.16.1/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --enable-dbus --disable-scrollkeeper \ + --enable-zeroconf --enable-python \ + --with-mozilla=firefox + +clean:: + rm -f po/.intltool-merge-cache + rm -f intltool-extract intltool-update intltool-merge + +post-patches:: + touch -t 200303261705 xmldocs.make + +binary-install/epiphany-browser:: + cd debian/epiphany-browser/usr/share/gnome/help; ln -s epiphany epiphany-browser --- epiphany-browser-2.16.1.orig/debian/control +++ epiphany-browser-2.16.1/debian/control @@ -0,0 +1,33 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Jordi Mallach +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons +Build-Depends: debhelper (>= 4.2.22), liborbit2-dev (>= 2.12.4), pkg-config, libglade2-dev (>= 2.3.1), libglib2.0-dev (>= 2.10.1), libgtk2.0-dev (>= 2.10.0), libgconf2-dev, libgnomevfs2-dev (>= 2.9.2), libstartup-notification0-dev (>= 0.5), libpango1.0-dev (>= 1.8.0), scrollkeeper, cdbs (>= 0.4.17), libgnome-desktop-dev (>= 2.9.91), perl, libxml2-dev (>= 2.6.12), libxslt1-dev (>= 1.1.7), gnome-pkg-tools, libxml-parser-perl, libgnome2-dev (>= 2.10.0), libgnomeui-dev (>= 2.6), iso-codes, gnome-icon-theme (>= 2.9.90), libdbus-glib-1-dev (>= 0.60), python-dev (>= 2.3), python-gtk2-dev (>= 2.7.1), python-gnome2-dev (>= 2.6.0), gnome-doc-utils (>= 0.3.2), firefox-dev (>= 1.5), liblaunchpad-integration-dev +Standards-Version: 3.7.2 + +Package: epiphany-browser +Architecture: any +Depends: ${shlibs:Depends}, firefox (>= 1.5), gnome-icon-theme (>= 2.9.90), dbus, iso-codes, ${misc:Depends} +Conflicts: epiphany-extensions (<< 1.8.2-5) +Recommends: yelp, epiphany-extensions +Suggests: mozilla-bonobo +Provides: www-browser +Description: Intuitive GNOME web browser + 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. + +Package: epiphany-browser-dev +Architecture: all +Section: devel +Depends: epiphany-browser (>= ${Source-Version}), libgnomeui-dev (>= 2.6.0) +Description: Development files for Epiphany web browser + This package is required to develop extensions for the GNOME Epiphany + web browser. --- epiphany-browser-2.16.1.orig/debian/epiphany-browser.gconf-defaults +++ epiphany-browser-2.16.1/debian/epiphany-browser.gconf-defaults @@ -0,0 +1,2 @@ +/apps/epiphany/general/homepage file:///usr/share/ubuntu-artwork/home/locales/index-%l.html +/apps/epiphany/directories/downloads_folder Desktop --- epiphany-browser-2.16.1.orig/debian/epiphany-browser.install +++ epiphany-browser-2.16.1/debian/epiphany-browser.install @@ -0,0 +1,9 @@ +debian/tmp/usr/bin/* +debian/tmp/usr/share/epiphany-browser/* +debian/tmp/usr/lib/epiphany/* +debian/tmp/etc/* +debian/tmp/usr/share/man/* +debian/tmp/usr/share/applications/* +debian/tmp/usr/share/gnome/* +debian/tmp/usr/share/locale/* +debian/tmp/usr/share/omf/* --- epiphany-browser-2.16.1.orig/debian/epiphany-browser-dev.install +++ epiphany-browser-2.16.1/debian/epiphany-browser-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/share/gtk-doc/* --- epiphany-browser-2.16.1.orig/debian/epiphany-browser.postinst +++ epiphany-browser-2.16.1/debian/epiphany-browser.postinst @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +for alt in x-www-browser gnome-www-browser; do + update-alternatives --install \ + /usr/bin/$alt $alt /usr/bin/epiphany 85 \ + --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany.1.gz +done + +if [ "$1" = "configure" ]; then + if [ -d /usr/share/gnome/help/epiphany-browser ] && [ ! -h /usr/share/gnome/help/epiphany-browser ]; then + rm -rf /usr/share/gnome/help/epiphany-browser + ln -s /usr/share/gnome/help/epiphany /usr/share/gnome/help/epiphany-browser + fi +fi + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.16.1.orig/debian/patches/99_configure.patch +++ epiphany-browser-2.16.1/debian/patches/99_configure.patch @@ -0,0 +1,110 @@ +diff -Nur epiphany-browser-2.16.1/configure epiphany-browser-2.16.1.new/configure +--- epiphany-browser-2.16.1/configure 2006-10-02 22:35:55.000000000 +0200 ++++ epiphany-browser-2.16.1.new/configure 2006-10-03 01:31:30.000000000 +0200 +@@ -712,7 +712,7 @@ + + # Identity of this package. + PACKAGE_NAME='GNOME Web Browser' +-PACKAGE_TARNAME='epiphany' ++PACKAGE_TARNAME='epiphany-browser' + PACKAGE_VERSION='2.16.1' + PACKAGE_STRING='GNOME Web Browser 2.16.1' + PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany' +@@ -1579,7 +1579,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] +@@ -2489,7 +2489,7 @@ + + + # Define the identity of the package. +- PACKAGE='epiphany' ++ PACKAGE='epiphany-browser' + VERSION='2.16.1' + + +@@ -23298,6 +23298,7 @@ + libxslt >= \$LIBXSLT_REQUIRED + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= \$LIBGLADE_REQUIRED \\ + gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23314,6 +23315,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23333,6 +23335,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23361,6 +23364,7 @@ + libxslt >= \$LIBXSLT_REQUIRED + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= \$LIBGLADE_REQUIRED \\ + gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23377,6 +23381,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23396,6 +23401,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23430,6 +23436,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23447,6 +23454,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23467,6 +23475,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23493,6 +23502,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 --- epiphany-browser-2.16.1.orig/debian/patches/06_lpi.patch +++ epiphany-browser-2.16.1/debian/patches/06_lpi.patch @@ -0,0 +1,45 @@ +diff -Nur epiphany-browser-2.15.4/configure.ac epiphany-browser-2.15.4.new/configure.ac +--- epiphany-browser-2.15.4/configure.ac 2006-07-11 10:32:09.000000000 +0200 ++++ epiphany-browser-2.15.4.new/configure.ac 2006-07-11 10:32:36.000000000 +0200 +@@ -95,6 +95,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +diff -Nur epiphany-browser-2.15.4/data/ui/epiphany-ui.xml epiphany-browser-2.15.4.new/data/ui/epiphany-ui.xml +--- epiphany-browser-2.15.4/data/ui/epiphany-ui.xml 2006-05-05 19:27:30.000000000 +0200 ++++ epiphany-browser-2.15.4.new/data/ui/epiphany-ui.xml 2006-07-11 10:32:17.000000000 +0200 +@@ -101,6 +101,9 @@ + + + ++ ++ ++ + + + +diff -Nur epiphany-browser-2.15.4/src/ephy-window.c epiphany-browser-2.15.4.new/src/ephy-window.c +--- epiphany-browser-2.15.4/src/ephy-window.c 2006-07-10 21:28:01.000000000 +0200 ++++ epiphany-browser-2.15.4.new/src/ephy-window.c 2006-07-11 10:32:17.000000000 +0200 +@@ -66,6 +66,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_X11_XF86KEYSYM_H + #include +@@ -3125,6 +3126,9 @@ + } + #endif + ++ launchpad_integration_add_ui (window->priv->manager, ++ "ui/menubar/HelpMenu/LaunchpadItems"); ++ + /* Initialize the menus */ + priv->tabs_menu = ephy_tabs_menu_new (window); + priv->enc_menu = ephy_encoding_menu_new (window); --- epiphany-browser-2.16.1.orig/debian/patches/07_use_correct_program_name.patch +++ epiphany-browser-2.16.1/debian/patches/07_use_correct_program_name.patch @@ -0,0 +1,12 @@ +diff -Nur epiphany-browser-2.15.3/src/ephy-main.c epiphany-browser-2.15.3.new/src/ephy-main.c +--- epiphany-browser-2.15.3/src/ephy-main.c 2006-07-07 13:18:02.000000000 +0200 ++++ epiphany-browser-2.15.3.new/src/ephy-main.c 2006-07-07 13:18:31.000000000 +0200 +@@ -513,7 +513,7 @@ + g_option_context_add_group (option_context, option_group); + #endif /* GNOME_ENABLE_DEBUG */ + +- program = gnome_program_init (PACKAGE, VERSION, ++ program = gnome_program_init ("epiphany", VERSION, + LIBGNOMEUI_MODULE, argc, argv, + GNOME_PARAM_GOPTION_CONTEXT, option_context, + GNOME_PARAM_HUMAN_READABLE_NAME, _("Web Browser"), --- epiphany-browser-2.16.1.orig/debian/patches/01_bookmarks_menu.patch +++ epiphany-browser-2.16.1/debian/patches/01_bookmarks_menu.patch @@ -0,0 +1,10 @@ +--- data/bme.desktop.in.in 2005-11-29 13:53:29.000000000 +0100 ++++ data/bme.desktop.in.in 2006-01-17 11:57:53.000000000 +0100 +@@ -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=General --- epiphany-browser-2.16.1.orig/debian/patches/08_localized_startup_page.patch +++ epiphany-browser-2.16.1/debian/patches/08_localized_startup_page.patch @@ -0,0 +1,209 @@ +diff -Nur epiphany-browser-2.14.1.1/src/ephy-home-action.c epiphany-browser-2.14.1.1.new/src/ephy-home-action.c +--- epiphany-browser-2.14.1.1/src/ephy-home-action.c 2006-01-29 22:47:21.000000000 +0100 ++++ epiphany-browser-2.14.1.1.new/src/ephy-home-action.c 2006-05-18 23:24:53.000000000 +0200 +@@ -26,13 +26,94 @@ + #include "ephy-gui.h" + #include "eel-gconf-extensions.h" + ++#include ++ ++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 *address; ++ const char * const * languages; ++ char *homepage; + + 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); ++ } ++ + ephy_link_open (EPHY_LINK (action), + address != NULL && address[0] != '\0' ? address : "about:blank", + NULL, +diff -Nur epiphany-browser-2.14.1.1/src/ephy-shell.c epiphany-browser-2.14.1.1.new/src/ephy-shell.c +--- epiphany-browser-2.14.1.1/src/ephy-shell.c 2006-03-02 22:23:34.000000000 +0100 ++++ epiphany-browser-2.14.1.1.new/src/ephy-shell.c 2006-05-18 23:24:53.000000000 +0200 +@@ -53,6 +53,7 @@ + #include + #include + #include ++#include + + #ifdef ENABLE_NETWORK_MANAGER + #include "ephy-net-monitor.h" +@@ -403,6 +404,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) + { +@@ -420,7 +459,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); +@@ -431,6 +471,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.16.1.orig/debian/patches/02_ac_init.patch +++ epiphany-browser-2.16.1/debian/patches/02_ac_init.patch @@ -0,0 +1,12 @@ +diff -urN epiphany-2.14.2.1.orig/configure.ac epiphany-2.14.2.1/configure.ac +--- epiphany-2.14.2.1.orig/configure.ac 2006-05-29 22:21:48.000000000 +0200 ++++ epiphany-2.14.2.1/configure.ac 2006-06-01 11:04:18.000000000 +0200 +@@ -15,7 +15,7 @@ + # with this program; if not, write to the Free Software Foundation, Inc., + # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +-AC_INIT([GNOME Web Browser],[2.16.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) ++AC_INIT([GNOME Web Browser],[2.16.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser]) + + GNOME_COMMON_INIT + --- epiphany-browser-2.16.1.orig/debian/patches/03_dbus.patch +++ epiphany-browser-2.16.1/debian/patches/03_dbus.patch @@ -0,0 +1,16 @@ +diff -urN epiphany-2.14.2.1.orig/src/ephy-main.c epiphany-2.14.2.1/src/ephy-main.c +--- epiphany-2.14.2.1.orig/src/ephy-main.c 2006-04-13 21:28:52.000000000 +0200 ++++ epiphany-2.14.2.1/src/ephy-main.c 2006-06-01 11:05:29.000000000 +0200 +@@ -692,11 +692,7 @@ + + if (!_ephy_dbus_startup (!private_instance, &error)) + { +- _ephy_dbus_release (); +- +- show_error_message (&error); +- +- exit (1); ++ private_instance = TRUE; + } + + /* If we're remoting, no need to start up any further services, --- epiphany-browser-2.16.1.orig/debian/copyright +++ epiphany-browser-2.16.1/debian/copyright @@ -0,0 +1,13 @@ +Debianized by Edd Dumbill from CVS on 2003/02/14. Upstream source code +is available from GNOME CVS anoncvs.gnome.org:/cvs/gnome, module +'epiphany'. + +Upstream author: + Marco Pesenti Gritti + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License version 2 as +published by the Free Software Foundation. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- epiphany-browser-2.16.1.orig/debian/epiphany-browser.prerm +++ epiphany-browser-2.16.1/debian/epiphany-browser.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + for alt in x-www-browser gnome-www-browser; do + update-alternatives --remove $alt /usr/bin/epiphany + done +fi + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.16.1.orig/debian/epiphany-browser.docs +++ epiphany-browser-2.16.1/debian/epiphany-browser.docs @@ -0,0 +1 @@ +NEWS --- epiphany-browser-2.16.1.orig/debian/README +++ epiphany-browser-2.16.1/debian/README @@ -0,0 +1,21 @@ +Printing +======== + +As of version 2:1.7-1 Debian's Mozilla now only supports Xprint +printing. Unfortunately, Epiphany cannot yet use this. This means you +cannot print from Epiphany at the moment. + +Work is underway to address this. + +For more information, see: + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256072 +and +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=247585 + +Anti-aliased fonts +================== + +You must install the mozilla-xft package if you want to have anti-aliased +font rendering from inside epiphany. + --- epiphany-browser-2.16.1.orig/debian/watch +++ epiphany-browser-2.16.1/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/epiphany/2.16/ \ + epiphany-(.*)\.tar\.gz \ + debian uupdate --- epiphany-browser-2.16.1.orig/debian/epiphany-browser.menu +++ epiphany-browser-2.16.1/debian/epiphany-browser.menu @@ -0,0 +1,3 @@ +?package(epiphany-browser):needs="x11" section="Apps/Net" \ + title="Epiphany web browser" command="/usr/bin/epiphany" \ + hints="Web browsers" --- epiphany-browser-2.16.1.orig/debian/NEWS +++ epiphany-browser-2.16.1/debian/NEWS @@ -0,0 +1,22 @@ +epiphany-browser (1.2.6-3) unstable; urgency=low + + * As of version 2:1.7-1 Debian's Mozilla now only supports Xprint + printing. Unfortunately, Epiphany cannot yet use this. This means you + cannot print from Epiphany at the moment. + + Work is underway to address this. For more information, see: + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256072 and + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=247585 + + -- Edd Dumbill Fri, 25 Jun 2004 10:00:54 +0100 + +epiphany-browser (0.8.0-1) unstable; urgency=low + + The way preferences are stored in Epiphany has been changed. You may have + to set up some of your preferences again. If you edit gconf manually to + set "hidden" preferences, note that middle_click_open_url is now in the + /apps/epiphany/general key. + + I'm told that version 0.8 is the last time this will happen. + + -- Edd Dumbill Fri, 18 Jul 2003 17:20:35 +0100