<<<<<<< TREE
iceape (1.1.1-3.mt9) feisty; urgency=low
* debian/patches/82_prefs_ubuntu.dpatch: Make use of the go button in
tool bar
* debian/patches/00list: Updated accordingly.
-- John Vivirito <gnomefreak@ubuntu.com> Tue, 29 May 2007 06:36:00 -0400
=======
iceape (1.1.2.dfsg1-2) unstable; urgency=low
* debian/remove.nonfree: add more binary files from tarball that don't
have sources:
./toolkit/mozapps/installer/windows/nsis/Processes.dll
./toolkit/mozapps/installer/windows/nsis/ShellLink.dll
./toolkit/mozapps/installer/windows/nsis/nsProcess.dll
./xpfe/bootstrap/macbuild/Contents/Resources/command.icns
./xpfe/bootstrap/macbuild/Contents/Resources/component.icns
./xpfe/bootstrap/macbuild/Contents/Resources/html.icns
./xpfe/bootstrap/macbuild/Contents/Resources/mozilla.icns
./xpfe/bootstrap/macbuild/Contents/Resources/plugin.icns
./xpfe/bootstrap/macbuild/Contents/Resources/pref.icns
./xpfe/bootstrap/macbuild/Contents/Resources/text.icns
./widget/src/os2/res/aliasb.ptr
./widget/src/os2/res/arrow_wait.ptr
./widget/src/os2/res/cell.ptr
./widget/src/os2/res/col_resize.ptr
./widget/src/os2/res/copy.ptr
./widget/src/os2/res/crosshair.ptr
./widget/src/os2/res/grabbing.ptr
./widget/src/os2/res/grab.ptr
./widget/src/os2/res/help.ptr
./widget/src/os2/res/row_resize.ptr
./widget/src/os2/res/select.ptr
./widget/src/os2/res/vertical_text.ptr
./widget/src/os2/res/zoom_in.ptr
./widget/src/os2/res/zoom_out.ptr
-- Alexander Sack <asac@debian.org> Mon, 11 Jun 2007 13:00:00 +0200
iceape (1.1.2-2) unstable; urgency=low
* debian/patches/82_prefs.dpatch: Set layout.css.dpi to 0 instead of -1.
libxul will use system DPI and avoid using huge fonts on systems where
DPI < 96.
* debian/patches/35_psm_wakeups.dpatch: Avoid some cpu wake ups in PSM.
bz#380558.
* debian/patches/00list: Updated accordingly.
-- Mike Hommey <glandium@debian.org> Sun, 10 Jun 2007 10:13:00 +0200
iceape (1.1.2-1) unstable; urgency=low
* New upstream release.
* Fixes mfsa-2007-12, mfsa-2007-{14-17}, also known as
CVE-2007-1362, CVE-2007-1558, CVE-2007-2867, CVE-2007-2868,
CVE-2007-2870, CVE-2007-2871.
* debian/patches/15_gecko_1.8.1.3.dpatch,
debian/patches/20_visibility.dpatch: Removed, as being applied upstream.
* debian/patches/25_gnome_helpers_with_params.dpatch: Adapted to upstream
changes. (Stolen from xulrunner)
* debian/control:
+ Update dependencies for iceape-dev and iceape-chatzilla so that
there's no problem with future -0lennyx releases.
+ Build depend on libnspr4-dev and libnss3-dev.
* debian/mozconfig: Use system nspr and nss.
* debian/rules:
+ Don't shlibsign.
+ Install symlinks for nspr and nss libraries in /usr/lib/iceape.
* debian/iceape-browser.install: Don't install libfreebl.
* shlibs.local: Force versioned dependencies on libnss because of our use
of the libnssckbi.so file under /usr/lib/nss which appeared in version
3.11.5-1.
* debian/patches/99_configure.dpatch:
+ Updated with autoconf.
+ Removed nsprpub/configure changes, not required anymore.
* debian/patches/80_config.dpatch: Don't copy config.{guess|sub} in
nsprpub/build.
* debian/patches/18_kbsd_nspr.dpatch: Removed, since we now use system
nspr.
* debian/patches/00list: Updated accordingly.
* debian/iceape-browser.links, debian/iceape-browser.install: Install the
isp directory.
-- Mike Hommey <glandium@debian.org> Sat, 09 Jun 2007 20:29:39 +0200
iceape (1.1.1+u2-0ubuntu1) gutsy; urgency=low
* debian/remove.nonfree: add more binary files from tarball that don't
have sources:
./toolkit/mozapps/installer/windows/nsis/Processes.dll
./toolkit/mozapps/installer/windows/nsis/ShellLink.dll
./toolkit/mozapps/installer/windows/nsis/nsProcess.dll
./xpfe/bootstrap/macbuild/Contents/Resources/command.icns
./xpfe/bootstrap/macbuild/Contents/Resources/component.icns
./xpfe/bootstrap/macbuild/Contents/Resources/html.icns
./xpfe/bootstrap/macbuild/Contents/Resources/mozilla.icns
./xpfe/bootstrap/macbuild/Contents/Resources/plugin.icns
./xpfe/bootstrap/macbuild/Contents/Resources/pref.icns
./xpfe/bootstrap/macbuild/Contents/Resources/text.icns
./widget/src/os2/res/aliasb.ptr
./widget/src/os2/res/arrow_wait.ptr
./widget/src/os2/res/cell.ptr
./widget/src/os2/res/col_resize.ptr
./widget/src/os2/res/copy.ptr
./widget/src/os2/res/crosshair.ptr
./widget/src/os2/res/grabbing.ptr
./widget/src/os2/res/grab.ptr
./widget/src/os2/res/help.ptr
./widget/src/os2/res/row_resize.ptr
./widget/src/os2/res/select.ptr
./widget/src/os2/res/vertical_text.ptr
./widget/src/os2/res/zoom_in.ptr
./widget/src/os2/res/zoom_out.ptr
-- John Vivirito <gnomefreak@ubuntu.com> Thu, 16 May 2007 06:09:14 -0400
>>>>>>> MERGE-SOURCE