--- iceowl-0.7.orig/debian/iceowl-nss.pc
+++ iceowl-0.7/debian/iceowl-nss.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib/iceowl
+includedir=/usr/include/iceowl
+
+Name: NSS
+Description: Mozilla Network Security Services
+Version: 3.0a2pre
+Requires: iceowl-nspr >= 4.7.0
+Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
+Cflags: -I${includedir}/nss
--- iceowl-0.7.orig/debian/iceowl.js
+++ iceowl-0.7/debian/iceowl.js
@@ -0,0 +1,16 @@
+// This is the Debian specific preferences file for Mozilla iceowl
+// You can make any change in here, it is the purpose of this file.
+// You can, with this file and all files present in the
+// /etc/iceowl/pref directory, override any preference that is
+// present in /usr/lib/iceowl/defaults/pref directory.
+// While your changes will be kept on upgrade if you modify files in
+// /etc/iceowl/pref, please note that they won't be kept if you
+// do them in /usr/lib/iceowl/defaults/pref.
+
+pref("extensions.update.enabled", true);
+
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
--- iceowl-0.7.orig/debian/presubj
+++ iceowl-0.7/debian/presubj
@@ -0,0 +1,37 @@
+*** Please submit non packaging issue (e.g. feature requests) bugs to
+the upstream bugzilla:
+   https://bugzilla.mozilla.org/enter_bug.cgi?product=Calendar
+Thank you. ***
+
+Extensions being a big source of problems, please either try to
+reproduce your bug with a clean user of with you current user in safe
+mode, with the "iceowl -safe-mode" command line before filing any bugs.
+If your bug disappears with a clean user or in safe mode, you might want
+to find which extension is responsible for it and file a bug to the
+appropriate package, bug tracking system, or author.
+
+Also, please try running firefox with MOZ_DISABLE_PANGO=1 set in your
+environment to test with Pango rendering disabled, which can cause
+problems in some cases.
+
+Iceowl requires the loopback interface (lo) to be up and unfiltered
+to accept keyboard input and function correctly. Please make sure this
+is the case before filing any bugs.
+
+If you get crashes and none of the above hints did avoid the crash, please
+first try to remove plugins from the /usr/lib/iceowl/plugins,
+and ~/.mozilla/plugins directories.
+
+If Firefox still crashes, please install the iceowl-dbg package and run
+iceowl with gdb with the "iceowl -g" command line. On the gdb prompt, type
+the following commands:
+set pagination off
+run
+bt full
+And attach the resulting backtrace to your bug report.
+
+If you are seeing XML parsing errors, please make sure you kill all
+running Iceowls and restart before filing any bugs. If not sure log out of
+your desktop session and re-log in to be sure that there is no iceowl
+process running anymore.
+
--- iceowl-0.7.orig/debian/iceowl-restart-required.update-notifier
+++ iceowl-0.7/debian/iceowl-restart-required.update-notifier
@@ -0,0 +1,10 @@
+Name: Iceowl restart required
+Name-fr: Relancement de Iceowl requis
+Priority: High
+Terminal: False
+DontShowAfterReboot: True
+DisplayIf: ps -C iceowl-bin
+Description: Iceowl has been upgraded (or reinstalled) and must be restarted.
+ Please quit and restart your web browser now.
+Description-fr: iceowl a été mis à jour (ou réinstallé) et doit être relancé.
+ Veuillez quitter et redémarrer for navigateur.
--- iceowl-0.7.orig/debian/changelog
+++ iceowl-0.7/debian/changelog
@@ -0,0 +1,3743 @@
+iceowl (0.7-2~bpo40+1) etch-backports; urgency=low
+
+  * etch backport.
+  * rules: Remove CC/CXX variable overrides (see #476045).
+
+ -- Robert Millan <rmh@aybabtu.com>  Fri, 25 Apr 2008 14:23:02 +0200
+
+iceowl (0.7-2) unstable; urgency=low
+
+  * import patches from xulrunner to fix FTBFS on mips/mipsel and fix sparc64
+    unichar aligment (Closes: 449340)
+    - add debian/patches/mips_performance
+    - add debian/patches/mips_xpcom
+    - add debian/patches/sparc64_unichar_alignment
+    - update debian/patches/series
+    - update debian/patches/configure-autoconf2-13-reconfigure.patch
+  * fix copy-paste errors in package description and Provides (Closes: 435228)
+    - update debian/control
+  * fix presubj to not refer to firefox anymore. Further adapt and improve the
+    text in order to suite iceowl (Closes: 436568)
+    - update debian/presubj
+  * rename iceowl.ubuntu-prefs.js => iceowl.debian-prefs.js (Closes: 437102)
+    - move debian/iceowl.ubuntu-prefs.js => debian/iceowl.debian-prefs.js
+    - update debian/iceowl.install
+  * fix startscript to follow symlinks for real (Closes: 441037)
+    - add debian/patches/follow_symlinks_startscript
+    - update debian/patches/series
+  * pass host arch information to configure and trust the supplied
+    architecture information. Thanks to Bastian Blank.
+    - update debian/rules
+    - add debian/patches/arch-detect
+    - update debian/patches/autoconf2.13-rerun
+    - update debian/patches/series
+  * enable auth extension to allow SPNEGO/Kerberos authentication
+    (Closes: 437026)
+    - update debian/rules
+
+ -- Alexander Sack <asac@debian.org>  Sun, 30 Dec 2007 20:13:32 +0100
+
+iceowl (0.7-1) unstable; urgency=low
+
+  * Upstream release 0.7
+  * Made use of upstream tarball
+  * Full list of changes can be found at:
+    http://weblogs.mozillazine.org/rumblingedge/archives/2007/07/sb_0-7.html
+    - Too many to list here.
+  * debian/control: Removed ${Source-Version} from depends of sunbird-dev
+    and just using sunbird as depend
+  * debian/patches/configure-autoconf2-13-reconfigure.patch: Ran
+    autoconf2.13 to update patch
+  * debian/patches/bz399589_fix_missing_symbol_with_new_nss.patch: Added
+    patch to fix FTBFS with error ‘SECAlgorithmIDTemplate’ was not declared
+    in this scope"
+  * debian/patches/series: Updated for
+    bz399589_fix_missing_symbol_with_new_nss.patch
+  * Reupload source tarball without binaries (LP: #121734) - sanitized
+    using debian/remove.binonly.sh
+  * debian/remove.binonly.sh: add script to strip original tarball from
+    binary only cruft.
+
+  [ Alexander Sack ]
+  * debian/rules: fix DEBIAN_MOZ_UPSTREAM_APPLICATION.
+  * debian/remove.binonly.sh: add script to remove binary only files.
+
+  Changes from Ubuntu 0.5 packaging:
+
+  [ Alexander Sack ]
+  * debian/rules, debian/control: use don't build lpia with gcc-4.1/g++-4.1
+    anymore, but use gcc-4.2/g++-4.2 for all archs now.
+  * debian/patches/configure-autoconf2-13-reconfigure.patch: update configure
+    patch to enable visibility changes of previous upload.
+  * debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3,
+    debian/patches/series: add patch to disable pragma visibility strategy
+    to hide symbols. stick to -fvisibility=hidden.
+  * debian/control: adding unzip to build-depends
+  * debian/control: fixing short summary of summary to refer
+    to Calendar instead of "mail client"
+  * debian/copyright: add info about
+    other-licenses/{7zstub,bsdiff,branding,libart_lgpl}
+
+  [ John Vivirito ]
+  * debian/sunbird.postinst: Fixed typo for the post install reminder to
+    restart Sunbird, from Sunbirdes to Sunbirds
+  * debian/sunbird.desktop: Moved menu item to Office from Internet
+  * debian/rules: Added "pref" to --enable-extension config options to
+    disable upstreams update choice in Help menu
+    [With help from Alexander]
+  * debian/sunbird.install: Added debian/tmp/usr/lib/sunbird/defaults
+    /autoconfig usr/share/sunbird/defaults due to failure to start after
+    install due to change in debian/rules above
+  * debian/sunbird.desktop: modified .desktop file to reflect sunbird
+  * debian/control: Fixed typos changed standalone to stand-alone
+  * debian/firefox.manpages: removed for now, not needed
+  * debian/sunbird.postinst: removed all code that installs sunbird as an
+    alternative for x-www-browser
+  * debian/sunbird.prerm: removed all code that installs sunbird as an
+    alternative for x-www-browser
+
+ -- Alexander Sack <asac@debian.org>  Fri, 28 Dec 2007 19:49:23 +0100
+
+iceowl (0.5-2) unstable; urgency=low
+
+  * debian/control: build-depend on unzip to fix ftbfs.
+
+  [ John Vivirito ]
+  * debian/firefox.manpages: removed for now, not needed
+  * debian/iceowl.postinst: removed all code that installs iceowl
+    as an alternative for x-www-browser
+  * debian/iceowl.prerm: removed all code that installs iceowl
+    as an alternative for x-www-browser
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 30 Jul 2007 08:50:37 +0000
+
+iceowl (0.5-1) unstable; urgency=low
+
+  * initial release of iceowl standalone calendar and
+    iceowl-extension - the icedove calendar extension
+    (Closes: 388218, 270533).
+
+ -- Alexander Sack <asac@debian.org>  Sun, 29 Jul 2007 14:12:14 +0200
+ 
+firefox (2.0.0.4+2-0ubuntu2) gutsy; urgency=low
+
+  * debian/docs, debian/MPL: ship MPL (LP: #119814)
+  * drop more patches:
+    * debian/patches/ubuntu-look-and-feel-patch.patch: drop patch removes
+      File->Import dialog (LP: #28563)
+    * debian/patches/series: drop ubuntu-look-and-feel-geometries.patch
+      from patch series; remove that patch-file from debian/patches dir
+      accordingly
+  * drop config tweaks from patchset as they are now shipped in
+    distromods extension:
+    * debian/patches/disable-default-setting-for-app.update.enabled-and-app.update.auto.patch,
+      debian/patches/enable-kerberos-for-https.patch,
+      debian/patches/locale-my-matchOS.patch,
+      debian/patches/ubuntu-disable-default-browser-check.patch,
+      debian/patches/use-intl.properties.patch: drop property only
+      patches from patchset
+    * debian/patches/series: remove property only patches above from
+      series file as well.
+    * debian/patches/no-have-stdint-h-ftbfs.patch,
+      debian/patches/ubuntu-disable-welcome-update-url.patch,
+      debian/patches/ubuntu-look-and-feel-disable-help-translate-menu.patch,
+      debian/patches/ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch,
+      debian/patches/ubuntu-look-and-feel-patch.patch,
+      debian/patches/ubuntu-look-and-feel-report-a-bug-menuitem.patch,
+      debian/patches/ubuntu-printing-patch.patch: drop property parts
+      and add TODO for patches that contain tweakings that can be 
+      moved to distro mods extension by overlays or other tricks.
+
+  [ Andrea Veri ]
+  * Added svedish translations support to firefox's .desktop file.
+    (LP: #107683)
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 8 Jun 2007 01:11:00 +0200
+
+firefox (2.0.0.4+2-0ubuntu1) gutsy; urgency=low
+
+  * new upstream security/stability update (LP: #117990)
+  * MFSA2007-17 aka CVE-2007-2871: XUL Popup Spoofing
+  * MFSA2007-16 aka CVE-2007-2870: XSS using addEventListener
+  * MFSA2007-14 aka CVE-2007-1362: Path Abuse in Cookies
+  * MFSA2007-13 aka CVE-2007-2869: Persistent Autocomplete Denial of Service
+  * MFSA2007-12 aka CVE-2007-2867 (layout engine) + CVE-2007-2868
+    (javascript engine): Crashes with evidence of memory corruption
+  * drop upstream applied patches: 
+      bz312998-GetVisibility-patch.patch,
+      bz358930-gradient-spread-method-pad-fix.patch,
+      bz366844-mozilla-configure-in-patch-to-workaround-gcc-visibility-bug.patch
+  * adapted patches to upstream codebase changes:
+      bz273524-gnome-mime-registry-ubuntu.patch 
+  * debian/firefox.1, debian/firefox.manpages: install firefox.1 (LP: #115112)
+  * install gnome-www-browser alternative in postinst and remove
+    that alternative in prerm - copied over from feisty
+  * debian/firefox.preinst: uninstall x-www-browser and mozilla alternative
+  * debian/firefox-dev.install: install nsBuildID.h to /usr/include/firefox/
+    (LP: #115630)
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 1 Jun 2007 12:10:00 +0200
+
+firefox (2.0.0.3+3-0ubuntu4) gutsy; urgency=low
+
+  * firefox: conflicts libnss3 to install proper symlink
+      /usr/lib/firefox/libnssckbi.so -> ../nss/libnssckbi.so
+  * add DisplayIf: instruction to test for running firefox; this is ment to
+    prevent restart notification from being displayed if ffox has been crashed in
+    the time between file replacement and update notification
+  * debian/firefox.postinst added - which was accidentially left behind when
+    migrating to new package layout
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 15 May 2007 12:10:00 +0200
+
+firefox (2.0.0.3+3-0ubuntu3) gutsy; urgency=low
+
+  * firefox-dev: Depend on libnss3-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 06 May 2007 14:11:05 +0000
+
+firefox (2.0.0.3+3-0ubuntu2) gutsy; urgency=low
+
+  * don't use -Xnss for dh_install of firefox-dev files - fix missing headers
+    for epiphany
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 4 May 2007 18:10:00 +0200
+
+firefox (2.0.0.3+3-0ubuntu1) gutsy; urgency=low
+
+  * debian/patches/series, debian/patches/ubuntu-prevent-distributor-user-agent-part-reset.patch:
+    enable update of user-agent parts on startup again
+  * debian/firefox.install: install default.xpm in /usr/share/firefox/chrome/icons 
+    by debhelper
+  * debian/rules, debian/vendor.js.in: create vendor.js pref file from 
+    .in template with data from /etc/lsb-release; add preprocessing of
+    vendor.js.in to cdbs 'common-install-arch' target.
+  * merging down patches and tweaks from old firefox package to
+    new package structure with cdbs.
+  * debian/cdbs-rules/debhelper.mk: custom cdbs rules which allows
+    to specify dh_install extra args on a per package base
+  * debian/control.in, debian/control, debian/rules: use
+    system-nspr and system-nss; drop libnss3 and libnspr4 and
+    friends from control files; remove debhelper files
+    accordingly
+  * debian/rules: added update-orig target
+  * merging down modification and changelog entries for firefox updates
+    (2.0.0.2+1-0ubuntu1, 2.0.0.2+1-0ubuntu2, 2.0.0.3+1-0ubuntu1,
+    2.0.0.3+1-0ubuntu2) imported using (feisty) approved patchset
+    at http://people.ubuntu.com/~asac/moz-screen.3
+
+     == Bugzilla Patches ==
+	
+       + bz161826-nsTextFrame-MeasureText-s-crash-on-RISC.patch
+       + bz241535-Assertion-failure-on-destroying-XEmbed-plug-in.patch
+       + bz273524-gnome-mime-registry-ubuntu.patch
+       + bz289394-align-double-on-ia64-deb-bug-303518.patch
+       + bz312998-GetVisibility-patch.patch
+       + bz331818-fix-crash-xpidl-zero-arguments.patch
+       + bz335810-pango-cursor-up-down-fix.patch
+       + bz343360-feed-flat-chrome-fix.patch
+       + bz345077-make-install-installs-extensions-in-chrome-and-extensions.patch
+       + bz358930-gradient-spread-method-pad-fix.patch
+       + bz366844-mozilla-configure-in-patch-to-workaround-gcc-visibility-bug.patch
+       + bz51429-anti-netstat-zombie-linux.patch
+       + bz7969-a-thai-patch.patch
+
+
+     == Patches for Upstream ==
+
+       + bzXXX-syntax-fixes-for-.m4-files-needed-for-proper-embedding.patch
+       + bzXXX-wl-no-as-needed-for-libxpcom-lp85112.patch
+       + deb299697-lp42559-use-FC_ANY_METRICS.patch
+       + disable-default-setting-for-app.update.enabled-and-app.update.auto.patch
+       + myspell-hunspell-support-configure-in-add-enable-system-myspell-support.patch
+
+     == Patches Ubuntu/Distribution ==
+
+       + enable-kerberos-for-https.patch
+       + flat-chrome-fix.patch
+       + locale-my-matchOS.patch
+       + add-a-recognized-pref-folder-called-syspref-inside-the-defaults-hierarchy.patch
+       + ubuntu-disable-default-browser-check.patch,
+       + ubuntu-disable-welcome-update-url.patch,
+       + ubuntu-look-and-feel-disable-help-translate-menu.patch,
+       + ubuntu-look-and-feel-geometries.patch,
+       + ubuntu-look-and-feel-home-folder.patch,
+       + ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch,
+       + ubuntu-look-and-feel-patch.patch,
+       + ubuntu-look-and-feel-report-a-bug-menuitem.patch,
+       + ubuntu-no-nss-chk-create.patch,
+       + ubuntu-prevent-distributor-user-agent-part-reset.patch
+
+
+     == Misc Patches ==
+       + build-system-garbage.patch
+
+     == Debian Directory ==
+       + debian/firefoxrc: fix old malone url in comment
+         (LP: #94392)
+       + debian/control.in, debian/control: fix missing firefox-libthai
+         depends on firefox; produce firefox-libthai binary package,
+         which contains libthai component introduced in patch
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 4 May 2007 01:16:00 +0200
+
+firefox (2.0.0.3+1-0ubuntu2) feisty; urgency=low
+
+  * debian/control: fix missing firefox-libthai depends on firefox
+  * xpfe/components/killAll/Makefile.in: drop unapproved/useless patch
+    to install/remove nsKillAll.js component.
+  * browser/locales/en-US/profile/bookmarks.html: fix bookmarks urls;
+    www.ubuntulinux.org/wiki/FrontPage -> wiki.ubuntu.com; www.ubuntulinux.org
+    -> www.ubuntu.com (LP: #93502)
+  * browser/base/content/baseMenuOverlay.xul: commenting out ubuntu help
+    menu entries: Get Help Online; Translate This application. Reenable as
+    soon as launchpad supports these features.
+  * layout/svg/renderer/src/cairo/nsSVGCairoGradient.cpp: fix for bz358930
+    (LP: #69721): 2.0 doesn't respect SVG gradient spreadMethod="pad"
+  * gfx/src/gtk/nsFontMetricsPango.cpp: fix for bz335810: cursor up/down
+    keypresses do not preserve horizontal position when using pango (LP: #36571)
+  * debian/firefoxrc: fix old malone url in comment (LP: #94392)
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 3 Apr 2007 12:45:00 +0200
+	
+firefox (2.0.0.3+1-0ubuntu1) feisty; urgency=low
+
+  * new upstream security/stability update (v2.0.0.3)
+  * MFSA-2006-11 aka CVE-2007-1562: FTP PASV port-scanning
+  * add Report a Bug ... menu entry to Help menu overlay (LP: #85041)
+  * gfx/src/gtk/nsFontMetricsXft.cpp: revert not-approved patch
+    bz252033-gtk2-xft-text-clipping-problem, because fix seems to 
+    have pretty bad performance overhead.
+  * config/autoconf.mk.in, configure.in, gfx/src/gtk/mozilla-decoder.cpp:
+    revert not-approved patch bz305185-system-pango-fix-for-gtk-2-8, because
+    no longer necessary, upstream bug was duped to 
+    https://bugzilla.mozilla.org/show_bug.cgi?id=338446
+  * xpfe/components/killAll/Makefile.in: revert not-approved patch
+    bz333289-nskillall-not-installed, because its just cruft from
+    old suite and not used for firefox.
+  * debian/control: add depends on libnspr4 to libnss3 (LP: #84481)
+
+ -- Alexander Sack <asac@ubuntu.com>  Fri, 23 Mar 2007 22:00:00 +0100
+	
+firefox (2.0.0.2+1-0ubuntu2) feisty; urgency=low
+
+  * reworked patchset and updated thai patch to latest
+  * debian/firefox.desktop: updated finnish translation for
+    .desktop file (Contributed by Timo Jyrinki <timo.jyrinki@iki.fi>)
+  * browser/app/profile/firefox.js: set pref browser.startup.homepage_override.mstone
+    to "ignore" (LP: #91798)
+  * browser/components/nsBrowserContentHandler.js: disable welcome and update
+    url feature completely (LP: #91798)
+  * use pref distributionID only ... don't hard code this anymore
+  * produce chromelist.txt files again (e.g. drop patch that prevents that)
+  * exclude patch that disabled mangle dir in
+    security/nss/cmd/shlibsign/manifest.mn
+
+  [ Theppitak Karoonboonyanan <thep@linux.thai.net> ]
+   * Update Thai line breaker patch based on libthai.
+     - Replace old patch with componentized mozlibthai patch extracted and
+       adapted from submitted patch in Debian #366306, which was backported
+       from patch against HEAD proposed in bz#7969.
+     - debian/control, debian/firefox-libthai.{install,postinst,prerm}:
+       + Add firefox-libthai sub-package and Build-Depends: libthai-dev
+       + Remove Suggests: libthai0 from firefox (we don't need PR_LoadLibrary()
+         hack any more), and Suggests: firefox-libthai instead
+     - debian/rules:
+       + Add --enable-libthai configure option
+       + Exclude mozlibthai component from firefox
+       + Add dh_install -pfirefox-libthai.
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 13 Mar 2007 20:00:00 +0100
+	
+firefox (2.0.0.2+1-0ubuntu1) feisty; urgency=low
+
+  * new upstream release 2.0.0.2
+  * MFSA2007-01 - Crashes with evidence of memory corruption
+    (rv:1.8.0.10/1.8.1.2):
+     - CVE-2007-0775 - layout engine crashes
+     - CVE-2007-0776 - SVG
+     - CVE-2007-0777 - javascript engine corruption
+  * MFSA2007-02 - Improvements to help protect against Cross-Site
+    Scripting attacks:
+     - CVE-2007-0995 - Invalid trailing characters in HTML tag attributes
+     - CVE-2007-0996 - Child frame character set inheritance
+     - CVE-2006-6077 - Injected password forms
+  * MFSA2007-03 aka CVE-2007-0778: Information disclosure through cache
+    collisions
+  * MFSA2007-04 aka CVE-2007-0779: Spoofing using custom cursor and CSS3
+    hotspot
+  * MFSA2007-05 aka CVE-2007-0780, CVE-2007-0800: XSS and local file access
+    by opening blocked popups
+  * MFSA2007-06 aka CVE-2007-0008, CVE-2007-0009: Mozilla Network Security
+    Services (NSS) SSLv2 buffer overflow
+  * MFSA2007-07 aka CVE-2007-0981: Embedded nulls in location.hostname
+    confuse same-domain checks
+
+ -- Alexander Sack <asac@ubuntu.com>  Sat, 24 Feb 2007 23:00:00 +0100
+
+firefox-trunk (2.99+2cvs20070328-0ubuntu0) feisty; urgency=low
+
+  * update upstream cvs
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 28 Mar 2007 11:00:00 +0200
+
+firefox-trunk (2.99+1-3.0a.20070201-0ubuntu0) feisty; urgency=low
+
+  * package firefox 3 preview
+  * rewrite packaging, make use of cdbs with quilt patch
+    system.
+  + imported initial patches
+
+ -- Alexander Sack <asac@ubuntu.com>  Thu, 22 Feb 2007 09:00:00 +0200
+
+firefox (2.0.0.1+1-0ubuntu2) feisty; urgency=low
+
+  * browser/app/Makefile.in: link firefox-bin with
+    --no-as-needed again. (regression from
+    2.0.0.1+1-0ubuntu1)
+  * browser/components/feeds/src/FeedWriter.js: fix
+    RSS preview/subscription for flat chrome
+    (Closes lp#61182)
+  * debian/rules: set BUILD_OFFICIAL and MOZILLA_OFFICIAL environment
+    so build gets a proper BUILD_ID.
+
+ -- Alexander Sack <asac@ubuntu.com>  Mon, 19 Feb 2007 12:45:00 +0100
+
+firefox (2.0.0.1+1-0ubuntu1) feisty; urgency=low
+
+  * repackage with new upstream mozilla.org and split up patches
+    into distinct feature patches available at 
+    http://people.ubuntu.com/~asac/firefox-patches/
+  * make use of original source tarball as distributed from
+    ftp.mozilla.org
+  * debian/rules: use --enable-official-branding to produce
+    official firefox branding; remove icons in debian/ dir;
+    add more garbage cleanup
+  * debian/firefox.links: /usr/share/pixmaps/firefox.png and
+    usr/share/pixmaps/mozilla-firefox.png now link to
+    usr/share/firefox/icons/mozicon128.png
+  * drop FeedWriter.js patch, no rational available.
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,
+    xpcom/reflect/xptcall/src/md/unix/Makefile.in,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s,
+    configure.in, config/rules.mk, security/coreconf/Linux.mk:
+    drop debian architecture patches for 
+    not ubuntu platforms
+  * debian/control: taking over maintainership
+  * configure.in: update hidden visibility patch from bugzilla
+  * configure.in: drop
+  * Makefile.in: drop explicit export of nss as build system is not
+    broken anymore
+  * browser/app/Makefile.in: drop linker tweaks for now.
+  * browser/app/profile/firefox.js: drop override for homepage
+  * browser/locales/en-US/chrome/branding/brand.properties: drop further
+    branding hacks not needed anymore
+  * browser/components/search/nsSearchService.js: drop not needed
+    official browser hacks
+  * prefs-size.diff: removed garbage file from source 
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 15 Feb 2007 23:15:00 +0100
+
+firefox (2.0.0.1+0dfsg-0ubuntu2) feisty; urgency=low
+
+  * Build using hunspell instead of myspell.
+    - debian/control: Build-depend on libhunspell-dev instead of libmyspell-dev.
+    - config/autoconf.mk.in: Add MOZ_MYSPELL_CFLAGS.
+    - extensions/spellcheck/myspell/src/Makefile.in: Use MOZ_MYSPELL_CFLAGS.
+    - extensions/spellcheck/myspell/src/mozMySpell.h: Include hunspell.cxx
+      instead of myspell.cxx.
+    - configure.in, configure: Overwrite myspell detection with hunspell.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 18 Jan 2007 11:57:14 +0000
+
+firefox (2.0.0.1+0dfsg-0ubuntu1) feisty; urgency=low
+
+  * New upstream security update:
+    - CVE-2006-6507, MFSA 2006-76: XSS using outer window's Function object.
+    - CVE-2006-6506, MFSA 2006-75: RSS Feed-preview referrer leak.
+    - CVE-2006-6504, MFSA 2006-73: SVG Processing Remote Code Execution.
+    - CVE-2006-6503, MFSA 2006-72: XSS by setting img.src to javascript: URI.
+    - CVE-2006-6502, MFSA 2006-71: LiveConnect crash finalizing JS objects.
+    - CVE-2006-6501, MFSA 2006-70: Privilege escallation using watch point.
+    - CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, MFSA 2006-68: Crashes
+      with evidence of memory corruption.
+  * debian/rules: use original upstream icons (LP: #68180).
+  * debian/debsearch.src: make feisty the default debsearch target.
+  * browser/base/content/utilityOverlay.js: change Launchpad translation/help
+    pages for Feisty.
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 21 Dec 2006 09:51:22 -0800
+
+firefox (2.0+0dfsg-0ubuntu3) edgy; urgency=low
+
+  * Patch from upstream CVS to fix RSS preview/subscription, thanks to Mike
+    Connor and Martin Jürgens (LP: #61182)
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Mon, 23 Oct 2006 10:20:25 +0100
+
+firefox (2.0+0dfsg-0ubuntu2) edgy; urgency=low
+
+  * uudecode debsearch.gif too.  Fixes FTBFS
+  * Make edgy the default debsearch target.  Closes: Malone: #61687
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Mon, 23 Oct 2006 08:52:11 +0200
+
+firefox (2.0+0dfsg-0ubuntu1) edgy; urgency=low
+
+  * Bump version to 2.0 (no upstream changes from rc3)
+  * browser/components/search/nsSearchService.js
+    - Set MOZ_OFFICIAL to "official", distributionID to "com.ubuntu"
+  * debian/branding: new subdirectory with images
+  * debian/rules:
+    - build: uudecode and substitute images in source tree, use debian/branding/icon64.png
+      instead of debian/firefox.png
+    - clean: restore images in source tree, remove uudecoded versions
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Fri, 20 Oct 2006 15:56:42 -0700
+
+firefox (1.99+2.0rc3+dfsg-0ubuntu1) edgy; urgency=low
+
+  * New upstream version 2.0rc3, UVF exception approved by Matt Zimmerman.
+  * configure: Fix bashism to let the gcc visibility=hidden bug detection
+    work.
+  * configure{,.in}: Change MOZ_APP_DISPLAYNAME from 'BonEcho' to 'Firefox' to
+    make UserAgent string work with web sites which evaluate it.
+  * browser/base/content/utilityOverlay.js: Open the Launchpad
+    translation/help pages for Edgy, not Dapper.
+  * For the sake of automatic vulnerability tracking: All 1.5.0.x and earlier
+    vulnerabilities were fixed in the 2.0 branch as well:
+    CVE-2005-0752 CVE-2005-1531 CVE-2005-1532 CVE-2005-2114 CVE-2006-0749
+    CVE-2006-1731 CVE-2006-1732 CVE-2006-1733 CVE-2006-1734 CVE-2006-1735
+    CVE-2006-1736 CVE-2006-1737 CVE-2006-1738 CVE-2006-1739 CVE-2006-1740
+    CVE-2006-1741 CVE-2006-1742 CVE-2006-1790 CVE-2006-2775 CVE-2006-2776
+    CVE-2006-2777 CVE-2006-2778 CVE-2006-2779 CVE-2006-2780 CVE-2006-2782
+    CVE-2006-2783 CVE-2006-2784 CVE-2006-2785 CVE-2006-2786 CVE-2006-2787
+    CVE-2006-2788 CVE-2006-3113 CVE-2006-3677 CVE-2006-3801 CVE-2006-3802
+    CVE-2006-3803 CVE-2006-3805 CVE-2006-3806 CVE-2006-3807 CVE-2006-3808
+    CVE-2006-3809 CVE-2006-3810 CVE-2006-3811 CVE-2006-3812 CVE-2006-4253
+    CVE-2006-4340 CVE-2006-4565 CVE-2006-4566 CVE-2006-4567 CVE-2006-4568
+    CVE-2006-4569 CVE-2006-4571
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 19 Oct 2006 09:28:15 +0200
+
+firefox (1.99+2.0rc2+dfsg-0ubuntu3) edgy; urgency=low
+
+  * debian/firefox-runner: Disable Pango if a Sinhala locale is present. LP
+    66270.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 15 Oct 2006 20:29:26 +0100
+
+firefox (1.99+2.0rc2+dfsg-0ubuntu2) edgy; urgency=low
+
+  * Delete /usr/lib/firefox/components/compreg.dat in the postinst.
+    This is a partial workaround for LP 30791.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 12 Oct 2006 12:19:11 +0100
+
+firefox (1.99+2.0rc2+dfsg-0ubuntu1) edgy; urgency=low
+
+  * New upstream version 2.0rc2.
+  * Fix/workaround for epiphany GtkSocket lifetype crash:
+    apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
+  * Change application name to `Firefox', as requested by mdz.
+    Files changed:
+      - browser/locales/en-US/chrome/branding/brand.dtd
+      - browser/locales/en-US/chrome/branding/brand.properties;
+    New values:
+      - brandShortName and brandFullName: `Bon Echo' => `Firefox'
+      - vendorShortName: `Mozilla' => `Ubuntu'
+  * Make preferences dialogue fit again (bah!).
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 10 Oct 2006 18:49:32 +0100
+
+firefox (1.99+2.0b2+dfsg-1ubuntu3) edgy; urgency=low
+
+  * Remove /usr/lib/mozilla-thunderbird from the LD_LIBRARY_PATH
+    if we find it there.  Workaround for LP 57923.
+  * Remove pocket name (eg `-security') from distribution identifier in
+    the browser user agent string.  LP 55289.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue,  3 Oct 2006 19:01:34 +0100
+
+firefox (1.99+2.0b2+dfsg-1ubuntu2) edgy; urgency=low
+
+  * Ship xpidl et al, in firefox-dev.  Relates to Debian #362190.
+    Fixes Malone #61160.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 21 Sep 2006 16:33:50 +0100
+
+firefox (1.99+2.0b2+dfsg-1ubuntu1) edgy; urgency=low
+
+  * Merged from Debian unstable; new upstream version.
+  * Remaining differences between
+    Debian and Ubuntu in no particular order:
+    - Build libnspr and libnss and corresponding -dev packages from this
+      source package.  Plus changes to make these libs build nicely.
+    - Various changes to preferences, default bookmarks and search engines.
+    - Support for `Get Help Online' and `Translate This Application'.
+    - Size changes for various dialogue boxes to make the contents fit.
+    - Downloads go to separate `Desktop' folder by default.
+    - Fix some underquoted m4 arguments.
+    - Minor changes in directories, symlinks and debian/control
+      to cope with Ubuntu and Debian's different histories.
+    - disable File / Import (wizard is nonfunctional).
+      Malone #28563, Debian #350599, Mozilla Bugzilla 117844.
+    - Change `Latest Headlines' to `Latest BBC Headlines' to properly
+      disclose the source up front, and use a corresponding RSS URL.
+    - Default for FIREFOX_DSP is none.
+    - Pango support is enabled only if an installed locale seems to need
+      it.
+    - Note in README.Debian about how to run xpcshell.
+    - Disable xprint.
+    - No build dependency on libxp-dev; build-depend on zip instead.
+    - Various icon changes.
+    - Some currently-unused directory merging code in firefox.preinst.
+    - Less detail in the user agent string.
+    - Belt-and-braces removal for some cruft left over by some versions of
+      the Mozilla build system.
+    - Better firefox.menu entry (says `Firefox Web Browser').
+    - Build dynamically linked, since in Ubuntu embedders use firefox.
+    - EbmedWindow::GetVisibility bugfix, Malone 40320, upstream 312998.
+    - Pass FC_ANY_METRICS to Fontconfig where appropriate.
+    - Extensive Thai language patch.
+    - Print in serif by default even though default display is sans.
+    - Some fixes to the (upstream-unused) nss makefiles.
+    - Strip PostScript/ from printer names.
+    - Better message about updates of read-only extension.
+    - Include pointer to the Gecko Runtime (GRE registration).
+    - Prevent websites from disabling context menus.
+   All of these changes are fully documented in the changelog below.
+   Please see those changelog entries for full details.  Much historical
+   information about changes either taken up by Debian or upstream, or
+   dropped by us, is retained in this changelog.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 13 Sep 2006 16:40:06 +0100
+
+firefox (1.99+2.0b2+dfsg-1) experimental; urgency=low
+
+  * New upstream beta release.
+
+  * extensions/inspector/build/src/Makefile.in,
+    extensions/inspector/build/src/inspector.pkg,
+    extensions/inspector/build/src/nsInspectorModule.cpp: Removed, the problem
+    was lying in debian/rules. /me goes hiding under a rock.
+  * layout/inspector/public/Makefile.in: Reverted previous changes.
+  * debian/rules: Don't exclude inspector files when dh_installing the firefox
+    package. We need the inspector.xpt file from the components directory. The
+    files for the dom-inspector package are already excluded from the
+    firefox.install file anyway.
+  * debian/firefox-dom-inspector.install,
+    debian/firefox-dom-inspector.links: Simplified.
+  * debian/control:
+    + Turn firefox-dom-inspector into an arch: all package, since the binary
+      component has been merged into the firefox binary.
+    + Adjust dependencies for binNMU safety.
+  * xpcom/reflect/xptcall/src/md/unix/Makefile.in, configure.in, configure:
+    Use ${host_cpu} instead of uname -m so that firefox can safely build on
+    s390x with a s390 target, and on amd64 with an x86 target.
+  * uriloader/exthandler/unix/nsGNOMERegistry.cpp,
+    uriloader/exthandler/unix/nsGNOMERegistry.h,
+    uriloader/exthandler/unix/nsOSHelperAppService.cpp,
+    uriloader/exthandler/unix/nsMIMEInfoUnix.cpp,
+    uriloader/exthandler/unix/nsMIMEInfoUnix.h: Adapted patch from bz#273524 to
+    make helper applications with parameters work. (Closes: #355511)
+  * debian/copyright: Adjusted with updated information for firefox 2.0, which
+    is now properly tri-licensed \o/. (Closes: #330295)
+  * debian/rules: Install the MPL file taken from the upstream LICENSE file.
+
+ -- Mike Hommey <glandium@debian.org>  Fri,  1 Sep 2006 08:36:26 +0200
+
+firefox (1.5.dfsg+1.5.0.6-3) unstable; urgency=low
+
+  * browser/app/Makefile.in: Workaround to force link the xpcom library to
+    the firefox binary despite -Wl,--as-needed in the LDFLAGS.
+    (Closes: #378667)
+  * debian/firefox.install: Don't install xpt_link, xpt_dump, xpidl,
+    xpicleanup, xpcshell nor regxpcom. They are of no use to firefox users and
+    are provided with xulrunner anyway. (Closes: #362190)
+
+ -- Mike Hommey <glandium@debian.org>  Sun, 20 Aug 2006 19:49:25 +0200
+
+firefox (1.5.dfsg+1.5.0.6-2) unstable; urgency=low
+
+  * debian/firefox.desktop: 
+    - Polish translation from Ian Jackson by way of an Ubuntu user. 
+      (Closes: #382079)
+    - Patch from Ian Jackson to stop claiming dav:// URLs when firefox
+      doesn't understand them. (Closes: #382080)
+  * editor/libeditor/text/nsPlaintextEditor.cpp: Apply patch from
+    bz#271815 to fix OverTheSpot mode used by many Asian language input
+    modules. (Closes: #379935)
+
+ -- Eric Dorland <eric@debian.org>  Tue, 15 Aug 2006 00:09:55 -0400
+
+firefox (1.5.dfsg+1.5.0.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Eric Dorland <eric@debian.org>  Thu,  3 Aug 2006 13:17:45 -0400
+
+firefox (1.5.dfsg+1.5.0.5-1) unstable; urgency=high
+ 
+  [ Eric Dorland ]
+  * New upstream release. Urgency high because it fixes MFSA 2006-44 to
+    MFSA 2006-56 excluiding MFSA-2006-49. (Closes: #380463)
+  
+  [ Mike Hommey ]
+  * debian/firefox.prerm: Remove /usr/lib/firefox/.autoreg instead of
+    /var/lib/firefox/.autoreg.
+  * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in:
+    Removed very old and now useless changes.
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp: Removed
+    useless new line that showed up in the diff.gz.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 30 Jul 2006 17:08:38 -0400
+
+firefox (1.99+2.0b1+dfsg-1) experimental; urgency=low
+
+  * New upstream beta targetted at experimental:
+    - Much better search plugins handling. They can be added and removed at
+      will, and even better, system-wise search plugins can be ignored at the
+      profile level. (Closes: #352195, #320957, #296425, #308005)
+  * browser/components/shell/src/Makefile.in: Correctly install the
+    setDefaultBrowser component.
+  * config/rules.mk: Don't install extensions in the chrome.
+  * debian/firefox.links: Link /usr/lib/firefox/dictionaries to
+    /usr/share/myspell/dicts.
+  * config/autoconf.mk.in, configure, configure.in: Add the
+    --enable-system-myspell argument to configure to use the system myspell
+    library.
+  * extensions/spellcheck/myspell/src/Makefile.in: Use the system myspell
+    library when asked to.
+  * debian/rules:
+    - Add --enable-system-myspell to configure call.
+    - Do shlibsign libfreebl's (there can be several depending on the arch).
+  * debian/control: Add libmyspell-dev to build dependencies.
+  * browser/components/microsummaries/src/Makefile.in, config/Makefile.in:
+    Add rules so that make clean cleans everything.
+  * allmakefiles.sh: Removed references to nonexisting Makefiles in
+    extensions/xmlextras/base.
+  * configure, configure.in: Apply patches from bz#334866, bz#319012 and
+    bz#335949 + fixups to workaround gcc visibility hidden bugs, especially
+    #331460 (an instance of which is actually still present in C++,
+    see gcc#26905).
+  * extensions/inspector/build/src/Makefile.in,
+    extensions/inspector/build/src/inspector.pkg,
+    extensions/inspector/build/src/nsInspectorModule.cpp: Added missing files
+    for the DOM Inspector component.
+  * extensions/inspector/build/src/Makefile.in,
+    layout/inspector/public/Makefile.in: Adapted so that the DOM Inspector
+    component would build correctly and the xpt would be installed in
+    the extensions directory.
+  * extensions/reporter/Makefile.in: Install missing reporter's preference.
+
+ -- Mike Hommey <glandium@debian.org>  Fri, 21 Jul 2006 07:05:25 +0200
+
+firefox (1.5.dfsg+1.5.0.4-3) unstable; urgency=low
+  
+  [ Eric Dorland ]
+  * debian/control: 
+    - Fix silly typo of binutils. (Closes: #378582)
+    - Standards-Version to 3.7.2.1.
+  
+  [ Mike Hommey ]
+  * debian/rules:
+    - Use a specific LD_LIBRARY_PATH at link time so that we don't need to
+      link against indirect dependencies. (Closes: #378378)
+    - Run shlibsign after the files are stripped so that it is accurate and
+      FIPS mode can correctly work.
+    - Removed old commented out OPTFLAGS that were kept in case gcc 4.0 did
+      no better than gcc 3.x.
+    - Removed old exported variables that are useless nowadays.
+    - Removed dh_strip call in binary-indep. Who wants to strip
+      arch-independant files ;)
+  * debian/presubj: Added notes about plugins and crash reports.
+  * security/manager/Makefile.in, security/nss/cmd/shlibsign/Makefile:
+    Don't build nor install the .chk files but still build shlibsign.
+  * debian/firefox.install: Don't install .chk files since we generate them
+    after dh_strip.
+  * security/nss/cmd/shlibsign/manifest.mn: Don't build in shlibsign/mangle.
+    It doesn't build anyway.
+
+ -- Eric Dorland <eric@debian.org>  Wed, 19 Jul 2006 23:56:22 -0400
+  
+firefox (1.5.dfsg+1.5.0.4-2) unstable; urgency=low
+
+  [ Eric Dorland ]
+  * netwerk/base/public/security-prefs.js: Disable SSLv2 by default. I
+    thought the weak cipher warning took care of this. (Closes: #371153)
+  * debian/firefox-runner: Simplify the dsp autodetection and add aoss to
+    the roster. (Closes: #372848)
+  * firefox-restart-required.update-notifier, firefox.postinst,
+    firefox.install: Add update-notifier to indicate that firefox needs to
+    be restarted on upgrade. Based on Ian Jackson's patch, but reworked a
+    little. Also with a bad French translation. Translators, assemble!
+    (Closes: #365865)
+  * config/rules.mk, debian/control: Apply patch from Thiemo Seufer to
+    remove mips -xgot hack and build depend on the appropriate binutils on
+    mips and mipsel. (Closes: #374372)
+  * debian/presubj, debian/README.Debian: Add a bit more information about
+    disabling Pango, which often seems to be the source of problems.
+  * debian/firefox-runner: 
+    - Print out MOZ_NO_REMOTE in verbose mode.
+    - Fix some unreachable logic, Thanks Daniel Jacobowitz.
+
+  [ Mike Hommey ]
+  * debian/rules:
+    - Fix for Gecko date extraction from client.mk.
+    - Disabled strict aliasing from optimized builds.
+    - Added -Wl,--as-needed to the LDFLAGS, so that we don't get indirect
+      libraries linked.
+  * config/static-config.mk: Add MOZ_XFT_LIBS to STATIC_EXTRA_LIBS. It used to
+    get linked as a side effect of linking to indirect libraries, but should
+    be linked directly since Xft symbols are used.
+  * debian/firefox-restart-required.update-notifier: Fixed the french
+    translation. ;)
+  * content/html/content/src/nsGenericHTMLElement.cpp,
+    content/html/content/src/nsHTMLInputElement.cpp,
+    dom/src/base/nsGlobalWindow.cpp: Fixed crasher and potential crashers.
+    Reported bz#343953.
+
+ -- Eric Dorland <eric@debian.org>  Sun,  9 Jul 2006 02:37:28 -0400
+
+firefox (1.5.dfsg+1.5.0.4-1) unstable; urgency=low
+
+  * The "Post-DebConf Hangover" release.
+  
+  [ Eric Dorland ]
+  * New upstream release. Fixes various security issues. MFSA 2006-31 to
+    MFSA 2006-43, excluding MFSA 2006-40.
+  * debian/control:
+    - Standards-Version to 3.7.2.0.
+    - Set priority of -dbg to extra and Section to devel.
+  * gfx/src/gtk/nsFontMetricsPango.cpp,
+    intl/lwbrk/src/nsJISx4501LineBreaker.cpp,
+    intl/unicharutil/util/nsUnicharUtils.h,
+    intl/unicharutil/util/nsUnicharUtils.cpp,
+    layout/generic/nsTextFrame.cpp: Patch from Jurij Smakov (from
+    bz#161826) to fix alignment issues on sparc64. (Closes: #354725)
+
+  [ Mike Hommey ]
+  * Applied distclean patch from xulrunner (in
+    debian/patches/01_distclean.dpatch), except for the javaxpcom stuff we
+    don't build anyway.
+  * browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd},
+    config/static-rules.mk: More cleaning for firefox.
+  * nsprpub/configure: Apply change to nsprpub/configure.in.
+    (Closes: #350616)
+  * gfx/src/gtk/nsFontMetricsPango.cpp: Some more changes so that it
+    actually builds without errors, and use PR_Malloc and PR_Free instead
+    of malloc and free.
+
+ -- Eric Dorland <eric@debian.org>  Fri,  2 Jun 2006 12:13:18 -0400
+
+firefox (1.5.dfsg+1.5.0.3-2) unstable; urgency=low
+
+  * debian/firefox.desktop: Add spanish translation, just in time for
+    DebConf 6! Thanks Ian Jackson. (Closes: #365870)
+  * debian/firefox-runner: Actually apply the patch from Morita Sho in
+    #364566. I'm a moron. (Closes: #365956, #365960)
+  * debian/control: Standards-Version to 3.7.1.0. Go policy team!
+
+ -- Eric Dorland <eric@debian.org>  Thu,  4 May 2006 01:38:18 -0400
+
+firefox (1.5.dfsg+1.5.0.3-1) unstable; urgency=critical
+
+  * The "secure enough for ya!" release.
+  * New upstream release. Contains security fixes, hence severity
+    critical. 
+    - Fixes CVE-2006-1993 aka MFSA 2006-30. (Closes: #364810)
+  
+  [ Mike Hommey ]
+  * security/manager/Makefile.in, debian/firefox.install: Build and
+    install the .chk file again. That will make the FIPS mode work again.
+  * debian/control: Bumped Standards-Version to 3.7.0.0. No changes.
+  * debian/rules: Fix the navigator.ProductSub value for dumb scripts.
+    Closes: #364640, #365099. We now use the date of the client.mk file,
+    which is likely to be the closest value to the release date, instead of
+    useless build date.
+    Add the debian version after the firefox version string.
+  * debian/rules: Use dpkg-architecture to find out the host and build that
+    we want to pass to the configure script. (Closes: #365738)
+
+  [ Eric Dorland ]
+  * debian/firefox-runner: 
+    - Quote the APPLICATION_ID variable to handle profiles with a space 
+      in the name. Inspired by Morita Sho's patch. (Closes: #364566)
+    - echo MOZ_DISABLE_PANGO on verbose.
+  * debian/rules: It's baaaackkk. Reenable xprint.
+
+ -- Eric Dorland <eric@debian.org>  Wed,  3 May 2006 00:32:49 -0400
+
+firefox (1.5.dfsg+1.5.0.3-0ubuntu3) dapper; urgency=low
+
+  * Thai-related crash fix (Malone 45395):
+    - nsCopySupport.cpp, nsCopySupport::HTMLCopy:
+       do not crash if htmlConverter->Convert fails.
+    - nsHTMLFormatConverter.cpp, nsHTMLFormatConverter::Convert:
+       properly report failure if dataStr.IsEmpty.
+    - nsJISx4501LineBreaker.cpp: fix printf(stderr -> fprintf.
+  * Add Polish translation for firefox.desktop (Malone 45447).
+    Thanks to contribution from Tomasz Dominikowski.
+  * Do not attempt to merge /usr/lib/mozilla-firefox and /usr/lib/firefox
+    and make the former a link to the latter; this is unfortunately
+    error-prone and makes more problems than it solves.
+    Fixes Malone 44487; regresses the plugins directory confusion bug.
+  * Include MFSA and CVE numbers in changelog entry for 1.5.dfsg-1.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 23 May 2006 17:45:30 +0100
+
+firefox (1.5.dfsg+1.5.0.3-0ubuntu2) dapper; urgency=low
+
+  * Fix memory leak in large clipboard handling.  Malone 41093.
+    Mozilla Bugzilla 289897; applied attachments 218749, 218753.
+  * Provide symlink /usr/lib/mozilla-firefox -> /usr/lib/firefox
+    (and shuffle stuff across if both directories exist).
+  * Remove update-notifier `restart required' on removal so that if you
+    remove firefox you're no longer asked to restart it.  Malone 36739.    
+  * Increase size of prefs window explicitly.  Malone 43528.
+  * Suppress the error if /var/lib/locales/supported.d/* can't be read
+    (probably because it doesn't exist).  If you get EIO or EACCES or some
+    such then having pango mysteriously disabled will be the least of your
+    worries.  Malone 44016.
+  * Really use firefox_1.5.dfsg+1.5.0.3.orig.tar.gz from Debian.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 12 May 2006 19:20:30 +0100
+
+firefox (1.5.dfsg+1.5.0.3-0ubuntu1) dapper; urgency=low
+
+  * New upstream version, 1.5.0.3, security/stability fix from upstream:
+    MFSA 2006-30, CVE-2006-1993: Deleted
+     object reference when designMode="on" 
+    This package is based on Debian's firefox_1.5.dfsg+1.5.0.3.orig.tar.gz
+    but has none of the corresponding Debian changes.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 10 May 2006 12:13:30 +0100
+
+firefox (1.5.dfsg+1.5.0.2-3) unstable; urgency=low
+
+  * debian/rules, debian/control: Build the -dbg package again.
+  * debian/firefox.1: Fix some incorrect references to mozilla. Thanks
+    Loïc Minier. (Closes: #364101)
+  * debian/firefox-runner: Patch from Mikhail Gusarov to be able to use
+    Network Audio Server's dsp wrapper. (Closes: #363124)
+  * debian/firefox.install: Fix screwed up path to firefox.xpm. (Closes:
+    #364359)
+  * debian/README.Debian: Document that firefox doesn't allow connections
+    on certain ports. Thanks W. Borgert. (Closes: #362785)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 23 Apr 2006 22:41:15 -0400
+
+firefox (1.5.dfsg+1.5.0.2-2) unstable; urgency=critical
+
+  * The "ftp-master's aren't my friends today" release.
+  * debian/rules, debian/control: Don't build the -dbg package for now, to
+    get around NEW queue processing.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 20 Apr 2006 22:33:18 -0400
+
+firefox (1.5.dfsg+1.5.0.2-1) unstable; urgency=critical
+
+  [ Eric Dorland ]
+  * New upstream release. Contains security fixes, hence severity
+    critical.
+    - Fixes the following vulnerabilites (Thanks Alexander Sack for 
+      compiling the list): CVE-2006-1724, CVE-2006-0884, 
+      CVE-2006-1730, CVE-2006-1729, CVE-2006-1728, CVE-2006-1727, 
+      CVE-2006-1045, CVE-2006-0748, CVE-2006-1726, CVE-2006-1725, 
+      CVE-2005-2353. (Closes: #362656)
+  * debian/firefox-runner: Patch from Paul Collins to fix some lingering
+    ProfileManager launch issues. (Closes: #356250)
+  * browser/components/preferences/privacy.xul,
+    browser/locales/en-US/chrome/browser/preferences/preferences.dtd:
+    Patch from Ian Jackson to make the preferences window bigger for
+    people with high rez displays. His changelog entry reads:
+    * Make Preferences window not chop off various elements:
+      - specify a width of 50em instead of 42em
+      - do not specify a height
+      - add another <separator/> to the bottom of privacy.xul's prefpane.
+        I have no idea why this is necessary :-(.
+      Malone 36985.
+  * configure.in, configure: Small typo in configure.in that wasn't
+    setting TARGET_XPCOM_ABI properly and breaking binary extensions on
+    some arches. (Closes: #359228)
+
+  [ Mike Hommey ]
+  * debian/rules: Disable elf-dynstr-gc, which is pretty useless nowadays.
+  * security/coreconf/rules.mk: Fix perl code that got broken by newer make.
+    Taken from bz#325148.
+  * browser/app/Makefile.in: Apply patch from bz#314927 to install default.xpm
+    in the correct place.
+  * debian/rules, debian/firefox.dirs, debian/firefox.install: Updated to fit
+    this change.
+  * security/coreconf/rules.mk: Force use of the -g flag in the CFLAGS.
+ 
+ -- Eric Dorland <eric@debian.org>  Sun, 16 Apr 2006 18:40:02 -0400
+
+firefox (1.5.dfsg+1.5.0.2-0ubuntu2) dapper; urgency=low
+
+  * Increase sizes of various dialogue boxes so that all of the contents
+    fit.  Malone 26225, 36985, and probably others.
+  * Set MOZ_DISABLE_PANGO=1 to disable pango, unless some locale is
+    selected as supported which would need pango for rendering; the
+    default can be overridden by setting MOZ_DISABLE_PANGO to 0 or 1.
+    Malone 32561 (workaround).
+  * Use update-notifier to request a firefox restart.  Malone 36739.
+  * Added Spanish translation to firefox.desktop.
+    Malone 39972.  Thanks to Rocco Stanzione for the patch.
+  * Add a couple of missing trailing newlines.
+    Malone 39972 again.  Thanks Rocco Stanzione for the report.
+  * EbmedWindow::GetVisibility bugfix, Malone 40320, upstream 312998,
+    thanks to chpe for the patch and discussion.
+  * Add FC_ANY_METRICS set to FcTrue to all patterns that are going to be
+    used for finding (rather than enumerating) fonts.  Malone 42559.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue,  2 May 2006 18:59:32 +0100
+
+firefox (1.5.dfsg+1.5.0.2-0ubuntu1) dapper; urgency=low
+
+  * New upstream version, 1.5.0.2.
+    Described as `stability and security fixes' by upstream but many
+    changes are included and producing a complete list is infeasible :-(.
+    Fixes are known to be included for:
+    - MFSA 2006-29, CVE-2006-1725: Spoofing with translucent windows
+    - MFSA 2006-28, CVE-2006-1726: Security check of
+         js_ValueToFunctionObject() can be circumvented
+    - MFSA 2006-27, CVE-2006-0748: Table Rebuilding Code Execution
+         Vulnerability
+    - MFSA 2006-25, CVE-2006-1727: Privilege escalation through Print Preview
+    - MFSA 2006-24, CVE-2006-1728: Privilege escalation using
+         crypto.generateCRMFRequest
+    - MFSA 2006-23, CVE-2006-1729: File stealing by changing input type
+    - MFSA 2006-22, CVE-2006-1730: CSS Letter-Spacing Heap Overflow
+         Vulnerability
+    - MFSA 2006-20, CVE-2006-1529, CVE-2006-1530, CVE-2006-1531,
+      CVE-2006-1723, CVE-2006-1724: Crashes with evidence of memory
+         corruption.
+    This package is based on Debian's firefox_1.5.dfsg+1.5.0.2.orig.tar.gz
+    but has none of the corresponding Debian changes.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 26 Apr 2006 16:53:22 +0100
+
+firefox (1.5.dfsg+1.5.0.1-5) unstable; urgency=low
+
+  [ Mike Hommey ]
+  * debian/rules:
+    - Add -g to the build flags when building with DEB_BUILD_OPTIONS=nostrip.
+      If we ask for nostrip, we want the debugging
+      symbols, right? ;)
+    - Changed the way we identificate ourselves in vendor.js.
+  * layout/build/Makefile.in, layout/build/nsLayoutModule.cpp: Remove useless
+    useragent setter at startup so that general.useragent.product and
+    general.useragent.productSub set in our vendor.js preference file work at
+    startup time.
+  * security/coreconf/Linux.mk:
+    - Patch from Martin Michlmayr for mips64 builds.
+    - Don't use x86 as CPU_ARCH when building on an unsupported architecture.
+  * security/manager/Makefile.in, security/nss/lib/ckfw/builtins/Makefile,
+    security/nss/lib/manifest.mn: Don't build the stuff we don't need, and
+    dynamically link libnssckbi to both libplc4 and libplds4 instead of
+    linking statically.
+  * debian/firefox.postinst, debian/firefox.prerm,
+    debian/firefox-gnome-support.postinst, debian/firefox-gnome-support.prerm:
+    Touch a .autoreg file at configure time, or removal of gnome-support and
+    remove it with the package. This will trigger autoregistration of the
+    components if the compreg.dat and xpti.dat files are older than the
+    .autoreg file. We used to remove compatibility.ini for that reason, but
+    stopped doing that because firefox was supposed to do that correctly,
+    which actually only correctly works on new upstream versions, not new
+    debian revisions, or installation of gnome-support.
+  * xpfe/components/killAll/Makefile.in: Correctly install the killAll
+    component.
+
+  [ Eric Dorland ]
+  * debian/control:
+    - Set Section of firefox-gnome-support and
+      mozilla-firefox-gnome-support to gnome.
+    - Standards-Version to 3.6.2.2.
+    - debhelper build-dep to >= 5.0.
+    - Add firefox-dbg package.
+  * debian/compat: Set to 5.
+  * debian/rules:
+    - Remove silly CVS tarball cleanup target.
+    - Add arch-independant debhelper calls, and make other debhelper
+      calls arch-dependent.
+    - Add --dbg-package=firefox-dbg to dh_strip call.
+    - Always build with the -g flag. (Based on a change Mike made)
+    - Patch from Andreas Jochens to use -mminimal-toc when building on 
+      ppc64. (Closes: #361035)
+    - Use --disable-strip, --disable-strip-libs in configure parameters.
+      Thanks Ian Jackson.
+    - Use .upstream instead of .orig to make it more clear and not  
+      confuse the clean target. Thanks Ian Jackson. (Closes: #362186)
+    - Disable xprint support for now, while the Xorg 7 transition sorts 
+      itself out. Should be reenabled next release.
+  * debian/firefox.xpm: Add more Debian compliant menu icon.
+  * debian/firefox.install, debian/rules: Install new Debian compliant
+    icon.
+  * debian/firefox.desktop: Add StartupNotify=true for pretty waiting
+    cursor. Thanks Sven Arvidsson. (Closes: #361527)
+  * debian/firefox-dom-inspector.preinst,
+    debian/firefox-dom-inspector.links,
+    debian/firefox-dom-inspector.install: Install non-architecture
+    specific bits of the inspector into /usr/share/firefox.
+  * debian/firefoxrc: Disable the dsp wrapper by default. esddsp is just
+    too buggy to allow this to continue. May reenable later if they clean
+    up their act. Leaving the bugs open for now.
+  * debian/firefox.NEWS: 
+    - Document the dsp wrapper changes.
+    - Remove old mozilla-firefox entries.
+  * debian/firefox.1: Fix typo of firefox, thanks Andrew Rendle. (Closes:
+    #362413)
+  * debian/firefox.install: We don't get .chk files anymore for some
+    reason.
+
+ -- Eric Dorland <eric@debian.org>  Fri, 14 Apr 2006 15:52:41 -0400
+
+firefox (1.5.dfsg+1.5.0.1-4) unstable; urgency=low
+
+  [ Mike Hommey ]
+  * debian/firefox-runner, debian/firefox.1: Patch from Ian Jackson to
+    make -P, -CreateProfile and -ProfileManager options correctly work
+    again, and improve the manual page. (Closes: #356250)
+  * debian/firefox.desktop:
+    - Fix trivial syntax problems. (Closes: #356263)
+    - Added Japanese and Korean translations.
+  * debian/firefox.dirs: Removed remainings of the time when we had a file
+    in /usr/sbin. (Closes: #356268)
+  * debian/firefox-gnome-support.prerm,
+    debian/firefox-gnome-support.postinst: Removed bashisms. (Closes:
+    #349946)
+  * debian/README.Debian:
+    - Replaced the bug reporting information by an invitation to read
+      /usr/share/bug/firefox/presubj. (Closes: #356269)
+    - Changed the heading to "Firefox for Debian".
+
+  [ Eric Dorland ]
+  * debian/firefox-gnome-support.postinst,
+    debian/firefox-gnome-support.prerm: Add forgotten #DEBHELPER# token.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 12 Mar 2006 21:34:14 -0500
+
+firefox (1.5.dfsg+1.5.0.1-3) unstable; urgency=low
+
+  [ Eric Dorland ]
+  * debian/control: Use strict dependencies for the transition packages,
+    no reason a transition package should be upgraded before the real
+    package.
+  * debian/README.Debian: Fix all references to
+    /etc/mozilla-firefox/mozilla-firefoxrc. (Closes: #351956)
+  * debian/firefox.desktop: Patch from Ian Jackson to add more
+    translations and more inline with the GNOME HIG. (Closes: #351807)
+  * widget/src/gtk2/nsWindow.cpp: Apply new ignore extended mouse buttons
+    patch from Peter Colberg (Closes: #351972)
+  * debian/firefox.1: Lower case first letter of -ContentLocale.
+  * debian/firefox.1, debian/firefox-runner: Add -no-remote switch to turn
+    on MOZ_NO_REMOTE. Use it for profile related commands as
+    well. (Closes: #351717, #344849)
+  * wikipedia.gif.uu, wikipedia.src, rules, firefox.install: Patch from
+    Ian Jackson to add wikipedia search engine. (Closes: #354107)
+
+  [ Mike Hommey ]
+  * modules/libpref/src/init/all.js: Set default fonts for all languages to
+    serif, sans-serif and monospace. It might solve a lot of fonts problems.
+  * config/config.mk, config/make-jars.pl, configure.in,
+    security/nss/lib/fortcrypt/swfort/pkcs11/config.mk,
+    extensions/inspector/Makefile.in: Allow building without zip when
+    building flat chrome.
+  * configure: Ran autoconf accordingly to changes in configure.in.
+  * debian/control: Removed build dependency on zip.
+  * debian/rules: Build flat chrome.
+  * debian/firefox.install: Changed wildcards accordingly.
+  * config/rules.mk:
+    + Don't build chromelist.txt files.
+    + Fixed "jar" build so that inspector files don't get duplicated in the
+      extension directory.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 26 Feb 2006 11:45:15 -0500
+
+firefox (1.5.dfsg+1.5.0.1-2) unstable; urgency=low
+
+  [ Mike Hommey ]
+  * debian/firefox-runner: export MOZ_DISABLE_PANGO. (Closes: #351959)
+  * debian/README.Debian: changed reference to the rc file in /etc.
+    (Closes: #351956)
+  
+  [ Eric Dorland ]
+  * debian/firefox.preinst: Fix {}'s bashism. Thanks Jeff King. (Closes:
+    #351811)
+  * modules/libpref/src/init/all.js: Make print.postscript.print_command
+    space-safe. Thanks Ian Jackson. (Closes: #351809)
+  * debian/firefox-runner: Don't completely override
+    $MOZ_PLUGIN_PATH. Thanks Ian Jackson. (Closes: #351806)
+
+ -- Eric Dorland <eric@debian.org>  Thu,  9 Feb 2006 01:23:35 -0500
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu12) dapper; urgency=low
+
+  * Sponsored upload for Theppitak Karoonboonyanan
+  * Updated Thai word breaking patch:
+    - load `libthai.so.0' instead of `libthai.so'.
+    - print debug message only when DEBUG is defined.
+    - debian/control: Suggests libthai0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Apr 2006 13:25:14 +0200
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu11) dapper; urgency=low
+
+  * Fix silly lack of [ ] quoting in AC_DEFUN use.
+    Malone 36659, Mozilla bugzilla 298457.
+  * Make Preferences window not chop off various elements:
+    - specify a width of 50em instead of 42em
+    - do not specify a height
+    - add another <separator/> to the bottom of privacy.xul's prefpane.
+      I have no idea why this is necessary :-(.
+    Malone 36985.
+  * Fix broken UTF-8 in .desktop file (again).  Malone 37779.
+  * Document how to use xpcshell in README.Debian.  Malone 35333.
+  * Clarify updateReadOnlyMessage to refer to `system package manager'
+    which will help the misunderstanding in Malone 31284.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 12 Apr 2006 17:18:52 +0100
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu10) dapper; urgency=low
+
+  * Generate `firefox-dbg' package with debugging symbols.
+    This involves changing debian/compat to 5, which should be safe.
+  * Fix Norwegian translation in firefox.desktop. (Malone 30603.)
+  * Fix trivial syntax problems in firefox.desktop. (Malone 33567.)
+  * Remove x-directory/webdav x-directory/webdav-prefer-directory
+    from MimeType list in desktop file.  (Malone 35928.)
+  * Use `about.png.upstream' instead of `about.png.orig' is the saved
+    original version for the branding; *.orig tends to get clobbered.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 24 Mar 2006 18:49:46 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu9) dapper; urgency=low
+
+  * added thai linebreaking support (thanks to Theppitak Karoonboonyanan)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 14 Mar 2006 15:16:52 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu8) dapper; urgency=low
+
+  * debian/rules:
+    - renamed the idl directory to match the .pc name, 
+      replace mozilla-firefox by firefox for firefox-config too
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 13 Mar 2006 15:12:43 +0100
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu7) dapper; urgency=low
+
+  * Pointing the .pc files to /usr/include/firefox is not enough,
+    better install the headers there too.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 11 Mar 2006 17:41:24 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu6) dapper; urgency=low
+
+  * Replace Ubuntu Bugzilla bookmark with Launchpad's `Request
+    support with Ubuntu' ticket creation page.  (Malone 28896.)
+  * Reinstate `Translate This Application' in Help menu, despite the fact
+    that Launchpad doesn't do this yet - you just get a page saying there
+    are no translations for Firefox.  mdz assures us that this will be
+    done some time during dapper's service life.
+  * Make -P, -CreateProfile and -ProfileManager imply sensible
+    values for -a, and document -a in firefox(1).  (Malone 31746.)
+  * Fix md5sum mismatch which causes spurious conffile prompt on
+    bookmarks.html.
+  * Set browser.startup.homepage_override.mstone to ignore,
+    to avoid the silly thing where the first time after the upgrade,
+    firefox looks like it has lost your home page because it is so keen to
+    tell you about the release notes.  (Malone 33895.)
+  * Change `Latest Headlines' to `Latest BBC Headlines' to properly
+    disclose the source up front, and use a corresponding RSS URL.
+  * Revert the `you have chosen to open' dialogue, as discussed on
+    ubuntu-devel.
+  * Fix firefox-*.pc files to contain correct references to libs and
+    includes, just like the mozilla-*.pc files.  (Malone 34200.)
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu,  9 Mar 2006 19:56:58 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu5) dapper; urgency=low
+
+  * Disable `Translate This Application' and don't try to have `Get Help
+    Online' translated because we don't know how to translate firefox:
+    https://launchpad.net/products/rosetta/+spec/rosetta-firefox-support
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 24 Feb 2006 14:49:23 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu4) dapper; urgency=low
+
+  * Disable (by default) the `you have chosen to open' dialogue box;
+    instead, we just take the default (which is to open with the
+    application from the Gnome MIME database).  This behaviour is
+    controlled by browser.helperApps.defaultNoAsk.openFile.
+  
+  Bookmark, search and translation reference regression fixes:
+  * Restore `Translate This Application' and `Get Help Online'
+  * Add Ubuntu and Free Software links back to bookmarks
+  
+  Bookmark, search and translation references improvements:
+  * Add Wikipedia to search box.
+  * Remove `Quick searches' from bookmarks (these just replicate
+    entries from the search box, and are broken anyway).
+  
+  * Get rid of README.Ubuntu - the contents are now no longer relevant.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 23 Feb 2006 14:44:42 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu3) dapper; urgency=low
+
+  * Move /usr/lib/libxpcom*.so etc. back to /usr/lib/firefox; avoids
+    clashes with other packages (eg mozilla).
+  * Add rpath setting for /usr/lib/firefox to all .pc files in
+    firefox-dev.  This is suboptimal, but at least it allows programs
+    which use firefox-dev at compile-time to find firefox's .so's.
+  * Take some redundant and perhaps privacy-leaking information out
+    of the default User-Agent (Malone 30677).
+
+ -- Ian Jackson <iwj@ubuntu.com>  Fri, 10 Feb 2006 17:42:12 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu2) dapper; urgency=low
+
+  * Fix stupid FTBFS on default.xpm introduced in last upload.
+  * Retrospectively insert CVE numbers into 1ubuntu1 changelog entry.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu,  9 Feb 2006 12:45:15 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1ubuntu1) dapper; urgency=low
+
+  Changes since 1.5.dfsg-4ubuntu6:
+  * New upstream version (1.5.0.1) - security and stability fixes,
+    allegedly. (About 7000 lines of diff, so not reviewed for Ubuntu.)
+    Security fixes included:
+    - CVE-2006-0292, CVE-2006-0293, MFSA 2006-01: JavaScript garbage-collection
+      hazards
+    - CVE-2006-0294, MFSA 2006-02: Changing position:relative to static
+      corrupts memory
+    - CVE-2005-4134, MFSA 2006-03: Long document title causes startup denial of
+      Service
+    - CVE-2006-0295, MFSA 2006-04: Memory corruption via QueryInterface on
+      Location, Navigator objects
+    - CVE-2006-0296, MFSA 2006-05: Localstore.rdf XML injection through
+      XULDocument.persist()
+    - CVE-2006-0297, MFSA 2006-06: Integer overflows in E4X, SVG and Canvas
+    - CVE-2006-0298, MFSA 2006-07: Read beyond buffer while parsing XML
+    - CVE-2006-0299, MFSA 2006-08: "AnyName" entrainment and access control
+      hazard
+  * Fix Norwegian translation in .desktop file.  (Malone #30603.)
+  * mkdir /usr/include/mozilla in firefox-dev.preinst to avoid
+    maintainer script sometimes preventing installation.
+  * Move the shlibs needed for gtkmozembed to /usr/lib (avoids
+    need for rpath and nonsense in firefox-gtkmozembed.pc).
+  * Work around new GNU make braindamage by adding seddery to
+    security/coreconf/rules.mk.
+
+  Expected-permanent differences between Ubuntu and Debian:
+  * Build nspr and nss for use by all other programs in the distribution
+    (Packages: libnspr-dev, libnss-dev, libnspr4, libnss3.  Fairly main
+    changes to parts of the build system.)  This is so that mozilla
+    can be in Ubuntu universe.
+  * Disable xprint.  (xprint is not used in Ubuntu.)
+  * Slightly different arrangements do with with transitional arrangements
+    related to package renaming from mozilla-firefox-*.
+  * Removed transitional packages mozilla-firefox-dom-inspector and
+    mozilla-firefox-gnome-support (not needed in Ubuntu).
+  * Build firefox-dev; applications which embed a browser in Ubuntu
+    generally embed Firefox rather than mozilla.  This also means that we
+    build firefox with dynamic linking so that embedders and load ff.
+  * Debian package search replaced by Ubuntu package search (and defaults
+    to searching only in dapper, not all releases).
+  * Changes to various icons (and their installation paths).
+  * Strip CUPS/ from the front of displayed printer names, since
+    all printing in Ubuntu is done via CUPS.
+
+  Other differences remaining between Ubuntu and Debian:
+  * debian/rules clean removes various junk left over by the mozilla build
+    system.  (Debian #350616.)
+  * Exclude libssl3.so from dpkg_shlibdeps as this triggers a bug in
+    fakeroot on amd64 in Ubuntu.
+  * Set FIREFOX_DSP=none by default.  Will sometimes break sound from eg
+    Flash.  See https://launchpad.net/malone/bugs/29760 for rationale.
+    (Debian maintainers notified but no bug filed.)
+  * Append our plugin path to any previous value of MOZ_PLUGIN_PATH.
+    (Malone 29412.  Debian #351806)
+  * firefox.desktop file has more translations and consistently calls the
+    application `Firefox Web Browser' (for better UI in the menus - this
+    change is also in firefox.menu).  Debian #351807.
+  * Default printing command doesn't break if printer name contains
+    spaces (actually a preference, in all.js).  (Debian #351809,
+    Mozilla Bugzilla #326245). 
+  * security/coreconf/rules.mk adjusted with awful seddery to cope with
+    GNU make change to POSIXly interpretation of backslash line-joining.
+    See http://lists.debian.org/debian-devel/2005/12/msg00988.html.
+    Mozilla Bugzilla #325148.
+  * security/coreconf/ruleset.mk has a set -e added.
+  * Use GNOME mime database instead of mailcap.  Patch imported from Red
+    Hat; see debian/gnome-mime-handling.diff.
+  * Change various preferences:
+    - Ubuntu-specific default homepage
+    - Ubuntu-specific release notes
+    - default homepage can be locale-specific
+    - middlebutton paste disabled
+    - do not load a special home page on first start after an upgrade
+    - disable File / Import (wizard is nonfunctional).
+      Malone #28563, Debian #350599, Mozilla Bugzilla 117844.
+    - save files to Desktop by default
+    - README.Ubuntu file (still rather full of junk)
+    - Prevent websites disabling the right-button context menu.
+    - Default font for display is sans, but:
+    - Default CSS for printing uses a serif font.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue,  7 Feb 2006 17:14:17 +0000
+
+firefox (1.5.dfsg+1.5.0.1-1) unstable; urgency=low
+
+  * The "those Ubuntu guys are great after all" release.
+  * New upstream release. (Closes: #351442)
+  
+  [ Mike Hommey ]
+  * debian/presubj: Added indications to try to reproduce without extensions
+    before actually filing a bug, and a hint to the safe mode.
+  * debian/firefox.install: added the reporter chrome files. (Closes: #344888)
+  * widget/src/gtk2/nsWindow.cpp: Revert additional stale patch for
+    extended mouse buttons support.
+  * debian/firefox.postinst, debian/firefox.prerm: unbashified.
+    (Closes: #349946)
+  * debian/control, debian/firefox-gnome-support.postinst,
+    debian/firefox-gnome-support.prerm: Let the firefox-gnome-support
+    package provide gnome-www-browser and handle a gnome-www-browser
+    alternative. Thanks Loïc Minier. (Closes: #350788)
+  * debian/firefox-runner: Enable Pango support by default. The
+    MOZ_ENABLE_PANGO environment variable is now useless. (Closes: #338716)
+  * debian/README.Debian: Change the paragraph about Pango to hint about
+    the MOZ_DISABLE_PANGO variable. 
+
+  [ Eric Dorland ]
+  * content/events/src/nsEventStateManager.cpp,
+    modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h: Apply
+    patch from Ian Jackson to revert a stale patch for multiple mouse
+    button support that was fixed in a different way in 1.5
+    (Closes: #348375)
+  * debian/firefox.preinst: Check md5sum's of old conffiles before cp'ing
+    them on upgrade. This won't stop all unnecessary conffile prompting in
+    all situations (especially from really old versions), but should
+    definitely should work for upgrading from testing or stable. (Closes:
+    #345112)
+  * debian/firefox.install:
+    - Remove run-mozilla.sh. (Closes: #348902)
+    - Reorganize things a bit.
+    - Move profile into /etc/firefox here, instead of in the rules file.
+  * debian/firefox.install, debian/firefox.preinst, debian/firefox.links,
+    debian/firefox.dirs, debian/rules: Move chrome, defaults, greprefs
+    into /usr/share/firefox for more FHS goodnesss.
+  * debian/firefox.1: Document -new-tab and -new-window options, and
+    remove deprecated -remote option. (Closes: #348699)
+  * debian/firefox-runner: Apply patch to properly URL escape local
+    files. Thanks Morita Sho. (Closes: #348451)
+  * browser/app/profile/firefox.js:
+    - Reallow 40-bit ciphers, since now firefox warns people who 
+      use them. (Closes: #349624)
+    - Enable bidi UI elements for our bi-directional friends. 
+      (Closes: #348069)
+  * debian/rules: Remove glob pattern from dh_install invocation. Thanks
+    Ian Jackson. (Closes: #350571)
+  * browser/base/content/aboutDialog.xul: Fix spurious scrollbar in the
+    about dialog box. Thanks Ian Jackson. (Closes: #350608)
+  * js/src/fdlibm/fdlibm.h: Patch to fix little endianess of
+    mipsel. Thanks Ian Jackson and Thiemo Seufer. (Closes: #350621)
+  * browser/base/content/search.xml: Patch from Ian Jackson to remove
+    misleading Clear option from search box context menu. (Closes: #350611)
+  * debian/watch: Fix regex to actually find the upstream tarballs.
+  * modules/libpref/src/init/all.js: Cope better with printers with spaces
+    in the name. Thanks Ian Jackson.
+  * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Take patch
+    from bz#235336 as suggested by Ian Jackson to allow password manager
+    to work with sites that only have a password field, no username.
+
+ -- Eric Dorland <eric@debian.org>  Mon,  6 Feb 2006 23:10:29 -0500
+
+firefox (1.5.dfsg-4) unstable; urgency=low
+
+  [ Eric Dorland ]
+  * debian/control, debian/rules: 
+    - Remove Kerberos options, it is now loaded dynamically.
+    - Use /usr/share/firefox now for finding default.xpm.
+  * debian/firefox.install, debian/firefox.links, debian/firefox.preinst:
+    Start moving some clearly non-arch specific things
+    (/usr/lib/firefox/searchplugins, /usr/lib/firefox/icons,
+    /usr/lib/firefox/res) out of /usr/lib/firefox and into
+    /usr/share/firefox to make things more FHS friendly. Can't believe no
+    one ever called me on this before.
+  * toolkit/components/remote/nsGTKRemoteService.cpp,
+    widget/src/xremoteclient/XRemoteClient.cpp: Apply patch from bz#312154
+    to fix remote interface on PPC (and probably other arches). (Closes:
+    #343913)
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp: Patch from
+    Zack Weinberg to fix FTBFS on m68k. (Closes: #343687)
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp: Patch from Antti
+    P Miettinen to fix small optimization problem with newer gcc's
+    (Closes: #344846)
+
+  [ Mike Hommey ]
+  * debian/firefox-runner: Cleaned up now useless variables.
+
+ -- Eric Dorland <eric@debian.org>  Tue, 10 Jan 2006 10:11:34 -0500
+
+firefox (1.5.dfsg-3) unstable; urgency=low
+
+  * debian/control: 
+    - Need explicit build dependency on gtk >= 2.8.
+    - Upgrade Standards-Version to 3.6.2.1. No changes.
+    - Add compatibility packages for mozilla-firefox-dom-inspector
+      and mozilla-firefox-gnome-support and make all the upgrade packages 
+      Architecture: all. (Closes: #343879, #344379)
+  * debian/watch: Add watch file.
+  * debian/about.png.uu: Add uuencoded version of previous about box
+    graphic.
+  * debian/rules: uudecode and install the about.png into the right
+    location.
+  * debian/firefox-runner: Add MOZ_PLUGIN_PATH to include plugins at the
+    old location for now. (Closes: #344085, #341682)
+  * widget/src/gtk2/nsWindow.cpp: Patch from bz#305970 to fix broken
+    contextual menu on Save File As. (Closes: #344430)
+
+  * config/mkdepend/imakemdep.h, security/nss/lib/pki1/pki1.h: Remove some
+    patches that are now useless (suggested by Mike Hommey).
+  * mailnews/extensions/palmsync/palm.html,
+    browser/themes/pinstripe/browser/browser.css,
+    gfx/src/mac/nsNativeThemeMac.h,
+    directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt,
+    layout/html/tests/table/bugs/bug123862.html,
+    layout/html/tests/table/bugs/bug119786.html,
+    layout/html/tests/table/bugs/bug101759.html,
+    layout/html/tests/table/bugs/bug14489.html,
+    layout/html/tests/table/bugs/bug222846.html,
+    layout/html/tests/block/bugs/155333-1.html,
+    layout/html/tests/block/bugs/185411-2.html,
+    layout/html/tests/block/bugs/13599.html,
+    layout/html/tests/block/bugs/53960.html,
+    layout/html/tests/block/bugs/155333-2.html,
+    layout/html/tests/block/bugs/38157-a.html,
+    layout/html/tests/block/bugs/38157-b.html,
+    layout/html/tests/block/bugs/46918.html,
+    layout/html/tests/block/printing/145305-11.html,
+    layout/html/tests/block/printing/145305-21.html,
+    layout/html/tests/block/printing/145305-13.html,
+    layout/html/tests/block/printing/145305-17.html,
+    layout/html/tests/block/printing/145305-19.html,
+    layout/html/tests/block/printing/145305-4.html,
+    layout/html/tests/block/printing/127145-1.html,
+    layout/html/tests/block/printing/145305-3.html,
+    layout/html/tests/block/printing/145305-7.html,
+    layout/html/tests/block/printing/145305-9.html,
+    layout/html/tests/frameset/core/r3.html,
+    layout/html/tests/frameset/core/r4.html,
+    layout/html/tests/frameset/core/blank2.html,
+    xpinstall/packager/stage_mfcembed.pl, xpinstall/packager/stage_gre.pl,
+    embedding/qa/testembed/Tests.cpp,
+    embedding/qa/testembed/nsihttpchanneltests.cpp,
+    embedding/qa/testembed/BrowserImpl.cpp,
+    embedding/qa/testembed/Tests.h, embedding/qa/testembed/QaUtils.cpp,
+    embedding/qa/testembed/resource.h,
+    embedding/qa/testembed/DomWindow.cpp,
+    embedding/qa/testembed/QaUtils.h, build/unix/abs2rel.pl,
+    xpfe/bootstrap/icons/windows/readme.txt,
+    security/nss/cmd/ssltap/ssltap-manual.html: Fix mess my subversion
+    repository made of line endings. This should reduce the size of the
+    diff.gz dramatically.
+
+ -- Eric Dorland <eric@debian.org>  Sat, 24 Dec 2005 03:23:02 -0500
+
+firefox (1.5.dfsg-2) unstable; urgency=low
+
+  * browser/locales/en-US/chrome/branding/brand.dtd,
+    browser/locales/en-US/chrome/branding/brand.properties: Change brand
+    name from Deer Park to Firefox. About box graphic still needs to be
+    fixed. *grumble* *grumble* (Closes: #343704)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 17 Dec 2005 13:45:14 -0500
+
+firefox (1.5.dfsg-1) unstable; urgency=low
+
+  * New upstream release. No actual code changes from RC3. Took the
+    opportunity to completely empty the /other-licenses directory of the
+    upstream tarball.
+  * configure, configure.in: Change MOZ_APP_DISPLAYNAME to Firefox, so we
+    can be called Firefox without using
+    --enable-official-branding. *grumble*
+  * config/autoconf.mk.in, gfx/src/gtk/mozilla-decoder.cpp, configure.in:
+    Apply patch from bz#305185 to fix problems building against gtk+ 2.8.
+  * debian/control: 
+    - Build-Depend on libfreetype6-dev since we do link
+      against it directly.
+    - Add mozilla-firefox package for easy transition. 
+    - Conflict against older mozilla-firefox packages.
+  * debian/firefox-runner: 
+    - Fix typo. (Closes: #341113)
+    - Check /usr/lib/mozilla-firefox/plugins for plugins too for the 
+      time being. (Closes: #341682)
+  * debian/firefox-dom-inspector.preinst: Remove, not needed since the
+    name change.
+  * debian/firefox.preinst: 
+    - Remove old upgrade code.
+    - Move old mozilla-firefox configs into place on install.
+  * debian/mozilla-firefox.preinst: Move upgrade code in here. Remove
+    mozilla-firefox alternative.
+  * debian/mozilla-firefox.postrm: Remove /etc/mozilla-firefox on purge.
+  
+  * Some patches missed when merging from Mike Hommey:
+  * browser/locales/en-US/searchplugins/answers.src: Change updateDays to
+    0.
+  * config/mkdepend/imakemdep.h: Define for amd64.
+  * configure, configure.in: Visibility patch for recent gcc's. (Closes:
+    #341766)
+  * modules/libpref/src/nsPrefService.cpp: Patch to load preferences from
+    defaults/syspref.
+  * content/events/src/nsEventStateManager.cpp: Extended mouse events
+    patch.
+  * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp,
+    gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.h,
+    gfx/src/x11shared/nsFontFreeType.cpp,
+    gfx/src/x11shared/nsFontFreeType.h,
+    layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch to
+    use new freetype API.
+
+ -- Eric Dorland <eric@debian.org>  Fri, 16 Dec 2005 11:37:23 -0500
+
+firefox (1.4.99+1.5rc3.dfsg-2) unstable; urgency=low
+
+  * The "Grand Renaming" release. Thanks to Mike Hommey for sherperding
+    the 1.5 series through experimental. Now it's my turn to muck it up. A
+    transition packages will be in the next release.
+  * debian/mozilla-firefox*: Rename to firefox*.
+  * debian/firefox.install, debian/firefox-dom-inspector.install,
+    debian/firefox-gnome-support.install, debian/firefox-runner,
+    firefox-xremote-client, firefox.1, firefox.desktop, firefox.dirs,
+    debian/firefox.js, debian/firefox.links, debian/firefox.manpages,
+    debian/firefox.menu, debian/firefox.mime, debian/firefox.postinst,
+    debian/firefox.prerm, debian/firefox.png.uu, debian/README.Debian,
+    debian/control, debian/rules: Search/Replace mozilla-firefox ->
+    firefox where appropriate.
+  * debian/firefox.links: Link old icon name to new.
+  * debian/README.Debian: Fix path to .mozilla/firefox/rc. (Closes:
+    #335433)
+  * config/autoconf.mk.in: Set mozappdir to /usr/lib/firefox.
+  
+ -- Eric Dorland <eric@debian.org>  Sun, 27 Nov 2005 20:03:02 -0500
+
+mozilla-firefox (1.4.99+1.5rc3.dfsg-1) experimental; urgency=low
+
+  * New upstream 1.5 preview release. Release Candidate 3.
+  * debian/mozilla-firefox-runner: Removed the ping stuff, it's now done by
+    firefox itself.
+
+ -- Mike Hommey <glandium@debian.org>  Fri, 18 Nov 2005 07:24:05 +0100
+
+mozilla-firefox (1.4.99+1.5rc2.dfsg-1) experimental; urgency=low
+
+  * New upstream 1.5 preview release. Release Candidate 2.
+  * xpcom/typelib/xpidl/xpidl.c: Fix crash when no file is given on the
+    command line (Closes: #323639). Also fix the error message about extra
+    arguments given showing before the crash.
+  * configure.in, configure: Work around dash's bug #337294 so that we can
+    build fine when sh is dash (Closes: #211010, #256384).
+  * debian/mozilla-firefox-runner:
+    - Removed the code to detect the JVM and set LD_ASSUME_KERNEL=2.2.5 for
+      b0rked 1.3 JVMs: it's been a long time they've not been ABI compatible.
+    - Removed setting of MOZILLA_FIVE_HOME. We already have a default one
+      built-in.
+    - Removed /usr/lib/mozilla/plugins from EXTENT_LD_LIB_PATH, since we never
+      get the plugins from there.
+    - Removed cleanup of the profile. It is correctly done by firefox, now.
+
+ -- Mike Hommey <glandium@debian.org>  Fri, 11 Nov 2005 08:07:05 +0100
+
+mozilla-firefox (1.4.99+1.5rc1.dfsg-1) experimental; urgency=low
+
+  * New upstream 1.5 preview release. Release Candidate 1.
+  * debian/mozilla-firefox.install: Don't install
+    /usr/lib/mozilla-firefox/extensions/reporter@mozilla.org, it got moved in
+    the chrome.
+
+ -- Mike Hommey <glandium@debian.org>  Tue,  1 Nov 2005 22:01:15 +0100
+
+mozilla-firefox (1.4.99+1.5beta2.dfsg-1) experimental; urgency=low
+
+  * build/unix/run-mozilla.sh, netwerk/base/src/nsStandardURL.cpp:
+    Reverted debian changes: they got applied upstream.
+  * configure: Applied configure.in changes by hand.
+  * debian/rules: Disabled both the installer and the updater, we don't need
+    them.
+
+ -- Mike Hommey <glandium@debian.org>  Fri,  7 Oct 2005 15:06:05 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-5) experimental; urgency=low
+
+  * debian/control: Bumped Standards-Version to 3.6.2.
+  * nsprpub/configure.in: Reverted changed.
+  * configure.in: Use -fvisibility=hidden in all cases. There is another bug
+    in gcc that makes it generate position dependent code when using the
+    system wrappers.
+  * configure, nsprpub/configure: Applied configure.in changes with
+    autoconf2.13.
+  * debian/rules: Put back the /usr/share/pixmaps/mozilla-firefox.xpm file.
+
+ -- Mike Hommey <glandium@debian.org>  Mon,  3 Oct 2005 18:46:50 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-4) experimental; urgency=low
+
+  * xpcom/typelib/xpt/src/Makefile.in: Reverted changes.
+  * configure.in, nsprpub/configure.in: Added a detection of the gcc bug about
+    visibility for builtins, and use -fvisibility=hidden instead of the system
+    wrappers in case the bug is found.
+  * configure, nsprpub/configure: Applied configure.in changes with
+    autoconf2.13. (Really closes: #329642)
+
+ -- Mike Hommey <glandium@debian.org>  Tue, 27 Sep 2005 20:16:34 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-3) experimental; urgency=low
+
+  * Sync with unstable branch.
+  * xpcom/typelib/xpt/src/Makefile.in: disable visibility stuff for ppc, as a
+    workaround for FTBFS. (Closes: #329642)
+
+ -- Mike Hommey <glandium@debian.org>  Mon, 26 Sep 2005 18:35:11 +0200
+
+mozilla-firefox (1.0.7-1) unstable; urgency=high
+
+  * New upstream release. Contains fixes for various security issues.
+  * debian/mozilla-firefox-runner: Remove /usr/lib from
+    LD_LIBRARY_PATH. (Closes: #321789)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 22 Sep 2005 01:23:10 -0400
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-2) experimental; urgency=low
+
+  * debian/rules: enabled support for canvas.
+
+ -- Mike Hommey <glandium@debian.org>  Tue, 20 Sep 2005 07:56:01 +0200
+
+mozilla-firefox (1.4.99+1.5beta1.dfsg-1) experimental; urgency=low
+
+  * Cleaned-up source tarball from trademarked content and CVS directories.
+  * debian/mozilla-firefox-small.xpm, debian/mozilla-firefox.xpm: Removed.
+  * debian/mozilla-firefox.dirs, debian/rules:
+    + Create /usr/lib/mozilla-firefox/chrome/icons/default and move
+      default.xpm in it. (Closes: #327828)
+    + Stop using our own xpm icons, upstream provide them, now.
+  * debian/rules: changed the build system a bit.
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Somewhat these
+    files disappeared. Put them back. (Closes: #328074)
+
+ -- Mike Hommey <glandium@debian.org>  Tue, 13 Sep 2005 18:25:48 +0200
+
+mozilla-firefox (1.4.99+1.5beta1-2) experimental; urgency=critical
+
+  * Sync with unstable branch.
+  * netwerk/base/src/nsStandardURL.cpp: Apply the patch for the 1.8 branch
+    from bz#307259 to fix CAN-2005-2871. (Closes: #327452)
+  * debian/mozilla-firefox-gnome-support.install, debian/rules: Move out
+    imgicon module in mozilla-firefox-gnome-support. (Closes: #327451)
+
+ -- Mike Hommey <glandium@debian.org>  Sun, 11 Sep 2005 10:45:34 +0200
+
+mozilla-firefox (1.0.6-5) unstable; urgency=critical
+
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: Fix for previous
+    arm fix. Thanks Steve. (Closes: #325535)
+  * netwerk/base/src/nsStandardURL.cpp: Patch from bz#307259 to fix
+    CAN-2005-2871, a buffer overflow vulnerability in IDN
+    processing. (Closes: #327452)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 10 Sep 2005 23:03:26 -0400
+
+mozilla-firefox (1.4.99+1.5beta1-1) experimental; urgency=low
+
+  * New upstream beta release.
+    + Find toolbar doesn't show up when in text fields. Closes: #280852.
+    + Better use of GTK2 themes. The most common case was highlighted menu
+      item text appearing in white on a white background. Closes: #223696,
+      #257430, #258181, #266334, #278559, #289326, #297320, #310098.
+    + Download manager correctly closes. Closes: #259015, #269975.
+    + Doesn't crash with the http://ln.hixie.ch/resources/style/orange
+      stylesheet. Closes: #277987.
+    + Locale extensions can properly be disabled. Closes: #279749 (to check).
+    + Doesn't crash on
+      http://einsteinmg.dyndns.org/cgi-bin/remangle.cgi?=0x27b9b660 anymore.
+      Closes: #294372.
+    + Downloads don't freeze when a modal window opens. Closes: #211332.
+    + Use GTK stock images. Closes: #281660.
+  * Sync with unstable branch changes.
+  * browser/app/profile/firefox.js, debian/firefox.js:
+    + Removed outdated extensions.update.autoUpdateEnabled and
+      extensions.update.autoUpdate;
+    + Removed general.useragent.locale.
+    + Allow extensions updates. It works correctly with system-wide installed
+      ones, now.
+  * netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,
+    nsprpub/pr/include/md/_linux.cfg, widget/src/gtk2/mozdrawingarea.c,
+    widget/src/gtk2/nsDragService.cpp: Reversed changes, since they got
+    applied upstream.
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp: correctly set
+    __attribute__. Closes: #325535.
+  * debian/rules:
+    + set --enable-extensions=default instead of a full list.
+      We will get the default set of extensions provided by upstream, and
+      won't need to check if they changed.
+    + set --enable-pango.
+    + set --enable-system-cairo.
+  * debian/control: added build dependency on libgnomeui-dev and libcairo2-dev.
+  * debian/mozilla-firefox.install, debian/rules: don't install files in
+    /usr/lib/mozilla-firefox/chrome/icons/ anymore.
+  * debian/mozilla-firefox-runner: Force MOZ_DISABLE_PANGO to 1 if
+    MOZ_ENABLE_PANGO is not set.
+  * debian/README.Debian:
+    + Removed the note about IDN, it is now enabled by default, with correct
+      whitelist set.
+    + Added a note about MOZ_ENABLE_PANGO.
+    + Changed notes about application update, extensions, and packaged
+      extensions.
+  * modules/libpref/src/init/all.js:
+    + Set general.config.obscure_value to 0, we don't care about the config
+      file not to be "obscured".
+    + Set general.config.filename to firefox.cfg.
+  * debian/firefox.cfg: Create configuration to lock some properties.
+  * debian/mozilla-firefox.install: Install this firefox.cfg in
+    /usr/lib/mozilla-firefox
+
+ -- Mike Hommey <glandium@debian.org>  Fri,  9 Sep 2005 17:40:40 +0200
+
+mozilla-firefox (1.0.6-4) unstable; urgency=low
+
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp: Patch
+    from Steve Langasek to fix unused vs. used gcc attribute on alpha and
+    arm. (Closes: #325535)
+  * browser/app/profile/firefox.js: Revert patch to remove the "I'm
+    feeling lucky" search. Some like it, some hate it, so upstream
+    behaviour wins. If you still feel strongly about it, make your case
+    upstream.
+  * gfx/src/gtk/nsFontMetricsXft.cpp: Apply patch from bz#252033 to work
+    around a bug in XRender that might be causing #319349. 
+
+ -- Eric Dorland <eric@debian.org>  Tue,  6 Sep 2005 02:10:07 -0400
+
+mozilla-firefox (1.0.99+deerpark-alpha2-2) experimental; urgency=low
+
+  * Sync with unstable branch changes, except the controversial "I'm feeling
+    lucky" change. I prefer waiting for the controversy to get to a
+    conclusion.
+  * debian/rules, debian/control: Remove build dependency on libmng-dev and
+    the --with-system-mng option to configure, the MNG support has been
+    removed upstream.
+  * debian/rules: Explicitely set the svg-renderer as cairo. It will use an
+    old cairo version bundled with firefox, but there's no other solution for
+    the moment. We have to wait for upstream 0.9.x and greater support
+    (hoped for 1.5).
+
+ -- Mike Hommey <glandium@debian.org>  Sun,  4 Sep 2005 09:01:54 +0200
+
+mozilla-firefox (1.0.6-3) unstable; urgency=low
+
+  * debian/rules, nsprpub/pr/include/md/_linux.cfg,
+    security/coreconf/Linux.mk: Apply patch from Andreas Jochens to allow
+    ppc64 builds. (Closes: #322617)
+  * debian/mozilla-firefox.prerm: Move -depth option to find to suppress
+    warnings. Thanks Mike Hommey.
+  * debian/presubj: Have bugzilla bug URL point to a page where you can
+    enter a bug.
+  * browser/app/profile/firefox.js: removed the "I'm feeling lucky" from
+    the keyword.URL, so now if you enter search terms in the address bar
+    you will be presented with search results and not taken to the first
+    result. Thanks Torok Edwin. (Closes: #321823)
+
+ -- Eric Dorland <eric@debian.org>  Mon, 22 Aug 2005 01:20:28 -0400
+
+mozilla-firefox (1.0.6-2) unstable; urgency=medium
+
+  * modules/libpr0n/src/imgLoader.cpp, modules/libpr0n/src/imgLoader.h:
+    Apply ported patch from Serge Belyshev from bz#293307 to fix problem
+    with gcc-4.0 on amd64. (Closes: #319336)
+  * debian/rules: Remove silly --enable-freetype configure line. Thanks
+    Antony Gelberg. (Closes: #319886)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 30 Jul 2005 02:11:03 -0400
+
+mozilla-firefox (1.0.6-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #318672)
+  * debian/rules: Remove hack to use gcc 3.4 on amd64, since now we're all
+    on gcc 4.0. (Closes: #318684)
+  * debian/control:
+    - Remove gcc 3.4 build depends on amd64
+    - Explicitly build depend on libxinerama-dev. 
+  * gfx/src/gtk/nsScreenGtk.cpp: Patch from Loic Minier to fix
+    gdk_property_get warnings.
+  * widget/src/gtk2/mozdrawingarea.c: Patch from Loic Minier to fix
+    crashes under GTK 2.7. (Closes: #318903)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 20 Jul 2005 02:57:44 -0400
+
+mozilla-firefox (1.0.99+deerpark-alpha2-1) experimental; urgency=low
+
+  * New upstream alpha release. Be aware that you WILL have troubles with
+    debian packages for firefox extensions.
+  * Reverted patches that got incorporated upstream.
+  * content/events/src/nsEventStateManager.cpp: Some changes to the previous
+    patch to fit changes in API.
+  * debian/update-mozilla-firefox-chrome,
+    debian/update-mozilla-firefox-chrome.8,
+    debian/mozilla-firefox-dom-inspector.post(inst|rm),
+    debian/mozilla-firefox-gnome-support.post(inst|rm),
+    debian/theme/*, debian/inspector/*: Removed.
+  * debian/mozilla-firefox.postinst: Removed call to
+    update-mozilla-firefox-chrome.
+  * debian/mozilla-firefox-dom-inspector.install: Only install files from
+    /usr/lib/mozilla-firefox/extensions/inspector@mozilla.org
+  * debian/mozilla-firefox.dirs: Don't create /var/lib/mozilla-firefox/*,
+    /usr/lib/mozilla-firefox/extensions nor /usr/lib/mozilla-firefox/plugins.
+  * debian/mozilla-firefox.install:
+    - Don't install regxpchrome, chrome/pipnss.jar and chrome/help.jar which
+      don't exist anymore.
+    - Install manifest files in addition to jar files in chrome.
+    - Install classic.jar in the normal chrome directory (awaiting EM
+      modifications so that it can actually go back in the extensions
+      directory).
+    - Don't install debian/theme/00classic and debian/theme/Uninstall,
+      which got removed.
+    - Get the theme in the correct directory (it's not in
+      defaults/profile/extensions anymore).
+    - Install the reporter extension.
+    - Selectively install subdirectories of /usr/lib/mozilla-firefox/defaults,
+      since some of them are useless.
+    - Install the unixprint plugin.
+  * debian/mozilla-firefox.manpages: Removed manual page for
+    update-mozilla-firefox-chrome.
+  * debian/mozilla-firefox.links: Removed all links in
+    /var/lib/mozilla-firefox/.
+  * debian/rules:
+    - Enable freetype in the build, we'll see if deerpark is any better than
+      1.0.x.
+    - Commented out OPTFLAGS set for some architectures. We will see if gcc
+      4.0 is doing any better.
+    - Enabled SVG support. (Closes: #215990)
+    - Enabled some more extensions to fit extensions provided by upstream.
+    - Added needed --enable-application=browser to the ./configure call.
+    - Don't install update-mozilla-firefox-chrome.
+    - Don't create installed-chrome.txt.
+    - Don't remove installed-extensions.txt, it doesn't exist anyway.
+    - Don't move classic theme's install.rdf, it's already at the correct
+      place.
+    - Remove unneeded removals of preferences files which are not there
+      anymore.
+  * debian/mozilla-firefox.preinst: Clean-up old generated files (those in
+    /var/lib/mozilla-firefox and
+    /usr/lib/mozilla-firefox/extensions/*/uninstall/Uninstall. (Note that for
+    the latter, some packages do provide them, but they were overwritten by
+    update-mozilla-firefox-chrome. They have actually no use, and it is safe
+    to remove them. Extensions packages will eventually remove them anyway)
+  * debian/mozilla-firefox.prerm: Put -depth option of find before -type d.
+
+ -- Mike Hommey <glandium@debian.org>  Sat, 16 Jul 2005 10:18:40 +0200
+
+mozilla-firefox (1.0.5-1) unstable; urgency=high
+
+  * New upstream release, fixes security issues. (Closes: #318061)
+  * debian/rules: Disable freetype in the build for the time being. This
+    *might* break printing in some cases.
+  * gfx/idl/nsIFreeType2.idl, gfx/src/freetype/nsFreeType.cpp,
+    gfx/src/freetype/nsFreeType.h, gfx/src/ps/nsFontMetricsPS.cpp,
+    gfx/src/ps/nsFontMetricsPS.h, gfx/src/x11shared/nsFontFreeType.cpp,
+    gfx/src/x11shared/nsFontFreeType.h,
+    layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp: Patch
+    from bz#234035 to try to get building with the new freetype. (Closes:
+    #314243)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 16 Jul 2005 00:43:54 -0400
+
+mozilla-firefox (1.0.4-3) unstable; urgency=low
+
+  * debian/mozilla-firefox.desktop: Add Czech translation from Jan
+    Outrata. (Closes: #311376)
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp,
+    xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Revert patch from
+    David Mosberger for 7+ args on ia64 that was added 1.0.3-2.
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf32.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf32.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp,
+    xpcom/reflect/xptcall/public/genstubs.pl: Better patch from bz#291378
+    which has been accepted upstream for ia64 7+ args fix.
+  * xpcom/reflect/xptcall/public/xptcstubsdecl.inc: Call genstubs.pl to
+    regenerate this file.
+  * dom/src/base/nsGlobalWindow.cpp,
+    embedding/components/windowwatcher/src/nsWindowWatcher.cpp: Fix
+    injection spoofing, patch from bz#296850. Fixes CAN-2004-0718. 
+
+ -- Eric Dorland <eric@debian.org>  Thu,  9 Jun 2005 23:54:41 -0400
+
+mozilla-firefox (1.0.4-2) unstable; urgency=critical
+
+  * debian/control: Build-depend on libxft-dev not libxft2-dev to appease
+    finicky sparc buildd.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 16 May 2005 21:17:57 -0400
+
+mozilla-firefox (1.0.4-1) unstable; urgency=critical
+
+  * New upstream release. Fixes CAN-2005-1477 and CAN-2005-1476. (Closes: #308620)
+  * debian/update-mozilla-firefox-chrome.8: Patch from A Costa to fix the
+    spelling of maintenace. (Closes: #305968)
+  * debian/mozilla-firefox.desktop: Patch from Steinar H. Gunderson to add
+    a Norwegian translation. (Closes: #305983)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 12 May 2005 22:59:47 -0400
+
+mozilla-firefox (1.0.3-2) unstable; urgency=high
+
+  * browser/app/profile/firefox.js: Disable SSLv2 and 40-bit ciphers by
+    default. 
+  * debian/mozilla-firefox.NEWS: Explain the SSL change.
+  * extensions/transformiix/source/base/Double.cpp: Patch from David
+    Mosberger-Tang (fixed up by me) to fix unaligned access on ia64 (and
+    perhaps other platforms). (Closes: #303518)
+  * xpcom/reflect/xptcall/public/xptcstubsdecl.inc,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp: Another patch
+    from David Mosberger-Tang to fix extension loading on ia64. (Closes:
+    #303515)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 21 Apr 2005 01:25:02 -0400
+
+mozilla-firefox (1.0.3-1) unstable; urgency=low
+
+  * New upstream release, fixes various security issues, so urgency high.
+  * js/src/fdlibm/fdlibm.h: Fix from David Mosberger to define ia64 as
+    little-endian arch (also added for mipsel). (Closes: #303438)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 17 Apr 2005 23:13:01 -0400
+
+mozilla-firefox (1.0.2-3) unstable; urgency=high
+
+  * gfx/src/freetype/nsFreeType.cpp,
+    netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,
+    security/nss/lib/pki1/oiddata.h, security/nss/lib/pki1/pki1.h,
+    widget/src/gtk2/nsDragService.cpp: Fixes for gcc-4.0,
+    bz#289238. (Closes: #301485)
+  * js/src/jsstr.c: Fix for JS memory access security bug, patch from
+    bz#288688. (Closes: #302775)
+
+ -- Eric Dorland <eric@debian.org>  Wed,  6 Apr 2005 01:36:11 -0400
+
+mozilla-firefox (1.0.2-2) unstable; urgency=high
+
+  * Last upload should of been marked urgency=high because of the security
+    fixes.
+  * debian/mozilla-firefox.postinst: Fix ridiculous typos. (Closes:
+    #300685)
+  * debian/mozilla-firefox-runner: Use pgrep to detect esd and arts
+    instead. Thanks Craig Small for the advice. (Closes: #302086)
+
+ -- Eric Dorland <eric@debian.org>  Fri,  1 Apr 2005 01:18:18 -0500
+
+mozilla-firefox (1.0.2-1) unstable; urgency=low
+
+  * New upstream release. Fixes CAN-2005-0399, CAN-2005-0401,
+    CAN-2005-0402. (Closes: #301243)
+  * debian/control: Update suggest for xprint rename. (Closes: #300976)
+  * xpcom/reflect/xptcall/src/md/unix/{Makefile.in,
+    xptcinvoke_asm_parisc_linux.s, xptcstubs_asm_parisc_linux.s}: Apply
+    patch from Ivar (Contributed by Randolph Chung) to fix Firefox on
+    hppa. (Closes: #286038)
+
+ -- Eric Dorland <eric@debian.org>  Fri, 25 Mar 2005 02:30:10 -0500
+
+mozilla-firefox (1.0.1-3) unstable; urgency=low
+
+  * widget/src/gtk2/nsGtkKeyUtils.cpp: Patch from bz#108170 to fix broken
+    keymap for Germans. (Closes: #299781)
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: avoid
+    crashing when extension's install.rdf is broken. (Closes: #298796)
+    (MH)
+  * debian/mozilla-firefox.prerm: Remove
+    /usr/lib/mozilla-firefox/defaults/profile/extensions/Extensions.rdf on
+    uninstall. (Closes: #298636)
+  * debian/mozilla-firefox.postinst: Add little echo to tell people to
+    restart firefox after upgrades.
+  * debian/presubj: Add a note there about restarting firefox before
+    submitting bugs.
+  * debian/mozilla-firefox-runner: Properly quote $@ expansion. (Closes:
+    #300195)
+  * browser/locales/en-US/searchplugins/
+    {yahoo.src,google.src,eBay.src,dictionary.src,creativecommons.src,
+    amazondotcom.src}: Set updateCheckDays to 0, which avoids duplicated
+    search entries in the menu. (Closes: #299006, #299813)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 20 Mar 2005 17:08:12 -0500
+
+mozilla-firefox (1.0.1-2) unstable; urgency=high
+
+  * Changes by Mike Hommey:
+  * Urgency: high due to RC bug fix.
+  * debian/update-mozilla-firefox-chrome: Re-initialize Extensions.rdf
+    inside the script instead of relying on mozilla-firefox's default
+    behaviour, which just fails when defaults/profile/extensions/ \
+    Extensions.rdf doesn't exist (and it seems some people like to remove
+    files in /etc). (Closes: #294175)
+  
+  * Changes by Eric Dorland:
+  * debian/mozilla-firefox.menu: Capitalize "browsers". Thanks Gerfried
+    Fuchs.
+  * debian/mozilla-firefox-runner: Fix from Marc Horowitz to fix sound
+    device detection. (Closes: #297088)
+  * toolkit/content/widgets/tabbrowser.xml: Apply patch from bz#283063, to
+    fix a memory leak when closing tabs. (Closes: #296749)
+  * xpfe/global/resources/content/bindings/browser.xml,
+    xpfe/global/resources/content/bindings/tabbrowser.xml,
+    toolkit/content/widgets/browser.xml,
+    toolkit/content/widgets/tabbrowser.xml: Apply patches from bz#131456
+    to fix various tab related memory leaks. (Closes: #280586)
+  * netwerk/protocol/http/src/nsHttpHandler.cpp: Patch from bz#265536 to
+    differentiate between AMD64 and i386. (Closes: #282592)
+
+ -- Eric Dorland <eric@debian.org>  Sat,  5 Mar 2005 18:46:09 -0500
+
+mozilla-firefox (1.0.1-1) unstable; urgency=high
+
+  * New upstream release. (Closes: #296851)
+    - This release fixes the Secunia window injection bug, 
+      CAN-2004-1156. (Closes: #293664)
+  
+  * Changes by Mike Hommey: 
+  * debian/rules: Some clean-up.
+  * debian/control: Changed my maintainer address.
+  * debian/README.Debian: Add a note about automatic updates for
+    extensions. (Closes: #296761)
+
+  * Changes by Eric Dorland:
+  * browser/app/profile/firefox.js: Remove disable IDN pref, it's the
+    default now anyway.
+
+ -- Eric Dorland <eric@debian.org>  Tue,  1 Mar 2005 02:03:48 -0500
+
+mozilla-firefox (1.0+dfsg.1-6) unstable; urgency=high
+
+  * The "And I thought IE had security bugs!" release.
+  * toolkit/content/widgets/tabbrowser.xml,
+    xpfe/global/resources/content/bindings/tabbrowser.xml: Fix
+    "Firetabbing" vulnerability from bugzilla#280056, fixes
+    CAN-2005-0231. (Closes: #294415)
+  * modules/plugin/base/src/nsPluginHostImpl.cpp: Fix "Fireflashing"
+    vulnerability from bugzilla#280664, fixes CAN-2005-0232. (Also Closes:
+    #294415)
+  * build/unix/run-mozilla.sh: Patch from Javier Fernández-Sanguino Peña
+    to fix insecure temp file usage in run-mozilla.sh. (Closes: #294127)
+  * netwerk/base/src/nsStandardURL.cpp, netwerk/base/src/nsStandardURL.h:
+    Patch from bugzilla#261934 to make the network.enableIDN preference
+    work and again.
+  * browser/app/profile/firefox.js: Disable IDN by default. This doesn't
+    close #293975, but drops its severity. 
+  * debian/README.Debian: Add warning and describe how to enable IDN.
+
+ -- Eric Dorland <eric@debian.org>  Wed,  9 Feb 2005 22:56:17 -0500
+
+mozilla-firefox (1.0+dfsg.1-5) unstable; urgency=low
+
+  * debian/mozilla-firefox.desktop: Don't translate "Mozilla Firefox" into
+    French.
+  * browser/app/profile/firefox.js: Set mozilla.widget.raise-on-setfocus
+    to false to prevent unecessary window raising. (Closes: #292049)
+  * debian/rules: Don't compile statically on mips and mipsel, since it's
+    broken for now.
+
+ -- Eric Dorland <eric@debian.org>  Sun,  6 Feb 2005 15:02:36 -0500
+
+mozilla-firefox (1.0+dfsg.1-4) unstable; urgency=low
+
+  * debian/mozilla-firefox.desktop: Add French translations from Jerome
+    Warnier. I will accept more, but closing this bug. (Closes: #292506)
+  * debian/README.Debian: Update the Emacs keybindings instructions.
+    (Closes: #291691)
+  * debian/mozilla-firefox.1: 
+    - Remove -splash from the manpage, it has never worked. (Closes: 
+      #287088)
+    - Add units to -height and -width description. (Closes: #285142)
+
+ -- Eric Dorland <eric@debian.org>  Wed,  2 Feb 2005 01:42:53 -0500
+
+mozilla-firefox (1.0+dfsg.1-3) experimental; urgency=low
+
+  * debian/mozilla-firefox.desktop: Add %u to the exec line so that apps
+    know it can handle URLs. (Closes: #290132)
+  * debian/README.Debian: 
+    - Improve button reversal instructions. Thanks Christian Mayrhuber
+    - Fix reference to ~/.firefox. 
+  * debian/rules: Enable static building. This will build firefox as one
+    large binary (mostly) and should speed a few things up, especially
+    program load time. I'd like to hear about any speedup (or slow down)
+    you exprience. Porters, please build this for your arch to make sure
+    this doesn't break anything.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 20 Jan 2005 01:40:34 -0500
+
+mozilla-firefox (1.0+dfsg.1-2) unstable; urgency=medium
+
+  * debian/mozilla-firefox-gnome-support.postrm,
+    debian/mozilla-firefox-dom-inspector.postrm: Don't die if
+    update-mozilla-firefox-chrome dies. (Closes: #287355)
+
+ -- Eric Dorland <eric@debian.org>  Sun,  9 Jan 2005 23:51:10 -0500
+
+mozilla-firefox (1.0+dfsg.1-1) unstable; urgency=low
+
+  * Not a new upstream release.
+  * other-licenses/branding/firefox, other-licenses/7zstub/firefox: Remove
+    these from the .orig.tar.gz, since they are not DFSG-free. We're not
+    using the files anyway, so out they go. (Not sure the 7zstub stuff is
+    non-free, but it's Windows only so no harm)
+  * debian/rules: 
+    - Remove explicit low-optimization on alpha, since Falk
+      Hueffner claims it works.
+    - Move entire defaults/profile directory into /etc/mozilla-firefox, 
+      rather than just the bookmarks.html. (Closes: #285538)
+  * debian/mozilla-firefox.links: Link entire defaults/profile now.
+  * debian/mozilla-firefox.preinst: Add upgrade code to remove old
+    defaults/profile to make way for new symlink.
+  * debian/mozilla-firefox.dirs: Just create etc/mozilla-firefox.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 19 Dec 2004 01:31:44 -0500
+
+mozilla-firefox (1.0-5) unstable; urgency=medium
+
+  * Changes by Mike Hommey:
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Make the
+    extensions upgrade work again. (Closes: #282143)
+  * debian/rules: Better DEB_BUILD_OPTIONS handling, better debugging
+    build (DEB_BUILD_OPTIONS="nostrip debug")
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+    toolkit/mozapps/extensions/content/extensions.js: Allow users to
+    disable globally installed extensions.
+
+  * Changes by Eric Dorland:
+  * debian/rules: Remove explicit low-optimization on sparc. Apparently
+    there was an issue for a number of arches that required lower
+    optimization settings, but it is now resolved. So porters, please
+    check -O2 on arm, alpha, powerpc and ia64 and let me know if it's
+    safe. Thanks David S. Miller. (Closes: #284533)
+
+ -- Eric Dorland <eric@debian.org>  Tue,  7 Dec 2004 01:06:48 -0500
+
+mozilla-firefox (1.0-4) unstable; urgency=medium
+
+  * debian/control: Make mozilla-firefox-gnome-support and xprt-xprintorg
+    Suggests, no Recommends after a look at policy. (Closes: #282432)
+  * debian/README.Debian: 
+    - Refer to .mozilla/firefox, not .firefox.
+    - Explain how to reenable emacs style keybindings. (Closes: #282321)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 27 Nov 2004 20:40:10 -0500
+
+mozilla-firefox (1.0-3) unstable; urgency=low
+
+  * Changes by Mike Hommey
+  * The "becoming more and more an iceweasel" release.
+  * debian/firefox.js:
+    + Enable firefox's internal locale autodetection.
+    + Disable default browser question at startup. (Closes: #280752)
+  * debian/mozilla-firefox-runner: Removed our locale autodetection.
+    That means now locales installed in user profiles are automatically
+    used, and that there is no need for /var/lib/mozilla-firefox/locales.d
+    anymore.
+  * debian/mozilla-firefox.dirs: Removed creation of
+    /var/lib/mozilla-firefox/locales.d.
+  * debian/rules: Removed creation of the locale file in
+    /var/lib/mozilla-firefox/locales.d.
+  * debian/presubj: Put some more recent information.
+  * htmlparser/src/nsParser.cpp: Applied patch from bz#57717 so that empty
+    html files don't get <html><body></body></html> when viewing source.
+  * browser/base/content/aboutDialog.css: increase the User Agent element
+    height as in bz#238137 (but up to MacOSX's height) to show the full User
+    Agent string.
+  * xpcom/io/nsAppDirectoryServiceDefs.h,
+    xpcom/io/nsAppFileLocationProvider.cpp,
+    xpfe/components/search/src/nsInternetSearchService.cpp: Applied patch from
+    bz#123315 so that Internet search services in user profiles are supported.
+    (Closes: #219053)
+  * debian/mozilla-firefox-runner:
+    + Remove compatibility.ini only if it is older than
+      /usr/lib/mozilla-firefox/components.ini. That way, we only rebuild it
+      after an update-mozilla-firefox-chrome.
+    + Detect if we're being run through sudo without the -H option, in which
+      case we force setting of $HOME. (Closes: #218156)
+  * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js.
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in:
+    + Removed some error messages that get there because firefox is trying to
+      write in the /usr/lib/mozilla-firefox directory as a user. They are
+      useless and lead users to think something is going wrong while it's the
+      (stupid but) normal way firefox works.
+    + Avoid creation of directories when attempting to read files, that
+      throwed uncaught exceptions breaking some stuff in several different
+      ways when extensions don't follow the new scheme for extensions.
+    + Avoid copying stuff from
+      /usr/lib/mozilla-firefox/defaults/profile/extensions/ to
+      /usr/lib/mozilla-firefox/extensions/, that's the *very* old way of
+      installing extensions, which, since the old scheme has been thrown away,
+      won't work anyway, if any extension provides files out there.
+    + CheckForMismatches: Avoid to disable already disabled global extensions,
+      and don't propose to upgrade the locked extensions. That fixes a
+      never-ending loop occuring when running firefox for the first time in a
+      user account, while some global extensions are expired.
+      (Closes: #278722, #281537)
+  * debian/mozilla-firefox.prerm, debian/mozilla-firefox.preinst: Moved
+    removal of links to /usr/lib/mozilla-firefox/defaults/profile/extensions/
+    sitting in /usr/lib/mozilla-firefox/extensions/, if any remaining, from
+    prerm to preinst. We remove them once and for all, they won't be created
+    by us anymore.
+  * debian/update-mozilla-firefox-chrome:
+    + Removed support for extensions in
+      /usr/lib/mozilla-firefox/defaults/profile/extensions/.
+    + Removed some clean-up that had been introduced to help the Extensions
+      Manager not to die, and which, actually, did not work out quite so well.
+      Anyways, with the changes this time, the EM is supposed to support much
+      more problems than ever before (as usual ;) ) so we don't need that
+      anymore.
+    + Avoid stupid mv error messages when firefox-bin -register fails (which
+      is not supposed to happen, but you're never too careful)
+  * debian/update-mozilla-firefox-chrome, debian/mozilla-firefox.preinst:
+    Move removal of some very old stuff to preinst, to do it once and for all
+    instead of doing it every time we run update-mozilla-firefox-chrome.
+  * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Applied patch from
+    bz#124561 to get a prompt for username/password in case anonymous login
+    fails.
+  * debian/mozilla-firefox-runner:
+    + Added check for more arguments so that the url in the command line get
+      detected more accurately.
+    + When a file name is given on the command line, prepend "file://" and
+      change spaces into %20. (Closes: #281800)
+
+  * Changes by Eric Dorland
+  * debian/mozilla-firefox.prerm: Patch from Philipp Weis to fix order of
+    find arguments. (Closes: #280852)
+  * debian/mozilla-firefox.desktop: Support new mime type handler in Gnome
+    2.8. (Closes: #281274) (MH: I added some more myme-types)
+  * debian/mozilla-firefox.postinst: Run update-desktop-database if it
+    exists.
+  * widget/src/gtk/nsWidget.cpp: We don't use gtk anymore, might as well
+    revert these patches. Thanks Stephane Despret. 
+
+ -- Eric Dorland <eric@debian.org>  Thu, 18 Nov 2004 22:16:28 -0500
+
+mozilla-firefox (1.0-2) unstable; urgency=low
+
+  * Changes by Mike Hommey
+  * The "don't do too much on the same day, it's bad for health" release.
+  * debian/firefox.js: Re-activated the extensions update service, and
+    removed the update url.
+  * browser/app/profile/firefox.js: Sync'ed with debian/firefox.js.
+  * debian/mozilla-firefox-dom-inspector.preinst: Removed old inspector.js
+    file.
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+    toolkit/mozapps/extensions/content/extensions.js: Disabled possibility
+    to update locked extensions and themes. Locked extensions being the
+    ones installed by the packaging system, they should be updated through
+    that.
+  * toolkit/mozapps/update/src/nsUpdateService.js.in: Disabled application
+    update functionnality. Firefox should be updated through the packaging
+    system.
+  * browser/components/prefwindow/content/pref-advanced.xul: Removed the
+    preferences panel item to activate application update, since it is
+    totally disabled.
+  * debian/mozilla-firefox-runner: Remove compatibility.ini instead of
+    compreg.dat. (Eric: This will cause a rebuild of the compreg.dat)
+  
+  * Changes by Eric Dorland:
+  * debian/mozilla-firefox.NEWS: Fix typos.
+  * README.Debian: 
+    - Add note about application update being completely disabled.
+    - Fix path to XUL.mfsal
+
+ -- Eric Dorland <eric@debian.org>  Wed, 10 Nov 2004 22:56:22 -0500
+
+mozilla-firefox (1.0-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #280449)
+  
+  * Changes by Mike Hommey:
+  * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch
+    #164795 from bz#266835 + some tweaks as previously. This might lead to
+    encoding problems with the password, but it is supposed to be ASCII
+    anyway.
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Reworked the
+    previous patches so that the Extensions Manager shows extensions that
+    have been disabled due to version mismatch, and added a workaround so
+    that components registration works correctly.
+  * debian/update-mozilla-firefox-chrome: Removed part that is useless due
+    to last changes in the Extensions Manager.
+  * Make the inspector a real extension again:
+    - debian/inspector/00dom-inspector: File for
+      /var/lib/mozilla-firefox/extensions.d.
+    - debian/inspector/Uninstall: Uninstall file needed in extension 
+      directory.
+    - debian/inspector/install.rdf: install.rdf taken from older versions, 
+      and adapted to newer versions, adding registered chrome.
+    - debian/mozilla-firefox-dom-inspector.dirs: Removed. Everything will 
+      be created by dh_install.
+    - debian/mozilla-firefox-dom-inspector.install: install
+      debian/inspector.rdf and most inspector files in the right place in
+      /usr/lib/mozilla-firefox/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}
+      and /var/lib/mozilla-firefox
+  * Make the classic theme a real extension, even though it's still in 
+    the main package:
+    - debian/theme/00classic: File for 
+      /var/lib/mozilla-firefox/extensions.d.
+    - debian/theme/Uninstall: Uninstall file needed in extension 
+      directory.
+    - debian/mozilla-firefox.install: Install all files in the right 
+      place in
+      /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+    - debian/mozilla-firefox.dirs: Removed creation of
+      /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome, 
+      it will be done by dh_install.
+    - browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in:
+      Added chrome to be registered.
+  * Removed support for /var/lib/mozilla-firefox/chrome.d:
+    - debian/mozilla-firefox.dirs: Removed creation of the directory.
+    - debian/rules: Removed creation of files there, and put the
+      installed-chrome.txt, excluding inspector and classic theme stuff,
+      directly in /usr/lib/mozilla-firefox/chrome.
+    - debian/update-mozilla-firefox-chrome: Removed all
+      /var/lib/mozilla-firefox/chrome.d related stuff.
+    - debian/mozilla-firefox.links: Removed installed-chrome.txt link.
+    - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: disable
+      extensions that fail to install chrome.
+  * debian/mozilla-firefox-runner: Remove user profile compreg.dat at
+    launch time.
+  * Moved some files in /var/lib/mozilla-firefox:
+    - debian/mozilla-firefox.links: Add a symlink for Extensions.rdf 
+      and components.ini, from /usr to /var.
+    - debian/mozilla-firefox.prerm: Don't remove files we don't 
+      provide and remove files at their new locations.
+    - debian/mozilla-firefox.preinst: Remove
+      /var/lib/mozilla-firefox/installed-chrome.txt.
+    - debian/update-mozilla-firefox-chrome: Create links for 
+      Extensions.rdf and components.ini after register call, and remove 
+      components.ini before.
+  * Clean-up in files generated by update-mozilla-firefox-chrome:
+    - debian/mozilla-firefox.links: Put all the links generated by
+      update-mozilla-firefox-chrome into the package.
+    - debian/mozilla-firefox.prerm: Remove all /var files generated 
+      in the remove target, and changed the way we clean-up 
+      /var/lib/mozilla-firefox.
+  * debian/mozilla-firefox.install: Removed chromelist.txt.
+  * Add support for extensions preferences:
+    - debian/update-mozilla-firefox-chrome: Handle
+      /usr/lib/mozilla-firefox/defaults.ini file.
+    - debian/mozilla-firefox.links: Add a symlink to /var for 
+      defaults.ini.
+    - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added 
+      defaults registration in -register command.
+    - mozilla-firefox-dom-inspector.install: Move inspector.js into 
+      the appropriate extension specific directory.
+  * Move preferences back into /usr:
+    - debian/rules: Don't move the prefs into 
+      /etc/mozilla-firefox/pref, and put the vendor thing into /usr 
+      as well, and remove firefox-l10.js file.
+    - debian/mozilla-firefox.preinst: remove old prefs in /etc and 
+      old symlink /usr/lib/mozilla-firefox/defaults/pref.
+    - debian/firefox.js: new Debian default preferences file.
+    - debian/mozilla-firefox.install: install firefox.js in
+      /etc/mozilla-firefox/pref.
+    - debian/mozilla-firefox.links: rename
+      /usr/lib/mozilla-firefox/defaults/pref symlink to
+      /usr/lib/mozilla-firefox/defaults/syspref.
+    - toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Added 
+      a hook so that defaults/syspref gets registered in defaults.ini 
+      after all other extensions preferences.
+  * debian/mozilla-firefox.preinst: only clean-up stuff if we are
+    upgrading from a version known to still have the files. Added some
+    more clean-up.
+  * debian/mozilla-firefox.install: Removed useless init.d.
+  * modules/libpref/src/init/all.js: Fixed all chrome URLs which refered to
+    mozilla stuff.
+  * debian/update-mozilla-firefox-chrome: Remove some more files before running
+    firefox-bin -register.
+
+  * Changes by Eric Dorland:
+  * debian/mozilla-firefox.NEWS: Add warning about broken extension and
+    locale packages with this release. 
+  * debian/mozilla-firefox-runner: Comment out warning about xprint,
+    xprint isn't necessarily needed for printing since postscript was
+    reenabled. (Closes: #279858)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 10 Nov 2004 00:33:44 -0500
+
+mozilla-firefox (0.99+1.0RC1-4) unstable; urgency=low
+
+  * debian/mozilla-firefox-runner:
+    - Fixed to run properly with dash. (Closes: #279549).
+    - Fixed indentation.
+    - Added a basic debugger support.
+  * debian/mozilla-firefox.1: Added information about debugger options.
+  * debian/rules: Added a debug option to DEB_BUILD_OPTIONS. If you want to
+    build a fully gdb'able package, use DEB_BUILD_OPTIONS="noopt nostrip
+    debug"
+  * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply new patch from
+    bz#266835.
+    - Further change this patch to use Append rather than AppendLiteral,
+      which doesn't seem to exist. (ED)
+
+ -- Mike Hommey <mh@glandium.org>  Thu,  4 Nov 2004 22:01:51 +0900
+
+mozilla-firefox (0.99+1.0RC1-3) unstable; urgency=low
+
+  * netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp: Apply patch from
+    bz#266835 to fix anonymous user password issue. (Closes: #226784)
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: (MH)
+    - Fully apply previous patches, which for some reason left a spurious code
+      line which made the extensions manager not like expired extensions
+      anymore. (Closes: #279140)
+    - Enhanced extensions manager so that the behaviour described in
+      https://bugzilla.mozilla.org/show_bug.cgi?id=247846#c14 *actually*
+      works. Extensions packagers are invited to move their chrome files
+      accordingly, and remove /var/lib/mozilla-firefox/chrome.d files so that
+      extensions chrome don't get registered when they are forced-disable due
+      to version mismatch or some other reason.
+  * debian/mozilla-firefox-runner: 
+    - Fix some thinkos. (MH)
+    - Fix for loading files from the command line. (Closes: #279018) (MH)
+    - Removed setting --display from $DISPLAY, let it get it from the 
+      environment, but pass --display if it is set. (Mike, 
+      I'm worried this will screw up some session 
+      managers, let me know what you think, we can revert it)
+    - Removed FIREFOX_OPEN_IN stuff, so that firefox now obeys to "open 
+      links from other applications in" setting. (Closes: #279073) (MH)
+    - Enhanced command line parsing, and drop empty arguments. 
+      (Closes: #279138) (MH)
+    - No need for a find to look for XUL.mfasl, we already have its 
+      location from the path list taken from profiles.ini. (MH)
+    - Better detection of dsp wrapper, when FIREFOX_DSP=auto. 
+      (Closes: #254611) (MH)
+    - Correctly open local files even when firefox was not previously 
+      running. (Closes: #279018) (MH)
+  * debian/mozilla-firefox.1: (MH)
+    - Removed references to FIREFOX_OPEN_IN.
+    - Added the -safe-mode option.
+  * debian/mozilla-firefoxrc: Removed FIREFOX_OPEN_IN. (MH)
+  
+ -- Eric Dorland <eric@debian.org>  Tue,  2 Nov 2004 00:46:28 -0500
+
+mozilla-firefox (0.99+1.0RC1-2) unstable; urgency=medium
+
+  * browser/app/profile/firefox.js: Disable browser update checking by
+    default.
+  * debian/mozilla-firefox-runner: Apply patch from Aurelien Jarno to fix
+    variable name typo. (Closes: #278844)
+
+ -- Eric Dorland <eric@debian.org>  Fri, 29 Oct 2004 23:50:59 -0400
+
+mozilla-firefox (0.99+1.0RC1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * layout/xul/base/src/nsImageBoxFrame.{cpp,h}: Remove some conflicts
+    from a previous patch.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 28 Oct 2004 23:33:46 -0400
+
+mozilla-firefox (0.10.1+1.0PR-5) unstable; urgency=low
+
+  * debian/rules: (MH)
+    - Use upstream extensions set. This will eventually get a
+      correct help menu and fix some yet undiscovered UI issues. 
+      (Closes: #257946)
+    - Added support for DEB_BUILD_OPTIONS=noopt.
+    - Changed OPTFLAGS assignment.
+    - Remove whitespace characters in version number for UserAgent
+      branding.
+    - Install mozilla-firefox-runner into /usr/lib/mozilla-firefox/firefox
+      (Closes: #278477)
+  * debian/mozilla-firefox.links: (MH)
+    - Link /usr/bin/firefox and /usr/bin/mozilla-firefox to 
+      /usr/lib/mozilla-firefox/firefox.
+    - Removed obsolete profile/US links.
+  * debian/mozilla-firefox.dirs: Create /etc/mozilla/profile instead of
+    /etc/mozilla/profile/US. (MH)
+  * toolkit/xre/nsAppRunner.cpp: Fix crash in nsCmdLineService::Initialize
+    when argc is changed by gtk (when treating gtk specific arguments)
+    (MH)
+  * debian/mozilla-firefox-runner (Changes by MH):
+    - Removed workaround for bug #122990. First, xmlterm is not an activated
+      extension, and secondly, if it still requires the TERM environment
+      variable, it is the user's duty to set it to whatever he wants, not
+      firefox's start script's.
+    - Removed the ulimit -c setting. First, it is set by default to 0 on a
+      newly installed debian, and secondly, it is user's choice to set it or
+      not if he needs to get core files.
+    - Removed unused shell variables.
+    - Removed unsetting AUDIODEV variable. If it still crashes, it does belong
+      to some other code than firefox. The AUDIODEV environment variable is
+      used nowhere in firefox code:
+      http://lxr.mozilla.org/aviarybranch/search?string=AUDIODEV
+      Note that there is a "A crash which occurred when AUDIODEV doesn't
+      contain "/" was fixed." log message in esound version 0.2.33 changes and
+      that the bug may have belonged there.
+    - Replaced ${HOME}/.mozilla-firefoxrc file by a ${HOME}/.mozilla/firefox/rc
+      file. The former is still supported, though, but will bring a warning
+      message. If both are present, only the latter is taken into account.
+    - Changed the way system and user FIREFOX_DSP and FIREFOX_OPEN_IN
+      variables are handled. First, use system values defined in
+      /etc/mozilla-firefox/mozilla-firefoxrc, then override with
+      ${HOME}/.mozilla/firefox/rc and then with runtime environment variables.
+    - Don't die when DISPLAY is not set. Display can be passed by --display
+      option, and if not set and needed (some options don't require it),
+      firefox will complain.
+    - Some shell code simplifications by using some coreutils.
+    - Added better command line parsing.
+    - Added verbosity mode.
+    - Removed setting of FONTCONFIG_PATH, /usr/lib/mozilla-firefox/res/Xft
+      doesn't exist
+    - Factorized localization detection.
+  * debian/mozilla-firefox.1 (MH):
+    - Made some clean-up between dashes and hyphens.
+    - Removed obsolete options and added new ones.
+    - Added informations about some debian specific stuff.
+  * debian/update-mozilla-firefox-chrome: Changed the way we move files to
+    /var/lib/mozilla-firefox. It will avoid creating files with a * in their
+    name whenever registration failed. (MH)
+  * debian/README.Debian: Update java instructions, tell them to just use
+    java-package.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 28 Oct 2004 21:30:40 -0400
+
+mozilla-firefox (0.10.1+1.0PR-4) unstable; urgency=medium
+
+  * This release mostly courtesy Mike Hommey. 
+  * layout/src/xul/base/src/nsImageBoxFrame.*: Backported patch from
+    bz#255372. (Closes: #278046)
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in: Force locking
+    globally installed extensions, that will prevent extensions packages
+    files to be unexpectedly removed by firefox.
+  * debian/control: Add Mike Hommey as an Uploader.
+  * debian/mozilla-firefox.install: Removed content-packs.jar which is
+    mozilla-browser specific.
+  * debian/mozilla-firefox.dirs: 
+    - Remove leading /'s.  
+    - Create
+    /usr/lib/mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+    /chrome directory so that preview is shown in the Themes Manager. Yes,
+    this is stupid, but it is the way firefox wants it (and it's not even
+    created by make install, nor in the official binary tarball. It is
+    only created at run time, but you know what ? under *nix, a normal
+    user can't create that directory) (Closes: #276404)
+  * debian/rules: Add a /etc/mozilla-firefox/pref/vendor.js file adding
+    the debian package version to the UserAgent. (Closes: #268654)
+  * debian/README.Debian: Update java instructions. I'd love some more
+    definitive pointers. (Closes: #277983)
+
+ -- Eric Dorland <eric@debian.org>  Tue, 26 Oct 2004 00:11:48 -0400
+
+mozilla-firefox (0.10.1+1.0PR-3) experimental; urgency=low
+
+  * debian/control: 
+    - Rename the mozilla-firefox-gnome-vfs package
+      mozilla-firefox-gnome-support since it does more than vfs. No 
+      need for Replaces or anything, since it never actually made it to 
+      the archive.
+    - Remove strict build dependencies on g++ and binutils, since the 
+      fixed versions have hit sarge.
+    - Remove hppa build depends, since gcc has also been fixed there.
+    - Build-depend on libgnome2-dev and libgconf2-dev to build in more 
+      gnome support.
+    - Have mozilla-firefox recommend it's gnome support. 
+  * debian/rules: 
+    - Remove hppa CC redefinitions.
+    - Exclude *gnome* not just *gnomevfs*.
+    - dh_install for gnome-support.
+  * debian/mozilla-firefox-gnome-vfs.*: Rename to
+    mozilla-firefox-gnome-support.*.
+  * debian/mozilla-firefox-gnome-support.install: Grab *gnome*, not just
+    *gnomevfs*.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 21 Oct 2004 23:04:53 -0400
+
+mozilla-firefox (0.10.1+1.0PR-2) experimental; urgency=low
+
+  * debian/mozilla-firefox-runner: 
+    - Patch from Sam Morris to handle cleanup of directories with 
+      unusual names.
+    - Fix return value check, patch from rgselk. (Closes: #269690)
+  * debian/mozilla-firefox.1: List full path to firefox-bin. (Closes:
+    #275563)
+  * debian/rules: 
+    - --with-gssapi=/usr, enable Negotiate extension. (Closes:
+      #274258)
+    - Enable gnomevfs support, 
+  * debian/control: 
+    - Build-depend on libkrb5-dev.
+    - Build-depend on libgnomevfs2-dev.
+    - New gnomevfs package, based on work by Mike Hommey. (Closes: 
+      #262062)
+  * debian/mozilla-firefox-gnome-vfs.post{inst,rm}: Added, same as
+    corresponding files from mozilla-firefox-dom-inspector.
+  * debian/mozilla-firefox-gnome-vfs.install: Install gnomevfs components.
+  * browser/app/profile/firefox.js: Set
+    network.negotiate-auth.trusted-uris to https:// to enable the
+    negotiate extension over secure links.
+  * config/rules.mk: Tweak patch from Thiemo Seufer to include svg_doc in
+    non-optimization. (Closes: #273353)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 17 Oct 2004 21:25:08 -0400
+
+mozilla-firefox (0.10.1+1.0PR-1) experimental; urgency=critical
+
+  * New upstream release, fixes security issue bz#259708. (Closes:
+    #274493)
+
+ -- Eric Dorland <eric@debian.org>  Sun,  3 Oct 2004 03:32:43 -0400
+
+mozilla-firefox (0.10+1.0PR-1) experimental; urgency=low
+
+  * New upstream release. (Closes: #273700, #267003)
+  * toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+    netwerk/dns/src/nsIDNService.cpp,
+    modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp,
+    gfx/src/windows/nsImageWin.cpp, gfx/src/shared/gfxImageFrame.cpp,
+    browser/app/profile/firefox.js: Resolve conflicts between my tree and
+    upstream.
+  * browser/app/Makefile.in: Fix $(DESTDIR) variable.
+  * accessible/src/atk/nsAccessibleWrap.cpp,
+    accessible/src/atk/nsAccessibleWrap.h: Apply patch from bugzilla for
+    alpha fix that's more likely to make it into CVS.
+  * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to make
+    update-mozilla-firefox-chrome more verbose on -v.
+  * debian/rules:
+    - Remove typeaheadfind for new find toolbar to work. (Mike Hommey) 
+      (Closes: #267170)
+    - Changes to reflect new upstream files. 
+  * debian/control: 
+    - Remove build-depend on libcairo-dev.
+    - Build depend on libxt-dev, seems to be necessary now. (Closes: 
+      #274311)
+  * debian/docs: Removed, as browser/README.html disappeared. (Mike Hommey)
+  * debian/mozilla-firefox.dirs: 
+    - Changes to reflect new upstream files.
+    - Removed obsolete libnullplugin.so.
+  * debian/mozilla-firefox.install: 
+     - Remove .jar's that aren't there anymore.
+     - Removed obsolete libnullplugin.so.
+  * debian/mozilla-firefox-dom-inspector.dirs,
+    debian/mozilla-firefox-dom-inspector.install, debian/rules: Upstream
+    doesn't consider DOM Inspector as a real extension, and do not provide
+    the appropriate files to make it appear in the extensions
+    manager. Removed all the extension related stuff in the package. (Mike
+    Hommey)
+  * other-licenses/libart_lgpl: Removed, was for SVG, no longer needed.
+  * modules/plugin/samples/default/unix/*: Reverted debian specific
+    changes, we don't want them in the diff since libnullplugin won't get
+    installed.
+
+ -- Eric Dorland <eric@debian.org>  Fri,  1 Oct 2004 18:50:46 -0400
+
+mozilla-firefox (0.9.3-6) unstable; urgency=high
+
+  * gfx/src/gtk/fontEncoding.properties: Uncomment symbol fonts. (Closes:
+    #272927)
+  * debian/control: Build-depend on binutils (>= 2.15-4) but only on mips
+    and mipsel. (Closes: #273353)
+  * configure.in, configure, rules.mk: Patch from Thiemo Seufer to
+    increase stability and performance on mips. (Closes: #272159)
+  * debian/mozilla-firefox-runner: Detect failure of ping()
+    better. (Closes: #267393)
+  * layout/html/document/src/html.css: Testing fix for xprint problems.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 27 Sep 2004 17:07:37 -0400
+
+mozilla-firefox (0.9.3-5) unstable; urgency=high
+
+  * debian/update-mozilla-firefox-chrome: Apply another patch form Mike
+    Hommey to fix a few more issues in the script. (Closes: #271480)
+  * Fixes to Secunia security bugs, ported from bugzilla: 
+    (Closes: #271888)
+    - browser/base/content/browser.js, 
+      xpfe/communicator/resources/content/contentAreaDD.js: Fix for
+      drag and drop exploit, bz#250862.
+    - caps/include/nsScriptSecurityManager.h, caps/src/caps.properties,
+      caps/src/nsScriptSecurityManager.cpp: Fix for enablePrivilege
+      exploit, bz#253942.
+    - gfx/src/shared/gfxImageFrame.cpp, gfx/src/windows/nsImageWin.cpp,
+      modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp: Fix for various
+      overflows in the BMP code, bz#255067.
+    - netwerk/dns/src/nsIDNService.cpp: Fix for bug in non-ASCII 
+      characters in domain names, bz#256316
+    - content/xbl/src/nsXBLPrototypeHandler.cpp: Clipboard injection 
+      fix, bz#257523.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 16 Sep 2004 20:06:47 -0400
+
+mozilla-firefox (0.9.3-4) unstable; urgency=high
+
+  * Urgency high, go into testing dammit!
+  * Apply patch from Mike Hommey as -3.1, which wasn't actually
+    released. See below. (Closes: #271480)
+  * debian/rules: Patch from Matthew Mueller to fix underquoted
+    argument. (Closes: #271432)
+  * debian/control: Build depend on binutils (>= 2.15-3) with fixed mips
+    support. We still need a fixed gcc.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 13 Sep 2004 20:41:27 -0400
+
+mozilla-firefox (0.9.3-3.1) unstable; urgency=low
+
+  * debian/rules: removed
+    /usr/lib/mozilla-firefox/defaults/profile/extensions/installed-extensions.txt
+  * debian/update-mozilla-firefox-chrome:
+    + Added a "verbose" mode.
+    + Added warning messages (only shown in verbose mode) about some
+      extensions specific issues. This is intended to be useful for extensions
+      maintainers.
+    + Check if the installed-extensions.txt file disappears, which tells if the
+      mozilla-firefox -register went ok.
+  * debian/update-mozilla-firefox-chrome.8:
+    + Fixed typos.
+    + Added reference to the -v option for the verbose mode.
+  * debian/mozilla-firefox-runner: enhanced the profile directory check. It
+    didn't work if the path indicated in the profiles.ini was not absolute.
+
+ -- Mike Hommey <mh@glandium.org>  Mon, 13 Sep 2004 20:31:21 +0900
+
+mozilla-firefox (0.9.3-3) unstable; urgency=high
+
+  * Acknowlege NMU from Mike Hommey. He did a fantastic job in porting a
+    large amount of fixes from upstream CVS. I owe him several large
+    beverages of his choice. (Closes: #259046, #259836)
+  * Port all of Mike's changes to my local CVS.
+  * debian/mozilla-firefox-runner: 
+    - Pass command-line arguments to get_locale so they can actually 
+      be used. (Closes: #240058)
+    - Apply patch from Mike Hommey to use the profiles.ini to find the 
+      path to the profile to clean XUL.mfasl. (Closes: #267326)
+  * debian/update-mozilla-firefox-chrome: Patch from Mike Hommey to fix
+    some bashisms introduced by his NMU.
+  * xpcom/reflect/xptcall/src/md/unix/Makefile.in,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s,
+    xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4,
+    xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s: Patch from
+    Thiemo Seufer to fix mips. This requires patches to gcc and binutils
+    to work and fully close #270621.
+
+ -- Eric Dorland <eric@debian.org>  Wed,  8 Sep 2004 21:13:35 -0400
+
+mozilla-firefox (0.9.3-2.2) unstable; urgency=high
+
+  * The "never edit the diff file unless you're sure nothing will be
+    missing" release.
+  * debian/mozilla-firefox.prerm: restore the uncut version.
+  * debian/control, debian/rules: Use gcc-3.2 to build on hppa, because of
+    toolchain bug #254549.
+
+ -- Mike Hommey <mh@glandium.org>  Mon, 23 Aug 2004 19:45:54 +0900
+
+mozilla-firefox (0.9.3-2.1) unstable; urgency=high
+
+  * Non Maintainer Upload for RC Fixes.
+  * Applied changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+    and toolkit/mozapps/extensions/locale/extensions.properties to solve some
+    issues with extensions management. (taken from CVS)
+  * Applied other changes to
+    toolkit/mozapps/extensions/src/nsExtensionManager.js.in,
+    toolkit/mozapps/extensions/public/nsIExtensionManager.idl and
+    mozilla/toolkit/xre/nsAppRunner.cpp to be able to use -register
+    instead of -list-global-items for extensions/components/chrome
+    registration through update-mozilla-firefox-chrome, thus not needing
+    Xvfb anymore (-register option doesn't require a X server).
+    (taken from CVS)
+  * Applied some more changes to
+    toolkit/mozapps/extensions/src/nsExtensionManager.js.in in order to
+    avoir overlayinfo deletion during extensions registration process.
+    (taken from CVS)
+  * Final changes to toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+    to avoid registering out of date extensions so that firefox doesn't enter
+    a loop at startup when no profile was found, and to only write in the
+    installed-extensions-processed.txt file the list of actually installed
+    extensions. Note that for packaged extensions installing their files
+    directly into the chrome or components directories, that only means they
+    won't appear in the Extensions Manager. They will still be available in
+    the GUI.
+  * All these fixes improve the Extensions Manager. Closes: #259046.
+  * accessible/src/atk/nsAccessibleWrap.cpp,
+    accessible/src/atk/nsAccessibleWrap.h: fixed 32-bit abuse of gobject
+    (Steve Langasek). Closes: #259836.
+  * debian/control: Removed dependency upon xvfb.
+  * debian/update-mozilla-firefox-chrome:
+    + Removed use of Xvfb.
+    + Removed creation of a root default profile, but kept the fake home
+      hack to avoid creation of a .mozilla directory in root's home.
+    + Changed extensions handling so that the overall process is cleaner.
+      Extensions packages will have to move extensions {uid} directories
+      to /usr/lib/mozilla-firefox/extensions/, while the current location
+      is still supported for compatibility purpose (but is strongly not
+      recommended).
+    + Removed use of regxpcom and regchrome, since what they both do is
+      done by firefox-bin -register.
+  * debian/rules: force GnomeVFS support to be disabled. (Josselin Mouette)
+  * debian/README.Debian:
+    + Added a note about potential problems with packaged "old" extensions.
+    + Added a note about how to manually disable packaged extensions in user
+      profile.
+    + Removed some old notes that don't apply anymore.
+  * debian/mozilla-firefox-dom-inspector.install, debian/rules: Move
+    extensions files to /usr/lib/mozilla-firefox/extensions/ instead of
+    /usr/lib/mozilla-firefox/defaults/profile/extensions/.
+  * debian/mozilla-firefox.links: Move installed-extensions.txt symlink
+    from /usr/lib/mozilla-firefox/defaults/profile/extensions/ to
+    /usr/lib/mozilla-firefox/extensions/.
+  * debian/mozilla-firefox.prerm: More cleanup on removal of package.
+
+ -- Mike Hommey <mh@glandium.org>  Sun, 22 Aug 2004 21:43:47 +0900
+
+mozilla-firefox (0.9.3-2) unstable; urgency=low
+
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Comment out
+    NARGSAVE, like I did in 0.9.1-7, should fully fix #262571.
+  * debian/mozilla-firefox.preinst: Remove brace expansion
+    bashism. (Closes: #264200)
+  * debian/control: Depend on debianutils (>= 1.16) since we use mktemp
+    -d. (Closes: #263958)
+  * debian/mozilla-firefox-runner: Make -contentLocale COUNTRY, not
+    lang-COUNTRY. (Closes: #263940)
+
+ -- Eric Dorland <eric@debian.org>  Sun,  8 Aug 2004 23:41:02 -0400
+
+mozilla-firefox (0.9.3-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #263193)
+  * debian/update-mozilla-firefox-chrome.8: Add manpage from Mark Suter
+    for update-mozilla-firefox-chrome.8. (Closes: #263149)
+  * debian/mozilla-firefox.manpages: Add update-mozilla-firefox-chrome.8.
+  * debian/control: Add build-deps on gcc-3.4 for amd64. (Closes: #262679)
+
+ -- Eric Dorland <eric@debian.org>  Wed,  4 Aug 2004 20:21:22 -0400
+
+mozilla-firefox (0.9.1-7) unstable; urgency=low
+
+  * debian/mozilla-firefox-runner:
+    - Reintroduce check for command-line arguments (I broke this last 
+      release). (Closes: #262692, #262462, #262537, #262588, #262727)
+    - Allow overriding of -contentLocale and -UILocale. (Closes: 
+      #240058)
+  * xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s: Comment out
+    NARGSAVE reassignment, it is defined elsewhere. (Closes: #262571)
+  * debian/rules: Force amd64 to build with gcc 3.4. (Closes: #262679)
+
+ -- Eric Dorland <eric@debian.org>  Mon,  2 Aug 2004 10:16:46 -0400
+
+mozilla-firefox (0.9.1-6) unstable; urgency=low
+
+  * widget/src/gtk2/keysym2ucs.c: Patch from Eugeniy Meshcheryakov to
+    allow mozilla firefox to enter a ghe with upturn. (Closes: #261543)
+  * debian/mozilla-firefox-runner: 
+    - Remove some mail and composer cruft. 
+    - Add warning if DISPLAY is not set. (Closes: #261465)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 29 Jul 2004 22:49:59 -0400
+
+mozilla-firefox (0.9.1-5) unstable; urgency=low
+
+  * debian/control: Goodbye mozilla-firebird transition package.
+  * debian/mozilla-firefox-runner: Add -a firefox flag when running
+    firefox-bin. (Closes: #259237)
+  * debian/mozilla-firefox.desktop: Add GenericName field.
+  * debian/update-mozilla-firefox-chrome: Fix quoting problem with
+    {*}. (Closes: #257243)
+  * debian/rules: 
+    - Re-enable postscript printing support, since the security 
+      issues turned out to be bogus. (Closes: #257628)
+    - Disable SVG support, it's still too broken to be usable. 
+      (Closes: #259544)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 18 Jul 2004 20:09:14 -0400
+
+mozilla-firefox (0.9.1-4) unstable; urgency=low
+
+  * The "Let's try unstable" release. There are still issues, but there
+    are issues with 0.8 as well, so no more point in waiting.
+  * debian/update-mozilla-firefox-chrome:
+    - Copy over empty Extensions.rdf file on update. (Closes: #257243)
+    - Increase sleep to 15 seconds, hopefully this will work on most 
+      people's machines. 
+  * My apologies to Mike Hommey for mispelling his name in last release.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 11 Jul 2004 23:51:24 -0400
+
+mozilla-firefox (0.9.1-3) experimental; urgency=low
+
+  * Ok, I was wrong, we're still in experimental. I think we need to fix a
+    few more issues before getting this in unstable, like #257258, and
+    make sure the hacky extensions mechanism is more bullet-proof.
+  * debian/rules: --disable-installer, since we don't use it.
+  * debian/update-mozilla-firefox-chrome: 
+    - Wait 8 seconds instead of 5 for the hack, might help some 
+      people reporting problems.
+    - Remove ${LIBDIR}/extensions/{*}. I may move that to 
+      /var/lib/mozilla-firefox eventually, but let's leave it for now.
+  * debian/mozilla-firefox.png.uu: Make a nicer png icon, based on the
+    about box graphic.
+  * debian/mozilla-firefox.preinst: Remove old config files in
+    /etc/mozilla-firefox/pref. (Closes: #257711, 257557)
+  * browser/app/profile: firefox.js: Revert change to app.version,
+    apparently it breaks extensions. (Closes: #257941)
+
+ -- Eric Dorland <eric@debian.org>  Wed,  7 Jul 2004 21:26:55 -0400
+
+mozilla-firefox (0.9.1-2) experimental; urgency=low
+
+  * The "Mike Homey, lord of the bugs" release. Thanks to Mike for being a
+    huge help with bug triage. That's right, help with bugs and your name
+    could have a prestigious place in the changelog.
+  * I'd like my next release to be to unstable, so let me know about
+    profile transition bugs, etc.
+  * debian/control: Build-depend on libcairo1-dev. 
+  * debian/rules: Enable svg support using cairo renderer. (Closes:
+    #215990)
+  * debian/mozilla-firefox-xremote-client: Add -a firefox switch to make
+    the remote client find firefox only. Thanks Jonathan Black. (Closes:
+    #256967)
+  * debian/mozilla-firefox.desktop: Make comment Gnome HIG
+    compliant. (Closes: #257592)
+  * browser/app/profile/firefox.js: 
+    - app.version = 0.9.1.
+    - Disable app updates by default. We're debian, we handle updates.
+  * debian/update-mozilla-firefox-chrome: 
+    - Remove installed-extensions-processed.txt before regenerating. 
+      (Closes: #257243)
+    - Take some, but not all advice from Alexandru Fomin. Improve Xvfb 
+      and extension registration hacks. 
+
+ -- Eric Dorland <eric@debian.org>  Sun,  4 Jul 2004 16:58:17 -0400
+
+mozilla-firefox (0.9.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * config/autoconf.mk.in: Alright, /usr/lib/firefox-0.9 was a bad idea,
+    use /usr/lib/mozilla-firefox. Change all the instances
+    /usr/lib/firefox-0.9 back to /usr/lib/mozilla-firefox. I feel
+    silly. (Closes: #256991)
+  * debian/mozilla-firefox-runner: Actually check for the existence of the
+    .mozilla/firefox directory before trying to clean it. 
+  * debian/update-mozilla-firefox-runner: 
+    - Call firefox-bin, not firefox you silly goose.  
+    - Use mozilla-firefox tempfile, not mozilla-browser.
+    - The horrible hackiness continues: For my previous hack to work, 
+      I need to preseed a profile directory in the home directory I
+      create. Now things should work. (Closes: #256812)
+
+ -- Eric Dorland <eric@debian.org>  Thu,  1 Jul 2004 17:16:29 -0400
+
+mozilla-firefox (0.9-1) experimental; urgency=low
+
+  * New upstream release. There may be regressions from 0.8. (Closes:
+    #254522)
+  * widget/src/gtk/nsGtkMozRemoteHelper.cpp,
+    widget/src/gtk2/nsGtkMozRemoteHelper.cpp,
+    widget/src/xremoteclient/XRemoteClient.cpp: Fix previously applied to
+    fix -remote behaviour undone. Mozilla now includes the program name in
+    the properties to distinguish between various Mozilla apps.
+  * xpcom/reflect/xptcall/src/md/unix/Makefile.in: remove extra endif.
+  * dom/public/idl/core/nsIDOMNSDocument.idl: Reintroduce referrer
+    attribute that got lost somehow.
+  * content/events/src/nsEventStateManager.cpp: Fix a strange broken
+    function call to GetContainer.
+  
+  * debian/rules: 
+    - Follow upstream and --enable-single-profile and 
+      --disable-profilesharing.
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - --user-app-dir=.mozilla to jive with new location.
+    - Remove dom-inspector extension dir from the regular package. 
+  * debian/control: Depend on xvfb for insane hack below.
+  * debian/mozilla-firefox.install:
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Remove ipc dir, mozipcd.
+    - Add init.d, greprefs dirs.
+  * debian/mozilla-firefox.dirs:
+    - Add /var/lib/mozilla-firefox/extensions{,.d}
+  * debian/mozilla-firefox-dom-inspector.dirs: Add
+    /var/lib/mozilla-firefox/extensions.d.
+  * debian/mozilla-firefox-dom-inspector.install:
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Install dom-inspector extension dir.
+  * debian/mozilla-firefox.links:
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Link /usr/lib/mozilla-firefox to /usr/lib/firefox-0.9.
+    - Link installed-extensions.txt to our place in 
+      /var/lib/mozilla-firefox.
+  * debian/mozilla-firefox-runner: 
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Fix xprintorg typo. (Closes: #255706)
+    - Search .mozilla/firefox for XUL.mfasl files.
+  * debian/mozilla-firefox-xremote-client: Replace
+    /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+  * debian/update-mozilla-firefox-chrome: 
+    - Replace /usr/lib/mozilla-firefox with /usr/lib/firefox-0.9.
+    - Capture return values from reg* commands on error, stolen 
+      from mozilla source.
+    - Remove returns from check_running.
+    - Pull in snippets from /var/lib/mozilla-firefox/extensions.d 
+      to generate installed-extensions.txt for new extensions mechanism.  
+    - An insane hack, but necessary because of upstream: Launch a Xvfb 
+      to run firefox to generate the necessary extension metadata. I've
+      been told this will not be necessary in the next version. 
+
+ -- Eric Dorland <eric@debian.org>  Mon, 28 Jun 2004 23:40:59 -0400
+
+mozilla-firefox (0.8-12) unstable; urgency=low
+
+  * The "Last Chance Before 0.9" release.
+  * debian/mozilla-firefox-runner: Fix unescaped \n, thanks Olly
+    Betts. (Closes: #252436)
+  * debian/update-mozilla-firefox-chrome: Watch out for empty
+    LD_LIBRARY_PATH. Thanks George Cristian Birzan. (Closes: #254142)
+  * debian/README.Debian: Restructure and update a bit.
+  * debian/presubj: Add bug information from README.Debian for reportbug.
+  * debian/mozilla-firefox.install: Install the presubj. 
+
+ -- Eric Dorland <eric@debian.org>  Mon, 14 Jun 2004 19:39:27 -0400
+
+mozilla-firefox (0.8-11) unstable; urgency=low
+
+  * Apply amd64 fix from #249211. 
+  * debian/README.Debian: Shamelessly stole the java plugin installation
+    instructions from the mozilla package. (Closes: #243513)
+  * nsCommonWidget.cpp, nsCommonWidget.h, nsWindow.cpp: Apply patch (with
+    some hand massaging) from upstream bugzilla bug #209342 to fix initial
+    window placement. (Closes: #235209, 241519)
+  * nsprpub/pr/src/misc/prnetdb.c: Apply patch from Miquel van Smoorenburg
+    to prevent unless reverse DNS lookups. (Closes: #251978)
+  * debian/mozilla-firefox-runner: Apply patch from Jasper Spaans to fix
+    remote xprint printing. (Closes: #252072)
+
+ -- Eric Dorland <eric@debian.org>  Tue,  1 Jun 2004 23:12:36 -0400
+
+mozilla-firefox (0.8-10) unstable; urgency=low
+
+  * debian/mozilla-firefox.install: Don't install uuencoded file. (Closes:
+    #251441)
+  * debian/mozilla-firefox-runner: unset AUDIODEV which can cause
+    crashes. Thanks Christopher Armstrong. (Closes: #236231)
+  * update-mozilla-firefox-chrome: Port security fix from #249613 to
+    handle insecure tempfile creation.
+  * debian/rules: Following the advice of #247585 I'm disabling postscript
+    printing. Perhaps this will alleviate some of the other printing
+    problems.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 30 May 2004 01:47:52 -0400
+
+mozilla-firefox (0.8-9) unstable; urgency=low
+
+  * debian/control: 
+    - Suggest latex-xft-fonts for MathML fonts. Thanks Michael 
+      JasonSmith. (Closes: #216925)
+    - Build depend on libx11-dev & libxp-dev instead of xlibs-dev to 
+      reflect new X packages.
+  * widget/src/gtk2/nsWindow.cpp: Apply patch from Peter Colberg to ignore
+    unused mouse buttons. (Closes: #244305)
+  * debian/README.Debian: Document the fact that the loopback interface
+    has to be up and unfiltered for things to work right.
+
+ -- Eric Dorland <eric@debian.org>  Wed,  5 May 2004 23:30:42 -0400
+
+mozilla-firefox (0.8-8) unstable; urgency=low
+
+  * security/nss/lib/freebl/unix_rand.c: Remove code that called netstat
+    to gain so entropy. It's pretty useless on a Linux system. Thanks
+    Wichert. (Closes: #241200)
+  * debian/README.Debian: Add note about changing the button order in the
+    dialog boxes. (Closes: #240261)
+  * debian/control: Add dummy package for mozilla-firebird to smooth
+    upgrades. (Closes: #235577)
+
+ -- Eric Dorland <eric@debian.org>  Sat,  3 Apr 2004 16:19:34 -0500
+
+mozilla-firefox (0.8-7) unstable; urgency=low
+
+  * debian/mozilla-firefox-runner: 
+    - Cleanup XUL.mfasl whenever firefox is run with no 
+      command-line. (Closes: #238717)
+    - Add patch from Laurent Buffler to add config to allow 
+      new tabs to be opened instead of new windows. (Closes: #239323)
+  * debian/mozilla-firefoxrc: Put the new FIREFOX_OPEN_IN variable in
+    there and document it's use.
+
+ -- Eric Dorland <eric@debian.org>  Sat, 27 Mar 2004 17:21:51 -0500
+
+mozilla-firefox (0.8-6) unstable; urgency=low
+
+  * debian/control: Build-depend on g++-3.3 (>= 3.3.3-4) to work around
+    broken 3.3.3-3 release. (Closes: #238318, #238241, #238441, #238523,
+    #238534)
+  * debian/rules: Install new small-firefox icon. 
+  * debian/mozilla-firefox{.png, .xpm, -small.xpm}: Use the new DFSG-free
+    icons, the old pretty ones are trademarked and not DSFG-free. I know,
+    it's stupid. Complain to the Mozilla Foundation, not me. (Closes:
+    #234869)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 21 Mar 2004 22:09:16 -0500
+
+mozilla-firefox (0.8-5) unstable; urgency=low
+
+  * Rebuild with g++-3.3 3.3.3-2 to work around broken g++. (Closes:
+    #238318)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 17 Mar 2004 21:38:58 -0500
+
+mozilla-firefox (0.8-4) unstable; urgency=low
+
+  * debian/README.Debian: 
+    - Tell people not to remove their ~/.firefox directory. Just move it
+      out of the way. (Closes: #235594)
+    - Add notes about the sound dsp. (Closes: #236678)
+  * debian/mozilla-firefox-runner: 
+    - Don't redirect stderr. (Closes: #236160)
+    - Add get_locale code from Aurelien Jarno (Closes: #235521)
+    - Fix dsp auto-detection code. (Closes: #236678)
+  * debian/rules: Add default locale file.
+  * debian/mozilla-firefox.dirs: Add locales dir. 
+
+  * browser/app/profile/all.js,
+    content/events/src/nsEventStateManager.cpp,
+    modules/libpref/src/init/all.js, widget/public/nsGUIEvent.h,
+    widget/src/gtk/nsWidget.cpp: Reapply extended mouse events patch from
+    Derek Upham. (Closes: #235385, #230876)
+  * browser/base/content/browser-sets.inc: Make ESC stop animations
+    again. (Closes: #235474)
+
+ -- Eric Dorland <eric@debian.org>  Tue, 16 Mar 2004 00:31:19 -0500
+
+mozilla-firefox (0.8-3) unstable; urgency=low
+
+  * debian/mozilla.firefox.menu: Change the case of
+    mozilla-Firefox. (Closes: #234982, #234755)
+  * debian/NEWS.Debian: Move to debian/mozilla-firefox.NEWS so that it
+    actually gets installed. (Closes: #234700)
+  * debian/update-mozilla-firefox-chrome: Setup dummy home directory to
+    capture silly .firefox directory. (Closes: #234855)
+  * debian/mozilla-firefox.png.uu, debian/mozilla-firefox.xpm: Use the
+    new, pretty mozilla-firefox icons. (Closes: #234869)
+  * debian/rules: Install the pretty icon in the right places. 
+
+ -- Eric Dorland <eric@debian.org>  Thu, 26 Feb 2004 21:10:27 -0500
+
+mozilla-firefox (0.8-2) unstable; urgency=low
+
+  * The "what he taketh, he giveth back" release.
+  * debian/rules:
+    - Disable the wallet extension, this really closes #222447.
+    - Remove some more cruft left over from the patch system.
+    - Reinstall the dom-inspector.
+  * debian/control: Add the dom-inspector back, now that it is supported
+    upstream.
+  * debian/mozilla-firefox-dom-inspector.{install,dirs,postinst,postrm}:
+    Bring these files back.
+  * docshell/base/nsWebShell.cpp: Only do keyword lookup on when DNS
+    entries don't exist. (Closes: #233916, #218033, #211524)
+
+ -- Eric Dorland <eric@debian.org>  Mon, 23 Feb 2004 21:48:03 -0500
+
+mozilla-firefox (0.8-1) unstable; urgency=low
+  
+  * The "Let's Change Our Name Every Other Day" release.
+  * New upstream release, mozilla-firebird has been renamed to
+    mozilla-firefox. Let's hope it lasts. (Closes: #231903, #222447)
+  * debian/mozilla-firebird.*: Renamed to debian/mozilla-firefox.*.
+
+  * debian/README.Debian: Update for firefox, remove blurb about the
+    inspector.
+  * debian/NEWS.Debian: Explain how to move your configs over. I may make
+    this automatic if enough people complain, but I'm loathe to muck
+    around in pople's home directories.
+
+  * debian/control:
+    - Rename the package.
+    - Tweak description to list Firefox's previous aliases.
+    - Remove conflicts on mozilla-firebird-dom-inspector.
+
+  * debian/rules: 
+    - s/firebird/firefox/g, s/MozillaFirebird/firebird/g.
+    - Comment out some old inspector code. 
+    - Remove unused patch subsystem.
+    - Disable gtktest. We don't need no stinking tests.
+    - Remove disable plaintext editor line, not sure why it's there.
+    - Disable LDAP support. We don't use it.
+    - Remove executable bit on *.so files.
+    - Remove useless preference files.
+    - Exclude the inspector files.
+    - Don't remove installed-chrome, we don't install it anymore.
+    - user-app-dir = .firefox. (Closes: #212301)
+    - export MOZILLA_OFFICIAL for the build ID. (Closes: #231133)
+
+  * debian/mozilla-firefox-runner: 
+    - s/firebird/firefox/g.
+    - Remove composer and editor functions.
+    - Use .firefox directory.
+
+  * debian/mozilla-firefox.install: 
+    - s/firebird/firefox/g, s/MozillaFirebird/firefox/g.
+    - Don't install timebombgen.
+    - Install icons directory.
+    - Don't install installed-chrome.txt, we just remove it anyway. 
+
+  * debian/mozilla-firefox.desktop, debian/mozilla-firefox.dirs,
+    debian/mozilla-firefox.manpages, debian/mozilla-firefox.links,
+    debian/mozilla-firefox.menu, debian/mozilla-firefox.mime,
+    debian/mozilla-firefoxrc, debian/mozilla-firefox.postinst,
+    debian/mozilla-firefox.prerm, debian/update-mozilla-firefox-chrome,
+    debian/mozilla-firefox.1, debian/mozilla-firefox-xremote-client:
+    s/firebird/firefox/g, s/MozillaFirebird/firefox/g.
+
+  * debian/mozilla-firefox.links: Link mozilla-firefox.1 to firefox.1.
+  
+  * debian/mozilla-firefox.preinst: Remove, at least with the rename I can
+    erase some of my previous blunders.
+
+  * debian/mozilla-firefox.{png.uu,xpm}: Use the package icon.
+
+  * browser/app/nsBrowserApp.cpp: Change package name to Firefox, so now
+    the ~/.firefox is used. (Closes: #196550)
+
+  * browser/app/profile/all.js: Merge in autoscroll fixes.
+  * browser/base/content/browser-sets.inc: Merge in upstream stop button
+    fix.
+  * modules/plugin/samples/default/unix/nullplugin.c: Merge in removal of
+    commented code.
+  * nsprpub/pr/include/md/_linux.cfg, nsprpub/pr/include/md/_linux.h,
+    security/coreconf/Linux.mk: Merge in hppa build fixes from upstream.
+  * config/autoconf.mk.in: Install into /usr/lib/mozilla-firefox now.
+  * content/base/src/nsDocumentViewer.cpp: Remove redundant stop patch
+    since it has been merged upstream.
+  * content/events/src/nsEventStateManager.cpp,
+    modules/libpref/src/init/all.js, widget/src/gtk/nsWidget.cpp: Revert
+    back to upstream version. There was a patch here to add support for
+    extended mouse buttons, but I'm removing it since I don't trust that
+    it works in the new version correctly. Send me another patch if you
+    want this functionality back.
+  * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Revert this
+    back to upstream, I'm not sure which patches I applied to this file,
+    likely something to try and fix the double password prompt.
+  * widget/src/xremoteclient/XRemoteClient.cpp,
+    widget/src/xremoteclient/XRemoteClient.h: Revert to upstream version,
+    I believe it does the right thing now, but the patch I used does not
+    apppear to have been used. Restore the properties to _FIREFOX_*
+    though.
+  * widget/src/gtk/nsGtkMozRemoteHelper.cpp,
+    widget/src/gtk2/nsGtkMozRemoteHelper.cpp: Change the _FIREBIRD_* to
+    _FIREFOX_* here as well.
+  * content/base/src/nsDocument.cpp: Comment out nsDocument::GetDomConfig,
+    needed to get things to compile.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 15 Feb 2004 21:28:45 -0500
+
+mozilla-firebird (0.7-7) unstable; urgency=low
+
+  * debian/mozilla-firebird-runner: Open a new window when loading a
+    regular file. (Closes: #228853)
+
+ -- Eric Dorland <eric@debian.org>  Thu, 29 Jan 2004 22:12:30 -0500
+
+mozilla-firebird (0.7-6) unstable; urgency=medium
+
+  * The "Indian-giver-christmas" release.
+  * Urgency medium since we're closing some critical bugs that need to get
+    in before a freeze.
+  * Completely remove mozilla-firebird-dom-browser. No one stepped up to
+    help fix it's brokeness in 0.7 and I don't use it or particularly care
+    about it. So it is no more. If someone steps up to take responsibility
+    I might put it back, but otherwise it may RIP. (Closes: #222085)
+  * debian/mozilla-firebird-runner: Remove XUL.mfasl uncoditionally
+    now. There is a corner case where this file is corrupted on upgrade
+    when firebird was running. This is a total hack, and not an elegant
+    solution, but at least it fixes the problem. (Closes: #224779,
+    #224323)
+  * debian/control: Conflict against old mozilla-firebird-dom-inspector
+    since it doesn't work anymore.
+
+ -- Eric Dorland <eric@debian.org>  Thu, 25 Dec 2003 15:54:21 -0500
+
+mozilla-firebird (0.7-5) unstable; urgency=low
+
+  * browser/base/content/browser-sets.inc: Patch to make ESC stop actually
+    work. (Closes: #223382)
+  * debian/rules: Turn down optimizations on sparc. (Closes: #223760)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 14 Dec 2003 23:01:59 -0500
+
+mozilla-firebird (0.7-4) unstable; urgency=low
+
+  * The "All of Takuo's hard work really pays off" release.
+  * toolkit/components/passwordmgr/base/nsPasswordManager.cpp: Patch from
+    upstream bugzilla (#220214) to fix double password prompt
+    problem. (Closes: #222696)
+  * xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4: Stolen
+    patch from mozilla package to make mozilla-firebird build on
+    mips. (Closes: #222743)
+  * content/base/src/nsDocumentViewer.cpp: Port yet another patch to allow
+    the ESC key to stop animated gifs. (Closes: #223382)
+
+ -- Eric Dorland <eric@debian.org>  Mon,  8 Dec 2003 23:59:16 -0500
+
+mozilla-firebird (0.7-3) unstable; urgency=low
+
+  * debian/control: Add dependency on psmisc since we use fuser. Thanks
+    Daniel Schröter.
+  * widget/src/xremoteclient/XRemoteClient.{cpp,h}: Apply patch from
+    bugzilla to fix -remote behaviour on modern WMs. Thanks Nikolai
+    Prokoschenko. (Closes: #197632)
+  * nsprpub/pr/src/misc/prdtoa.c: Apply fix from mozilla package (#215067)
+    to fix building on arm. This is a partial fix to #222743.
+  * debian/patches: Remove these. Put everything in CVS.
+
+ -- Eric Dorland <eric@debian.org>  Fri,  5 Dec 2003 20:03:46 -0500
+
+mozilla-firebird (0.7-2) unstable; urgency=low
+
+  * Apply excellent patch from Alexander Sack <asac@jwsdot.com> to fix the
+    issues with mozilla running and firebird not starting. (Closes:
+    #216264)
+  * browser/app/profile/all.js: Set the default of "general.autoScroll" to
+    false because it annoyes me. (Closes: #221661)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 19 Nov 2003 20:59:55 -0500
+
+mozilla-firebird (0.7-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #216019)
+  * debian/patches/dom-inspector.diff: Remove, and apply directly into my
+    CVS.
+  * debian/patches/pref.diff: Removed, doesn't seem applicable anymore.
+  * debian/rules: export MOZ_FIREBIRD=1.
+  * debian/control: 
+    - Change Chimera to Camino. (Closes: #220821)
+    - Fix typos in descriptions. (Closes: #218202)
+    - Add build-deps on m4. (Closes: #219681)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 12 Nov 2003 23:01:35 -0500
+
+mozilla-firebird (0.6.1-8) unstable; urgency=low
+
+  * Apply patch to make forward and back buttons work on mice. (Closes:
+    #211606)
+  * debian/rules: Use -O optimization on alpha, so it will build
+    again. (Closes: #213603)
+  
+ -- Eric Dorland <eric@debian.org>  Fri,  3 Oct 2003 00:07:44 -0400
+
+mozilla-firebird (0.6.1-7) unstable; urgency=low
+
+  * Rebuild with the latest and greatest from unstable. This seems to fix
+    the problems with bookmarks people were having, at least for me. No
+    idea why. Please reopen if this doesn't fix it for you. (Closes:
+    #209339, #211706, #211286, #211146, #212011) 
+
+ -- Eric Dorland <eric@debian.org>  Mon, 22 Sep 2003 00:00:08 -0400
+
+mozilla-firebird (0.6.1-6) unstable; urgency=low
+
+  * Patch from Eric Wong <normalperson@yhbt.net> to make plugin requests
+    less annoying. (Closes: #196609)
+  * debian/rules: Stop building libart.
+  * debian/mozilla-firebird.links: Fix path to bookmarks file. (Partial
+    fix to #211286)
+
+ -- Eric Dorland <eric@debian.org>  Wed, 17 Sep 2003 20:22:56 -0400
+
+mozilla-firebird (0.6.1-5) unstable; urgency=low
+
+  * The "sorry Chris Gray" release.
+  * debian/rules: disable SVG. This was causing drag and drop to lock up
+    X and possibly fixes #208630. (Closes: #209371)
+  * debian/mozilla-firebird-runner: Remove XUL.mfasl if we have upgraded,
+    since it can cause problems. (Closes: #200073, #202130, #207351)
+
+ -- Eric Dorland <eric@debian.org>  Sat, 13 Sep 2003 20:15:37 -0400
+
+mozilla-firebird (0.6.1-4) unstable; urgency=low
+
+  * The "pleasing Chris Gray" release.
+  * other-licenses/libart_gpl: Add this library for svg.
+  * debian/rules: 
+    - Enable svg.
+    - Move bookmarks.html file into /etc. (Closes: #207398)
+  * debian/mozilla-firebird.links: Add links back to files moved to /etc.
+  * security/coreconf/Linux2.6.mk: Add this as a copy of Linux2.5.mk to
+    get mozilla-firebird to build on 2.6. (Closes: #207821)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 31 Aug 2003 04:40:30 -0400
+
+mozilla-firebird (0.6.1-3) unstable; urgency=low
+
+  * debian/mozilla-firebird.prerm: Remove mozilla alternative on
+    remove. (Closes: #205310)
+  * debian/debsearch.{gif.uu,src}: Debian search plugin graciously
+    contributed by Fergus McKenzie-Kay <Linux@NerdIT.com>.
+  * debian/rules: 
+    - uudecode and clean up debsearch.gif.uu.
+    - Steal platform specific optimization code from mozilla 
+      package. Thanks Brian Nelson. (Closes: #206309) 
+  * debian/mozilla-firebird.install: Install the above files. 
+  * debian/control: Update Standards-Version to 3.6.1.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 24 Aug 2003 19:09:11 -0400
+
+mozilla-firebird (0.6.1-2) unstable; urgency=low
+
+  * The "Stop Pestering Me Already!" release.
+  * debian/control: Only recommend xprt-xprintorg, don't require
+    it. (Closes: #204176)
+
+ -- Eric Dorland <eric@debian.org>  Sun, 10 Aug 2003 20:00:11 -0400
+
+mozilla-firebird (0.6.1-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #203518, #201203)
+  * debian/control:
+    - Standards-Version to 3.6.0.
+    - Don't provide www-browser anymore. (Closes: #201035)
+    - Depend on xprt-xprintorg so printing will work. (Closes: #202418)
+  * debian/mozilla-firebird.preinst: Remove www-browser alternative.
+  * debian/mozilla-firebird.postinst: Don't install www-browser alternative.
+  * debian/mozilla-firebird.prerm: Don't remove www-browser alternative
+    anymore.
+  * debian/README.Debian: Added note about configuration breaking on
+    upgrade. (Closes: #202130)
+  * debian/patches/classic.diff: Removed. Not sure what it's point was.
+  * debian/rules: Add --disable-pedantic to the configure options.
+
+ -- Eric Dorland <eric@debian.org>  Sun,  3 Aug 2003 14:58:12 -0400
+
+mozilla-firebird (0.6-8) unstable; urgency=low
+
+  * debian/patches/alpha-build-fix.diff: Steal patch from mozilla to allow
+    building on alpha. (Closes: #198638)
+  * debian/patches/hppa-build-fix.diff: Steal patch from mozilla to allow
+    building on hppa, clean it up so it applies cleanly. (Closes: #199068)
+  * debian/mozilla-firebird.png.uu: Added uuencoded nice png icon.
+  * debian/rules: Add code to decode and clean up the new icon file.
+  * debian/mozilla-firebird.install: Install new icon.
+  * debian/mozilla-firebird.desktop: Use the new icon.
+
+ -- Eric Dorland <eric@debian.org>  Fri, 27 Jun 2003 23:21:56 -0400
+
+mozilla-firebird (0.6-7) unstable; urgency=low
+
+  * debian/mozilla-firebird.1: Stole the mozilla manpage for my own
+    nefarious purposes. (Closes: #196638)
+  * debian/mozilla-firebird.postrm: Add slave links to the
+    mozilla-firebird manpage. (Closes: #197145)
+  * debian/mozilla-firebird-xremote-client: Set up the environment
+    properly so it returns correct information. (Closes: #197632)
+  * debian/mozilla-firebird.xpm: Added icon from
+    http://iconpacks.mozdev.org/phoenix/iconshots/flame48true.png to have
+    a nice menu icon. (Closes: #197565)
+  * Updated the README.Debian with some helpful bug reporting tips.
+  * debian/rules: Replaced dh_installmanpages with dh_installman.
+
+ -- Eric Dorland <eric@debian.org>  Sun, 22 Jun 2003 15:15:37 -0400
+
+mozilla-firebird (0.6-6) unstable; urgency=low
+
+  * debian/mozilla-firebird.postinst: Add priority 0 alternative on
+    mozilla. (Closes: #196444)
+  * debian/control: Add build-depends on libxrender-dev, libmng-dev,
+    libpng12-dev, libjpeg62-dev.
+  * debian/rules: 
+    - Build with system jpeg, mng and png libs.
+    - Exclude inspector files from mozilla-firebird. 
+      (Closes: #196432, #196509)
+
+ -- Eric Dorland <eric@debian.org>  Sat,  7 Jun 2003 15:19:23 -0400
+
+mozilla-firebird (0.6-5) unstable; urgency=low
+
+  * The "Mike Hommey is my homey" release.
+  * Thanks to Mike Hommey <mh@glandium.org> for his excellent work on this
+    version (it's 99% his), which I've shamelessly stolen.
+  * Added a README.Debian file.
+  * Added a separate mozilla-firebird-dom-inspector package.
+  * debian/patches/dom-inspector.diff:
+    - add DOM Inspector to Tools menu. (note: DOM Inspector is still
+      not very well integrated with Firebird)
+    - remove modern skin references.
+  * debian/patches/xpinstall.diff: remove unneeded chrome registrations
+    from xpinstall/packager/unix/browser.jst.
+  * debian/patches/classic.diff: remove
+    themes/classic/global/win/preview.gif from jar file and modify
+    preview image reference in rdf file to Preview.png.
+  * debian/patches/pref.diff: remove preview image constraints in
+    browser/components/prefwindow/skin/pref.css file to avoid deformation
+    of preview image in classic theme.
+  * debian/mozilla-firebird.preinst: added #DEBHELPER#.
+  * debian/mozilla-firebird.install:
+    - Don't install the modern.jar and embed-sample.jar files.
+    - Remove files related to dom-inspector.
+  * debian/rules:
+    - enabling xinerama support.
+    - disabling build of chatzilla and venkman.
+    - moved /var/lib/mozilla-firebird/chrome.d/99default to
+      /var/lib/mozilla-firebird/chrome.d/00all
+    - remove references to embed-sample.jar in
+      /var/lib/mozilla-firebird/chrome.d/00all
+    - Add some comments.
+    - Change == to =, for more strict /bin/sh's.
+  * debian/control: Build-Depend on libidl-dev (>= 0.8.0) because the
+    configure script requires at least this version.
+  * debian/copyright: Make this a real debian copyright file. 
+  
+ -- Eric Dorland <eric@debian.org>  Thu,  5 Jun 2003 01:00:32 -0400
+
+mozilla-firebird (0.6-4) unstable; urgency=low
+
+  * debian/rules: Change -O2 to -O for building on powerpc.
+  * debian/mozilla-firebird.preinst: Delete
+    /usr/lib/mozilla-firebird/defaults/pref on upgrade to facilitate
+    transition to prefs in /etc. Thanks to all who reported this.
+
+ -- Eric Dorland <eric@debian.org>  Tue, 27 May 2003 21:45:06 -0400
+
+mozilla-firebird (0.6-3) unstable; urgency=low
+
+  * First attempt at a debian upload. (Closes: #163270)
+  * debian/rules:
+    + Small fix to Mike Hommey's chrome patch.
+    + Suggestion from Bernhard R. Link to install
+      /usr/lib/mozilla-firebird/defaults/pref to 
+      /etc/mozilla-firebird/pref
+    + Add dh_installmime call.
+  * debian/mozilla-firebird.mime: Install mime type handlers for firebird.
+  * debian/mozilla-firebird.links: Link
+    /usr/lib/mozilla-firebird/defaults/pref to /etc/mozilla-firebird/pref
+  * debian/mozilla-firebird.install: Don't install the inspector.jar.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 26 May 2003 00:28:40 -0400
+
+mozilla-firebird (0.6-2) unstable; urgency=low
+
+  * debian/rules:
+    + Add --with-user-appdir=.mozilla-firebird, since it still 
+      defaults to .phoenix.
+    + Don't use the ${prefix} variable, use /usr, since ${prefix} 
+      doesn't seem to work.
+    + Use --without-system-nspr.
+  * debian/mozilla-firebird.install:
+    + Be picky about what chrome files we install, since there's 
+      quite a few we don't need, and a bunch of empty dirs.
+  * Excellent patch from Mike Hommey <mh@glandium.org> to add a
+    update-mozilla-firebird-chrome script.
+  
+ -- Eric Dorland <eric@debian.org>  Sat, 24 May 2003 13:00:44 -0400
+
+mozilla-firebird (0.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * Renamed to mozilla-firebird.
+  * Changed phoenix to mozilla-firebird where appropriate.
+  * debian/mozilla-firebird.links: Add link mozilla-firebird to
+    MozillaFirebird.
+  * debian/control:
+    + Standars-Version to 3.5.10.0.
+    + Build-depend on gtk2 libs now.
+    + Build-depend on libidl-dev.
+    + Add Provides x-www-browser.
+  * debian/rules:
+    + Enable building with the gtk2 libs.
+    + Make mozilla-firebird-xremote-client executable in install target.
+  * debian/mozilla-firebird.desktop: Added gnome menu entry.
+  * debian/mozilla-firebird.{prerm,postinst}: Add alternatives to
+    www-browser and x-www-browser.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 19 May 2003 20:43:39 -0400
+
+phoenix (0.5-4) unstable; urgency=low
+
+  * debian/control: Depend on fontconfig.
+  * debian/rules: Add source-tarball-from-cvs to build a orig tarball from
+    a checked out cvs tree. Now I can provide source package. And there
+    was much rejoicing.
+
+ -- Eric Dorland <eric@debian.org>  Fri, 17 Jan 2003 21:06:47 -0500
+
+phoenix (0.5-3) unstable; urgency=low
+
+  * debian/phoenix-xremote-client: Added to send remote commands to
+    phoenix. Just a wrapper that calls phoenix-bin -remote.
+  * debian/phoenix-runner: 
+    + Use phoenix-xremote-client.
+    + Replace MOZILLA_DSP with PHOENIX_DSP.
+  * debian/phoenixrc: phoenix-runner uses this file to determine what dsp
+    to start.
+  * debian/phoenix.install: 
+    + Install phoenix-xremote-client, and don't install
+      mozilla-xremote-client.
+    + Install phoenixrc.
+
+ -- Eric Dorland <eric@debian.org>  Mon, 23 Dec 2002 02:52:21 -0500
+
+phoenix (0.5-2) unstable; urgency=low
+
+  * debian/control: 
+    + Add Provides: www-browser.
+    + Build-depend on libxft2-dev, libnspr-dev.
+  * debian/rules:
+    + Use xft and the system nspr.
+    + Install phoenix-runner.
+  * debian/phoenix-runner: Stolen from the mozilla package to run phoenix.
+
+ -- Eric Dorland <eric@debian.org>  Sat, 21 Dec 2002 02:03:11 -0500
+
+phoenix (0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/phoenix.install: Fix paths to phoenix libs.
+  * debian/control: 
+    + Standards-Version to 3.5.8
+    + Improve build-deps.
+  * debian/rules: 
+    + Have configure options here, no more .mozconfig.
+    + Steal some patch code from Colin.
+  * debian/patches/mozappdir.diff: Change the mozappdir.
+  
+ -- Eric Dorland <eric@debian.org>  Mon,  9 Dec 2002 02:43:13 -0500
+
+phoenix (0.4-3) unstable; urgency=low
+
+  * debian/phoenix.menu: Add menu entry.
+  * Rebuild to fix libstdc++ dependency.
+  * .mozonfig: Disable more tests.
+
+ -- Eric Dorland <eric@debian.org>  Wed, 20 Nov 2002 19:13:18 -0500
+
+phoenix (0.4-2) unstable; urgency=low
+
+  * debian/control:
+    + Add build-depends.
+    + Fix section and description.
+  * .mozconfig:
+    + Use system zlib.
+
+ -- Eric Dorland <eric@debian.org>  Wed, 13 Nov 2002 19:03:52 -0500
+
+phoenix (0.4-1) unstable; urgency=low
+
+  * Initial release.
+  
+ -- Eric Dorland <eric@debian.org>  Mon, 11 Nov 2002 23:09:41 -0500
--- iceowl-0.7.orig/debian/iceowl-dev.install
+++ iceowl-0.7/debian/iceowl-dev.install
@@ -0,0 +1,10 @@
+debian/tmp/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig
+debian/*.pc usr/lib/pkgconfig
+debian/tmp/usr/share/idl/iceowl/* usr/share/idl/iceowl/
+debian/tmp/usr/include/iceowl usr/include/
+debian/tmp/usr/bin/iceowl-config usr/bin
+
+debian/tmp/usr/lib/iceowl/regxpcom usr/lib/iceowl
+debian/build-tools/obscure-tool usr/lib/iceowl
+debian/tmp/usr/lib/iceowl/xp* usr/lib/iceowl
+
--- iceowl-0.7.orig/debian/iceowl-dom-inspector.dirs
+++ iceowl-0.7/debian/iceowl-dom-inspector.dirs
@@ -0,0 +1 @@
+usr/lib/iceowl/extensions
--- iceowl-0.7.orig/debian/iceowl.prerm
+++ iceowl-0.7/debian/iceowl.prerm
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ]; then
+    rm -rf /var/lib/iceowl/chrome/overlayinfo
+    rm -f /var/lib/iceowl/chrome/chrome.rdf
+    rm -f /var/lib/iceowl/defaults.ini
+    rm -f /var/lib/iceowl/components.ini
+    rm -f /var/lib/iceowl/components/xpti.dat
+    rm -f /var/lib/iceowl/components/compreg.dat
+    rm -f /usr/lib/iceowl/.autoreg
+    rm -f /var/lib/iceowl/extensions/installed-extensions.txt
+    rm -f /var/lib/iceowl/extensions/Extensions.rdf
+    rm -f /usr/lib/iceowl/defaults/profile/extensions/Extensions.rdf
+    if [ -d /var/lib/iceowl/ ]; then
+        find /var/lib/iceowl/ -depth -type d -empty -exec rmdir {} \;
+    fi
+fi
+
+#DEBHELPER#
--- iceowl-0.7.orig/debian/iceowl.links
+++ iceowl-0.7/debian/iceowl.links
@@ -0,0 +1,15 @@
+usr/lib/iceowl/iceowl usr/bin/iceowl
+usr/lib/nss/libnssckbi.so usr/lib/iceowl/libnssckbi.so
+usr/share/iceowl/chrome usr/lib/iceowl/chrome
+usr/share/iceowl/defaults usr/lib/iceowl/defaults
+usr/share/iceowl/greprefs usr/lib/iceowl/greprefs
+usr/share/iceowl/icons usr/lib/iceowl/icons
+usr/share/iceowl/res usr/lib/iceowl/res
+usr/share/iceowl/searchplugins usr/lib/iceowl/searchplugins
+usr/share/iceowl/js usr/lib/iceowl/js
+
+/etc/iceowl/pref /usr/share/iceowl/defaults/syspref
+
+/usr/share/iceowl/icons/mozicon50.png /usr/share/pixmaps/iceowl.png
+
+/usr/share/myspell/dicts /usr/lib/iceowl/dictionaries
--- iceowl-0.7.orig/debian/cdbs-rules/debhelper.mk
+++ iceowl-0.7/debian/cdbs-rules/debhelper.mk
@@ -0,0 +1,239 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters@debian.org>
+# Description: Uses Debhelper to implement the binary package building stage
+#
+# This program 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, or (at
+# your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+####
+# General variables implemented by this rule file:
+#
+# DEB_INSTALL_DIRS_ALL
+#   Subdirectories to create in installation staging directory for every package
+# DEB_INSTALL_DIRS_<package>
+#   Like the above, but for a particular package <package>.
+# DEB_INSTALL_DOCS_ALL
+#   Files which should go in /usr/share/doc/<package> for every package
+# DEB_INSTALL_DOCS_<package>
+#   Files which should go in /usr/share/doc/<package> for package
+# DEB_INSTALL_CHANGELOGS_ALL
+#   File which should be interpreted as upstream changelog
+# DEB_COMPRESS_EXCLUDE
+#   Regular expressions matching files which should not be compressed.
+# DEB_FIXPERMS_EXCLUDE
+#   Regular expressions matching files which should not have their permissions changed.
+# DEB_CLEAN_EXCLUDE
+#   Regular expressions matching files which should not be cleaned.
+# DEB_DH_ALWAYS_EXCLUDE
+#   Force builddeb to exclude files.  See the DH_ALWAYS_EXCLUDE section
+#   in debhelper(7) for more details.
+# DEB_SHLIBDEPS_LIBRARY_package
+#   The name of the current library package
+# DEB_SHLIBDEPS_INCLUDE
+#   A space-separated list of library paths to search for dependency info
+# DEB_SHLIBDEPS_INCLUDE_package
+#   Like the above, but for a particular package.
+# DEB_PERL_INCLUDE
+#   A space-separated list of paths to search for perl modules
+# DEB_PERL_INCLUDE_package
+#   Like the above, but for a particular package.
+# DEB_UPDATE_RCD_PARAMS
+#   Arguments to pass to update-rc.d in init scripts
+####
+# Special variables used by this rule file:
+#
+# DEB_DH_MAKESHLIBS_ARGS_ALL
+#   Arguments passed directly to dh_makeshlibs, for all packages
+# DEB_DH_MAKESHLIBS_ARGS_<package>
+#   Arguments passed directly to dh_makeshlibs, for a particular package <package>
+# DEB_DH_MAKESHLIBS_ARGS
+#   Completely override argument passing to dh_makeshlibs. 
+# DEB_DH_SHLIBDEPS_ARGS_ALL
+#   Arguments passed directly to dh_shlibdeps, for all packages
+# DEB_DH_SHLIBDEPS_ARGS_<package>
+#   Arguments passed directly to dh_shlibdeps, for a particular package <package>
+# DEB_DH_SHLIBDEPS_ARGS
+#   Completely override argument passing to dh_shlibdeps.
+# DEB_DH_PERL_ARGS
+#   Completely override argument passing to dh_perl.
+####
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_debhelper
+_cdbs_rules_debhelper = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+DH_COMPAT ?= $(shell cat debian/compat 2>/dev/null)
+ifeq (,$(DH_COMPAT))
+DH_COMPAT = 5
+endif
+
+ifeq ($(DH_COMPAT),4)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 4.2.0)
+else
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5)
+endif
+
+ifeq ($(DEB_VERBOSE_ALL), yes)
+DH_VERBOSE = 1
+endif
+
+is_debug_package=$(if $(patsubst %-dbg,,$(cdbs_curpkg)),,yes)
+
+DEB_INSTALL_DIRS_ALL =
+DEB_INSTALL_CHANGELOGS_ALL = $(if $(DEB_ISNATIVE),,$(shell for f in ChangeLog Changelog Changes CHANGES changelog; do if test -s $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; break; fi; done))
+DEB_INSTALL_DOCS_ALL = $(filter-out $(DEB_INSTALL_CHANGELOGS_ALL),$(shell for f in README NEWS TODO BUGS AUTHORS THANKS; do if test -s $(DEB_SRCDIR)/$$f -a ! -d $(DEB_SRCDIR)/$$f; then echo $(DEB_SRCDIR)/$$f; fi; done))
+
+cdbs_add_dashx = $(foreach i,$(1),$(patsubst %,-X %,$(i)))
+cdbs_strip_quotes = $(subst ',,$(subst ",,$(1)))
+# hello emacs '
+
+DEB_DH_MAKESHLIBS_ARGS = $(DEB_DH_MAKESHLIBS_ARGS_ALL) $(DEB_DH_MAKESHLIBS_ARGS_$(cdbs_curpkg))
+DEB_DH_SHLIBDEPS_ARGS = $(if $(DEB_SHLIBDEPS_LIBRARY_$(cdbs_curpkg)),-L $(DEB_SHLIBDEPS_LIBRARY_$(cdbs_curpkg))) $(if $(DEB_SHLIBDEPS_INCLUDE_$(cdbs_curpkg))$(DEB_SHLIBDEPS_INCLUDE),-l $(shell echo $(DEB_SHLIBDEPS_INCLUDE_$(cdbs_curpkg)):$(DEB_SHLIBDEPS_INCLUDE) | perl -pe 's/ /:/g;')) $(DEB_DH_SHLIBDEPS_ARGS_ALL) $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))
+
+DEB_DH_BUILDDEB_ENV = $(if $(DEB_DH_ALWAYS_EXCLUDE),DH_ALWAYS_EXCLUDE=$(DEB_DH_ALWAYS_EXCLUDE),)
+DEB_DH_PERL_ARGS = $(if $(DEB_PERL_INCLUDE_$(cdbs_curpkg))$(DEB_PERL_INCLUDE),$(shell echo $(DEB_PERL_INCLUDE_$(cdbs_curpkg)) $(DEB_PERL_INCLUDE)))
+
+ifneq ($(words $(DEB_DBG_PACKAGES)),0)
+ifeq ($(words $(DEB_DBG_PACKAGES)),1)
+DEB_DBG_PACKAGE_ALL = $(if $(strip $(foreach x,$(DEB_PACKAGES),$(DEB_DBG_PACKAGE_$(x)))),,$(DEB_DBG_PACKAGES))
+else
+ifeq (yes,$(if $(findstring no,$(foreach x,$(DEB_DBG_PACKAGES),$(if $(filter $(x:-dbg=),$(DEB_PACKAGES)),yes,no))),no,yes))
+define cdbs_deb_dbg_package_assign
+DEB_DBG_PACKAGE_$(1:-dbg=) = $(1)
+endef
+$(foreach x,$(DEB_DBG_PACKAGES),$(eval $(call cdbs_deb_dbg_package_assign,$(value x))))
+endif
+endif
+cdbs_dbg_package = $(if $(DEB_DBG_PACKAGE_$(cdbs_curpkg)),$(DEB_DBG_PACKAGE_$(cdbs_curpkg)),$(DEB_DBG_PACKAGE_ALL))
+cdbs_dbg_package_option = $(if $(cdbs_dbg_package),$(shell if [ "$(DH_COMPAT)" -eq 5 ]; then echo "--dbg-package=$(strip $(cdbs_dbg_package))"; fi))
+DEB_DH_STRIP_ARGS = $(cdbs_dbg_package_option)
+endif
+
+pre-build:: debian/compat
+
+debian/compat:
+	$(if $(DEB_DH_COMPAT_DISABLE),,echo $(DH_COMPAT) >$@)
+
+clean::
+	dh_clean $(call cdbs_add_dashx,$(DEB_CLEAN_EXCLUDE))
+
+common-install-prehook-arch common-install-prehook-indep:: common-install-prehook-impl
+common-install-prehook-impl::
+	dh_clean -k $(call cdbs_add_dashx,$(DEB_CLEAN_EXCLUDE))
+	dh_installdirs -A $(DEB_INSTALL_DIRS_ALL)
+
+$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
+	dh_installdirs -p$(cdbs_curpkg) $(DEB_INSTALL_DIRS_$(cdbs_curpkg))
+
+# Create .debs or .udebs as we see fit
+$(patsubst %,binary/%,$(DEB_ALL_PACKAGES)) :: binary/% : binary-makedeb/%
+
+####
+# General Debian package creation rules.
+####
+
+# This rule is called once for each package.  It does the work
+# of installing to debian/<packagename>; this includes running
+# dh_install to split the source from debian/tmp, as well as installing
+# ChangeLogs and the like.
+$(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) :: binary-install/%:
+	dh_installdocs -p$(cdbs_curpkg) $(DEB_INSTALL_DOCS_ALL) $(DEB_INSTALL_DOCS_$(cdbs_curpkg)) 
+	dh_installexamples -p$(cdbs_curpkg) $(DEB_INSTALL_EXAMPLES_$(cdbs_curpkg))
+	dh_installman -p$(cdbs_curpkg) $(DEB_INSTALL_MANPAGES_$(cdbs_curpkg)) 
+	dh_installinfo -p$(cdbs_curpkg) $(DEB_INSTALL_INFO_$(cdbs_curpkg)) 
+	dh_installmenu -p$(cdbs_curpkg) $(DEB_DH_INSTALL_MENU_ARGS)
+	dh_installcron -p$(cdbs_curpkg) $(DEB_DH_INSTALL_CRON_ARGS)
+	dh_installinit -p$(cdbs_curpkg) $(if $(DEB_UPDATE_RCD_PARAMS),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS))",$(if $(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)),--update-rcd-params="$(call cdbs_strip_quotes,$(DEB_UPDATE_RCD_PARAMS_$(cdbs_curpkg)))")) $(DEB_DH_INSTALLINIT_ARGS) 
+	dh_installdebconf -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEBCONF_ARGS)
+	dh_installemacsen -p$(cdbs_curpkg) $(if $(DEB_EMACS_PRIORITY),--priority=$(DEB_EMACS_PRIORITY)) $(if $(DEB_EMACS_FLAVOR),--flavor=$(DEB_EMACS_FLAVOR)) $(DEB_DH_INSTALLEMACSEN_ARGS)
+	dh_installcatalogs -p$(cdbs_curpkg) $(DEB_DH_INSTALLCATALOGS_ARGS)
+	dh_installpam -p$(cdbs_curpkg) $(DEB_DH_INSTALLPAM_ARGS)
+	dh_installlogrotate -p$(cdbs_curpkg) $(DEB_DH_INSTALLLOGROTATE_ARGS)
+	dh_installlogcheck -p$(cdbs_curpkg) $(DEB_DH_INSTALLLOGCHECK_ARGS)
+	dh_installmime -p$(cdbs_curpkg) $(DEB_DH_INSTALLMIME_ARGS)
+	dh_installchangelogs -p$(cdbs_curpkg) $(DEB_DH_INSTALLCHANGELOGS_ARGS) $(DEB_INSTALL_CHANGELOGS_ALL) $(DEB_INSTALL_CHANGELOGS_$(cdbs_curpkg))
+	$(if $(wildcard /usr/bin/dh_installudev),dh_installudev -p$(cdbs_curpkg) $(DEB_DH_INSTALLUDEV_ARGS))
+	dh_install -p$(cdbs_curpkg) $(if $(DEB_DH_INSTALL_SOURCEDIR),--sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)) $(DEB_DH_INSTALL_ARGS) $(DEB_DH_INSTALL_ARGS_$(cdbs_curpkg))
+	dh_link -p$(cdbs_curpkg) $(DEB_DH_LINK_ARGS) $(DEB_DH_LINK_$(cdbs_curpkg))
+
+# This rule is called after all packages have been installed, and their
+# post-install hooks have been run.
+common-binary-post-install-arch:: $(patsubst %,binary-post-install/%,$(DEB_ARCH_PACKAGES))
+common-binary-post-install-indep:: $(patsubst %,binary-post-install/%,$(DEB_INDEP_PACKAGES))
+
+# This rule is called once for each package; it's a general hook
+# to do things like remove files, etc.
+$(patsubst %,binary-post-install/%,$(DEB_ALL_PACKAGES)) :: binary-post-install/%: binary-install/%
+
+# This rule is called after installation and the post-install hooks,
+# to strip files.
+$(patsubst %,binary-strip/%,$(DEB_ARCH_PACKAGES)) :: binary-strip/%: common-binary-post-install-arch binary-strip-IMPL/%
+$(patsubst %,binary-strip/%,$(DEB_INDEP_PACKAGES)) :: binary-strip/%: common-binary-post-install-indep binary-strip-IMPL/%
+$(patsubst %,binary-strip-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-strip-IMPL/%: 
+	$(if $(is_debug_package),,dh_strip -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_STRIP_EXCLUDE)) $(DEB_DH_STRIP_ARGS))
+
+# This rule is called right before generating debs {post,pre}{inst,rm} and controls, deps, are calculated
+# for each package, but after the binary-fixup hooks have been run.
+# (necessary for dh_shlibdeps to work on our own dh_makeshlibs'ed libs)
+common-binary-fixup-arch:: $(patsubst %,binary-fixup/%,$(DEB_ARCH_PACKAGES))
+common-binary-fixup-indep:: $(patsubst %,binary-fixup/%,$(DEB_INDEP_PACKAGES))
+
+# This rule is called after stripping; it compresses, fixes permissions,
+# and sets up shared library information.
+$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
+	dh_compress -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_COMPRESS_EXCLUDE)) $(DEB_DH_COMPRESS_ARGS)
+	dh_fixperms -p$(cdbs_curpkg) $(call cdbs_add_dashx,$(DEB_FIXPERMS_EXCLUDE)) $(DEB_DH_FIXPERMS_ARGS)
+	$(if $(is_debug_package),,dh_makeshlibs -p$(cdbs_curpkg) $(DEB_DH_MAKESHLIBS_ARGS))
+
+# This rule is called right before building the binary .deb packages
+# for each package, but after the binary-predeb hooks have been run.
+common-binary-predeb-arch:: $(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES))
+common-binary-predeb-indep:: $(patsubst %,binary-predeb/%,$(DEB_INDEP_PACKAGES))
+
+# This rule is called right before a packages' .deb file is made.
+# It is a good place to make programs setuid, change the scripts in DEBIAN/, etc. 
+$(patsubst %,binary-predeb/%,$(DEB_ARCH_PACKAGES)) :: binary-predeb/%: common-binary-fixup-arch binary-predeb-IMPL/%
+$(patsubst %,binary-predeb/%,$(DEB_INDEP_PACKAGES)) :: binary-predeb/%: common-binary-fixup-indep binary-predeb-IMPL/%
+$(patsubst %,binary-predeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-predeb-IMPL/%:
+	dh_installdeb -p$(cdbs_curpkg) $(DEB_DH_INSTALLDEB_ARGS)
+	dh_perl -p$(cdbs_curpkg) $(DEB_DH_PERL_ARGS)
+	dh_shlibdeps -p$(cdbs_curpkg) $(DEB_DH_SHLIBDEPS_ARGS)
+
+# This rule is called to create a package.  Generally it's not going to be
+# useful to hook things onto this rule.
+$(patsubst %,binary-makedeb/%,$(DEB_ARCH_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-arch binary-makedeb-IMPL/%
+$(patsubst %,binary-makedeb/%,$(DEB_INDEP_PACKAGES)) :: binary-makedeb/% : common-binary-predeb-indep binary-makedeb-IMPL/%
+$(patsubst %,binary-makedeb-IMPL/%,$(DEB_ALL_PACKAGES)) :: binary-makedeb-IMPL/% : 
+	dh_gencontrol -p$(cdbs_curpkg) $(DEB_DH_GENCONTROL_ARGS)
+	dh_md5sums -p$(cdbs_curpkg) $(DEB_DH_MD5SUMS_ARGS)
+	$(DEB_DH_BUILDDEB_ENV) dh_builddeb -p$(cdbs_curpkg) $(DEB_DH_BUILDDEB_ARGS)
+
+## Deprecated
+common-binary-post-install:: common-binary-post-install-arch common-binary-post-install-indep
+common-binary-predeb:: common-binary-predeb-arch common-binary-predeb-indep
+
+## Deprecated special handling of .udebs
+$(patsubst %,binary/%,$(DEB_UDEB_PACKAGES)) :: binary/% : binary-makeudeb/%
+$(patsubst %,binary-install-udeb/%,$(DEB_UDEB_PACKAGES)) :: binary-install-udeb/%:
+common-binary-post-install-udeb:: $(patsubst %,binary-post-install-udeb/%,$(DEB_UDEB_PACKAGES))
+$(patsubst %,binary-post-install-udeb/%,$(DEB_UDEB_PACKAGES)) :: binary-post-install-udeb/%: binary-install-udeb/%
+$(patsubst %,binary-makeudeb/%,$(DEB_UDEB_PACKAGES)) :: binary-makeudeb/% : common-binary-post-install-udeb
+
+endif
--- iceowl-0.7.orig/debian/iceowlrc
+++ iceowl-0.7/debian/iceowlrc
@@ -0,0 +1,5 @@
+# which /dev/dsp wrapper to use
+Sunbird_DSP="none"
+# Note that "auto" and "esd" involve the use of esddsp, which
+# is known to be buggy and to make iceowl unstable.
+# See https://launchpad.net/bugs/29760.
--- iceowl-0.7.orig/debian/iceowl.postinst
+++ iceowl-0.7/debian/iceowl.postinst
@@ -0,0 +1,26 @@
+#!/bin/sh -e
+
+if [ -x /usr/sbin/update-desktop-database ]; then
+    /usr/sbin/update-desktop-database
+fi
+
+#DEBHELPER#
+
+echo "Please restart any running Iceowls, or you will experience problems."
+
+unud=/var/lib/update-notifier/user.d
+
+if pgrep iceowl-bin >/dev/null 2>&1 && test -d $unud; then
+    cp -f /usr/share/iceowl/iceowl-restart-required.update-notifier \
+        "$unud/iceowl-restart-required"
+fi
+
+crd=/usr/lib/iceowl/components/compreg.dat
+if test -f $crd; then
+    cat >&2 <<'END'
+Warning: something created compreg.dat!
+Your system was affected by this bug: https://launchpad.net/bugs/30791
+compreg.dat has now been removed again, which should fix the symptoms.
+END
+    rm $crd
+fi
--- iceowl-0.7.orig/debian/iceowl-extension.dirs
+++ iceowl-0.7/debian/iceowl-extension.dirs
@@ -0,0 +1,2 @@
+usr/lib/thunderbird/extensions/
+usr/lib/icedove/extensions/
--- iceowl-0.7.orig/debian/MPL
+++ iceowl-0.7/debian/MPL
@@ -0,0 +1,567 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``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 ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+     ----------------------------------------------------------------------
+
+     AMENDMENTS
+
+     The Netscape Public License Version 1.1 ("NPL") consists of the
+     Mozilla Public License Version 1.1 with the following Amendments,
+     including Exhibit A-Netscape Public License.  Files identified with
+     "Exhibit A-Netscape Public License" are governed by the Netscape
+     Public License Version 1.1.
+
+     Additional Terms applicable to the Netscape Public License.
+          I. Effect.
+          These additional terms described in this Netscape Public
+          License -- Amendments shall apply to the Mozilla Communicator
+          client code and to all Covered Code under this License.
+
+          II. "Netscape's Branded Code" means Covered Code that Netscape
+          distributes and/or permits others to distribute under one or more
+          trademark(s) which are controlled by Netscape but which are not
+          licensed for use under this License.
+
+          III. Netscape and logo.
+          This License does not grant any rights to use the trademarks
+          "Netscape", the "Netscape N and horizon" logo or the "Netscape
+          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
+          "Smart Browsing" even if such marks are included in the Original
+          Code or Modifications.
+
+          IV. Inability to Comply Due to Contractual Obligation.
+          Prior to licensing the Original Code under this License, Netscape
+          has licensed third party code for use in Netscape's Branded Code.
+          To the extent that Netscape is limited contractually from making
+          such third party code available under this License, Netscape may
+          choose to reintegrate such code into Covered Code without being
+          required to distribute such code in Source Code form, even if
+          such code would otherwise be considered "Modifications" under
+          this License.
+
+          V. Use of Modifications and Covered Code by Initial Developer.
+               V.1. In General.
+               The obligations of Section 3 apply to Netscape, except to
+               the extent specified in this Amendment, Section V.2 and V.3.
+
+               V.2. Other Products.
+               Netscape may include Covered Code in products other than the
+               Netscape's Branded Code which are released by Netscape
+               during the two (2) years following the release date of the
+               Original Code, without such additional products becoming
+               subject to the terms of this License, and may license such
+               additional products on different terms from those contained
+               in this License.
+
+               V.3. Alternative Licensing.
+               Netscape may license the Source Code of Netscape's Branded
+               Code, including Modifications incorporated therein, without
+               such Netscape Branded Code becoming subject to the terms of
+               this License, and may license such Netscape Branded Code on
+               different terms from those contained in this License.
+
+          VI. Litigation.
+          Notwithstanding the limitations of Section 11 above, the
+          provisions regarding litigation in Section 11(a), (b) and (c) of
+          the License shall apply to all disputes relating to this License.
+
+     EXHIBIT A-Netscape Public License.
+
+          "The contents of this file are subject to the Netscape 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/NPL/
+
+          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 Communicator client code, released
+          March 31, 1998.
+
+          The Initial Developer of the Original Code is Netscape
+          Communications Corporation. Portions created by Netscape are
+          Copyright (C) 1998-1999 Netscape Communications Corporation. All
+          Rights Reserved.
+
+          Contributor(s): ______________________________________.
+
+          Alternatively, the contents of this file may be used under the
+          terms of the _____ license (the "[___] License"), in which case
+          the provisions of [______] License are applicable  instead of
+          those above.  If you wish to allow use of your version of this
+          file only under the terms of the [____] License and not to allow
+          others to use your version of this file under the NPL, indicate
+          your decision by deleting  the provisions above and replace  them
+          with the notice and other provisions required by the [___]
+          License.  If you do not delete the provisions above, a recipient
+          may use your version of this file under either the NPL or the
+          [___] License."
--- iceowl-0.7.orig/debian/remove.binonly.sh
+++ iceowl-0.7/debian/remove.binonly.sh
@@ -0,0 +1,112 @@
+#! /bin/sh
+
+rm -fv ./build/wince/shunt/build/shunt.vcb
+rm -fv ./build/wince/shunt/build/shunt.vco
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(2i\).68k.u
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(4i\).68k.u
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch PPC.u
+# these are only files there; just do it quick and dirty because I don't understand how to fix the syntax it complains about: this does it:
+rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u
+rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp
+rm -fv ./modules/oji/tests/script/killer.exe
+rm -fv ./modules/plugin/samples/default/mac/NullPlugin.rsrc
+rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc
+rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx
+rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
+rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
+rm -fv ./extensions/manticore/resources/manticore.psd
+rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc
+rm -fv ./config/bin2rc.exe
+rm -fv ./config/makedep.exe
+rm -fv ./config/mangle.exe
+rm -fv ./config/mantomak.exe
+rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
+rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx
+rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx
+rm -fv ./embedding/browser/cocoa/res/English.lproj/alert.nib/objects.nib
+rm -fv ./embedding/browser/powerplant/resources/cfmAlias.rsrc
+rm -fv ./embedding/browser/powerplant/resources/cfmAliasDebug.rsrc
+rm -fv ./embedding/minimo/mozconfig
+rm -fv ./embedding/qa/testembed/testembed.aps
+rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
+rm -fv ./embedding/tests/cocoaEmbed/res/English.lproj/MainMenu.nib/objects.nib
+rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
+rm -fv ./intl/unicharutil/tools/data/case.dat
+rm -fv ./intl/unicharutil/tools/data/cmbcl.dat
+rm -fv ./intl/unicharutil/tools/data/ctype.dat
+rm -fv ./intl/unicharutil/tools/data/decomp.dat
+rm -fv ./intl/unicharutil/tools/data/num.dat
+rm -fv ./js/src/fdlibm/fdlibm.mdp
+rm -fv ./js/src/js.mdp
+rm -fv ./js/src/liveconnect/jsj_nodl.c
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
+rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
+rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection
+rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
+rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
+rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
+rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
+rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp
+rm -fv ./xpcom/typelib/xpidl/macplugin/compiler.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/linker.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/panel.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/version.rsrc
+rm -fv ./xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp
+rm -fv ./xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc
+rm -fv ./xpinstall/packager/mac/ASEncoder/src/ASEncoderUsage.script
+rm -fv ./xpinstall/test/pre_checkin.xpi
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Core.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_ForeignThreads.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MPW.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MSL.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_SIOUX.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Sfio.PPC.Lib
+rm -fv ./xpinstall/wizard/mac/rsrc/MIWCommon.rsrc
+rm -fv ./xpinstall/wizard/mac/rsrc/Mozilla.rsrc
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_ch_d.bmp
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_chec.bmp
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_unch.bmp
+rm -fv ./gfx/cairo/libpixman/src/pixman-vc71.lib
+rm -fv ./gfx/src/mac/printerplugin/Resources/English.lproj/Localizable.strings
+rm -fv ./gfx/src/mac/nsMacGFX.rsrc
+rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda
+rm -fv ./layout/doc/object_diagram_template.sda
+rm -fv ./layout/html/tests/block/bugs/RealSnow.jar
+rm -fv ./webshell/tests/viewer/mac/cfmAlias.rsrc
+rm -fv ./webshell/tests/viewer/mac/cfmAliasDebug.rsrc
+rm -fv ./webshell/tests/viewer/mac/viewer.ppob
+rm -fv ./webshell/tests/viewer/mac/viewer.rsrc
+rm -fv ./webshell/tests/viewer/mac/viewercarb.rsrc
+rm -fv ./webshell/tests/viewer/viewer-beos.rsrc
+rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
+rm -fv ./xpfe/bootstrap/apprunner-beos.rsrc
+rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.ncb
+rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.opt
+rm -fv ./toolkit/mozapps/installer/windows/nsis/Processes.dll
+rm -fv ./toolkit/mozapps/installer/windows/nsis/ShellLink.dll
+rm -fv ./toolkit/mozapps/installer/windows/nsis/nsProcess.dll
+
+rm -fvr other-licenses/7zstub/
+rm -fv README/mozilla/README.os2
+
+rm -fv netwerk/protocol/ftp/doc/rfc959.txt
+rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt
+
--- iceowl-0.7.orig/debian/build-tools/obscure.c
+++ iceowl-0.7/debian/build-tools/obscure.c
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2006 Canonical Ltd.
+ * Author: Alexander Sack <asac@jwsdot.com>
+ *
+ * This program 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.  See http://www.gnu.org/copyleft/gpl.html for
+ * the full text of the license.
+ */
+
+#include <argp.h>
+#include <error.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+
+const char *obscure_program_version =
+"obscure 0.1";
+const char *obscure_program_bug_address =
+"Alexander Sack <asac@jwsdot.com>";
+  
+static char doc[] =
+"obscure #1 -- a program shift a firefox configuration file by 'obscure_value'";
+
+/* A description of the arguments we accept. */
+static char args_doc[] = "INPUTFILE [OUTPUTFILE]";
+
+static struct argp_option options[] = {
+  {"offset",  'o', "INTEGER",      0,  "[DEFAULT=13] obscure value offset" },
+  {"reverse",  'r', 0, 0,  "reverse direction of shift to unobscure" },
+  {0}
+};
+
+struct arguments
+{
+  int obscure_value;
+  int do_reverse;
+  char *inputfile;
+  char *outputfile;
+};
+
+static error_t
+parse_opt (int key, char *arg, struct argp_state *state);
+
+/* Our argp parser. */
+static struct argp argp = { options, parse_opt, args_doc, doc };
+    
+static struct arguments arguments;
+
+int main(int argc, char** argv)
+{
+  memset(&arguments, '\0', sizeof(struct arguments));
+
+  arguments.obscure_value = 13;
+
+  argp_parse (&argp, argc, argv, 0, 0, &arguments);
+
+  if(arguments.do_reverse)
+    arguments.obscure_value *= -1;
+
+  int ifd = open(arguments.inputfile, O_RDONLY);
+  int ofd = 1;
+
+  if(arguments.outputfile) {
+    ofd = open(arguments.outputfile, O_WRONLY | O_CREAT, 0644);
+  }
+  
+  if(ifd == -1)
+  {
+    perror("cannot open inputfile");
+  }
+  if(ofd == -1)
+  {
+    perror("cannot open outputfile");
+  }
+
+  char buf[4096];
+  int readn;
+  while( (readn = read(ifd, buf, 4096)) > 0)
+  {
+    int writen=0;
+    int i;
+
+    for(i=0; i < readn; i++)
+      buf[i]+=arguments.obscure_value;
+
+    while(writen < readn)
+       writen += write(ofd, buf, readn-writen);
+  }
+
+  return 0;
+}
+
+
+static error_t
+parse_opt (int key, char *arg, struct argp_state *state)
+{
+  struct arguments *arguments = state->input;
+  switch (key)
+  {
+  case 'r':
+    arguments->do_reverse = 1;
+    break;
+  case 'o':
+    arguments->obscure_value = atoi(arg);
+    break;
+  case ARGP_KEY_ARG:
+    if(state->arg_num == 0)
+	arguments->inputfile = arg;
+    else if(state->arg_num == 1)
+	arguments->outputfile = arg;
+    else
+      argp_usage(state);
+    break;
+  case ARGP_KEY_END:
+    if(state->arg_num < 1)
+      argp_usage(state);
+    break;
+  default:
+    return ARGP_ERR_UNKNOWN;
+  }
+  return 0;
+}
--- iceowl-0.7.orig/debian/iceowl.install
+++ iceowl-0.7/debian/iceowl.install
@@ -0,0 +1,41 @@
+debian/tmp/usr/lib/iceowl/*.so usr/lib/iceowl
+debian/tmp/usr/lib/iceowl/components usr/lib/iceowl
+debian/tmp/usr/lib/iceowl/iceowl-bin usr/lib/iceowl
+debian/tmp/usr/lib/iceowl/run-mozilla.sh usr/lib/iceowl
+debian/tmp/usr/bin/iceowl usr/lib/iceowl
+
+debian/tmp/usr/lib/iceowl/defaults/pref usr/share/iceowl/defaults
+debian/tmp/usr/lib/iceowl/defaults/profile usr/share/iceowl/profile
+debian/tmp/usr/lib/iceowl/greprefs usr/share/iceowl
+debian/tmp/usr/lib/iceowl/res usr/share/iceowl
+debian/tmp/usr/lib/iceowl/icons usr/share/iceowl
+debian/tmp/usr/lib/iceowl/chrome/calendar* usr/share/iceowl/chrome
+debian/tmp/usr/lib/iceowl/chrome/comm* usr/share/iceowl/chrome
+debian/tmp/usr/lib/iceowl/chrome/en-US* usr/share/iceowl/chrome
+debian/tmp/usr/lib/iceowl/chrome/toolkit* usr/share/iceowl/chrome
+debian/tmp/usr/lib/iceowl/chrome/pippki* usr/share/iceowl/chrome
+debian/tmp/usr/lib/iceowl/chrome/classic* usr/share/iceowl/chrome
+debian/tmp/usr/lib/iceowl/chrome/icons/default/default.xpm usr/share/iceowl/chrome/icons/default
+
+debian/tmp/usr/lib/iceowl/js usr/share/iceowl
+
+debian/iceowl.debian-prefs.js usr/share/iceowl/greprefs
+
+debian/iceowl.desktop usr/share/applications
+debian/presubj usr/share/bug/iceowl
+
+debian/iceowl.js etc/iceowl/pref
+debian/iceowl.cfg usr/lib/iceowl
+
+debian/debsearch.gif usr/share/iceowl/searchplugins
+debian/debsearch.src usr/share/iceowl/searchplugins
+
+debian/wikipedia.gif usr/share/iceowl/searchplugins
+debian/wikipedia.src usr/share/iceowl/searchplugins
+
+debian/iceowl-restart-required.update-notifier usr/share/iceowl
+
+debian/tmp/usr/lib/iceowl/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/iceowl/extensions
+
+debian/tmp/usr/lib/iceowl/defaults/autoconfig usr/share/iceowl/defaults
+
--- iceowl-0.7.orig/debian/iceowl-dom-inspector.install
+++ iceowl-0.7/debian/iceowl-dom-inspector.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/iceowl/extensions/inspector@mozilla.org usr/lib/iceowl/extensions
--- iceowl-0.7.orig/debian/control
+++ iceowl-0.7/debian/control
@@ -0,0 +1,35 @@
+Source: iceowl
+Section: web
+Priority: optional
+Maintainer: Alexander Sack <asac@debian.org>
+Build-Depends: bzip2, debhelper (>= 5), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), libx11-dev, libxt-dev, libgtk2.0-dev (>= 2.8), zlib1g-dev, liborbit2-dev, libidl-dev (>= 0.8.0), zip, libxft-dev, libfreetype6-dev, libpng12-dev, libjpeg62-dev, libxrender-dev, libxinerama-dev, libcairo2-dev, libgnome2-dev, libgconf2-dev, libgnomevfs2-dev, libgnomeui-dev, sharutils, m4, binutils (>= 2.17-1) [mips mipsel], libhunspell-dev, libthai-dev, libnss3-dev, libnspr4-dev, imagemagick, unzip
+Standards-Version: 3.7.2.1
+
+Package: iceowl
+Architecture: any
+Depends: fontconfig, psmisc, debianutils (>= 1.16), ${shlibs:Depends}
+Conflicts: libnss3
+Replaces: libnss3
+Suggests: latex-xft-fonts
+Description: Standalone Calendar Application
+ Iceowl is a Mozilla Based Calendar application. The 
+ goal is to produce a cross platform stand alone Calendar 
+ application using the XUL user interface language. Iceowl 
+ leaves a somewhat smaller memory footprint than the Mozilla suite.
+
+Package: iceowl-extension
+Architecture: any
+Depends: icedove | thunderbird, ${shlibs:Depends}
+Suggests: latex-xft-fonts
+Description: Calendar Extension for Thunderbird/Icedove
+ Icedove Extension is a Calendar extension for Thunderbird
+ and Icedove based on iceowl - the Mozilla Based Standalone
+ Calendar application.
+
+Package: iceowl-dev
+Architecture: any
+Section: devel
+Depends: iceowl (= ${Source-Version}), libnss3-dev
+Description: iceowl development files
+ The Iceowl development files
+
--- iceowl-0.7.orig/debian/remove.nonfree
+++ iceowl-0.7/debian/remove.nonfree
@@ -0,0 +1,186 @@
+#! /bin/sh
+
+tmpdir=$(mktemp -d)
+
+rm -fv ./build/wince/shunt/build/shunt.vcb
+rm -fv ./build/wince/shunt/build/shunt.vco
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(2i\).68k.u
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch \(4i\).68k.u
+#rm -fv ./directory/c-sdk/ldap/examples/macintosh/asearch PPC.u
+# these are only files there; just do it quick and dirty because I don't understand how to fix the syntax it complains about: this does it:
+rm -fv ./directory/c-sdk/ldap/examples/macintosh/*.u
+rm -fv ./directory/c-sdk/ldap/libraries/macintosh/LDAPClient.mcp
+rm -fv ./modules/oji/tests/script/killer.exe
+rm -fv ./modules/plugin/samples/default/mac/NullPlugin.rsrc
+rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic Plugin.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/basic/mac/Basic.rsrc
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable Plugin.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable PluginIDL.mcp
+rm -fv ./modules/plugin/tools/sdk/samples/scriptable/mac/Scriptable.rsrc
+rm -fv ./other-licenses/7zstub/firefox/7zSD.sfx
+rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
+rm -fv ./toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
+rm -fv ./extensions/manticore/resources/manticore.psd
+rm -fv ./extensions/universalchardet/doc/UniversalCharsetDetection.doc
+rm -fv ./config/bin2rc.exe
+rm -fv ./config/makedep.exe
+rm -fv ./config/mangle.exe
+rm -fv ./config/mantomak.exe
+rm -fv ./embedding/browser/activex/src/pluginhostctrl/cab/redist/ATL.DLL
+rm -fv ./embedding/browser/activex/tests/vbrowse/browser.frx
+rm -fv ./embedding/browser/activex/tests/vbrowse/frmToolBar.frx
+rm -fv ./embedding/browser/cocoa/res/English.lproj/alert.nib/objects.nib
+rm -fv ./embedding/browser/powerplant/resources/cfmAlias.rsrc
+rm -fv ./embedding/browser/powerplant/resources/cfmAliasDebug.rsrc
+rm -fv ./embedding/minimo/mozconfig
+rm -fv ./embedding/qa/testembed/testembed.aps
+rm -fv ./embedding/tests/MSDotNETCSEmbed/MSDotNETCSEmbed.suo
+rm -fv ./embedding/tests/cocoaEmbed/res/English.lproj/MainMenu.nib/objects.nib
+rm -fv ./embedding/wrappers/DotNETEmbed/DotNETEmbed.snk
+rm -fv ./intl/unicharutil/tools/data/case.dat
+rm -fv ./intl/unicharutil/tools/data/cmbcl.dat
+rm -fv ./intl/unicharutil/tools/data/ctype.dat
+rm -fv ./intl/unicharutil/tools/data/decomp.dat
+rm -fv ./intl/unicharutil/tools/data/num.dat
+rm -fv ./js/src/fdlibm/fdlibm.mdp
+rm -fv ./js/src/js.mdp
+rm -fv ./js/src/liveconnect/jsj_nodl.c
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar
+rm -fv ./plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
+rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin
+rm -fv ./plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Dialogs.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Strings.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/Resources/Version.rsrc
+rm -fv ./plugin/oji/MRJ/plugin/MRJPlugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/netscape.plugin.jar
+rm -fv ./plugin/oji/MRJ/plugin/Source/JMURLConnection
+rm -fv ./plugin/oji/MRJ/testing/ConsoleApplet/ConsoleApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/JSApplet/JSApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/SwingApplet/TestApplet.mcp
+rm -fv ./plugin/oji/MRJ/testing/TrivialApplet/MyApplet.mcp
+rm -fv ./plugin/oji/MRJCarbon/MRJSDK/JavaFrameworks/JavaEmbeddingLib
+rm -fv ./plugin/oji/MRJCarbon/plugin/MRJPlugin.jar
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc
+rm -fv ./plugin/oji/MRJCarbon/plugin/Resources/Version.rsrc
+rm -fv ./xpcom/reflect/xptcall/tests/eVC4/XPTCInvoke_Testing.cpp
+rm -fv ./xpcom/tests/StringFactoringTests/StringTest.mcp
+rm -fv ./xpcom/typelib/xpidl/macplugin/compiler.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/linker.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/panel.rsrc
+rm -fv ./xpcom/typelib/xpidl/macplugin/version.rsrc
+rm -fv ./xpinstall/packager/mac/ASEncoder/build/ASEncoder.mcp
+rm -fv ./xpinstall/packager/mac/ASEncoder/rsrc/ASEncoder.rsrc
+rm -fv ./xpinstall/packager/mac/ASEncoder/src/ASEncoderUsage.script
+rm -fv ./xpinstall/test/pre_checkin.xpi
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Core.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_ForeignThreads.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MPW.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_MSL.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_SIOUX.PPC.Lib
+rm -fv ./xpinstall/wizard/libxpnet/GUSI/lib/GUSI_Sfio.PPC.Lib
+rm -fv ./xpinstall/wizard/mac/rsrc/MIWCommon.rsrc
+rm -fv ./xpinstall/wizard/mac/rsrc/Mozilla.rsrc
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_ch_d.bmp
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_chec.bmp
+rm -fv ./xpinstall/wizard/os2/setuprsc/box_unch.bmp
+rm -fv ./gfx/cairo/libpixman/src/pixman-vc71.lib
+rm -fv ./gfx/src/mac/printerplugin/Resources/English.lproj/Localizable.strings
+rm -fv ./gfx/src/mac/nsMacGFX.rsrc
+rm -fv ./layout/doc/SpaceMgr_BlockReflSt_OD.sda
+rm -fv ./layout/doc/object_diagram_template.sda
+rm -fv ./layout/html/tests/block/bugs/RealSnow.jar
+rm -fv ./webshell/tests/viewer/mac/cfmAlias.rsrc
+rm -fv ./webshell/tests/viewer/mac/cfmAliasDebug.rsrc
+rm -fv ./webshell/tests/viewer/mac/viewer.ppob
+rm -fv ./webshell/tests/viewer/mac/viewer.rsrc
+rm -fv ./webshell/tests/viewer/mac/viewercarb.rsrc
+rm -fv ./webshell/tests/viewer/viewer-beos.rsrc
+rm -fv ./xpfe/bootstrap/appleevents/nsAppleEvents.rsrc
+rm -fv ./xpfe/bootstrap/apprunner-beos.rsrc
+rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.ncb
+rm -fv ./mailnews/mapi/old/tests/mapitest/mapitest.opt
+
+rm -fv ./toolkit/mozapps/installer/windows/nsis/Processes.dll
+rm -fv ./toolkit/mozapps/installer/windows/nsis/ShellLink.dll
+rm -fv ./toolkit/mozapps/installer/windows/nsis/nsProcess.dll
+
+rm -fv ./xpfe/bootstrap/macbuild/Contents/Resources/command.icns
+rm -fv ./xpfe/bootstrap/macbuild/Contents/Resources/component.icns
+rm -fv ./xpfe/bootstrap/macbuild/Contents/Resources/html.icns
+rm -fv ./xpfe/bootstrap/macbuild/Contents/Resources/mozilla.icns
+rm -fv ./xpfe/bootstrap/macbuild/Contents/Resources/plugin.icns
+rm -fv ./xpfe/bootstrap/macbuild/Contents/Resources/pref.icns
+rm -fv ./xpfe/bootstrap/macbuild/Contents/Resources/text.icns
+
+# mac cursor images have no source either
+rm -fv ./widget/src/os2/res/aliasb.ptr
+rm -fv ./widget/src/os2/res/arrow_wait.ptr
+rm -fv ./widget/src/os2/res/cell.ptr
+rm -fv ./widget/src/os2/res/col_resize.ptr
+rm -fv ./widget/src/os2/res/copy.ptr
+rm -fv ./widget/src/os2/res/crosshair.ptr
+rm -fv ./widget/src/os2/res/grabbing.ptr
+rm -fv ./widget/src/os2/res/grab.ptr
+rm -fv ./widget/src/os2/res/help.ptr
+rm -fv ./widget/src/os2/res/row_resize.ptr
+rm -fv ./widget/src/os2/res/select.ptr
+rm -fv ./widget/src/os2/res/vertical_text.ptr
+rm -fv ./widget/src/os2/res/zoom_in.ptr
+rm -fv ./widget/src/os2/res/zoom_out.ptr
+ 
+
+
+echo also we need to remove any copyrighted image files from the mozilla src  suite,  not replaced by the branding process. This includes theme throbbers depending on how you handle that and windows icons, app icons, windows splash etc
+
+rm -fv ./xpfe/bootstrap/splash.bmp
+rm -fv ./xpfe/bootstrap/mozilla.ico
+rm -fv ./xpfe/bootstrap/mozos2.ico
+rm -fv ./browser/app/mozicon128.png
+rm -fv ./browser/app/mozicon16.xpm
+rm -fv ./browser/app/mozicon50.xpm
+
+# I'm not sure about the os2 as I can't see them
+rm -fv ./xpfe/bootstrap/icons/os2/mozilla.ico
+
+rm -fv ./xpinstall/wizard/windows/setuprsc/bitmap1.bmp
+rm -fv ./xpinstall/wizard/windows/setuprsc/downloadLogo.bmp
+rm -fv ./xpinstall/wizard/windows/setuprsc/turbo-systray.bmp
+
+rm -fv ./xpinstall/wizard/os2/nsinstall/stubinstall.ico
+rm -fv ./xpinstall/wizard/os2/setuprsc/downloadLogo.bmp
+rm -fv ./xpinstall/wizard/os2/setuprsc/bitmap1.bmp
+
+rm -fv ./suite/branding/icons/gtk/seamonkey.png # 128x128
+rm -fv ./suite/branding/icons/gtk/default.xpm # 32x32
+rm -fv ./suite/branding/icons/gtk/default16.xpm #16x16
+rm -fv ./suite/branding/content/logo.gif # 200x200
+
+# remove the throbbers as they are branded
+
+rm -fv ./themes/classic/communicator/brand/throbber-single.gif
+rm -fv ./themes/classic/communicator/brand/throbber16-single.gif
+rm -fv ./themes/classic/communicator/brand/throbber-anim.gif
+rm -fv ./themes/classic/communicator/brand/throbber16-anim.gif
+
+rm -fv ./themes/modern/communicator/brand/throbber-single.gif
+rm -fv ./themes/modern/communicator/brand/throbber16-single.gif
+rm -fv ./themes/modern/communicator/brand/throbber-anim.gif
+rm -fv ./themes/modern/communicator/brand/throbber16-anim.gif
+
+rm -fv ./xpfe/bootstrap/splash.xpm
+rm -fv ./themes/classic/communicator/icons/turbo-systray.gif
+rm -fv ./themes/modern/communicator/icons/turbo-systray.gif
+
+
+rm -fvr other-licenses/
+rm -fv README/mozilla/README.os2
+
+rm -fv netwerk/protocol/ftp/doc/rfc959.txt
+rm -fv directory/c-sdk/ldap/docs/draft-ietf-ldapext-ldap-c-api-05.txt
+
+mkdir other-licenses/
+
+echo rm -rf $tmpdir
--- iceowl-0.7.orig/debian/iceowl.debian-prefs.js
+++ iceowl-0.7/debian/iceowl.debian-prefs.js
@@ -0,0 +1,4 @@
+
+// only define lock file
+pref("general.config.filename", "iceowl.cfg");
+
--- iceowl-0.7.orig/debian/iceowl.desktop
+++ iceowl-0.7/debian/iceowl.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Iceowl Calendar
+Comment=Standalone Calendar
+GenericName=Calendar
+Exec=iceowl %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=iceowl.png
+Categories=Application;Office;
+MimeType=text/calendar
+StartupWMClass=Iceowl-bin
+StartupNotify=true
--- iceowl-0.7.orig/debian/iceowl-gnome-support.prerm
+++ iceowl-0.7/debian/iceowl-gnome-support.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+    update-alternatives --remove gnome-www-browser /usr/bin/iceowl
+    touch /usr/lib/iceowl/.autoreg
+fi
+
+#DEBHELPER#
--- iceowl-0.7.orig/debian/iceowl-nspr.pc
+++ iceowl-0.7/debian/iceowl-nspr.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib/iceowl
+includedir=/usr/include/iceowl
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: 4.7.0
+Libs: -L/usr/lib/iceowl -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+Cflags: -I/usr/include/iceowl/nspr
+
+
--- iceowl-0.7.orig/debian/vendor.js.in
+++ iceowl-0.7/debian/vendor.js.in
@@ -0,0 +1,4 @@
+#expand pref("general.useragent.vendor","__DISTRIB_ID__");
+#expand pref("general.useragent.vendorSub","__DISTRIB_RELEASE__");
+#expand pref("general.useragent.vendorComment","__DISTRIB_CODENAME__");
+pref("browser.display.use_system_colors",   true);
--- iceowl-0.7.orig/debian/compat
+++ iceowl-0.7/debian/compat
@@ -0,0 +1 @@
+5
--- iceowl-0.7.orig/debian/rules
+++ iceowl-0.7/debian/rules
@@ -0,0 +1,104 @@
+#!/usr/bin/make -f
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p')
+DEBIAN_REV_CODE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*-\([0-9]*\)[^-]*$$/0\1/ ; s/^.*\(..\)$$/\1/')
+DEBIAN_DATE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*cvs\([0-9]*\).*$$/\1/')
+
+DEBIAN_MOZ_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \([0-9.]*\).*$$/\1/ p')
+
+DEBIAN_MOZ_SOURCE_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
+DEBIAN_MOZ_APPLICATION := $(shell dpkg-parsechangelog | sed -n 's/Source: \(.*\)$$/\1/ p')
+DEBIAN_MOZ_UPSTREAM_APPLICATION ?= iceowl
+
+DEB_TAR_SRCDIR		:= mozilla
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        OPTFLAGS = -O0
+else
+        OPTFLAGS = -O2 -fno-strict-aliasing
+endif
+
+OPTFLAGS += -g
+
+#DEB_AUTO_UPDATE_DEBIAN_CONTROL=1
+#DEB_AUTO_UPDATE_AUTOCONF=2.13
+
+DEB_DH_INSTALL_ARGS_iceowl := -Xgnome -Ximgicon -Xmozlibthai
+DEB_DH_INSTALL_ARGS_iceowl-dev :=
+
+include /usr/share/cdbs/1/rules/tarball.mk
+include $(CURDIR)/debian/cdbs-rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+
+
+DEB_CONFIGURE_USER_FLAGS= \
+        --host=$(DEB_HOST_GNU_TYPE) \
+	--enable-application=calendar \
+	--disable-strip \
+	--disable-strip-libs \
+        --enable-default-toolkit=gtk2 \
+	--with-default-mozilla-five-home=/usr/lib/iceowl \
+	--with-system-mng=/usr \
+	--with-system-png=/usr \
+	--with-system-jpeg=/usr \
+	--with-system-zlib=/usr \
+	--enable-optimize="-pipe -w $(OPTFLAGS)" \
+	--enable-extensions=default,lightning,pref,auth \
+	--with-system-nspr \
+	--with-system-nss \
+	--enable-postscript \
+	--enable-gnomevfs \
+	--enable-libthai \
+	--enable-system-cairo \
+	--disable-debug \
+	--with-distribution-id=com.ubuntu
+
+UUDECODE = \
+	debsearch.gif \
+	wikipedia.gif \
+	$(NULL)
+
+common-install-arch::
+	set -e; mkdir -p debian/iceowl-extension/usr/lib/iceowl-extension; \
+		sh -c "set -e; cd debian/iceowl-extension/usr/lib/iceowl-extension/; unzip $(CURDIR)/build-tree/mozilla/dist/xpi-stage/lightning.xpi"
+
+pre-build::
+	set -e; for i in $(UUDECODE); do \
+		uudecode -o debian/$$i debian/$$i.uu; \
+		done; gcc -o debian/build-tools/obscure-tool debian/build-tools/obscure.c; \
+		debian/build-tools/obscure-tool debian/iceowl.cfg.source debian/iceowl.cfg
+
+clean::
+	set -e; for i in $(UUDECODE); do \
+		rm -f debian/$$i; \
+		done; rm -f debian/build-tools/obscure-tool;
+		rm -f debian/iceowl.cfg
+
+common-install-arch:: common-install-impl
+	set -e; /usr/bin/convert -resize 48x48 $(CURDIR)/debian/tmp/usr/lib/iceowl/icons/mozicon128.png $(CURDIR)/debian/tmp/usr/lib/iceowl/icons/mozicon50.png
+
+$(CURDIR)/../$(DEBIAN_MOZ_APPLICATION)_$(DEBIAN_MOZ_SOURCE_VERSION).orig.tar.gz: $(DEBIAN_MOZ_UPSTREAM_APPLICATION)-$(DEBIAN_MOZ_UPSTREAM_VERSION)-source.tar.bz2
+	set -e; rm -rf $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION); \
+		mkdir $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION); \
+		cp $^ $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION)/; \
+		tar cvzf $@ $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION)/$^ ; \
+		rm -rf $(DEBIAN_MOZ_APPLICATION)-$(DEBIAN_MOZ_SOURCE_VERSION)
+
+update-orig: $(CURDIR)/../$(DEBIAN_MOZ_APPLICATION)_$(DEBIAN_MOZ_SOURCE_VERSION).orig.tar.gz
+
+echox:
+	set -e; echo DEBIAN_MOZ_APPLICATION = $(DEBIAN_MOZ_APPLICATION); \
+		echo DEBIAN_MOZ_SOURCE_VERSION = $(DEBIAN_MOZ_SOURCE_VERSION)
+
+CFLAGS =
+CXXFLAGS =
--- iceowl-0.7.orig/debian/patches/bz270159-lp65164-empty-file-or-duplicate-extension-on-fat32-ntfs
+++ iceowl-0.7/debian/patches/bz270159-lp65164-empty-file-or-duplicate-extension-on-fat32-ntfs
@@ -0,0 +1,33 @@
+Index: ./toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in
+===================================================================
+RCS file: /cvsroot/mozilla/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in,v
+retrieving revision 1.46
+diff -u -8 -p -r1.46 nsHelperAppDlg.js.in
+--- mozilla/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in	17 Apr 2007 18:51:34 -0000	1.46
++++ mozilla/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in	21 Jun 2007 15:41:20 -0000
+@@ -278,23 +278,25 @@ nsUnknownContentTypeDialog.prototype = {
+       aLeafName = aLeafName.replace(/^\.+/, "");
+ 
+       if (aLeafName == "")
+         aLeafName = "unnamed" + (aFileExt ? "." + aFileExt : "");
+       aLocalFile.append(aLeafName);
+ 
+       this.makeFileUnique(aLocalFile);
+ 
++#ifdef XP_WIN
+       if (aLocalFile.isExecutable() && !this.mLauncher.targetFile.isExecutable()) {
+         var f = aLocalFile.clone();
+         aLocalFile.leafName = aLocalFile.leafName + "." + this.mLauncher.MIMEInfo.primaryExtension; 
+ 
+         f.remove(false);
+         this.makeFileUnique(aLocalFile);
+       }
++#endif
+ 
+       return aLocalFile;
+     },
+ 
+     /**
+      * Generates and returns a uniquely-named file from aLocalFile.  If
+      * aLocalFile does not exist, it will be the file returned; otherwise, a
+      * file whose name is similar to that of aLocalFile will be returned.
--- iceowl-0.7.orig/debian/patches/mips_performance
+++ iceowl-0.7/debian/patches/mips_performance
@@ -0,0 +1,58 @@
+---
+ config/rules.mk |    9 ---------
+ configure.in    |    2 --
+ 2 files changed, 11 deletions(-)
+
+Index: mozilla/config/rules.mk
+===================================================================
+--- mozilla.orig/config/rules.mk
++++ mozilla/config/rules.mk
+@@ -451,25 +451,16 @@
+ ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
+ ifeq ($(MODULE),layout)
+ OS_CFLAGS += -Wa,-xgot
+ OS_CXXFLAGS += -Wa,-xgot
+ endif
+ endif
+ endif
+ 
+-ifeq ($(OS_ARCH),Linux)
+-ifneq (,$(filter mips mipsel,$(OS_TEST)))
+-ifeq ($(MODULE),layout)
+-OS_CFLAGS += -Wa,-xgot
+-OS_CXXFLAGS += -Wa,-xgot
+-endif
+-endif
+-endif
+-
+ #
+ # HP-UX specific section: for COMPONENTS only, add -Bsymbolic flag
+ # which uses internal symbols first
+ #
+ ifeq ($(OS_ARCH),HP-UX)
+ ifdef IS_COMPONENT
+ ifeq ($(GNU_CC)$(GNU_CXX),)
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in
++++ mozilla/configure.in
+@@ -1602,18 +1602,16 @@
+     	CFLAGS="$CFLAGS -mieee"
+     	CXXFLAGS="$CXXFLAGS -mieee"
+     ;;
+     i*86)
+     	USE_ELF_DYNSTR_GC=1
+         MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
+     ;;
+     mips*)
+-        CFLAGS="$CFLAGS -Wa,-xgot"
+-        CXXFLAGS="$CXXFLAGS -Wa,-xgot"
+     ;;
+     esac
+     ;;
+ 
+ *-wince*)
+ 
+     MOZ_TOOLS_DIR=`echo $MOZ_TOOLS`
+     AR_LIST="$AR -list"
--- iceowl-0.7.orig/debian/patches/bz399589_fix_missing_symbol_with_new_nss.patch
+++ iceowl-0.7/debian/patches/bz399589_fix_missing_symbol_with_new_nss.patch
@@ -0,0 +1,37 @@
+Index: mozilla/security/manager/ssl/src/nsKeygenHandler.cpp
+===================================================================
+--- mozilla.orig/security/manager/ssl/src/nsKeygenHandler.cpp	2005-07-20 15:31:22.000000000 -0400
++++ mozilla/security/manager/ssl/src/nsKeygenHandler.cpp	2007-11-12 18:10:29.000000000 -0500
+@@ -75,6 +75,15 @@
+     { nsnull, 0 }, 
+ };
+ 
++DERTemplate SECAlgorithmIDTemplate[] = {
++    { DER_SEQUENCE,
++	  0, NULL, sizeof(SECAlgorithmID) },
++    { DER_OBJECT_ID,
++	  offsetof(SECAlgorithmID,algorithm), },
++    { DER_OPTIONAL | DER_ANY,
++	  offsetof(SECAlgorithmID,parameters), },
++    { 0, }
++};
+ 
+ DERTemplate CERTSubjectPublicKeyInfoTemplate[] = {
+     { DER_SEQUENCE,
+@@ -95,16 +104,6 @@
+     { 0, }
+ };
+ 
+-DERTemplate SECAlgorithmIDTemplate[] = {
+-    { DER_SEQUENCE,
+-	  0, NULL, sizeof(SECAlgorithmID) },
+-    { DER_OBJECT_ID,
+-	  offsetof(SECAlgorithmID,algorithm), },
+-    { DER_OPTIONAL | DER_ANY,
+-	  offsetof(SECAlgorithmID,parameters), },
+-    { 0, }
+-};
+-
+ const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
+     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) },
+     { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) },
--- iceowl-0.7.orig/debian/patches/bz161826-nsTextFrame-MeasureText-s-crash-on-RISC.patch
+++ iceowl-0.7/debian/patches/bz161826-nsTextFrame-MeasureText-s-crash-on-RISC.patch
@@ -0,0 +1,197 @@
+From 84e750219be86603168a47b17d84bfaf69288606 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:14 +0100
+Subject: [PATCH] bz161826 nsTextFrame::MeasureText()'s crash on RISC
+
+ + nsTextFrame::MeasureText()'s fast text measuring codepath crashes on
+RISC machines
+---
+ intl/lwbrk/src/nsJISx4501LineBreaker.cpp |   24 ++++++++++++------------
+ intl/unicharutil/util/nsUnicharUtils.cpp |   23 +++++++++++++++++++++++
+ intl/unicharutil/util/nsUnicharUtils.h   |    5 +++++
+ layout/generic/nsTextFrame.cpp           |    8 ++++----
+ 4 files changed, 44 insertions(+), 16 deletions(-)
+
+Index: mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
+===================================================================
+--- mozilla.orig/intl/lwbrk/src/nsJISx4501LineBreaker.cpp	2007-04-04 18:45:09.000000000 +0200
++++ mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp	2007-04-04 18:45:40.000000000 +0200
+@@ -482,57 +482,57 @@
+   NS_ENSURE_TRUE(oNeedMoreText, NS_ERROR_NULL_POINTER);
+   NS_ENSURE_TRUE(aPos <= aLen, NS_ERROR_ILLEGAL_VALUE);
+ 
+   //forward check for CJK characters until a space is found. 
+   //if CJK char is found before space, use 4051, otherwise western
+   PRUint32 cur;
+   for (cur = aPos; cur < aLen; ++cur)
+   {
+-    if (IS_SPACE(aText[cur]))
++    if (IS_SPACE(GetUnichar(&aText[cur])))
+     {
+       *oNext = cur;
+       *oNeedMoreText = PR_FALSE;
+       return NS_OK;
+     }
+-    if (IS_CJK_CHAR(aText[cur]))
++    if (IS_CJK_CHAR(GetUnichar(&aText[cur])) || IS_THAI(GetUnichar(&aText[cur])))
+       goto ROUTE_CJK_NEXT;
+   }
+   *oNext = aLen;
+   *oNeedMoreText = PR_TRUE;
+   return NS_OK;
+ 
+ ROUTE_CJK_NEXT:
+   PRInt8 c1, c2;
+   cur = aPos;
+-  if(NEED_CONTEXTUAL_ANALYSIS(aText[cur]))
++  if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur])))
+   {
+-    c1 = this->ContextualAnalysis((cur>0)?aText[cur-1]:0,
+-                                  aText[cur],
+-                                  (cur<(aLen-1)) ?aText[cur+1]:0);
++    c1 = this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0,
++                                  GetUnichar(&aText[cur]),
++                                  (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0);
+   } else  {
+-    c1 = this->GetClass(aText[cur]);
++    c1 = this->GetClass(GetUnichar(&aText[cur]));
+   }
+   
+   if(CLASS_THAI == c1) 
+   {
+      *oNext = PRUint32(TrbFollowing(aText, aLen, aPos));
+      *oNeedMoreText = PR_FALSE;
+      return NS_OK;
+   }
+ 
+   for(cur++; cur <aLen; cur++)
+   {
+-     if(NEED_CONTEXTUAL_ANALYSIS(aText[cur]))
++     if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur])))
+      {
+-       c2= this->ContextualAnalysis((cur>0)?aText[cur-1]:0,
+-                                  aText[cur],
+-                                  (cur<(aLen-1)) ?aText[cur+1]:0);
++       c2= this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0,
++                                  GetUnichar(&aText[cur]),
++                                  (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0);
+      } else {
+-       c2 = this->GetClass(aText[cur]);
++       c2 = this->GetClass(GetUnichar(&aText[cur]));
+      }
+ 
+      if(GetPair(c1, c2)) {
+        *oNext = cur ;
+        *oNeedMoreText = PR_FALSE;
+        return NS_OK;
+      }
+      c1 = c2;
+Index: mozilla/intl/unicharutil/util/nsUnicharUtils.cpp
+===================================================================
+--- mozilla.orig/intl/unicharutil/util/nsUnicharUtils.cpp	2007-04-04 18:45:09.000000000 +0200
++++ mozilla/intl/unicharutil/util/nsUnicharUtils.cpp	2007-04-04 18:45:40.000000000 +0200
+@@ -343,8 +343,31 @@
+         if (aChar < 256)
+             result = toupper(char(aChar));
+         else
+             result = aChar;
+     }
+     return result;
+ }
+ 
++PRUnichar
++GetUnichar(const void *ptr)
++{
++    PRUnichar result;
++#if NEED_STRICT_ALIGNMENT
++    *((char *) &result) = *((char *) ptr);
++    *((char *) &result + 1) = *((char *) ptr + 1);
++#else
++    result = *((PRUnichar *) ptr);
++#endif
++    return result;
++}
++
++void
++SetUnichar(void *ptr, PRUnichar aChar)
++{
++#if NEED_STRICT_ALIGNMENT
++    *((char *) ptr) = *((char *) &aChar);
++    *((char *) ptr + 1) = *((char *) &aChar + 1);
++#else
++    *((PRUnichar *) ptr) = aChar;
++#endif
++}
+Index: mozilla/intl/unicharutil/util/nsUnicharUtils.h
+===================================================================
+--- mozilla.orig/intl/unicharutil/util/nsUnicharUtils.h	2007-04-04 18:45:09.000000000 +0200
++++ mozilla/intl/unicharutil/util/nsUnicharUtils.h	2007-04-04 18:45:40.000000000 +0200
+@@ -77,16 +77,21 @@
+                         aHay.BeginReading(searchBegin),
+                         aHay.EndReading(searchEnd),
+                         nsCaseInsensitiveStringComparator());
+ }
+ 
+ PRUnichar ToUpperCase(PRUnichar);
+ PRUnichar ToLowerCase(PRUnichar);
+ 
++#define NEED_STRICT_ALIGNMENT defined(__sparc__) || defined(__alpha__) || defined(__mips__)
++
++PRUnichar GetUnichar(const void *);
++void SetUnichar(void *, PRUnichar);
++
+ inline PRBool IsUpperCase(PRUnichar c) {
+     return ToLowerCase(c) != c;
+ }
+ 
+ inline PRBool IsLowerCase(PRUnichar c) {
+     return ToUpperCase(c) != c;
+ }
+ 
+Index: mozilla/layout/generic/nsTextFrame.cpp
+===================================================================
+--- mozilla.orig/layout/generic/nsTextFrame.cpp	2007-04-04 18:45:09.000000000 +0200
++++ mozilla/layout/generic/nsTextFrame.cpp	2007-04-04 18:45:40.000000000 +0200
+@@ -5124,18 +5124,18 @@
+ TransformTextToUnicode(char* aText, PRInt32 aNumChars)
+ {
+   // Go backwards over the characters and convert them.
+   unsigned char*  cp1 = (unsigned char*)aText + aNumChars - 1;
+   PRUnichar*      cp2 = (PRUnichar*)aText + (aNumChars - 1);
+   
+   while (aNumChars-- > 0) {
+     // XXX: If you crash here then you may see the issue described
+-    // in http://bugzilla.mozilla.org/show_bug.cgi?id=36146#c44
+-    *cp2-- = PRUnichar(*cp1--);
++    // in http://bugzilla.mozilla.org/show_bug.cgi?id=161826
++    SetUnichar(cp2--, PRUnichar(*cp1--));
+   }
+ }
+  
+ PRUint32
+ nsTextFrame::EstimateNumChars(PRUint32 aAvailableWidth,
+                               PRUint32 aAverageCharWidth)
+ {
+   // Estimate the number of characters that will fit. Use 105% of the available
+@@ -6222,19 +6222,19 @@
+   return NS_OK;
+ }
+ 
+ static void
+ RevertSpacesToNBSP(PRUnichar* aBuffer, PRInt32 aWordLen)
+ {
+   PRUnichar* end = aBuffer + aWordLen;
+   for (; aBuffer < end; aBuffer++) {
+-    PRUnichar ch = *aBuffer;
++    PRUnichar ch = GetUnichar(aBuffer);
+     if (ch == ' ') {
+-      *aBuffer = CH_NBSP;
++      SetUnichar(aBuffer, CH_NBSP);
+     }
+   }
+ }
+ 
+ nsTextDimensions
+ nsTextFrame::ComputeTotalWordDimensions(nsPresContext* aPresContext,
+                                    nsILineBreaker* aLineBreaker,
+                                    nsLineLayout& aLineLayout,
--- iceowl-0.7.orig/debian/patches/iceowl-branding
+++ iceowl-0.7/debian/patches/iceowl-branding
@@ -0,0 +1,67 @@
+---
+ calendar/locales/en-US/chrome/branding/brand.dtd        |    6 +++---
+ calendar/locales/en-US/chrome/branding/brand.properties |    8 ++++----
+ configure.in                                            |    4 ++--
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+Index: mozilla/calendar/locales/en-US/chrome/branding/brand.dtd
+===================================================================
+--- mozilla.orig/calendar/locales/en-US/chrome/branding/brand.dtd	2006-07-19 22:08:21.000000000 +0000
++++ mozilla/calendar/locales/en-US/chrome/branding/brand.dtd	2007-07-29 03:36:57.000000000 +0000
+@@ -1,3 +1,3 @@
+-<!ENTITY  brandShortName        "Calendar">
+-<!ENTITY  brandFullName         "Calendar">
+-<!ENTITY  vendorShortName       "Mozilla">
++<!ENTITY  brandShortName        "Iceowl">
++<!ENTITY  brandFullName         "Iceowl Calendar">
++<!ENTITY  vendorShortName       "Debian">
+Index: mozilla/calendar/locales/en-US/chrome/branding/brand.properties
+===================================================================
+--- mozilla.orig/calendar/locales/en-US/chrome/branding/brand.properties	2006-09-15 01:43:42.000000000 +0000
++++ mozilla/calendar/locales/en-US/chrome/branding/brand.properties	2007-07-29 03:36:57.000000000 +0000
+@@ -1,16 +1,16 @@
+-brandShortName=Calendar
+-brandFullName=Calendar
+-vendorShortName=Mozilla
++brandShortName=Iceowl
++brandFullName=Iceowl Calendar
++vendorShortName=Debian
+ 
+ # LOCALIZATION NOTE (releaseNotesURL):
+ #   For nightly builds, direct the user to an appropriate, yet non-version
+ #   specific project site.
+ #
+ #   %s is replaced by __MOZ_APP_VERSION__
+ #
+ #   example:
+ #     __MOZ_APP_VERSION__: 0.4
+ #     releaseNotesUrl: http://www.mozilla.foo/sunbird%S.html
+ #     result: http://www.mozilla.foo/sunbird0.4.html
+ #
+-releaseNotesURL=http://www.mozilla.org/projects/calendar/
++releaseNotesURL=http://www.asoftsite.org
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-07-29 03:36:57.000000000 +0000
++++ mozilla/configure.in	2007-07-29 03:38:05.000000000 +0000
+@@ -4415,18 +4415,18 @@
+   MOZ_XUL_APP=1
+   MOZ_STANDALONE_COMPOSER=1
+   MOZ_COMPOSER=1
+   MOZ_APP_VERSION=0.17+
+   AC_DEFINE(MOZ_STANDALONE_COMPOSER)
+   ;;
+ 
+ calendar)
+-  MOZ_APP_NAME=sunbird
+-  MOZ_APP_DISPLAYNAME=Calendar
++  MOZ_APP_NAME=iceowl
++  MOZ_APP_DISPLAYNAME=Iceowl
+   MOZ_XUL_APP=1
+   MOZ_SUNBIRD=1
+   MOZ_CALENDAR=1
+   MOZ_XPFE_COMPONENTS=
+   MOZ_APP_VERSION=$SUNBIRD_VERSION
+   MOZ_PLAINTEXT_EDITOR_ONLY=1
+   NECKO_PROTOCOLS_DEFAULT="about http ftp file res viewsource"
+   MOZ_NO_ACTIVEX_SUPPORT=1
--- iceowl-0.7.orig/debian/patches/arch-detect
+++ iceowl-0.7/debian/patches/arch-detect
@@ -0,0 +1,40 @@
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-10-27 13:49:46.000000000 +0000
++++ mozilla/configure.in	2007-10-27 13:49:46.000000000 +0000
+@@ -821,24 +821,17 @@
+ 
+ MOZ_ENABLE_POSTSCRIPT=1 
+ 
+-if test -n "$CROSS_COMPILE"; then
+-    OS_TARGET="${target_os}"
+-    OS_ARCH=`echo $target_os | sed -e 's|/|_|g'`
+-    OS_RELEASE=
+-    OS_TEST="${target_cpu}"
+-    case "${target_os}" in
+-        linux*)       OS_ARCH=Linux ;;
+-        solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
+-        mingw*)       OS_ARCH=WINNT ;;
+-        wince*)       OS_ARCH=WINCE ;;
+-        darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
+-    esac
+-else
+-    OS_TARGET=`uname -s`
+-    OS_ARCH=`uname -s | sed -e 's|/|_|g'`
+-    OS_RELEASE=`uname -r`
+-    OS_TEST=`uname -m`
+-fi
++OS_TARGET="${host_os}"
++OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`
++OS_RELEASE=
++OS_TEST="${host_cpu}"
++case "${host_os}" in
++    linux*)       OS_ARCH=Linux ;;
++    solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
++    mingw*)       OS_ARCH=WINNT ;;
++    wince*)       OS_ARCH=WINCE ;;
++    darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
++esac
+ _COMPILER_PREFIX=
+ 
+ HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`
--- iceowl-0.7.orig/debian/patches/follow_symlinks_startscript
+++ iceowl-0.7/debian/patches/follow_symlinks_startscript
@@ -0,0 +1,35 @@
+---
+ calendar/sunbird/app/mozilla.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: mozilla/calendar/sunbird/app/mozilla.in
+===================================================================
+--- mozilla.orig/calendar/sunbird/app/mozilla.in
++++ mozilla/calendar/sunbird/app/mozilla.in
+@@ -105,24 +105,26 @@
+   dist_bin="$curdir"
+   found=1
+ else
+   here=`/bin/pwd`
+   while [ -h "$progname" ]; do
+     bn=`basename "$progname"`
+     cd `dirname "$progname"`
+     progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
++    progbase=`basename "$progname"`
+     if [ ! -x "$progname" ]; then
+       break
+     fi
+     curdir=`dirname "$progname"`
+     run_moz="$curdir/run-mozilla.sh"
+     if [ -x "$run_moz" ]; then
+       cd "$curdir"
+       dist_bin=`pwd`
++      run_moz="$dist_bin/run-mozilla.sh"
+       found=1
+       break
+     fi
+   done
+   cd "$here"
+ fi
+ if [ $found = 0 ]; then
+   # Check default compile-time libdir
--- iceowl-0.7.orig/debian/patches/flat-chrome-fix.patch
+++ iceowl-0.7/debian/patches/flat-chrome-fix.patch
@@ -0,0 +1,181 @@
+From 30242a14c585a41835696856f81e7864d6486a36 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Mon, 12 Mar 2007 17:03:03 +0100
+Subject: [PATCH] flat chrome fix
+
+  * do-not-zip-chrome-jars-use-exploded-structure-instead-configure-in-remove-ac_msg_error-in-case-zip-is-not-found-in-path
+---
+ config/config.mk    |    6 +++++-
+ config/make-jars.pl |    5 ++++-
+ config/rules.mk     |    2 +-
+ configure.in        |   10 +++++++---
+ 4 files changed, 17 insertions(+), 6 deletions(-)
+
+Index: mozilla/config/config.mk
+===================================================================
+--- mozilla.orig/config/config.mk	2007-04-04 18:45:06.000000000 +0200
++++ mozilla/config/config.mk	2007-04-04 18:45:47.000000000 +0200
+@@ -456,20 +456,24 @@
+         -D_IMPL_NS_WIDGET \
+         $(NULL)
+ endif
+ endif
+ 
+ # Flags passed to make-jars.pl
+ 
+ MAKE_JARS_FLAGS = \
+-	-s $(srcdir) -t $(topsrcdir) -z $(ZIP) -p $(MOZILLA_DIR)/config/preprocessor.pl \
++	-s $(srcdir) -t $(topsrcdir) -p $(MOZILLA_DIR)/config/preprocessor.pl \
+ 	-f $(MOZ_CHROME_FILE_FORMAT) \
+ 	$(NULL)
+ 
++ifdef ZIP
++MAKE_JARS_FLAGS += -z $(ZIP)
++endif
++
+ ifdef NO_JAR_AUTO_REG
+ MAKE_JARS_FLAGS += -a
+ endif
+ 
+ ifdef USE_EXTENSION_MANIFEST
+ MAKE_JARS_FLAGS += -e
+ endif
+ 
+Index: mozilla/config/make-jars.pl
+===================================================================
+--- mozilla.orig/config/make-jars.pl	2007-04-04 18:45:06.000000000 +0200
++++ mozilla/config/make-jars.pl	2007-04-04 18:45:47.000000000 +0200
+@@ -132,17 +132,17 @@
+     $force_x11 = 1;
+ }
+ 
+ my $zipprog = $ENV{ZIP};
+ if (defined($::opt_z)) {
+     $zipprog = $::opt_z;
+ }
+ 
+-if ($zipprog eq "") {
++if (($fileformat eq "jar" || $fileformat eq "both") && $zipprog eq "") {
+     print "A valid zip program must be given via the -z option or the ZIP environment variable. Exiting.\n";
+     exit(1);
+ }
+ 
+ my $force_os;
+ if (defined($::opt_o)) {
+     $force_os = $::opt_o;
+ }
+@@ -509,40 +509,43 @@
+         my @manifestLines;
+ 
+         print "+++ making chrome $cwd  => $jarDir/$jarfile.jar\n";
+         while (defined($_ = shift @gLines)) {
+             if (/^\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) {
+                 my $dest = $1;
+                 my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
+                 EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0);
++                EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0) if ($fileformat eq "flat");
+                 $args = "$args$dest ";
+                 if (!foreignPlatformFile($jarfile)  && $autoreg &&
+                     $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
+                 {
+                     my $chrome_type = $1;
+                     my $pkg_name = $2;
+                     RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name);
+                 }
+             } elsif (/^\+\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) {
+                 my $dest = $1;
+                 my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
+                 EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0);
++                EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0) if ($fileformat eq "flat");
+                 $overrides = "$overrides$dest ";
+                 if (!foreignPlatformFile($jarfile)  && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
+                 {
+                     my $chrome_type = $1;
+                     my $pkg_name = $2;
+                     RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name);
+                 }
+             } elsif (/^\*\+?\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) {
+                 # preprocessed (always override)
+                 my $dest = $1;
+                 my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
+                 EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1);
++                EnsureFileInDir("$jarDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1) if ($fileformat eq "flat");
+                 $overrides = "$overrides$dest ";
+                 if (!foreignPlatformFile($jarfile)  && $autoreg && $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
+                 {
+                     my $chrome_type = $1;
+                     my $pkg_name = $2;
+                     RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name);
+                 }
+             } elsif (/^\%\s+(.*)$/) {
+Index: mozilla/config/rules.mk
+===================================================================
+--- mozilla.orig/config/rules.mk	2007-04-04 18:45:44.000000000 +0200
++++ mozilla/config/rules.mk	2007-04-04 18:45:47.000000000 +0200
+@@ -1572,17 +1572,17 @@
+ ifndef XPI_NAME
+ 	@$(EXIT_ON_ERROR) \
+ 	if test -f $(JAR_MANIFEST); then \
+ 	  if test ! -d $(DESTDIR)$(mozappdir)/chrome; then $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/chrome; fi; \
+ 	  if test ! -d $(MAKE_JARS_TARGET)/chrome; then $(NSINSTALL) -D $(MAKE_JARS_TARGET)/chrome; fi; \
+ 	  $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
+ 	    $(JAR_MANIFEST) | \
+ 	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \
+-	    -d $(MAKE_JARS_TARGET) -j $(DESTDIR)$(mozappdir)/chrome \
++	    -d $(MAKE_JARS_TARGET)/chrome -j $(DESTDIR)$(mozappdir)/chrome \
+ 	    $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \
+ 	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \
+ 	    $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \
+ 	fi
+ endif
+ endif
+ 
+ ifneq ($(DIST_FILES),)
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-04-04 18:45:22.000000000 +0200
++++ mozilla/configure.in	2007-04-04 18:45:47.000000000 +0200
+@@ -555,19 +555,16 @@
+     AC_MSG_RESULT([yes])    
+ fi
+ 
+ AC_PATH_PROG(DOXYGEN, doxygen, :)
+ AC_PATH_PROG(WHOAMI, whoami, :)
+ AC_PATH_PROG(AUTOCONF, autoconf, :)
+ AC_PATH_PROG(UNZIP, unzip, :)
+ AC_PATH_PROGS(ZIP, zip)
+-if test -z "$ZIP" || test "$ZIP" = ":"; then
+-    AC_MSG_ERROR([zip not found in \$PATH])
+-fi
+ AC_PATH_PROG(SYSTEM_MAKEDEPEND, makedepend)
+ AC_PATH_PROG(XARGS, xargs)
+ if test -z "$XARGS" || test "$XARGS" = ":"; then
+     AC_MSG_ERROR([xargs not found in \$PATH .])
+ fi
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ 
+@@ -6083,16 +6080,23 @@
+ 
+ if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && 
+     test "$MOZ_CHROME_FILE_FORMAT" != "flat" &&
+     test "$MOZ_CHROME_FILE_FORMAT" != "symlink" &&
+     test "$MOZ_CHROME_FILE_FORMAT" != "both"; then
+     AC_MSG_ERROR([--enable-chrome-format must be set to either jar, flat, both, or symlink])
+ fi
+ 
++if test "$MOZ_CHROME_FILE_FORMAT" = "jar" ||
++    test "$MOZ_CHROME_FILE_FORMAT" = "both"; then
++    if test -z "$ZIP" || test "$ZIP" = ":"; then
++        AC_MSG_ERROR([zip is required for chrome format $MOZ_CHROME_FILE_FORMAT])
++    fi
++fi
++
+ dnl ========================================================
+ dnl = Define default location for MOZILLA_FIVE_HOME
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(default-mozilla-five-home,
+ [  --with-default-mozilla-five-home
+                           Set the default value for MOZILLA_FIVE_HOME],
+ [ val=`echo $withval`
+   AC_DEFINE_UNQUOTED(MOZ_DEFAULT_MOZILLA_FIVE_HOME,"$val") ])
--- iceowl-0.7.orig/debian/patches/bzXXX-wl-no-as-needed-for-libxpcom-lp85112.patch
+++ iceowl-0.7/debian/patches/bzXXX-wl-no-as-needed-for-libxpcom-lp85112.patch
@@ -0,0 +1,35 @@
+From d2482fd280b631b9831d5c636a6006533bfdacb9 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Sat, 24 Feb 2007 21:21:30 +0100
+Subject: [PATCH] bzXXX-wl-no-as-needed-for-libxpcom-lp85112
+
+   + use -Wl,--no-as-needed for libxpcom.so (Closes: LP#85112) to reduce
+     lib dependencies of plugins.
+---
+ browser/app/Makefile.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: mozilla/browser/app/Makefile.in
+===================================================================
+--- mozilla.orig/browser/app/Makefile.in	2006-08-29 04:03:07.000000000 +0200
++++ mozilla/browser/app/Makefile.in	2007-04-04 18:49:39.000000000 +0200
+@@ -83,17 +83,19 @@
+ TK_LIBS := -framework Cocoa $(TK_LIBS)
+ endif
+ 
+ LIBS = \
+ 	$(STATIC_COMPONENTS_LINKER_PATH) \
+ 	$(EXTRA_DSO_LIBS) \
+ 	$(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
+ 	$(MOZ_JS_LIBS) \
++	-Wl,--no-as-needed \
+ 	$(XPCOM_LIBS) \
++	-Wl,--as-needed \
+ 	$(NSPR_LIBS) \
+ 	$(TK_LIBS) \
+ 	$(NULL)
+ 
+ # Add explicit X11 dependency when building against X11 toolkits
+ ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)))
+ LIBS += $(XLDFLAGS) $(XLIBS)
+ endif
--- iceowl-0.7.orig/debian/patches/add-a-recognized-pref-folder-called-syspref-inside-the-defaults-hierarchy.patch
+++ iceowl-0.7/debian/patches/add-a-recognized-pref-folder-called-syspref-inside-the-defaults-hierarchy.patch
@@ -0,0 +1,45 @@
+From edbcc401e0ec0ceae7c3c1091a5866fa3e2d1e93 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:15 +0100
+Subject: [PATCH] add a recognized pref folder called 'syspref' inside the defaults/ hierarchy.
+
+---
+ modules/libpref/src/nsPrefService.cpp |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+Index: mozilla/modules/libpref/src/nsPrefService.cpp
+===================================================================
+--- mozilla.orig/modules/libpref/src/nsPrefService.cpp	2007-02-05 02:38:32.000000000 +0100
++++ mozilla/modules/libpref/src/nsPrefService.cpp	2007-04-04 18:48:52.000000000 +0200
+@@ -753,16 +753,31 @@
+ #endif
+   };
+ 
+   rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
+   if (NS_FAILED(rv)) {
+     NS_WARNING("Error parsing application default preferences.");
+   }
+ 
++  // Load files from defaults/syspref
++  nsCOMPtr<nsIFile> SysPrefDir;
++  rv = defaultPrefDir->GetParent(getter_AddRefs(SysPrefDir));
++  NS_ENSURE_SUCCESS(rv, rv);
++  rv = SysPrefDir->AppendNative(NS_LITERAL_CSTRING("syspref"));
++  NS_ENSURE_SUCCESS(rv, rv);
++  PRBool exists;
++  if (NS_SUCCEEDED(SysPrefDir->Exists(&exists)) && exists) {
++    rv = pref_LoadPrefsInDir(SysPrefDir, nsnull, 0);
++    if (NS_FAILED(rv)) {
++      NS_WARNING("Error parsing system default preferences.");
++    }
++
++  }
++
+   // xxxbsmedberg: TODO load default prefs from a category
+   // but the architecture is not quite there yet
+ 
+   nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
+   if (NS_FAILED(rv)) return rv;
+ 
+   nsCOMPtr<nsISimpleEnumerator> dirList;
+   dirSvc->Get(NS_APP_PREFS_DEFAULTS_DIR_LIST,
--- iceowl-0.7.orig/debian/patches/use_moz_app_name
+++ iceowl-0.7/debian/patches/use_moz_app_name
@@ -0,0 +1,107 @@
+---
+ calendar/sunbird/app/Makefile.in       |   15 ++++++++-------
+ calendar/sunbird/app/nsCalendarApp.cpp |    2 +-
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+
+Index: mozilla/calendar/sunbird/app/Makefile.in
+===================================================================
+--- mozilla.orig/calendar/sunbird/app/Makefile.in	2007-03-20 20:14:44.000000000 +0000
++++ mozilla/calendar/sunbird/app/Makefile.in	2007-07-29 11:20:59.000000000 +0000
+@@ -53,16 +53,17 @@
+     $(NULL)
+ 
+ # hardcode en-US for the moment
+ AB_CD = en-US
+ DEFINES += -DAB_CD=$(AB_CD)
+ 
+ APP_VERSION = $(SUNBIRD_VERSION)
+ DEFINES += -DAPP_VERSION="$(APP_VERSION)"
++DEFINES += -DAPP_NAME="\"$(MOZ_APP_DISPLAYNAME)\""
+ 
+ APP_UA_NAME = $(shell echo $(MOZ_APP_DISPLAYNAME) | sed -e's/[^A-Za-z]//g')
+ DEFINES += -DAPP_UA_NAME="$(APP_UA_NAME)"
+ 
+ ifdef LIBXUL_SDK
+ # Build application.ini for a XULRunner app
+ DIST_FILES = application.ini
+ 
+@@ -77,19 +78,19 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ else
+ # Build a binary bootstrapping with XRE_main
+ 
+ MOZILLA_INTERNAL_API = 1
+ 
+ ifeq ($(USE_SHORT_LIBNAME), 1)
+-PROGRAM = sunbird$(BIN_SUFFIX)
++PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
+ else
+-PROGRAM = sunbird-bin$(BIN_SUFFIX)
++PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
+ endif
+ 
+ REQUIRES = \
+ 	appshell \
+ 	string \
+ 	xpcom \
+ 	xulapp \
+ 	$(NULL)
+@@ -258,29 +259,29 @@
+ 	@echo 	WinSetProperty			= PMMERGE.5452 >>$(EXE_DEF_FILE)
+ 
+ LDFLAGS += -Zlinker /NOE
+ endif
+ endif
+ 
+ ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+ 
+-sunbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
++$(MOZ_APP_NAME):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
+-                -e "s|%MOZ_USER_DIR%|.mozilla/sunbird|" \
++                -e "s|%MOZ_USER_DIR%|.mozilla/$(MOZ_APP_NAME)|" \
+ 		-e "s|%MREDIR%|$(mredir)|" > $@
+ 	chmod +x $@
+ 
+-libs:: sunbird
++libs:: $(MOZ_APP_NAME)
+ 	$(INSTALL) $< $(DIST)/bin
+ 
+-install:: sunbird
++install:: $(MOZ_APP_NAME)
+ 	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
+ 
+-GARBAGE += sunbird
++GARBAGE += $(MOZ_APP_NAME)
+ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, sunbird.js)
+ 
+ endif
+ 
+ ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ ICON_FILES = \
+     $(DIST)/branding/mozicon128.png \
+     $(DIST)/branding/mozicon50.xpm \
+Index: mozilla/calendar/sunbird/app/nsCalendarApp.cpp
+===================================================================
+--- mozilla.orig/calendar/sunbird/app/nsCalendarApp.cpp	2007-01-06 04:51:32.000000000 +0000
++++ mozilla/calendar/sunbird/app/nsCalendarApp.cpp	2007-07-29 11:10:41.000000000 +0000
+@@ -44,17 +44,17 @@
+ #endif
+ #include "nsBuildID.h"
+ #include <string.h>
+ 
+ static const nsXREAppData kAppData = {
+   sizeof(nsXREAppData),
+   nsnull,
+   "Mozilla",
+-  "Sunbird",
++  APP_NAME,
+   NS_STRINGIFY(APP_VERSION),
+   NS_STRINGIFY(BUILD_ID),
+   "{718e30fb-e89b-41dd-9da7-e25a45638b28}",
+   "Copyright (c) 2004-2007 mozilla.org",
+   NS_XRE_ENABLE_EXTENSION_MANAGER
+ };
+ 
+ int main(int argc, char* argv[])
--- iceowl-0.7.orig/debian/patches/bz289394-align-double-on-ia64-deb-bug-303518.patch
+++ iceowl-0.7/debian/patches/bz289394-align-double-on-ia64-deb-bug-303518.patch
@@ -0,0 +1,96 @@
+From f7d8435e8a3923eb783a404a9db6187ee8ce40ff Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:16 +0100
+Subject: [PATCH] bz289394-align-double-on-ia64-deb-bug-303518
+
+  + align double on ia64 ... deb bug 303518
+---
+ extensions/transformiix/source/base/Double.cpp |   35 ++++++++++++-------------
+ 1 file changed, 17 insertions(+), 18 deletions(-)
+
+Index: mozilla/extensions/transformiix/source/base/Double.cpp
+===================================================================
+--- mozilla.orig/extensions/transformiix/source/base/Double.cpp	2006-06-22 21:13:00.000000000 +0200
++++ mozilla/extensions/transformiix/source/base/Double.cpp	2007-04-04 18:49:14.000000000 +0200
+@@ -70,33 +70,32 @@
+  * differently: the 32 bit words are in little endian byte order, the two words
+  * are stored in big endian`s way.
+  */
+ 
+ #if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
+ #define CPU_IS_ARM
+ #endif
+ 
+-#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
+-/**
+- * This version of the macros is safe for the alias optimizations
+- * that gcc does, but uses gcc-specific extensions.
+- */
+-
+ typedef union txdpun {
+-    PRFloat64 d;
+     struct {
+ #if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
+         PRUint32 lo, hi;
+ #else
+         PRUint32 hi, lo;
+ #endif
+     } s;
++    PRFloat64 d;
+ } txdpun;
+ 
++#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
++/**
++ * This version of the macros is safe for the alias optimizations
++ * that gcc does, but uses gcc-specific extensions.
++ */
+ #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
+ #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
+ 
+ #else // __GNUC__
+ 
+ /* We don't know of any non-gcc compilers that perform alias optimization,
+  * so this code should work.
+  */
+@@ -112,30 +111,30 @@
+ #endif // __GNUC__
+ 
+ #define TX_DOUBLE_HI32_SIGNBIT   0x80000000
+ #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
+ #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
+ 
+ //-- Initialize Double related constants
+ #ifdef IS_BIG_ENDIAN
+-const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
+-                                0xffffffff};
+-const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
+-const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
++const txdpun nanMask =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
++                           0xffffffff};
++const txdpun infMask =    {TX_DOUBLE_HI32_EXPMASK, 0};
++const txdpun negInfMask = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
+ #else
+-const PRUint32 nanMask[2] =    {0xffffffff,
+-                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
+-const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
+-const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
++const txdpun nanMask = {0xffffffff,
++                        TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
++const txdpun infMask =    {0, TX_DOUBLE_HI32_EXPMASK};
++const txdpun negInfMask = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
+ #endif
+ 
+-const double Double::NaN = *((double*)nanMask);
+-const double Double::POSITIVE_INFINITY = *((double*)infMask);
+-const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
++const double Double::NaN = nanMask.d;
++const double Double::POSITIVE_INFINITY = infMask.d;
++const double Double::NEGATIVE_INFINITY = negInfMask.d;
+ 
+ /*
+  * Determines whether the given double represents positive or negative
+  * inifinity
+  */
+ MBool Double::isInfinite(double aDbl)
+ {
+     return ((TX_DOUBLE_HI32(aDbl) & ~TX_DOUBLE_HI32_SIGNBIT) == TX_DOUBLE_HI32_EXPMASK &&
--- iceowl-0.7.orig/debian/patches/bz51429-anti-netstat-zombie-linux.patch
+++ iceowl-0.7/debian/patches/bz51429-anti-netstat-zombie-linux.patch
@@ -0,0 +1,35 @@
+From e3b39210f0218658fd93526ee3f920ca65ff7205 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Tue, 13 Mar 2007 20:10:10 +0100
+Subject: [PATCH] bz51429-anti-netstat-zombie-linux
+
+---
+ security/nss/lib/freebl/unix_rand.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: mozilla/security/nss/lib/freebl/unix_rand.c
+===================================================================
+--- mozilla.orig/security/nss/lib/freebl/unix_rand.c	2006-10-13 00:50:48.000000000 +0200
++++ mozilla/security/nss/lib/freebl/unix_rand.c	2007-04-04 18:49:00.000000000 +0200
+@@ -871,17 +871,21 @@
+ 
+ #ifdef DARWIN
+ #include <crt_externs.h>
+ #endif
+ 
+ /* Fork netstat to collect its output by default. Do not unset this unless
+  * another source of entropy is available
+  */
++#ifndef LINUX
+ #define DO_NETSTAT 1
++#else
++#define DO_NETSTAT 0
++#endif
+ 
+ void RNG_SystemInfoForRNG(void)
+ {
+     FILE *fp;
+     char buf[BUFSIZ];
+     size_t bytes;
+     const char * const *cp;
+     char *randfile;
--- iceowl-0.7.orig/debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3
+++ iceowl-0.7/debian/patches/force-no-pragma-visibility-for-gcc-4.2_4.3
@@ -0,0 +1,28 @@
+---
+ configure.in |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-08-21 15:52:32.000000000 +0000
++++ mozilla/configure.in	2007-08-21 15:54:29.000000000 +0000
+@@ -2642,18 +2642,17 @@
+                          if test `grep -c "@PLT" conftest.S` = 0; then
+                            ac_cv_visibility_builtin_bug=yes
+                          fi
+                        fi
+                        rm -f conftest.{c,S}
+                        ])
+         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
+                 "$ac_cv_have_visibility_class_bug" = "no"; then
+-          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+-          WRAP_SYSTEM_INCLUDES=1
++          VISIBILITY_FLAGS='-fvisibility=hidden'
+         else
+           VISIBILITY_FLAGS='-fvisibility=hidden'
+         fi # have visibility pragma bug
+       fi   # have visibility pragma
+     fi     # have visibility(default) attribute
+   fi       # have visibility(hidden) attribute
+ fi         # GNU_CC
+ 
--- iceowl-0.7.orig/debian/patches/series
+++ iceowl-0.7/debian/patches/series
@@ -0,0 +1,40 @@
+bz399589_fix_missing_symbol_with_new_nss.patch
+stable-fsh
+#build-system-garbage.patch
+bz161826-nsTextFrame-MeasureText-s-crash-on-RISC.patch
+bz345077-make-install-installs-extensions-in-chrome-and-extensions.patch
+flat-chrome-fix.patch
+#ubuntu-look-and-feel-patch.patch
+#ubuntu-look-and-feel-home-folder.patch
+#ubuntu-printing-patch.patch
+bz273524-gnome-mime-registry-ubuntu.patch
+bzXXX-syntax-fixes-for-.m4-files-needed-for-proper-embedding.patch
+bz7969-a-thai-patch.patch
+bz241535-Assertion-failure-on-destroying-XEmbed-plug-in.patch
+add-a-recognized-pref-folder-called-syspref-inside-the-defaults-hierarchy.patch
+bz51429-anti-netstat-zombie-linux.patch
+bz331818-fix-crash-xpidl-zero-arguments.patch
+bz289394-align-double-on-ia64-deb-bug-303518.patch
+#bz343360-feed-flat-chrome-fix.patch
+#bzXXX-wl-no-as-needed-for-libxpcom-lp85112.patch
+#ubuntu-disable-welcome-update-url.patch
+#ubuntu-look-and-feel-report-a-bug-menuitem.patch
+#ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch
+#ubuntu-look-and-feel-disable-help-translate-menu.patch
+bz335810-pango-cursor-up-down-fix.patch
+myspell-hunspell-support-configure-in-add-enable-system-myspell-support.patch
+bz270159-lp65164-empty-file-or-duplicate-extension-on-fat32-ntfs
+#bz384304_lp117575_linkrecursion_fix_in_startscript.patch
+bzXXX-lp23369-dont-use-gconf-system-prefs-if-not-gnome.patch
+fix-ftbfs-dont-build-xpfe-components-builds
+iceowl-branding
+iceowl-install-rdf
+use_moz_app_name
+force-no-pragma-visibility-for-gcc-4.2_4.3
+bz344818_att264996.patch
+mips_xpcom
+mips_performance
+sparc64_unichar_alignment
+follow_symlinks_startscript
+arch-detect
+configure-autoconf2-13-reconfigure.patch
--- iceowl-0.7.orig/debian/patches/fix-ftbfs-dont-build-xpfe-components-builds
+++ iceowl-0.7/debian/patches/fix-ftbfs-dont-build-xpfe-components-builds
@@ -0,0 +1,29 @@
+---
+ configure.in                |    2 ++
+
+---
+ configure.in |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-07-28 22:13:32.000000000 +0000
++++ mozilla/configure.in	2007-07-28 22:13:45.000000000 +0000
+@@ -4420,16 +4420,17 @@
+   ;;
+ 
+ calendar)
+   MOZ_APP_NAME=sunbird
+   MOZ_APP_DISPLAYNAME=Calendar
+   MOZ_XUL_APP=1
+   MOZ_SUNBIRD=1
+   MOZ_CALENDAR=1
++  MOZ_XPFE_COMPONENTS=
+   MOZ_APP_VERSION=$SUNBIRD_VERSION
+   MOZ_PLAINTEXT_EDITOR_ONLY=1
+   NECKO_PROTOCOLS_DEFAULT="about http ftp file res viewsource"
+   MOZ_NO_ACTIVEX_SUPPORT=1
+   MOZ_ACTIVEX_SCRIPTING_SUPPORT=
+   MOZ_INSTALLER=
+   MOZ_MATHML=
+   NECKO_DISK_CACHE=
--- iceowl-0.7.orig/debian/patches/ubuntu-look-and-feel-disable-help-translate-menu.patch
+++ iceowl-0.7/debian/patches/ubuntu-look-and-feel-disable-help-translate-menu.patch
@@ -0,0 +1,44 @@
+From d06b84cead04bdff820888acaf06895b203645dd Mon Sep 17 00:00:00 2001
+From: Alexander Sack <asac@jwsdot.com>
+Date: Mon, 2 Apr 2007 15:37:15 +0200
+Subject: [PATCH] ubuntu-look-and-feel-disable-help-translate-menu
+
+TODO: move as overlay to distromods
+
+---
+ browser/base/content/baseMenuOverlay.xul |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: mozilla/browser/base/content/baseMenuOverlay.xul
+===================================================================
+--- mozilla.orig/browser/base/content/baseMenuOverlay.xul	2007-04-04 18:52:24.000000000 +0200
++++ mozilla/browser/base/content/baseMenuOverlay.xul	2007-04-04 18:52:34.000000000 +0200
+@@ -94,24 +94,24 @@
+                   accesskey="&helpForIEUsers.accesskey;"
+                   oncommand="openHelp('ieusers', 'chrome://browser/locale/help/help.rdf');"/>
+ #endif
+         <menuitem id="releaseNotes"
+                   accesskey="&helpReleaseNotes.accesskey;"
+                   label="&helpReleaseNotes.label;"
+                   oncommand="openReleaseNotes(event)"
+                   onclick="checkForMiddleClick(this, event);"/>
+-        <menuitem label="Get Help Online ..."
+-                  oncommand="getHelpOnline(event);"/>
++<!--        <menuitem label="Get Help Online ..."
++                  oncommand="getHelpOnline(event);"/> -->
+                 <!-- label="&helpGetHelpOnline.label;" at some point -->
+         <menuitem id="ubuntu_report_a_bug" label="Report a Bug..."
+                   oncommand="ubuntuReportBug(event);"/>
+                 <!-- label="&reportABugTranslate.label;" at some point -->
+-        <menuitem label="Translate This Application..."
+-                  oncommand="helpTranslateLaunchpad(event);"/>
++<!--        <menuitem label="Translate This Application..."
++                  oncommand="helpTranslateLaunchpad(event);"/> -->
+                 <!-- LP doesn't, yet but mdz asked to have this anyway -->
+                 <!-- label="&helpTranslate.label;" at some point -->
+         <menuseparator id="aboutSeparator"/>
+         <menuitem id="checkForUpdates"
+                   accesskey="&updateCmd.accesskey;"
+                   label="&updateCmd.label;"
+                   class="menuitem-iconic"
+                   oncommand="checkForUpdates();"/>
--- iceowl-0.7.orig/debian/patches/bzXXX-lp23369-dont-use-gconf-system-prefs-if-not-gnome.patch
+++ iceowl-0.7/debian/patches/bzXXX-lp23369-dont-use-gconf-system-prefs-if-not-gnome.patch
@@ -0,0 +1,60 @@
+Index: extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp,v
+retrieving revision 1.8
+diff -u -8 -p -r1.8 nsSystemPrefService.cpp
+--- mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp	23 Feb 2005 16:15:37 -0000	1.8
++++ mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp	22 Jun 2007 09:19:11 -0000
+@@ -38,16 +38,17 @@
+  * the terms of any one of the NPL, the GPL or the LGPL.
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+ #include "plstr.h"
++#include "prenv.h"
+ #include "nsCOMPtr.h"
+ #include "nsIPref.h"
+ #include "nsIServiceManager.h"
+ #include "nsIObserver.h"
+ #include "nsWeakReference.h"
+ 
+ #include "nsString.h"
+ #include "nsSystemPrefLog.h"
+@@ -234,25 +235,34 @@ nsSystemPrefService::~nsSystemPrefServic
+         (void)mObservers->EnumerateForwards(sysPrefDeleteObserver, nsnull);
+         delete mObservers;
+     }
+ }
+ 
+ nsresult
+ nsSystemPrefService::Init()
+ {
++    char* gnomeSessionId;
++
+     if (!gSysPrefLog) {
+         gSysPrefLog = PR_NewLogModule("Syspref");
+         if (!gSysPrefLog) return NS_ERROR_OUT_OF_MEMORY;
+     }
+ 
+     SYSPREF_LOG(("Init SystemPref Service\n"));
+     if (mInitialized)
+         return NS_ERROR_FAILURE;
+ 
++    gnomeSessionId = PR_GetEnv("GNOME_DESKTOP_SESSION_ID");
++
++    if (!gnomeSessionId) {
++        SYSPREF_LOG(("nsSystemPrefService:: Init failed - not a gnome session!\n"));
++        return NS_ERROR_FAILURE;
++    }
++
+     if (!mGConf) {
+         mGConf = new GConfProxy(this);
+         if (!mGConf->Init()) {
+             delete mGConf;
+             mGConf = nsnull;
+             return NS_ERROR_FAILURE;
+         }
+     }
--- iceowl-0.7.orig/debian/patches/ubuntu-look-and-feel-report-a-bug-menuitem.patch
+++ iceowl-0.7/debian/patches/ubuntu-look-and-feel-report-a-bug-menuitem.patch
@@ -0,0 +1,145 @@
+From 653f68a2e5de75c30940190706d5802b411f2c04 Mon Sep 17 00:00:00 2001
+From: Alexander Sack <asac@jwsdot.com>
+Date: Mon, 2 Apr 2007 15:37:04 +0200
+Subject: [PATCH] ubuntu-look-and-feel-report-a-bug-menuitem
+
+TODO: move this patch to distromods extension
+
+---
+ browser/base/content/baseMenuOverlay.xul       |    5 ++
+ browser/base/content/ubuntuReportBugOverlay.js |   62 +++++++++++++++++++++++++
+ browser/base/jar.mn                            |    1 
+ 3 files changed, 68 insertions(+)
+
+Index: mozilla/browser/base/content/baseMenuOverlay.xul
+===================================================================
+--- mozilla.orig/browser/base/content/baseMenuOverlay.xul	2007-04-04 18:52:11.000000000 +0200
++++ mozilla/browser/base/content/baseMenuOverlay.xul	2007-04-04 18:52:24.000000000 +0200
+@@ -46,16 +46,18 @@
+ ]>
+ <overlay id="baseMenuOverlay"
+          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ 
+ <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
+ <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
+ 
++<script src="ubuntuReportBugOverlay.js"/>
++
+ #ifdef XP_MACOSX
+ <!-- nsMenuBarX hides these and uses them to build the Application menu.
+      When using Carbon widgets for Mac OS X widgets, some of these are not
+      used as they only apply to Cocoa widget builds. All version of Firefox
+      through Firefox 2 will use Carbon widgets. -->
+     <menupopup id="menu_ToolsPopup">
+         <menuitem id="menu_preferences" label="&preferencesCmdMac.label;" key="key_preferencesCmdMac" oncommand="openPreferences();"/>
+         <menuitem id="menu_mac_services" label="&servicesMenuMac.label;"/>
+@@ -95,16 +97,19 @@
+         <menuitem id="releaseNotes"
+                   accesskey="&helpReleaseNotes.accesskey;"
+                   label="&helpReleaseNotes.label;"
+                   oncommand="openReleaseNotes(event)"
+                   onclick="checkForMiddleClick(this, event);"/>
+         <menuitem label="Get Help Online ..."
+                   oncommand="getHelpOnline(event);"/>
+                 <!-- label="&helpGetHelpOnline.label;" at some point -->
++        <menuitem id="ubuntu_report_a_bug" label="Report a Bug..."
++                  oncommand="ubuntuReportBug(event);"/>
++                <!-- label="&reportABugTranslate.label;" at some point -->
+         <menuitem label="Translate This Application..."
+                   oncommand="helpTranslateLaunchpad(event);"/>
+                 <!-- LP doesn't, yet but mdz asked to have this anyway -->
+                 <!-- label="&helpTranslate.label;" at some point -->
+         <menuseparator id="aboutSeparator"/>
+         <menuitem id="checkForUpdates"
+                   accesskey="&updateCmd.accesskey;"
+                   label="&updateCmd.label;"
+Index: mozilla/browser/base/content/ubuntuReportBugOverlay.js
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/browser/base/content/ubuntuReportBugOverlay.js	2007-04-04 18:52:24.000000000 +0200
+@@ -0,0 +1,62 @@
++/*
++# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++# ***** 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) 1998
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#   Alexander Sack <asac@ubuntu.com>
++#
++# 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 *****
++*/
++
++function ubuntuReportBug(event) {
++
++  var executable =
++      Components.classes['@mozilla.org/file/local;1']
++      .createInstance(Components.interfaces.nsILocalFile);
++
++  executable.initWithPath("/usr/bin/ubuntu-bug");
++
++  if(!executable.isExecutable)
++	  alert('NOasd');
++
++  var procUtil =
++      Components.classes['@mozilla.org/process/util;1']
++      .createInstance(Components.interfaces.nsIProcess);
++
++  var nsFile = executable.QueryInterface(Components.interfaces.nsIFile);
++
++  procUtil.init(executable);
++
++  var args = new Array("-p", "firefox" );
++  var res = procUtil.run(false, args, args.length);
++}
+Index: mozilla/browser/base/jar.mn
+===================================================================
+--- mozilla.orig/browser/base/jar.mn	2007-04-04 18:52:11.000000000 +0200
++++ mozilla/browser/base/jar.mn	2007-04-04 18:52:24.000000000 +0200
+@@ -32,16 +32,17 @@
+ *       content/browser/safeMode.js                   (content/safeMode.js)
+ *       content/browser/safeMode.xul                  (content/safeMode.xul)
+ *       content/browser/sanitize.js                   (content/sanitize.js)
+ *       content/browser/sanitize.xul                  (content/sanitize.xul)
+ *       content/browser/utilityOverlay.js             (content/utilityOverlay.js)
+ *       content/browser/web-panels.js                 (content/web-panels.js)
+ *       content/browser/web-panels.xul                (content/web-panels.xul)
+ *       content/browser/baseMenuOverlay.xul           (content/baseMenuOverlay.xul)
++*       content/browser/ubuntuReportBugOverlay.js     (content/ubuntuReportBugOverlay.js)
+ # XXX: We should exclude this one as well (bug 71895)
+ *       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
+ #ifdef XP_MACOSX
+ *       content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
+ *       content/browser/downloadManagerOverlay.xul    (content/downloadManagerOverlay.xul)
+ *       content/browser/extensionsManagerOverlay.xul  (content/extensionsManagerOverlay.xul)
+ *       content/browser/jsConsoleOverlay.xul          (content/jsConsoleOverlay.xul)
+ *       content/browser/softwareUpdateOverlay.xul  (content/softwareUpdateOverlay.xul)
--- iceowl-0.7.orig/debian/patches/ubuntu-printing-patch.patch
+++ iceowl-0.7/debian/patches/ubuntu-printing-patch.patch
@@ -0,0 +1,93 @@
+From bb95c1b7ad520edee9e172118fc3418d13096a99 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:15 +0100
+Subject: [PATCH] ubuntu-printing patch
+
+---
+ layout/style/html.css                              |    7 +++++++
+ toolkit/components/printing/content/printdialog.js |    5 +++++
+ xpfe/global/resources/content/printdialog.js       |    7 ++++++-
+ 4 files changed, 20 insertions(+), 3 deletions(-)
+
+Index: mozilla/layout/style/html.css
+===================================================================
+--- mozilla.orig/layout/style/html.css	2007-04-04 18:47:49.000000000 +0200
++++ mozilla/layout/style/html.css	2007-04-04 18:48:19.000000000 +0200
+@@ -462,16 +462,23 @@
+ marquee[direction="up"], marquee[direction="down"] {
+   -moz-binding: url('chrome://xbl-marquee/content/xbl-marquee.xml#marquee-vertical');
+   height: 200px;
+ }
+ 
+ /* PRINT ONLY rules follow */
+ @media print {
+ 
++  body {
++    font-family: times, serif;
++  }
++  tt, pre, listing, xmp, plaintext, code, kbd, samp {
++    font-family: courier, monospace;
++  }
++
+   marquee { -moz-binding: none; }
+ 
+   /* XXX this should not be necessary, we should be stopping blinking
+      of any kind in print preview, not just the <blink> element */
+   blink {
+     text-decoration: none;
+   }
+  
+Index: mozilla/toolkit/components/printing/content/printdialog.js
+===================================================================
+--- mozilla.orig/toolkit/components/printing/content/printdialog.js	2007-04-04 18:47:49.000000000 +0200
++++ mozilla/toolkit/components/printing/content/printdialog.js	2007-04-04 18:48:19.000000000 +0200
+@@ -155,16 +155,21 @@
+           // build popup menu from printer names
+           while (aDataObject.hasMoreElements()) {
+             printerName = aDataObject.getNext();
+             printerName = printerName.QueryInterface(Components.interfaces.nsISupportsString);
+             var printerNameStr = printerName.toString();
+             if (strDefaultPrinterName == "")
+                strDefaultPrinterName = printerNameStr;
+ 
++            // We strip PostScript/ from the front of displayed printer
++            // names.  It's a bit kludgy to do this here but at least
++            // for Ubuntu all the printers come via CUPS.
++            var printerLabelStr = printerNameStr.replace(RegExp("^PostScript/"), "");
++
+             list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
+           }
+           if (strDefaultPrinterName != "") {
+             this.listElement.removeAttribute("disabled");
+           } else {
+             var stringBundle = srGetStrBundle("chrome://global/locale/printing.properties");
+             this.listElement.setAttribute("value", strDefaultPrinterName);
+             this.listElement.setAttribute("label", stringBundle.GetStringFromName("noprinter"));
+Index: mozilla/xpfe/global/resources/content/printdialog.js
+===================================================================
+--- mozilla.orig/xpfe/global/resources/content/printdialog.js	2007-04-04 18:47:49.000000000 +0200
++++ mozilla/xpfe/global/resources/content/printdialog.js	2007-04-04 18:48:19.000000000 +0200
+@@ -155,17 +155,22 @@
+           // build popup menu from printer names
+           while (aDataObject.hasMoreElements()) {
+             printerName = aDataObject.getNext();
+             printerName = printerName.QueryInterface(Components.interfaces.nsISupportsString);
+             var printerNameStr = printerName.toString();
+             if (strDefaultPrinterName == "")
+                strDefaultPrinterName = printerNameStr;
+ 
+-            list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
++            // We strip PostScript/ from the front of displayed printer
++            // names.  It's a bit kludgy to do this here but at least
++            // for Ubuntu all the printers come via CUPS.
++            var printerLabelStr = printerNameStr.replace(RegExp("^PostScript/"), "");
++
++            list.appendItem(printerLabelStr, printerNameStr, getPrinterDescription(printerNameStr));
+           }
+           if (strDefaultPrinterName != "") {
+             this.listElement.removeAttribute("disabled");
+           } else {
+             var stringBundle = srGetStrBundle("chrome://global/locale/printing.properties");
+             this.listElement.setAttribute("value", strDefaultPrinterName);
+             this.listElement.setAttribute("label", stringBundle.GetStringFromName("noprinter"));
+ 
--- iceowl-0.7.orig/debian/patches/stable-fsh
+++ iceowl-0.7/debian/patches/stable-fsh
@@ -0,0 +1,37 @@
+---
+ config/autoconf.mk.in |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: mozilla/config/autoconf.mk.in
+===================================================================
+--- mozilla.orig/config/autoconf.mk.in	2007-04-04 18:45:15.000000000 +0200
++++ mozilla/config/autoconf.mk.in	2007-04-04 18:45:17.000000000 +0200
+@@ -52,24 +52,24 @@
+ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
+ MOZ_APP_VERSION = @MOZ_APP_VERSION@
+ 
+ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ 
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @datadir@/idl/$(MOZ_APP_NAME)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/$(MOZ_APP_NAME)
++mredir		= $(libdir)/mre/mre
+ mrelibdir	= $(mredir)/lib
+ 
+ DIST		= $(DEPTH)/dist
+ 
+ MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@
+ 
+ MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
+ MOZ_GFX_TOOLKIT	= $(MOZ_WIDGET_TOOLKIT)
--- iceowl-0.7.orig/debian/patches/bz384304_lp117575_linkrecursion_fix_in_startscript.patch
+++ iceowl-0.7/debian/patches/bz384304_lp117575_linkrecursion_fix_in_startscript.patch
@@ -0,0 +1,10 @@
+--- ./browser/app/mozilla.in	2005-09-20 23:13:03.000000000 +0200
++++ ./browser/app/mozilla.in	2007-06-13 16:36:16.000000000 +0200
+@@ -111,6 +111,7 @@
+     bn=`basename "$progname"`
+     cd `dirname "$progname"`
+     progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
++    progbase=`basename "$progname"`
+     if [ ! -x "$progname" ]; then
+       break
+     fi
--- iceowl-0.7.orig/debian/patches/bz343360-feed-flat-chrome-fix.patch
+++ iceowl-0.7/debian/patches/bz343360-feed-flat-chrome-fix.patch
@@ -0,0 +1,43 @@
+From 405bf272fde7da634e824d9ac32709522c267267 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Sat, 24 Feb 2007 21:21:21 +0100
+Subject: [PATCH] bz343360-feed-flat-chrome-fix
+
+  + browser/components/feeds/src/FeedWriter.js: apply fix from bugzilla
+    bug #343360; FileWriter's security check doesn't work with flat chrome
+---
+ browser/components/feeds/src/FeedWriter.js |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+Index: mozilla/browser/components/feeds/src/FeedWriter.js
+===================================================================
+--- mozilla.orig/browser/components/feeds/src/FeedWriter.js	2007-01-07 01:53:49.000000000 +0100
++++ mozilla/browser/components/feeds/src/FeedWriter.js	2007-04-04 18:49:18.000000000 +0200
+@@ -790,18 +790,25 @@
+    *        The window of the document invoking the BrowserFeedWriter
+    */
+   _getOriginalURI: function FW__getOriginalURI(window) {  
+     var chan = 
+         window.QueryInterface(Ci.nsIInterfaceRequestor).
+         getInterface(Ci.nsIWebNavigation).
+         QueryInterface(Ci.nsIDocShell_MOZILLA_1_8_BRANCH).
+         currentDocumentChannel;
+-    const kPrefix = "jar:file:";
+-    if (chan.URI.spec.substring(0, kPrefix.length) == kPrefix)
++    const SUBSCRIBE_PAGE_URI = "chrome://browser/content/feeds/subscribe.xhtml";
++    var uri = Cc["@mozilla.org/network/io-service;1"].
++              getService(Ci.nsIIOService).
++              newURI(SUBSCRIBE_PAGE_URI, "", null);
++    var resolvedURI = Cc["@mozilla.org/chrome/chrome-registry;1"].
++                      getService(Ci.nsIChromeRegistry).
++                      convertChromeURL(uri);
++
++    if (resolvedURI.equals(chan.URI))
+       return chan.originalURI;
+     else
+       return null;
+   },
+ 
+   _window: null,
+   _document: null,
+   _feedURI: null,
--- iceowl-0.7.orig/debian/patches/ftbfs-with-branding-dir
+++ iceowl-0.7/debian/patches/ftbfs-with-branding-dir
@@ -0,0 +1,39 @@
+---
+ browser/branding/unofficial/Makefile.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: mozilla/browser/branding/unofficial/Makefile.in
+===================================================================
+--- mozilla.orig/browser/branding/unofficial/Makefile.in	2007-03-22 02:55:50.000000000 +0100
++++ mozilla/browser/branding/unofficial/Makefile.in	2007-03-22 03:00:53.000000000 +0100
+@@ -1,28 +1,28 @@
+ # Branding Makefile
+ #  - jars chrome artwork
+ #  - copies artwork to appropriate places in objdir for bundling into app 
+ #    resources
+ 
+ DEPTH = ../../..
+-topsrcdir = @top_srcdir@
++topsrcdir = $(DEPTH)
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+ DIRS = \
+ 	content \
+ 	locales \
+ 	$(NULL)
+ 
+ PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js
+ 
+-include $(topsrcdir)/config/rules.mk
++include $(DEPTH)/config/rules.mk
+ 
+ BROWSER_APP_FILES = \
+ 	default.xpm \
+ 	mozicon128.png \
+ 	mozicon16.xpm \
+ 	mozicon50.xpm \
+ 	firefox.ico \
+ 	document.ico \
--- iceowl-0.7.orig/debian/patches/myspell-hunspell-support-configure-in-add-enable-system-myspell-support.patch
+++ iceowl-0.7/debian/patches/myspell-hunspell-support-configure-in-add-enable-system-myspell-support.patch
@@ -0,0 +1,143 @@
+---
+ config/autoconf.mk.in                          |    4 ++++
+ configure.in                                   |   16 ++++++++++++++++
+ extensions/spellcheck/myspell/src/Makefile.in  |   24 ++++++++++++++++--------
+ extensions/spellcheck/myspell/src/mozMySpell.h |    2 +-
+ 4 files changed, 37 insertions(+), 9 deletions(-)
+
+Index: mozilla/config/autoconf.mk.in
+===================================================================
+--- mozilla.orig/config/autoconf.mk.in	2007-04-18 09:22:51.000000000 +0000
++++ mozilla/config/autoconf.mk.in	2007-04-18 09:26:37.000000000 +0000
+@@ -188,16 +188,20 @@
+ 
+ MOZ_XUL                    = @MOZ_XUL@
+ 
+ NECKO_PROTOCOLS = @NECKO_PROTOCOLS@
+ NECKO_DISK_CACHE = @NECKO_DISK_CACHE@
+ NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@
+ NECKO_COOKIES = @NECKO_COOKIES@
+ 
++MOZ_NATIVE_MYSPELL = @SYSTEM_MYSPELL@
++MOZ_MYSPELL_LIBS = @MOZ_MYSPELL_LIBS@
++MOZ_MYSPELL_CFLAGS = @MOZ_MYSPELL_CFLAGS@
++
+ MOZ_NATIVE_ZLIB	= @SYSTEM_ZLIB@
+ MOZ_NATIVE_JPEG	= @SYSTEM_JPEG@
+ MOZ_NATIVE_PNG	= @SYSTEM_PNG@
+ MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
+ 
+ MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
+ MOZ_MATHML = @MOZ_MATHML@
+ MOZ_XTF = @MOZ_XTF@
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-04-18 09:22:51.000000000 +0000
++++ mozilla/configure.in	2007-04-18 09:26:38.000000000 +0000
+@@ -3859,16 +3859,32 @@
+ 
+ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
+     PNG_CFLAGS="-I${PNG_DIR}/include"
+     PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
+ fi
+ 
+ fi # SKIP_LIBRARY_CHECKS
+ 
++dnl system MySpell Support
++dnl ========================================================
++MOZ_ARG_ENABLE_BOOL(system-myspell,
++[  --enable-system-myspell   Use system myspell (located with pkgconfig)],
++    SYSTEM_MYSPELL=1 )
++
++if test -n "$SYSTEM_MYSPELL"; then
++    dnl PKG_CHECK_MODULES(MOZ_MYSPELL, myspell)
++    MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell"
++    MOZ_MYSPELL_LIBS="-lhunspell"
++fi
++
++AC_SUBST(SYSTEM_MYSPELL)
++AC_SUBST(MOZ_MYSPELL_LIBS)
++AC_SUBST(MOZ_MYSPELL_CFLAGS)
++
+ dnl ========================================================
+ dnl Java SDK support
+ dnl ========================================================
+ JAVA_INCLUDE_PATH=
+ MOZ_ARG_WITH_STRING(java-include-path,
+ [  --with-java-include-path=dir   Location of Java SDK headers],
+     JAVA_INCLUDE_PATH=$withval)
+ 
+Index: mozilla/extensions/spellcheck/myspell/src/Makefile.in
+===================================================================
+--- mozilla.orig/extensions/spellcheck/myspell/src/Makefile.in	2006-06-29 21:23:45.000000000 +0000
++++ mozilla/extensions/spellcheck/myspell/src/Makefile.in	2007-04-18 09:26:38.000000000 +0000
+@@ -55,30 +55,38 @@
+ REQUIRES	= xpcom \
+ 		  string \
+ 		  uconv \
+ 		  unicharutil \
+ 		  spellchecker \
+ 		  xulapp \
+ 		  $(NULL)
+ 
+-CPPSRCS =         affentry.cpp \
+-		  affixmgr.cpp \
+-		  hashmgr.cpp \
+-		  suggestmgr.cpp \
+-		  csutil.cpp \
+-		  myspell.cpp \
+-		  mozMySpell.cpp \
+-		  mozMySpellFactory.cpp \
++CPPSRCS =         mozMySpell.cpp \
++                  mozMySpellFactory.cpp \
+                   $(NULL)
++ifndef MOZ_NATIVE_MYSPELL
++CPPSRCS +=        affentry.cpp \
++                  affixmgr.cpp \
++                  hashmgr.cpp \
++                  suggestmgr.cpp \
++                  csutil.cpp \
++                  myspell.cpp \
++                  $(NULL)
++endif
+ 
+ ifdef MOZ_XUL_APP
+ CPPSRCS += mozMySpellDirProvider.cpp
+ endif
+ 
+ EXTRA_DSO_LDOPTS = \
+ 		$(LIBS_DIR) \
+ 		$(XPCOM_LIBS) \
+ 		$(NSPR_LIBS) \
+ 		$(MOZ_UNICHARUTIL_LIBS) \
++		$(MOZ_MYSPELL_LIBS) \
+ 		$(NULL)
+ 
+ include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_MYSPELL
++CXXFLAGS += $(MOZ_MYSPELL_CFLAGS)
++endif
+Index: mozilla/extensions/spellcheck/myspell/src/mozMySpell.h
+===================================================================
+--- mozilla.orig/extensions/spellcheck/myspell/src/mozMySpell.h	2006-06-29 21:46:59.000000000 +0000
++++ mozilla/extensions/spellcheck/myspell/src/mozMySpell.h	2007-04-18 09:26:38.000000000 +0000
+@@ -51,17 +51,17 @@
+  * and affix compression in general, please see:
+  * http://www.cs.ucla.edu/ficus-members/geoff/ispell.html
+  * (the home page for ispell)
+  *
+  * ***** END LICENSE BLOCK ***** */
+ #ifndef mozMySpell_h__
+ #define mozMySpell_h__
+ 
+-#include "myspell.hxx"
++#include "hunspell.hxx"
+ #include "mozISpellCheckingEngine.h"
+ #include "mozIPersonalDictionary.h"
+ #include "nsString.h"
+ #include "nsCOMPtr.h"
+ #include "nsIObserver.h"
+ #include "nsIUnicodeEncoder.h"
+ #include "nsIUnicodeDecoder.h"
+ #include "nsInterfaceHashtable.h"
--- iceowl-0.7.orig/debian/patches/build-system-garbage.patch
+++ iceowl-0.7/debian/patches/build-system-garbage.patch
@@ -0,0 +1,471 @@
+From b2020068aa3b9d34685cbf50ce1796fe72415e4e Mon Sep 17 00:00:00 2001
+From: Alexander Sack <asac@hector.personalfree.com>
+Date: Mon, 12 Feb 2007 16:11:52 +0000
+Subject: [PATCH] build system garbage
+
+  + Makefile.in, browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in, browser/components/microsummaries/src/Makefile.in, build/unix/Makefile.in, config/Makefile.in, config/static-rules.mk, extensions/pref/system-pref/src/gconf/Makefile.in, profile/dirserviceprovider/standalone/Makefile.in, security/manager/Makefile.in, toolkit/library/Makefile.in, toolkit/mozapps/downloads/src/Makefile.in, toolkit/mozapps/extensions/src/Makefile.in, toolkit/mozapps/update/src/Makefile.in, toolkit/xre/Makefile.in, xpcom/build/Makefile.in, xpcom/glue/standalone/Makefile.in, xpfe/components/filepicker/src/Makefile.in: adding GARBAGE files that are not properly cleaned up during make clean/distclean.
+
+cleaned files:
+---
+ Makefile.in                                                                       |    1 
+ allmakefiles.sh                                                                   |    3 --
+ browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in |    2 +
+ browser/components/microsummaries/src/Makefile.in                                 |    1 
+ browser/components/shell/src/Makefile.in                                          |   11 ++--------
+ browser/locales/Makefile.in                                                       |    2 +
+ build/unix/Makefile.in                                                            |    2 -
+ config/Makefile.in                                                                |    2 +
+ config/static-rules.mk                                                            |    2 +
+ extensions/pref/system-pref/src/gconf/Makefile.in                                 |    2 +
+ profile/dirserviceprovider/standalone/Makefile.in                                 |    2 +
+ security/manager/Makefile.in                                                      |    2 +
+ toolkit/library/Makefile.in                                                       |    4 +++
+ toolkit/mozapps/downloads/src/Makefile.in                                         |    1 
+ toolkit/mozapps/extensions/src/Makefile.in                                        |    1 
+ toolkit/mozapps/update/src/Makefile.in                                            |    1 
+ toolkit/xre/Makefile.in                                                           |    6 +----
+ xpcom/build/Makefile.in                                                           |    2 -
+ xpcom/glue/standalone/Makefile.in                                                 |    2 -
+ xpfe/components/filepicker/src/Makefile.in                                        |    1 
+ 20 files changed, 32 insertions(+), 18 deletions(-)
+
+Index: mozilla/Makefile.in
+===================================================================
+--- mozilla.orig/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -442,16 +442,17 @@
+ 
+ endif # BUILD_MODULES == all
+ 
+ STATIC_MAKEFILES := nsprpub directory/c-sdk security/nss
+ 
+ GARBAGE_DIRS += dist
+ DIST_GARBAGE = config.cache config.log config.status config-defs.h \
+    dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
++   gfx/gfx-config.h netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
+    unallmakefiles mozilla-config.h \
+    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out 
+ 
+ # Build pseudo-external modules first when export is explicitly called
+ export::
+ 	$(RM) -rf $(DIST)/sdk
+ 	$(MAKE) -C config export
+ 	$(MAKE) nspr
+Index: mozilla/allmakefiles.sh
+===================================================================
+--- mozilla.orig/allmakefiles.sh	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/allmakefiles.sh	2007-04-04 18:45:26.000000000 +0200
+@@ -1523,19 +1523,16 @@
+             extensions/webservices/wsdl/Makefile
+             extensions/webservices/wsdl/src/Makefile
+             " ;;
+         xforms ) MAKEFILES_extensions="$MAKEFILES_extensions
+             extensions/xforms/Makefile
+             " ;;
+         xmlextras ) MAKEFILES_extensions="$MAKEFILES_extensions
+             extensions/xmlextras/Makefile
+-            extensions/xmlextras/base/Makefile
+-            extensions/xmlextras/base/src/Makefile
+-            extensions/xmlextras/base/public/Makefile
+             extensions/xmlextras/pointers/Makefile
+             extensions/xmlextras/pointers/src/Makefile
+             extensions/xmlextras/build/Makefile
+             extensions/xmlextras/build/src/Makefile
+             " ;;
+         xml-rpc ) MAKEFILES_extensions="$MAKEFILES_extensions
+             extensions/xml-rpc/Makefile
+             extensions/xml-rpc/idl/Makefile
+Index: mozilla/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+===================================================================
+--- mozilla.orig/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -50,8 +50,10 @@
+ 	$(NULL)
+ 
+ libs::
+ 	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf.in > install.rdf
+ 	$(INSTALL) $(FILES) $(DIST)/bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+  
+ install::
+ 	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
++
++GARBAGE += $(FILES)
+Index: mozilla/browser/components/microsummaries/src/Makefile.in
+===================================================================
+--- mozilla.orig/browser/components/microsummaries/src/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/browser/components/microsummaries/src/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -39,13 +39,14 @@
+ srcdir    = @srcdir@
+ VPATH   = @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+ MODULE = microsummaries
+ 
+ EXTRA_COMPONENTS = nsMicrosummaryService.js
++GARBAGE += nsMicrosummaryService.js
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ nsMicrosummaryService.js: nsMicrosummaryService.js.in
+ 	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ 
+Index: mozilla/browser/components/shell/src/Makefile.in
+===================================================================
+--- mozilla.orig/browser/components/shell/src/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/browser/components/shell/src/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -71,26 +71,21 @@
+ CPPSRCS = nsGNOMEShellService.cpp
+ REQUIRES += mozgnome
+ endif
+ endif
+ endif
+ 
+ ifdef CPPSRCS
+ LIBRARY_NAME = shellservice_s
+-endif
+-
++endif 
+ FORCE_STATIC_LIB = 1
+ 
++EXTRA_COMPONENTS = nsSetDefaultBrowser.js
++
+ include $(topsrcdir)/config/rules.mk
+ 
+ DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\"
+ 
+-JS_SET_BROWSER_COMPONENT = nsSetDefaultBrowser.js
+-
+ CXXFLAGS += $(TK_CFLAGS)
+ 
+-libs::
+-	$(INSTALL) $(srcdir)/$(JS_SET_BROWSER_COMPONENT) $(DIST)/bin/components
+-
+ clobber::
+ 	rm -f $(DIST)/lib/$(LIBRARY_NAME).lib
+-	rm -f $(DIST)/bin/components/$(JS_SET_BROWSER_COMPONENT)
+Index: mozilla/browser/locales/Makefile.in
+===================================================================
+--- mozilla.orig/browser/locales/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/browser/locales/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -51,16 +51,18 @@
+ run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if ! test -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
+ _ABS_DIST := $(shell cd $(DIST) && pwd)
+ 
+ ifdef MOZ_BRANDING_DIRECTORY
+ SUBMAKEFILES += \
+ 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
+ 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
+ 	$(NULL)
++
++GARBAGE = $(SUBMAKEFILES)
+ endif
+ 
+ # This makefile uses variable overrides from the libs-% target to
+ # build non-default locales to non-default dist/ locations. Be aware!
+ 
+ AB = $(firstword $(subst -, ,$(AB_CD)))
+ 
+ APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)
+Index: mozilla/build/unix/Makefile.in
+===================================================================
+--- mozilla.orig/build/unix/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/build/unix/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -66,17 +66,17 @@
+ endif
+ 
+ _DEFS = $(subst \,\\\\\,$(ACDEFINES))
+ 
+ pkg_config_files=$(MOZ_APP_NAME)-nspr.pc $(MOZ_APP_NAME)-xpcom.pc \
+ 	$(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \
+ 	$(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc
+ 
+-GARBAGE	= $(pkg_config_files) mozilla-config
++GARBAGE	= $(pkg_config_files) $(MOZ_APP_NAME)-config
+ 
+ $(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ 	cat $< | sed \
+ 	-e "s|%prefix%|$(prefix)|" \
+ 	-e "s|%exec_prefix%|$(exec_prefix)|" \
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%libdir%|$(mozappdir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+Index: mozilla/config/Makefile.in
+===================================================================
+--- mozilla.orig/config/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/config/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -136,16 +136,18 @@
+ 	if test ! -d system_wrappers; then mkdir system_wrappers; fi
+ 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+ 		-DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
+ 		-DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \
+ 		-DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
+ 		-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
+ 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+ 	$(INSTALL) system_wrappers $(DIST)/include
++
++GARBAGE_DIRS += system_wrappers
+ endif
+ 
+ # we don't use an explicit dependency here because then we would
+ # regenerate nsBuildID.h during the make install phase and that would
+ # be bad.
+ install::
+ 	@if test ! -f nsBuildID.h; then\
+ 		echo "You must have done at least a make export before trying to do a make install."; \
+Index: mozilla/config/static-rules.mk
+===================================================================
+--- mozilla.orig/config/static-rules.mk	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/config/static-rules.mk	2007-04-04 18:45:26.000000000 +0200
+@@ -9,11 +9,13 @@
+ $(warning FINAL_LINK_COMPS = $(FINAL_LINK_COMPS))
+ 
+ nsStaticComponents.cpp: $(topsrcdir)/config/nsStaticComponents.cpp.in Makefile Makefile.in $(FINAL_LINK_COMP_NAMES)
+ 	rm -f $@
+ 	cat $< | \
+ 	sed -e "s|%MODULE_LIST%|$(foreach m, $(STATIC_COMPONENT_LIST),MODULE($(m)))|" \
+ 	> $(_TARGET)
+ 
++GARBAGE += nsStaticComponents.cpp
++
+ ifeq ($(OS_ARCH),IRIX)
+ LDFLAGS	+= -Wl,-LD_LAYOUT:lgot_buffer=80
+ endif
+Index: mozilla/extensions/pref/system-pref/src/gconf/Makefile.in
+===================================================================
+--- mozilla.orig/extensions/pref/system-pref/src/gconf/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/extensions/pref/system-pref/src/gconf/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -82,8 +82,10 @@
+ 
+ CFLAGS		+= $(MOZ_GTK2_CFLAGS)
+ CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
+ 
+ LOCAL_INCLUDES = -I$(srcdir)/..
+ 
+ export::
+ 	$(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp .
++
++GARBAGE += nsSystemPrefFactory.cpp
+Index: mozilla/profile/dirserviceprovider/standalone/Makefile.in
+===================================================================
+--- mozilla.orig/profile/dirserviceprovider/standalone/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/profile/dirserviceprovider/standalone/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -60,8 +60,10 @@
+ FORCE_STATIC_LIB = 1
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ LOCAL_INCLUDES = -I$(srcdir)/../src
+ 
+ export:: $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS)
+ 	$(INSTALL) $^ .
++
++GARBAGE		= $(notdir $(MODULES_PROFILEDIRSERVICE_SRC_CSRCS))
+Index: mozilla/security/manager/Makefile.in
+===================================================================
+--- mozilla.orig/security/manager/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/security/manager/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -221,16 +221,18 @@
+ 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+ ifndef SKIP_CHK
+ 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+ 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+ endif
+ 	touch $@
+ endif
+ 
++GARBAGE += .nss.cleaned
++
+ .nss.checkout:
+ ifndef MOZ_NATIVE_NSS
+ 	touch $(srcdir)/$@
+ endif
+ 
+ dependclean export packages chrome::
+ 	$(MAKE) -C boot $@
+ 	$(MAKE) -C ssl $@
+Index: mozilla/toolkit/library/Makefile.in
+===================================================================
+--- mozilla.orig/toolkit/library/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/toolkit/library/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -395,14 +395,18 @@
+ export:: dlldeps.cpp dlldeps-obs.cpp
+ 
+ dlldeps.cpp: $(topsrcdir)/xpcom/build/dlldeps.cpp
+ 	$(INSTALL) $^ .
+ 
+ dlldeps-obs.cpp: $(topsrcdir)/xpcom/obsolete/dlldeps-obs.cpp
+ 	$(INSTALL) $^ .
+ 
++GARBAGE += dlldeps.cpp dlldeps-obs.cpp
++
+ ifdef MOZ_JAVAXPCOM
+ export:: dlldeps-javaxpcom.cpp
+ 
+ dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
+ 	$(INSTALL) $^ .
++
++GARBAGE += dlldeps-javaxpcom.cpp
+ endif
+Index: mozilla/toolkit/mozapps/downloads/src/Makefile.in
+===================================================================
+--- mozilla.orig/toolkit/mozapps/downloads/src/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/toolkit/mozapps/downloads/src/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -40,14 +40,15 @@
+ srcdir    = @srcdir@
+ VPATH   = @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+ MODULE = helperAppDlg
+ 
+ EXTRA_COMPONENTS = nsHelperAppDlg.js
++GARBAGE += nsHelperAppDlg.js
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ nsHelperAppDlg.js: nsHelperAppDlg.js.in
+ 	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ 
+ 
+Index: mozilla/toolkit/mozapps/extensions/src/Makefile.in
+===================================================================
+--- mozilla.orig/toolkit/mozapps/extensions/src/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/toolkit/mozapps/extensions/src/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -40,14 +40,15 @@
+ srcdir    = @srcdir@
+ VPATH   = @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+ MODULE = extensions
+ 
+ EXTRA_COMPONENTS = nsExtensionManager.js
++GARBAGE += nsExtensionManager.js
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ nsExtensionManager.js: nsExtensionManager.js.in
+ 	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ 
+ 
+Index: mozilla/toolkit/mozapps/update/src/Makefile.in
+===================================================================
+--- mozilla.orig/toolkit/mozapps/update/src/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/toolkit/mozapps/update/src/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -44,16 +44,17 @@
+ 
+ MODULE = extensions
+ 
+ ifdef MOZ_UPDATER
+ DIRS = updater
+ endif
+ 
+ EXTRA_COMPONENTS = nsUpdateService.js
++GARBAGE += nsUpdateService.js
+ 
+ ifeq ($(OS_ARCH),WINNT)
+ EXTRA_COMPONENTS += nsPostUpdateWin.js
+ endif
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ nsUpdateService.js: nsUpdateService.js.in
+Index: mozilla/toolkit/xre/Makefile.in
+===================================================================
+--- mozilla.orig/toolkit/xre/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/toolkit/xre/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -155,26 +155,24 @@
+ 
+ STACKWALK_CPPSRCS := $(addprefix $(topsrcdir)/xpcom/base/, $(STACKWALK_SRC_LCSRCS))
+ ifndef MOZ_ENABLE_LIBXUL
+ CPPSRCS           += nsStackFrameUnix.cpp
+ endif
+ SHAREDCPPSRCS	  += nsSigHandlers.cpp
+ endif
+ 
+-GARBAGE += $(SHAREDSRCS) $(wildcard *.$(OBJ_SUFFIX))
++GARBAGE += $(SHAREDCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
+ ifeq ($(OS_ARCH),WINNT)
+-GARBAGE	+= $(addprefix $(srcdir)/,$(SHAREDSRCS))
++GARBAGE	+= $(addprefix $(srcdir)/,$(SHAREDCPPSRCS))
+ endif
+ 
+ ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+-ifndef MOZ_ENABLE_LIBXUL
+ GARBAGE += $(STACKWALK_SRC_LCSRCS)
+ endif
+-endif
+ 
+ SHARED_LIBRARY_LIBS += ../profile/src/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX)
+ 
+ ifdef MOZ_ENABLE_XREMOTE
+ SHARED_LIBRARY_LIBS += $(DEPTH)/widget/src/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX)
+ LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/xremoteclient
+ endif
+ 
+Index: mozilla/xpcom/build/Makefile.in
+===================================================================
+--- mozilla.orig/xpcom/build/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/xpcom/build/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -146,17 +146,17 @@
+ ifndef MINIMO
+ FORCE_SHARED_LIB = 1
+ endif
+ endif
+ 
+ # UNIX98 iconv support
+ OS_LIBS += $(LIBICONV)
+ 
+-GARBAGE         += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUENS_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
++GARBAGE         += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ DEFINES		+= \
+ 		-D_IMPL_NS_COM \
+ 		-D_IMPL_NS_STRINGAPI \
+ 		-DEXPORT_XPT_API \
+ 		-DEXPORT_XPTC_API \
+Index: mozilla/xpcom/glue/standalone/Makefile.in
+===================================================================
+--- mozilla.orig/xpcom/glue/standalone/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/xpcom/glue/standalone/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -91,17 +91,17 @@
+ 		$(NULL)
+ 
+ # we don't want the shared lib, but we want to force the creation of a static lib.
+ FORCE_STATIC_LIB = 1
+ 
+ # Force use of PIC
+ FORCE_USE_PIC	= 1
+ 
+-GARBAGE         += $(XPCOM_GLUE_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
++GARBAGE         += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
+ 
+ SRCS_IN_OBJDIR	= 1
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS)
+ 	$(INSTALL) $^ .
+ 
+Index: mozilla/xpfe/components/filepicker/src/Makefile.in
+===================================================================
+--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in	2007-04-04 18:45:12.000000000 +0200
++++ mozilla/xpfe/components/filepicker/src/Makefile.in	2007-04-04 18:45:26.000000000 +0200
+@@ -64,16 +64,17 @@
+ 		$(NULL)
+ 
+ CPPSRCS		= \
+ 		nsFileView.cpp \
+ 		nsWildCard.cpp \
+ 		$(NULL)
+ 
+ EXTRA_COMPONENTS = nsFilePicker.js
++GARBAGE += nsFilePicker.js
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+ 
+ nsFilePicker.js: nsFilePicker.js.in
+ 	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@
+ 
--- iceowl-0.7.orig/debian/patches/configure-autoconf2-13-reconfigure.patch
+++ iceowl-0.7/debian/patches/configure-autoconf2-13-reconfigure.patch
@@ -0,0 +1,9953 @@
+---
+ configure | 1881 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 1055 insertions(+), 826 deletions(-)
+
+Index: mozilla/configure
+===================================================================
+--- mozilla.orig/configure
++++ mozilla/configure
+@@ -55,16 +55,18 @@
+                           Use system libjpeg [installed at prefix PFX]"
+ ac_help="$ac_help
+   --with-system-zlib[=PFX]
+                           Use system libz [installed at prefix PFX]"
+ ac_help="$ac_help
+   --with-system-png[=PFX]
+                           Use system libpng [installed at prefix PFX]"
+ ac_help="$ac_help
++  --enable-system-myspell   Use system myspell (located with pkgconfig)"
++ac_help="$ac_help
+   --with-java-include-path=dir   Location of Java SDK headers"
+ ac_help="$ac_help
+   --with-java-bin-path=dir   Location of Java binaries (java, javac, jar)"
+ ac_help="$ac_help
+   --enable-default-toolkit=TK
+                           Select default toolkit
+                           Platform specific defaults:
+                             BeOS - beos
+@@ -141,16 +143,18 @@
+ ac_help="$ac_help
+   --disable-oji           Disable Open JVM Integration support"
+ ac_help="$ac_help
+   --enable-xinerama       Enable Xinerama support
+                            ( not safe for Red Hat 7.0 ) "
+ ac_help="$ac_help
+   --enable-ctl            Enable Thai Complex Script support"
+ ac_help="$ac_help
++  --disable-libthai       Disable Thai word break support with libthai"
++ac_help="$ac_help
+   --disable-view-source     Disable view source support"
+ ac_help="$ac_help
+   --disable-accessibility Disable accessibility support"
+ ac_help="$ac_help
+   --disable-xpfe-components
+                           Disable xpfe components"
+ ac_help="$ac_help
+   --disable-xpinstall     Disable xpinstall support"
+@@ -955,17 +959,17 @@
+ 
+ 
+ # Make sure we can run config.sub.
+ if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:964: checking host system type" >&5
++echo "configure:968: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+ NONE)
+   case $nonopt in
+   NONE)
+     if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+@@ -976,17 +980,17 @@
+ 
+ host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ echo "$ac_t""$host" 1>&6
+ 
+ echo $ac_n "checking target system type""... $ac_c" 1>&6
+-echo "configure:985: checking target system type" >&5
++echo "configure:989: checking target system type" >&5
+ 
+ target_alias=$target
+ case "$target_alias" in
+ NONE)
+   case $nonopt in
+   NONE) target_alias=$host_alias ;;
+   *) target_alias=$nonopt ;;
+   esac ;;
+@@ -994,17 +998,17 @@
+ 
+ target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+ target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ echo "$ac_t""$target" 1>&6
+ 
+ echo $ac_n "checking build system type""... $ac_c" 1>&6
+-echo "configure:1003: checking build system type" >&5
++echo "configure:1007: checking build system type" >&5
+ 
+ build_alias=$build
+ case "$build_alias" in
+ NONE)
+   case $nonopt in
+   NONE) build_alias=$host_alias ;;
+   *) build_alias=$nonopt ;;
+   esac ;;
+@@ -1064,22 +1068,22 @@
+ WINDRES_VERSION=2.14.90
+ W32API_VERSION=2.4
+ GNOMEVFS_VERSION=2.0
+ GNOMEUI_VERSION=2.2.0
+ GCONF_VERSION=1.2.1
+ LIBGNOME_VERSION=2.0
+ 
+ MISSING_X=
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in mawk gawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1078: checking for $ac_word" >&5
++echo "configure:1082: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$AWK"; then
+   ac_cv_prog_AWK="$AWK" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1167,17 +1171,17 @@
+ fi
+ 
+ 
+ for ac_prog in nsinstall 
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1176: checking for $ac_word" >&5
++echo "configure:1180: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$NSINSTALL_BIN" in
+   /*)
+   ac_cv_path_NSINSTALL_BIN="$NSINSTALL_BIN" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -1209,17 +1213,17 @@
+ 
+ if test -z "$COMPILE_ENVIRONMENT"; then
+ if test -z "$NSINSTALL_BIN" || test "$NSINSTALL_BIN" = ":"; then
+    for ac_prog in $PYTHON python
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1218: checking for $ac_word" >&5
++echo "configure:1222: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PYTHON" in
+   /*)
+   ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -1280,23 +1284,23 @@
+     echo "cross compiling from $host to $target"
+     cross_compiling=yes
+ 
+     _SAVE_CC="$CC"
+     _SAVE_CFLAGS="$CFLAGS"
+     _SAVE_LDFLAGS="$LDFLAGS"
+ 
+     echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
+-echo "configure:1289: checking for host c compiler" >&5
++echo "configure:1293: checking for host c compiler" >&5
+     for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1295: checking for $ac_word" >&5
++echo "configure:1299: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$HOST_CC"; then
+   ac_cv_prog_HOST_CC="$HOST_CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1321,23 +1325,23 @@
+ done
+ test -n "$HOST_CC" || HOST_CC=""""
+ 
+     if test -z "$HOST_CC"; then
+         { echo "configure: error: no acceptable c compiler found in \$PATH" 1>&2; exit 1; }
+     fi
+     echo "$ac_t""$HOST_CC" 1>&6
+     echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
+-echo "configure:1330: checking for host c++ compiler" >&5
++echo "configure:1334: checking for host c++ compiler" >&5
+     for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1336: checking for $ac_word" >&5
++echo "configure:1340: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$HOST_CXX"; then
+   ac_cv_prog_HOST_CXX="$HOST_CXX" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1376,17 +1380,17 @@
+     if test -z "$HOST_LDFLAGS"; then
+         HOST_LDFLAGS="$LDFLAGS"
+     fi
+     for ac_prog in $HOST_RANLIB ranlib
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1385: checking for $ac_word" >&5
++echo "configure:1389: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$HOST_RANLIB"; then
+   ac_cv_prog_HOST_RANLIB="$HOST_RANLIB" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy=":"
+@@ -1411,17 +1415,17 @@
+ done
+ test -n "$HOST_RANLIB" || HOST_RANLIB="ranlib"
+ 
+     for ac_prog in $HOST_AR ar
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1420: checking for $ac_word" >&5
++echo "configure:1424: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$HOST_AR"; then
+   ac_cv_prog_HOST_AR="$HOST_AR" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy=":"
+@@ -1446,50 +1450,50 @@
+ done
+ test -n "$HOST_AR" || HOST_AR="ar"
+ 
+     CC="$HOST_CC"
+     CFLAGS="$HOST_CFLAGS"
+     LDFLAGS="$HOST_LDFLAGS"
+ 
+     echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1455: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
++echo "configure:1459: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 1457 "configure"
++#line 1461 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: installation or configuration problem: host compiler $HOST_CC cannot create executables." 1>&2; exit 1; } 
+ fi
+ rm -f conftest*
+ 
+     CC="$HOST_CXX"
+     CFLAGS="$HOST_CXXFLAGS"
+ 
+     echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1479: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
++echo "configure:1483: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 1481 "configure"
++#line 1485 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: installation or configuration problem: host compiler $HOST_CXX cannot create executables." 1>&2; exit 1; } 
+ fi
+@@ -1508,17 +1512,17 @@
+         ;;
+     esac
+ 
+     for ac_prog in $CC "${target_alias}-gcc" "${target}-gcc"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1517: checking for $ac_word" >&5
++echo "configure:1521: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1542,17 +1546,17 @@
+ test -n "$CC" && break
+ done
+ test -n "$CC" || CC=":"
+ 
+     unset ac_cv_prog_CC
+     # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1551: checking for $ac_word" >&5
++echo "configure:1555: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1572,17 +1576,17 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1581: checking for $ac_word" >&5
++echo "configure:1585: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+@@ -1623,17 +1627,17 @@
+ fi
+ 
+   if test -z "$CC"; then
+     case "`uname -s`" in
+     *win32* | *WIN32*)
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1632: checking for $ac_word" >&5
++echo "configure:1636: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1655,33 +1659,33 @@
+ fi
+  ;;
+     esac
+   fi
+   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1668: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1675 "configure"
++#line 1679 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+     ac_cv_prog_cc_cross=no
+   else
+     ac_cv_prog_cc_cross=yes
+   fi
+ else
+@@ -1697,31 +1701,31 @@
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1710: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1711: checking whether we are using GNU C" >&5
++echo "configure:1715: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.c <<EOF
+ #ifdef __GNUC__
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+ fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+ 
+@@ -1730,17 +1734,17 @@
+ else
+   GCC=
+ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1743: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+   ac_cv_prog_cc_g=yes
+ else
+   ac_cv_prog_cc_g=no
+@@ -1766,17 +1770,17 @@
+   fi
+ fi
+ 
+     for ac_prog in $CXX "${target_alias}-g++" "${target}-g++"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1775: checking for $ac_word" >&5
++echo "configure:1779: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CXX"; then
+   ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1802,17 +1806,17 @@
+ test -n "$CXX" || CXX=":"
+ 
+     unset ac_cv_prog_CXX
+     for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1811: checking for $ac_word" >&5
++echo "configure:1815: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CXX"; then
+   ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -1834,33 +1838,33 @@
+ fi
+ 
+ test -n "$CXX" && break
+ done
+ test -n "$CXX" || CXX="gcc"
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1847: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1854 "configure"
++#line 1858 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+     ac_cv_prog_cxx_cross=no
+   else
+     ac_cv_prog_cxx_cross=yes
+   fi
+ else
+@@ -1876,31 +1880,31 @@
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+ if test $ac_cv_prog_cxx_works = no; then
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1885: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1889: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:1890: checking whether we are using GNU C++" >&5
++echo "configure:1894: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.C <<EOF
+ #ifdef __GNUC__
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+ fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+ 
+@@ -1909,17 +1913,17 @@
+ else
+   GXX=
+ fi
+ 
+ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:1918: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:1922: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+   ac_cv_prog_cxx_g=yes
+ else
+   ac_cv_prog_cxx_g=no
+@@ -1940,81 +1944,30 @@
+ else
+   if test "$GXX" = yes; then
+     CXXFLAGS="-O2"
+   else
+     CXXFLAGS=
+   fi
+ fi
+ 
+-for ac_declaration in \
+-   ''\
+-   '#include <stdlib.h>' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat > conftest.$ac_ext <<EOF
+-#line 1959 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  :
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  continue
+-fi
+-rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#line 1977 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  break
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-done
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+-fi
+-
+-
+ 
+     case "$build:$target" in
+       powerpc-apple-darwin8*:i?86-apple-darwin*)
+                                 CFLAGS=$_SAVE_CFLAGS
+         CXXFLAGS=$_SAVE_CXXFLAGS
+         ;;
+     esac
+ 
+     for ac_prog in $RANLIB "${target_alias}-ranlib" "${target}-ranlib"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2013: checking for $ac_word" >&5
++echo "configure:1966: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2039,17 +1992,17 @@
+ done
+ test -n "$RANLIB" || RANLIB=":"
+ 
+     for ac_prog in $AR "${target_alias}-ar" "${target}-ar"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2048: checking for $ac_word" >&5
++echo "configure:2001: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$AR"; then
+   ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2074,17 +2027,17 @@
+ done
+ test -n "$AR" || AR=":"
+ 
+     for ac_prog in $AS "${target_alias}-as" "${target}-as"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2083: checking for $ac_word" >&5
++echo "configure:2036: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$AS" in
+   /*)
+   ac_cv_path_AS="$AS" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -2115,17 +2068,17 @@
+ done
+ test -n "$AS" || AS=":"
+ 
+     for ac_prog in $LD "${target_alias}-ld" "${target}-ld"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2124: checking for $ac_word" >&5
++echo "configure:2077: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$LD"; then
+   ac_cv_prog_LD="$LD" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2150,17 +2103,17 @@
+ done
+ test -n "$LD" || LD=":"
+ 
+     for ac_prog in $STRIP "${target_alias}-strip" "${target}-strip"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2159: checking for $ac_word" >&5
++echo "configure:2112: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$STRIP"; then
+   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2185,17 +2138,17 @@
+ done
+ test -n "$STRIP" || STRIP=":"
+ 
+     for ac_prog in $WINDRES "${target_alias}-windres" "${target}-windres"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2194: checking for $ac_word" >&5
++echo "configure:2147: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$WINDRES"; then
+   ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2223,17 +2176,17 @@
+     cat >> confdefs.h <<\EOF
+ #define CROSS_COMPILE 1
+ EOF
+ 
+ else
+     # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2232: checking for $ac_word" >&5
++echo "configure:2185: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2253,17 +2206,17 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2262: checking for $ac_word" >&5
++echo "configure:2215: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+@@ -2304,17 +2257,17 @@
+ fi
+ 
+   if test -z "$CC"; then
+     case "`uname -s`" in
+     *win32* | *WIN32*)
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2313: checking for $ac_word" >&5
++echo "configure:2266: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2336,33 +2289,33 @@
+ fi
+  ;;
+     esac
+   fi
+   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2345: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2298: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 2356 "configure"
++#line 2309 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+     ac_cv_prog_cc_cross=no
+   else
+     ac_cv_prog_cc_cross=yes
+   fi
+ else
+@@ -2378,31 +2331,31 @@
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2387: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2340: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:2392: checking whether we are using GNU C" >&5
++echo "configure:2345: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.c <<EOF
+ #ifdef __GNUC__
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+ fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+ 
+@@ -2411,17 +2364,17 @@
+ else
+   GCC=
+ fi
+ 
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:2420: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2373: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+   ac_cv_prog_cc_g=yes
+ else
+   ac_cv_prog_cc_g=no
+@@ -2447,17 +2400,17 @@
+   fi
+ fi
+ 
+     for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2456: checking for $ac_word" >&5
++echo "configure:2409: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CXX"; then
+   ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2479,33 +2432,33 @@
+ fi
+ 
+ test -n "$CXX" && break
+ done
+ test -n "$CXX" || CXX="gcc"
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2488: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:2441: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 2499 "configure"
++#line 2452 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+     ac_cv_prog_cxx_cross=no
+   else
+     ac_cv_prog_cxx_cross=yes
+   fi
+ else
+@@ -2521,31 +2474,31 @@
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+ if test $ac_cv_prog_cxx_works = no; then
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2530: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2483: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:2535: checking whether we are using GNU C++" >&5
++echo "configure:2488: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.C <<EOF
+ #ifdef __GNUC__
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+ fi
+ fi
+ 
+ echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+ 
+@@ -2554,17 +2507,17 @@
+ else
+   GXX=
+ fi
+ 
+ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:2563: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:2516: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+   ac_cv_prog_cxx_g=yes
+ else
+   ac_cv_prog_cxx_g=no
+@@ -2585,71 +2538,20 @@
+ else
+   if test "$GXX" = yes; then
+     CXXFLAGS="-O2"
+   else
+     CXXFLAGS=
+   fi
+ fi
+ 
+-for ac_declaration in \
+-   ''\
+-   '#include <stdlib.h>' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat > conftest.$ac_ext <<EOF
+-#line 2604 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:2612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  :
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  continue
+-fi
+-rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#line 2622 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:2629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  break
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-done
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+-fi
+-
+-
+     # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2648: checking for $ac_word" >&5
++echo "configure:2550: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2671,17 +2573,17 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     for ac_prog in $AS as
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2680: checking for $ac_word" >&5
++echo "configure:2582: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$AS" in
+   /*)
+   ac_cv_path_AS="$AS" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -2712,17 +2614,17 @@
+ done
+ test -n "$AS" || AS="$CC"
+ 
+     for ac_prog in ar
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2721: checking for $ac_word" >&5
++echo "configure:2623: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$AR"; then
+   ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2747,17 +2649,17 @@
+ done
+ test -n "$AR" || AR=":"
+ 
+     for ac_prog in ld
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2756: checking for $ac_word" >&5
++echo "configure:2658: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$LD"; then
+   ac_cv_prog_LD="$LD" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2782,17 +2684,17 @@
+ done
+ test -n "$LD" || LD=":"
+ 
+     for ac_prog in strip
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2791: checking for $ac_word" >&5
++echo "configure:2693: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$STRIP"; then
+   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2817,17 +2719,17 @@
+ done
+ test -n "$STRIP" || STRIP=":"
+ 
+     for ac_prog in windres
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2826: checking for $ac_word" >&5
++echo "configure:2728: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$WINDRES"; then
+   ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2906,17 +2808,17 @@
+     if test "$GCC" != "yes"; then
+         # Check to see if we are really running in a msvc environemnt
+         _WIN32_MSVC=1
+         for ac_prog in midl
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2915: checking for $ac_word" >&5
++echo "configure:2817: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$MIDL"; then
+   ac_cv_prog_MIDL="$MIDL" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -2948,24 +2850,24 @@
+         ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+         cat > conftest.$ac_ext <<EOF
+-#line 2957 "configure"
++#line 2859 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+  printf("Hello World\n"); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: \$(CC) test failed.  You must have MS VC++ in your path to build." 1>&2; exit 1; } 
+ fi
+ rm -f conftest*
+@@ -2973,24 +2875,24 @@
+         ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+         cat > conftest.$ac_ext <<EOF
+-#line 2982 "configure"
++#line 2884 "configure"
+ #include "confdefs.h"
+ #include <new.h>
+ int main() {
+  unsigned *test = new unsigned(42); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: \$(CXX) test failed.  You must have MS VC++ in your path to build." 1>&2; exit 1; } 
+ fi
+ rm -f conftest*
+@@ -3036,17 +2938,17 @@
+ 
+         # Check midl version
+         _MIDL_FULL_VERSION=`"${MIDL}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"`
+         _MIDL_MAJOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $1 }'`
+         _MIDL_MINOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $2 }'`
+         _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
+          # Add flags if necessary
+          echo $ac_n "checking for midl flags""... $ac_c" 1>&6
+-echo "configure:3045: checking for midl flags" >&5
++echo "configure:2947: checking for midl flags" >&5
+          if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then
+              # Starting with MIDL version 6.0.359, the MIDL compiler
+              # generates /Oicf /robust stubs by default, which is not
+              # compatible with versions of Windows older than Win2k.
+              # This switches us back to the old behaviour. When we drop
+              # support for Windows older than Win2k, we should remove
+              # this.
+              MIDL_FLAGS="${MIDL_FLAGS} -no_robust"
+@@ -3058,47 +2960,47 @@
+         
+         unset _MSVC_VER_FILTER
+         
+     else
+         # Check w32api version
+         _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
+         _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'`
+         echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6
+-echo "configure:3067: checking for w32api version >= $W32API_VERSION" >&5
++echo "configure:2969: checking for w32api version >= $W32API_VERSION" >&5
+         cat > conftest.$ac_ext <<EOF
+-#line 3069 "configure"
++#line 2971 "configure"
+ #include "confdefs.h"
+ #include <w32api.h>
+ int main() {
+ #if (__W32API_MAJOR_VERSION < $_W32API_MAJOR_VERSION) || \
+                 (__W32API_MAJOR_VERSION == $_W32API_MAJOR_VERSION && \
+                  __W32API_MINOR_VERSION < $_W32API_MINOR_VERSION)
+                 #error "test failed."
+             #endif
+             
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+    res=yes 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+    res=no 
+ fi
+ rm -f conftest*
+         echo "$ac_t""$res" 1>&6
+         if test "$res" != "yes"; then
+             { echo "configure: error: w32api version $W32API_VERSION or higher required." 1>&2; exit 1; }
+         fi
+         # Check windres version
+         echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6
+-echo "configure:3097: checking for windres version >= $WINDRES_VERSION" >&5
++echo "configure:2999: checking for windres version >= $WINDRES_VERSION" >&5
+         _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'`
+         echo "$ac_t""$_WINDRES_VERSION" 1>&6
+         _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
+         _WINDRES_MINOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
+         _WINDRES_RELEASE_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $3 }'`
+         WINDRES_MAJOR_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
+         WINDRES_MINOR_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
+         WINDRES_RELEASE_VERSION=`echo $WINDRES_VERSION | $AWK -F\. '{ print $3 }'`
+@@ -3115,72 +3017,72 @@
+     ;;
+ esac
+ 
+ if test -n "$_WIN32_MSVC"; then
+     SKIP_PATH_CHECKS=1
+     SKIP_COMPILER_CHECKS=1
+     SKIP_LIBRARY_CHECKS=1
+     echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:3124: checking how to run the C preprocessor" >&5
++echo "configure:3026: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+ if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     # This must be in double quotes, not single quotes, because CPP may get
+   # substituted into the Makefile and "${CC-cc}" will confuse make.
+   CPP="${CC-cc} -E"
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 3139 "configure"
++#line 3041 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 3156 "configure"
++#line 3058 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 3173 "configure"
++#line 3075 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -3198,27 +3100,27 @@
+   ac_cv_prog_CPP="$CPP"
+ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+ for ac_hdr in mmintrin.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3207: checking for $ac_hdr" >&5
++echo "configure:3109: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3212 "configure"
++#line 3114 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -3239,41 +3141,41 @@
+ fi
+ done
+ 
+ fi
+ 
+ if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
+     if test "x$CC" != xcc; then
+   echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
+-echo "configure:3248: checking whether $CC and cc understand -c and -o together" >&5
++echo "configure:3150: checking whether $CC and cc understand -c and -o together" >&5
+ else
+   echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
+-echo "configure:3251: checking whether cc understands -c and -o together" >&5
++echo "configure:3153: checking whether cc understands -c and -o together" >&5
+ fi
+ set dummy $CC; ac_cc="`echo $2 |
+ 		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo 'foo(){}' > conftest.c
+ # Make sure it works both with $CC and with simple cc.
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
+-if { (eval echo configure:3263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+-   test -f conftest.o && { (eval echo configure:3264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++if { (eval echo configure:3165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++   test -f conftest.o && { (eval echo configure:3166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+ then
+   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+   if test "x$CC" != xcc; then
+     # Test first that cc exists at all.
+-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
++    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+       ac_try='cc -c conftest.c -o conftest.o 1>&5'
+-      if { (eval echo configure:3271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+-	 test -f conftest.o && { (eval echo configure:3272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++      if { (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++	 test -f conftest.o && { (eval echo configure:3174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+       then
+         # cc works too.
+         :
+       else
+         # cc exists but doesn't like -o.
+         eval ac_cv_prog_cc_${ac_cc}_c_o=no
+       fi
+     fi
+@@ -3299,72 +3201,72 @@
+         _OLDCC=$CC
+         _OLDCXX=$CXX
+         CC="${srcdir}/build/hcc '$CC'"
+         CXX="${srcdir}/build/hcpp '$CXX'"
+     fi
+ fi
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:3308: checking how to run the C preprocessor" >&5
++echo "configure:3210: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+ if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     # This must be in double quotes, not single quotes, because CPP may get
+   # substituted into the Makefile and "${CC-cc}" will confuse make.
+   CPP="${CC-cc} -E"
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 3323 "configure"
++#line 3225 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 3340 "configure"
++#line 3242 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 3357 "configure"
++#line 3259 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -3379,35 +3281,35 @@
+ fi
+   CPP="$ac_cv_prog_CPP"
+ else
+   ac_cv_prog_CPP="$CPP"
+ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+-echo "configure:3388: checking how to run the C++ preprocessor" >&5
++echo "configure:3290: checking how to run the C++ preprocessor" >&5
+ if test -z "$CXXCPP"; then
+ if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+   CXXCPP="${CXX-g++} -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 3401 "configure"
++#line 3303 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -3444,17 +3346,17 @@
+ # SunOS /usr/etc/install
+ # IRIX /sbin/install
+ # AIX /bin/install
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:3453: checking for a BSD compatible install" >&5
++echo "configure:3355: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+   for ac_dir in $PATH; do
+     # Account for people who put trailing slashes in PATH elements.
+     case "$ac_dir/" in
+@@ -3497,17 +3399,17 @@
+ # It thinks the first close brace ends the variable substitution.
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ 
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:3506: checking whether ln -s works" >&5
++echo "configure:3408: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   rm -f conftestdata
+ if ln -s X conftestdata 2>/dev/null
+ then
+   rm -f conftestdata
+   ac_cv_prog_LN_S="ln -s"
+@@ -3522,17 +3424,17 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ for ac_prog in $PERL perl5 perl 
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3531: checking for $ac_word" >&5
++echo "configure:3433: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PERL" in
+   /*)
+   ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3562,40 +3464,40 @@
+ test -n "$PERL" && break
+ done
+ 
+ if test -z "$PERL" || test "$PERL" = ":"; then
+     { echo "configure: error: perl not found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6
+-echo "configure:3571: checking for minimum required perl version >= $PERL_VERSION" >&5
++echo "configure:3473: checking for minimum required perl version >= $PERL_VERSION" >&5
+ _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5`
+ _perl_res=$?
+ echo "$ac_t""$_perl_version" 1>&6
+ 
+ if test "$_perl_res" != 0; then
+     { echo "configure: error: Perl $PERL_VERSION or higher is required." 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking for full perl installation""... $ac_c" 1>&6
+-echo "configure:3581: checking for full perl installation" >&5
++echo "configure:3483: checking for full perl installation" >&5
+ _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5`
+ _perl_res=$?
+ if test "$_perl_res" != 0; then
+     echo "$ac_t""no" 1>&6
+     { echo "configure: error: Cannot find Config.pm or \$Config{archlib}.  A full perl installation is required." 1>&2; exit 1; }
+ else
+     echo "$ac_t""yes" 1>&6    
+ fi
+ 
+ # Extract the first word of "doxygen", so it can be a program name with args.
+ set dummy doxygen; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3594: checking for $ac_word" >&5
++echo "configure:3496: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$DOXYGEN" in
+   /*)
+   ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3621,17 +3523,17 @@
+   echo "$ac_t""$DOXYGEN" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ # Extract the first word of "whoami", so it can be a program name with args.
+ set dummy whoami; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3630: checking for $ac_word" >&5
++echo "configure:3532: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$WHOAMI" in
+   /*)
+   ac_cv_path_WHOAMI="$WHOAMI" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3657,17 +3559,17 @@
+   echo "$ac_t""$WHOAMI" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ # Extract the first word of "autoconf", so it can be a program name with args.
+ set dummy autoconf; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3666: checking for $ac_word" >&5
++echo "configure:3568: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$AUTOCONF" in
+   /*)
+   ac_cv_path_AUTOCONF="$AUTOCONF" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3693,17 +3595,17 @@
+   echo "$ac_t""$AUTOCONF" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ # Extract the first word of "unzip", so it can be a program name with args.
+ set dummy unzip; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3702: checking for $ac_word" >&5
++echo "configure:3604: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$UNZIP" in
+   /*)
+   ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3731,17 +3633,17 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ for ac_prog in zip
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3740: checking for $ac_word" >&5
++echo "configure:3642: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$ZIP" in
+   /*)
+   ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3766,23 +3668,20 @@
+   echo "$ac_t""$ZIP" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ test -n "$ZIP" && break
+ done
+ 
+-if test -z "$ZIP" || test "$ZIP" = ":"; then
+-    { echo "configure: error: zip not found in \$PATH" 1>&2; exit 1; }
+-fi
+ # Extract the first word of "makedepend", so it can be a program name with args.
+ set dummy makedepend; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3781: checking for $ac_word" >&5
++echo "configure:3680: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$SYSTEM_MAKEDEPEND" in
+   /*)
+   ac_cv_path_SYSTEM_MAKEDEPEND="$SYSTEM_MAKEDEPEND" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3807,17 +3706,17 @@
+   echo "$ac_t""$SYSTEM_MAKEDEPEND" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ # Extract the first word of "xargs", so it can be a program name with args.
+ set dummy xargs; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3816: checking for $ac_word" >&5
++echo "configure:3715: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$XARGS" in
+   /*)
+   ac_cv_path_XARGS="$XARGS" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3870,17 +3769,17 @@
+         fi
+     fi
+ 
+                 for ac_prog in pbbuild xcodebuild pbxbuild
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3879: checking for $ac_word" >&5
++echo "configure:3778: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PBBUILD" in
+   /*)
+   ac_cv_path_PBBUILD="$PBBUILD" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -3920,17 +3819,17 @@
+           HAS_XCODE_2_1=1;
+         fi
+       ;;
+     esac
+ 
+             # Extract the first word of "sdp", so it can be a program name with args.
+ set dummy sdp; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3929: checking for $ac_word" >&5
++echo "configure:3828: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$SDP" in
+   /*)
+   ac_cv_path_SDP="$SDP" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -4016,34 +3915,34 @@
+     CXXCPP="$CXXCPP -isysroot ${MACOS_SDK_DIR}"
+ 
+     if test "$GCC_VERSION_FULL" = "4.0.0" ; then
+                                     LDFLAGS="$LDFLAGS -Wl,-syslibroot,${MACOS_SDK_DIR}"
+     fi
+   fi
+ 
+   echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6
+-echo "configure:4025: checking for valid compiler/Mac OS X SDK combination" >&5
++echo "configure:3924: checking for valid compiler/Mac OS X SDK combination" >&5
+   ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+   cat > conftest.$ac_ext <<EOF
+-#line 4034 "configure"
++#line 3933 "configure"
+ #include "confdefs.h"
+ #include <new>
+                  int main() { return 0; }
+ int main() {
+ result=yes
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+   
+@@ -4058,17 +3957,17 @@
+ 
+ case "$host_os" in
+ cygwin*|mingw*|mks*|msvc*)
+     for ac_prog in $MAKE make gmake
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4067: checking for $ac_word" >&5
++echo "configure:3966: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$MAKE" in
+   /*)
+   ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -4101,17 +4000,17 @@
+ 
+     ;;
+ *)
+     for ac_prog in $MAKE gmake make
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4110: checking for $ac_word" >&5
++echo "configure:4009: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$MAKE" in
+   /*)
+   ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -4169,17 +4068,17 @@
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ 
+ # If we find X, set shell vars x_includes and x_libraries to the
+ # paths, otherwise set no_x=yes.
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:4178: checking for X" >&5
++echo "configure:4077: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+   withval="$with_x"
+   :
+ fi
+ 
+ # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+@@ -4231,22 +4130,22 @@
+ fi
+ 
+ if test "$ac_x_includes" = NO; then
+   # Guess where to find include files, by looking for this one X11 .h file.
+   test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 4240 "configure"
++#line 4139 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+@@ -4305,24 +4204,24 @@
+   test -z "$x_direct_test_library" && x_direct_test_library=Xt
+   test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+ 
+   # See if we find them without any special options.
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4314 "configure"
++#line 4213 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -4418,50 +4317,50 @@
+   # It would also be nice to do this for all -L options, not just this one.
+   if test -n "$x_libraries"; then
+     X_LIBS="$X_LIBS -L$x_libraries"
+     # For Solaris; some versions of Sun CC require a space after -R and
+     # others require no space.  Words are not sufficient . . . .
+     case "`(uname -sr) 2>/dev/null`" in
+     "SunOS 5"*)
+       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+-echo "configure:4427: checking whether -R must be followed by a space" >&5
++echo "configure:4326: checking whether -R must be followed by a space" >&5
+       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+       cat > conftest.$ac_ext <<EOF
+-#line 4430 "configure"
++#line 4329 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_nospace=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_R_nospace=no
+ fi
+ rm -f conftest*
+       if test $ac_R_nospace = yes; then
+ 	echo "$ac_t""no" 1>&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 4453 "configure"
++#line 4352 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_space=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_R_space=no
+ fi
+@@ -4483,39 +4382,39 @@
+ 
+   if test "$ISC" = yes; then
+     X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+   else
+     # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
+     # libraries were built with DECnet support.  And karl@cs.umb.edu says
+     # the Alpha needs dnet_stub (dnet does not exist).
+     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:4492: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:4391: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4500 "configure"
++#line 4399 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa();
+ 
+ int main() {
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4527,39 +4426,39 @@
+   echo "$ac_t""yes" 1>&6
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:4536: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:4435: checking for dnet_ntoa in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4544 "configure"
++#line 4443 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa();
+ 
+ int main() {
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4578,22 +4477,22 @@
+ 
+     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+     # to get the SysV transport functions.
+     # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+     # needs -lnsl.
+     # The nsl library prevents programs from opening the X display
+     # on Irix 5.2, according to dickey@clark.net.
+     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:4587: checking for gethostbyname" >&5
++echo "configure:4486: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4592 "configure"
++#line 4491 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -4609,17 +4508,17 @@
+ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+ choke me
+ #else
+ gethostbyname();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=no"
+ fi
+@@ -4630,39 +4529,39 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:4639: checking for gethostbyname in -lnsl" >&5
++echo "configure:4538: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4647 "configure"
++#line 4546 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char gethostbyname();
+ 
+ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4682,22 +4581,22 @@
+     # lieder@skyler.mavd.honeywell.com says without -lsocket,
+     # socket/setsockopt and other routines are undefined under SCO ODT
+     # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
+     # on later versions), says simon@lia.di.epfl.ch: it contains
+     # gethostby* variants that don't use the nameserver (or something).
+     # -lsocket must be given before -lnsl if both are needed.
+     # We assume that if connect needs -lnsl, so does gethostbyname.
+     echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:4691: checking for connect" >&5
++echo "configure:4590: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4696 "configure"
++#line 4595 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -4713,17 +4612,17 @@
+ #if defined (__stub_connect) || defined (__stub___connect)
+ choke me
+ #else
+ connect();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_connect=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_connect=no"
+ fi
+@@ -4734,39 +4633,39 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_func_connect = no; then
+       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:4743: checking for connect in -lsocket" >&5
++echo "configure:4642: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4751 "configure"
++#line 4650 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char connect();
+ 
+ int main() {
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4780,22 +4679,22 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     fi
+ 
+     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+     echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:4789: checking for remove" >&5
++echo "configure:4688: checking for remove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4794 "configure"
++#line 4693 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -4811,17 +4710,17 @@
+ #if defined (__stub_remove) || defined (__stub___remove)
+ choke me
+ #else
+ remove();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_remove=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_remove=no"
+ fi
+@@ -4832,39 +4731,39 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_func_remove = no; then
+       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:4841: checking for remove in -lposix" >&5
++echo "configure:4740: checking for remove in -lposix" >&5
+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4849 "configure"
++#line 4748 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char remove();
+ 
+ int main() {
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4878,22 +4777,22 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+     echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:4887: checking for shmat" >&5
++echo "configure:4786: checking for shmat" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4892 "configure"
++#line 4791 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -4909,17 +4808,17 @@
+ #if defined (__stub_shmat) || defined (__stub___shmat)
+ choke me
+ #else
+ shmat();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_shmat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_shmat=no"
+ fi
+@@ -4930,39 +4829,39 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     if test $ac_cv_func_shmat = no; then
+       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:4939: checking for shmat in -lipc" >&5
++echo "configure:4838: checking for shmat in -lipc" >&5
+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lipc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4947 "configure"
++#line 4846 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char shmat();
+ 
+ int main() {
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -4985,39 +4884,39 @@
+   test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+   # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+   # check for ICE first), but we must link in the order -lSM -lICE or
+   # we get undefined symbols.  So assume we have SM if we have ICE.
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:4994: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:4893: checking for IceConnectionNumber in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5002 "configure"
++#line 4901 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char IceConnectionNumber();
+ 
+ int main() {
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -5091,34 +4990,27 @@
+ MOZ_GFX_TOOLKIT='$(MOZ_WIDGET_TOOLKIT)'
+ MOZ_WIDGET_TOOLKIT_LDFLAGS='-lwidget_$(MOZ_WIDGET_TOOLKIT)'
+ MOZ_GFX_TOOLKIT_LDFLAGS='-lgfx_$(MOZ_GFX_TOOLKIT) $(MOZ_XLIBRGB_LDFLAGS)'
+ WIDGET_DLL='\"libwidget_$(MOZ_WIDGET_TOOLKIT)$(DLL_SUFFIX)\"'
+ GFXWIN_DLL='\"libgfx_$(MOZ_GFX_TOOLKIT)$(DLL_SUFFIX)\"'
+ 
+ MOZ_ENABLE_POSTSCRIPT=1 
+ 
+-if test -n "$CROSS_COMPILE"; then
+-    OS_TARGET="${target_os}"
+-    OS_ARCH=`echo $target_os | sed -e 's|/|_|g'`
+-    OS_RELEASE=
+-    OS_TEST="${target_cpu}"
+-    case "${target_os}" in
+-        linux*)       OS_ARCH=Linux ;;
+-        solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
+-        mingw*)       OS_ARCH=WINNT ;;
+-        wince*)       OS_ARCH=WINCE ;;
+-        darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
+-    esac
+-else
+-    OS_TARGET=`uname -s`
+-    OS_ARCH=`uname -s | sed -e 's|/|_|g'`
+-    OS_RELEASE=`uname -r`
+-    OS_TEST=`uname -m`
+-fi
++OS_TARGET="${host_os}"
++OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`
++OS_RELEASE=
++OS_TEST="${host_cpu}"
++case "${host_os}" in
++    linux*)       OS_ARCH=Linux ;;
++    solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
++    mingw*)       OS_ARCH=WINNT ;;
++    wince*)       OS_ARCH=WINCE ;;
++    darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
++esac
+ _COMPILER_PREFIX=
+ 
+ HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`
+ 
+ #######################################################################
+ # Master "Core Components" macros for getting the OS target           #
+ #######################################################################
+ 
+@@ -5445,41 +5337,41 @@
+ fi
+ 
+ MKSHLIB_FORCE_ALL=
+ MKSHLIB_UNFORCE_ALL=
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ if test "$GNU_CC"; then
+   echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6
+-echo "configure:5454: checking whether ld has archive extraction flags" >&5
++echo "configure:5346: checking whether ld has archive extraction flags" >&5
+   if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   _SAVE_LDFLAGS=$LDFLAGS; _SAVE_LIBS=$LIBS
+     ac_cv_mkshlib_force_and_unforce="no"
+     exec 3<&0 <<LOOP_INPUT
+ 	force="-Wl,--whole-archive";   unforce="-Wl,--no-whole-archive"
+ 	force="-Wl,-z -Wl,allextract"; unforce="-Wl,-z -Wl,defaultextract"
+ 	force="-Wl,-all";              unforce="-Wl,-none"
+ LOOP_INPUT
+     while read line
+     do
+       eval $line
+       LDFLAGS=$force
+       LIBS=$unforce
+       cat > conftest.$ac_ext <<EOF
+-#line 5471 "configure"
++#line 5363 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_mkshlib_force_and_unforce=$line; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+     done
+@@ -5502,95 +5394,95 @@
+ if test "$COMPILE_ENVIRONMENT"; then
+ configure_static_assert_macros='
+ #define CONFIGURE_STATIC_ASSERT(condition) CONFIGURE_STATIC_ASSERT_IMPL(condition, __LINE__)
+ #define CONFIGURE_STATIC_ASSERT_IMPL(condition, line) CONFIGURE_STATIC_ASSERT_IMPL2(condition, line)
+ #define CONFIGURE_STATIC_ASSERT_IMPL2(condition, line) typedef int static_assert_line_##line[(condition) ? 1 : -1]
+ '
+ 
+ echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6
+-echo "configure:5511: checking that static assertion macros used in autoconf tests work" >&5
++echo "configure:5403: checking that static assertion macros used in autoconf tests work" >&5
+ if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+   ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+   ac_cv_static_assertion_macros_work="yes"
+   cat > conftest.$ac_ext <<EOF
+-#line 5525 "configure"
++#line 5417 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(1)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_static_assertion_macros_work="no"
+ fi
+ rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+-#line 5542 "configure"
++#line 5434 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_static_assertion_macros_work="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+   ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+   cat > conftest.$ac_ext <<EOF
+-#line 5565 "configure"
++#line 5457 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(1)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_static_assertion_macros_work="no"
+ fi
+ rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+-#line 5582 "configure"
++#line 5474 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_static_assertion_macros_work="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+   ac_ext=C
+@@ -5615,26 +5507,26 @@
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
+-echo "configure:5624: checking for 64-bit OS" >&5
++echo "configure:5516: checking for 64-bit OS" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 5626 "configure"
++#line 5518 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(sizeof(long) == 8)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="no"
+ fi
+@@ -5782,28 +5674,28 @@
+             ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+             echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6
+-echo "configure:5791: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
++echo "configure:5683: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
+             cat > conftest.$ac_ext <<EOF
+-#line 5793 "configure"
++#line 5685 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ #if (__IBMCPP__ < 502)
+                  #error "Bad compiler"
+                  #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _BAD_COMPILER=
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _BAD_COMPILER=1
+ fi
+@@ -5831,27 +5723,27 @@
+         DLL_SUFFIX='_shr.a'
+         ;;
+     esac
+     if test "$COMPILE_ENVIRONMENT"; then
+         for ac_hdr in sys/inttypes.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5840: checking for $ac_hdr" >&5
++echo "configure:5732: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5845 "configure"
++#line 5737 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -5883,32 +5775,32 @@
+     no_x=yes
+     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -Wl,-h,$@ -o $@'
+     _PLATFORM_DEFAULT_TOOLKIT="beos"
+     DSO_LDOPTS='-nostart'
+     TK_LIBS='-lbe -lroot'
+     LIBS="$LIBS -lbe"
+     if test "$COMPILE_ENVIRONMENT"; then
+         echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
+-echo "configure:5892: checking for main in -lbind" >&5
++echo "configure:5784: checking for main in -lbind" >&5
+ ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbind  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5900 "configure"
++#line 5792 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -5919,32 +5811,32 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   LIBS="$LIBS -lbind"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+         echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
+-echo "configure:5928: checking for main in -lzeta" >&5
++echo "configure:5820: checking for main in -lzeta" >&5
+ ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lzeta  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5936 "configure"
++#line 5828 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -5998,28 +5890,28 @@
+     STRIP="$STRIP -x -S"
+     _PLATFORM_DEFAULT_TOOLKIT='mac'
+     MOZ_ENABLE_POSTSCRIPT=
+     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+     # set MACOSX to generate lib/mac/MoreFiles/Makefile
+     MACOSX=1
+ 
+         echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
+-echo "configure:6007: checking for -dead_strip option to ld" >&5
++echo "configure:5899: checking for -dead_strip option to ld" >&5
+     _SAVE_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,-dead_strip"
+     cat > conftest.$ac_ext <<EOF
+-#line 6011 "configure"
++#line 5903 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   _HAVE_DEAD_STRIP=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _HAVE_DEAD_STRIP=
+ fi
+@@ -6148,18 +6040,16 @@
+     	CFLAGS="$CFLAGS -mieee"
+     	CXXFLAGS="$CXXFLAGS -mieee"
+     ;;
+     i*86)
+     	USE_ELF_DYNSTR_GC=1
+         MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
+     ;;
+     mips*)
+-        CFLAGS="$CFLAGS -Wa,-xgot"
+-        CXXFLAGS="$CXXFLAGS -Wa,-xgot"
+     ;;
+     esac
+     ;;
+ 
+ *-wince*)
+ 
+     MOZ_TOOLS_DIR=`echo $MOZ_TOOLS`
+     AR_LIST="$AR -list"
+@@ -6877,24 +6767,24 @@
+ 
+        CFLAGS="$CFLAGS -xstrconst -xbuiltin=%all"
+        CXXFLAGS="$CXXFLAGS -xbuiltin=%all -features=tmplife"
+        LDFLAGS="-xildoff -zlazyload -zcombreloc $LDFLAGS"
+        if test -z "$CROSS_COMPILE" && test -f /usr/lib/ld/map.noexstk; then
+            _SAVE_LDFLAGS=$LDFLAGS
+            LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" 
+            cat > conftest.$ac_ext <<EOF
+-#line 6886 "configure"
++#line 6776 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   LDFLAGS=$_SAVE_LDFLAGS
+ fi
+ rm -f conftest*
+@@ -6912,36 +6802,36 @@
+        AR_FLAGS='-o $@'
+        AS='/usr/ccs/bin/as'
+        ASFLAGS="$ASFLAGS -K PIC -L -P -D_ASM -D__STDC__=0"
+        AS_DASH_C_FLAG=''
+        TARGET_COMPILER_ABI="sunc"
+         CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
+         CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
+        echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6
+-echo "configure:6921: checking for Forte compiler version >= WS6U2" >&5
++echo "configure:6811: checking for Forte compiler version >= WS6U2" >&5
+        
+        ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+        cat > conftest.$ac_ext <<EOF
+-#line 6931 "configure"
++#line 6821 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ #if (__SUNPRO_CC < 0x530)
+            #error "Denied"
+            #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _BAD_COMPILER=
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _BAD_COMPILER=1
+ fi
+@@ -7060,17 +6950,17 @@
+          fi
+         fi
+         ;;
+     *-nto*) 
+         MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
+         ;;
+     *-darwin*)
+         echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6
+-echo "configure:7069: checking for -exported_symbols_list option to ld" >&5
++echo "configure:6959: checking for -exported_symbols_list option to ld" >&5
+         if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+            if $LD -exported_symbols_list 2>&1 | grep "argument missing" >/dev/null; then
+              ac_cv_exported_symbols_list=true
+            else
+              ac_cv_exported_symbols_list=false
+@@ -7100,47 +6990,47 @@
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:7109: checking for ANSI C header files" >&5
++echo "configure:6999: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7114 "configure"
++#line 7004 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   ac_cv_header_stdc=yes
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_header_stdc=no
+ fi
+ rm -f conftest*
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 7139 "configure"
++#line 7029 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "memchr" >/dev/null 2>&1; then
+   :
+ else
+   rm -rf conftest*
+@@ -7148,17 +7038,17 @@
+ fi
+ rm -f conftest*
+ 
+ fi
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 7157 "configure"
++#line 7047 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "free" >/dev/null 2>&1; then
+   :
+ else
+   rm -rf conftest*
+@@ -7169,28 +7059,28 @@
+ fi
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7178 "configure"
++#line 7068 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int main () { int i; for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:7189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_header_stdc=no
+ fi
+@@ -7204,22 +7094,22 @@
+ if test $ac_cv_header_stdc = yes; then
+   cat >> confdefs.h <<\EOF
+ #define STDC_HEADERS 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:7213: checking for working const" >&5
++echo "configure:7103: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7218 "configure"
++#line 7108 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ /* Ultrix mips cc rejects this.  */
+ typedef int charset[2]; const charset x;
+ /* SunOS 4.1.1 cc rejects this.  */
+ char const *const *ccp;
+@@ -7258,17 +7148,17 @@
+   struct s *b; b->j = 5;
+ }
+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+   const int foo = 10;
+ }
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_c_const=no
+ fi
+@@ -7279,22 +7169,22 @@
+ if test $ac_cv_c_const = no; then
+   cat >> confdefs.h <<\EOF
+ #define const 
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:7288: checking for mode_t" >&5
++echo "configure:7178: checking for mode_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7293 "configure"
++#line 7183 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -7312,22 +7202,22 @@
+ if test $ac_cv_type_mode_t = no; then
+   cat >> confdefs.h <<\EOF
+ #define mode_t int
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:7321: checking for off_t" >&5
++echo "configure:7211: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7326 "configure"
++#line 7216 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -7345,22 +7235,22 @@
+ if test $ac_cv_type_off_t = no; then
+   cat >> confdefs.h <<\EOF
+ #define off_t long
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:7354: checking for pid_t" >&5
++echo "configure:7244: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7359 "configure"
++#line 7249 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -7378,22 +7268,22 @@
+ if test $ac_cv_type_pid_t = no; then
+   cat >> confdefs.h <<\EOF
+ #define pid_t int
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:7387: checking for size_t" >&5
++echo "configure:7277: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7392 "configure"
++#line 7282 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+ #include <stdlib.h>
+ #include <stddef.h>
+ #endif
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+@@ -7411,30 +7301,30 @@
+ if test $ac_cv_type_size_t = no; then
+   cat >> confdefs.h <<\EOF
+ #define size_t unsigned
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
+-echo "configure:7420: checking for st_blksize in struct stat" >&5
++echo "configure:7310: checking for st_blksize in struct stat" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7425 "configure"
++#line 7315 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ int main() {
+ struct stat s; s.st_blksize;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_st_blksize=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_struct_st_blksize=no
+ fi
+@@ -7445,30 +7335,30 @@
+ if test $ac_cv_struct_st_blksize = yes; then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_ST_BLKSIZE 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
+-echo "configure:7454: checking for siginfo_t" >&5
++echo "configure:7344: checking for siginfo_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7459 "configure"
++#line 7349 "configure"
+ #include "confdefs.h"
+ #define _POSIX_C_SOURCE 199506L
+                   #include <signal.h>
+ int main() {
+ siginfo_t* info;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_siginfo_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_siginfo_t=false
+ fi
+@@ -7492,30 +7382,30 @@
+ 
+    cat >> confdefs.h <<\EOF
+ #define __off_t 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for int16_t""... $ac_c" 1>&6
+-echo "configure:7501: checking for int16_t" >&5
++echo "configure:7391: checking for int16_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7506 "configure"
++#line 7396 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ int16_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_int16_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_int16_t=false
+ fi
+@@ -7527,30 +7417,30 @@
+ #define HAVE_INT16_T 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for int32_t""... $ac_c" 1>&6
+-echo "configure:7536: checking for int32_t" >&5
++echo "configure:7426: checking for int32_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7541 "configure"
++#line 7431 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ int32_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_int32_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_int32_t=false
+ fi
+@@ -7562,30 +7452,30 @@
+ #define HAVE_INT32_T 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for int64_t""... $ac_c" 1>&6
+-echo "configure:7571: checking for int64_t" >&5
++echo "configure:7461: checking for int64_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7576 "configure"
++#line 7466 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ int64_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_int64_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_int64_t=false
+ fi
+@@ -7597,30 +7487,30 @@
+ #define HAVE_INT64_T 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for int64""... $ac_c" 1>&6
+-echo "configure:7606: checking for int64" >&5
++echo "configure:7496: checking for int64" >&5
+ if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7611 "configure"
++#line 7501 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ int64 foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_int64=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_int64=false
+ fi
+@@ -7632,30 +7522,30 @@
+ #define HAVE_INT64 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for uint""... $ac_c" 1>&6
+-echo "configure:7641: checking for uint" >&5
++echo "configure:7531: checking for uint" >&5
+ if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7646 "configure"
++#line 7536 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ uint foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_uint=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_uint=false
+ fi
+@@ -7667,30 +7557,30 @@
+ #define HAVE_UINT 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for uint_t""... $ac_c" 1>&6
+-echo "configure:7676: checking for uint_t" >&5
++echo "configure:7566: checking for uint_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7681 "configure"
++#line 7571 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ uint_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_uint_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_uint_t=false
+ fi
+@@ -7702,30 +7592,30 @@
+ #define HAVE_UINT_T 1
+ EOF
+ 
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
+-echo "configure:7711: checking for uint16_t" >&5
++echo "configure:7601: checking for uint16_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7716 "configure"
++#line 7606 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+                   #include <sys/types.h>
+ int main() {
+ uint16_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_uint16_t=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_uint16_t=false
+ fi
+@@ -7746,30 +7636,30 @@
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ 
+ echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
+-echo "configure:7755: checking for uname.domainname" >&5
++echo "configure:7645: checking for uname.domainname" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7760 "configure"
++#line 7650 "configure"
+ #include "confdefs.h"
+ #include <sys/utsname.h>
+ int main() {
+  struct utsname *res; char *domain; 
+             (void)uname(res);  if (res != 0) { domain = res->domainname; } 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_uname_domainname_field=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_uname_domainname_field=false
+ fi
+@@ -7783,30 +7673,30 @@
+ EOF
+ 
+     echo "$ac_t""yes" 1>&6
+ else
+     echo "$ac_t""no" 1>&6
+ fi
+ 
+ echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
+-echo "configure:7792: checking for uname.__domainname" >&5
++echo "configure:7682: checking for uname.__domainname" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7797 "configure"
++#line 7687 "configure"
+ #include "confdefs.h"
+ #include <sys/utsname.h>
+ int main() {
+  struct utsname *res; char *domain; 
+             (void)uname(res);  if (res != 0) { domain = res->__domainname; } 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_uname_us_domainname_field=true
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_uname_us_domainname_field=false
+ fi
+@@ -7829,31 +7719,31 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ 
+ 
+ echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
+-echo "configure:7838: checking for usable wchar_t (2 bytes, unsigned)" >&5
++echo "configure:7728: checking for usable wchar_t (2 bytes, unsigned)" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7843 "configure"
++#line 7733 "configure"
+ #include "confdefs.h"
+ #include <stddef.h>
+                      $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2);
+                      CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_usable_wchar_v2="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_usable_wchar_v2="no"
+ fi
+@@ -7876,31 +7766,31 @@
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     _SAVE_CXXFLAGS=$CXXFLAGS
+     CXXFLAGS="$CXXFLAGS -fshort-wchar"
+ 
+     echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
+-echo "configure:7885: checking for compiler -fshort-wchar option" >&5
++echo "configure:7775: checking for compiler -fshort-wchar option" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7890 "configure"
++#line 7780 "configure"
+ #include "confdefs.h"
+ #include <stddef.h>
+                          $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2);
+                          CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_usable_wchar_option_v2="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_usable_wchar_option_v2="no"
+ fi
+@@ -7924,17 +7814,17 @@
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ fi
+ 
+ if test "$GNU_CC"; then
+   echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
+-echo "configure:7933: checking for visibility(hidden) attribute" >&5
++echo "configure:7823: checking for visibility(hidden) attribute" >&5
+ if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.c <<EOF
+                   int foo __attribute__ ((visibility ("hidden"))) = 1;
+ EOF
+                   ac_cv_visibility_hidden=no
+                   if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+@@ -7949,17 +7839,17 @@
+ echo "$ac_t""$ac_cv_visibility_hidden" 1>&6
+   if test "$ac_cv_visibility_hidden" = "yes"; then
+     cat >> confdefs.h <<\EOF
+ #define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
+ EOF
+ 
+ 
+     echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
+-echo "configure:7958: checking for visibility(default) attribute" >&5
++echo "configure:7848: checking for visibility(default) attribute" >&5
+ if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.c <<EOF
+                     int foo __attribute__ ((visibility ("default"))) = 1;
+ EOF
+                     ac_cv_visibility_default=no
+                     if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+@@ -7974,17 +7864,17 @@
+ echo "$ac_t""$ac_cv_visibility_default" 1>&6
+     if test "$ac_cv_visibility_default" = "yes"; then
+       cat >> confdefs.h <<\EOF
+ #define HAVE_VISIBILITY_ATTRIBUTE 1
+ EOF
+ 
+ 
+       echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
+-echo "configure:7983: checking for visibility pragma support" >&5
++echo "configure:7873: checking for visibility pragma support" >&5
+ if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.c <<EOF
+ #pragma GCC visibility push(hidden)
+                       int foo_hidden = 1;
+ #pragma GCC visibility push(default)
+                       int foo_default = 1;
+@@ -7999,17 +7889,17 @@
+                       fi
+                       rm -f conftest.cs
+                     
+ fi
+ 
+ echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
+       if test "$ac_cv_visibility_pragma" = "yes"; then
+         echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6
+-echo "configure:8008: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
++echo "configure:7898: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.c <<EOF
+ #pragma GCC visibility push(hidden)
+ struct __attribute__ ((visibility ("default"))) TestStruct {
+   static void Init();
+ };
+@@ -8027,17 +7917,17 @@
+                        fi
+                        rm -rf conftest.{c,S}
+                        
+ fi
+ 
+ echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6
+ 
+         echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
+-echo "configure:8036: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
++echo "configure:7926: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.c <<EOF
+ #pragma GCC visibility push(hidden)
+ #pragma GCC visibility push(default)
+ #include <string.h>
+ #pragma GCC visibility pop
+@@ -8057,48 +7947,47 @@
+                        fi
+                        rm -f conftest.{c,S}
+                        
+ fi
+ 
+ echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
+         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
+                 "$ac_cv_have_visibility_class_bug" = "no"; then
+-          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+-          WRAP_SYSTEM_INCLUDES=1
++          VISIBILITY_FLAGS='-fvisibility=hidden'
+         else
+           VISIBILITY_FLAGS='-fvisibility=hidden'
+         fi # have visibility pragma bug
+       fi   # have visibility pragma
+     fi     # have visibility(default) attribute
+   fi       # have visibility(hidden) attribute
+ fi         # GNU_CC
+ 
+ 
+ 
+ 
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+-echo "configure:8084: checking for $ac_hdr that defines DIR" >&5
++echo "configure:7973: checking for $ac_hdr that defines DIR" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8089 "configure"
++#line 7978 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+ int main() {
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=no"
+ fi
+@@ -8113,36 +8002,36 @@
+  ac_header_dirent=$ac_hdr; break
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+-echo "configure:8122: checking for opendir in -ldir" >&5
++echo "configure:8011: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8130 "configure"
++#line 8019 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char opendir();
+ 
+ int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8154,36 +8043,36 @@
+   echo "$ac_t""yes" 1>&6
+   LIBS="$LIBS -ldir"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:8163: checking for opendir in -lx" >&5
++echo "configure:8052: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8171 "configure"
++#line 8060 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char opendir();
+ 
+ int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8205,27 +8094,27 @@
+ # for stuff like -lXshm
+     CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+     ;;
+ esac
+ for ac_hdr in sys/byteorder.h compat.h getopt.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8214: checking for $ac_hdr" >&5
++echo "configure:8103: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8219 "configure"
++#line 8108 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8245,27 +8134,27 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_hdr in sys/bitypes.h memory.h unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8254: checking for $ac_hdr" >&5
++echo "configure:8143: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8259 "configure"
++#line 8148 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8285,27 +8174,27 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_hdr in gnu/libc-version.h nl_types.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8294: checking for $ac_hdr" >&5
++echo "configure:8183: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8299 "configure"
++#line 8188 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8325,27 +8214,27 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_hdr in malloc.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8334: checking for $ac_hdr" >&5
++echo "configure:8223: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8339 "configure"
++#line 8228 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8365,27 +8254,27 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_hdr in X11/XKBlib.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8374: checking for $ac_hdr" >&5
++echo "configure:8263: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8379 "configure"
++#line 8268 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8406,27 +8295,27 @@
+ fi
+ done
+ 
+ 
+ for ac_hdr in sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8415: checking for $ac_hdr" >&5
++echo "configure:8304: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8420 "configure"
++#line 8309 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8447,27 +8336,27 @@
+ fi
+ done
+ 
+ 
+ for ac_hdr in mmintrin.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8456: checking for $ac_hdr" >&5
++echo "configure:8345: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8461 "configure"
++#line 8350 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8494,27 +8383,27 @@
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ NEW_H=new.h
+ ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for new""... $ac_c" 1>&6
+-echo "configure:8503: checking for new" >&5
++echo "configure:8392: checking for new" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8508 "configure"
++#line 8397 "configure"
+ #include "confdefs.h"
+ #include <new>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8545,27 +8434,27 @@
+ case $target in
+ *-aix4.3*|*-aix5*)
+ 	;;
+ *)
+ 	for ac_hdr in sys/cdefs.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8554: checking for $ac_hdr" >&5
++echo "configure:8443: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8559 "configure"
++#line 8448 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8589,36 +8478,36 @@
+ 	;;
+ esac
+ 
+ case $target in
+ *-hpux11.*)
+ 	;;
+ *)
+ 	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
+-echo "configure:8598: checking for gethostbyname_r in -lc_r" >&5
++echo "configure:8487: checking for gethostbyname_r in -lc_r" >&5
+ ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8606 "configure"
++#line 8495 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char gethostbyname_r();
+ 
+ int main() {
+ gethostbyname_r()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8638,36 +8527,36 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	;;
+ esac
+ echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
+-echo "configure:8647: checking for atan in -lm" >&5
++echo "configure:8536: checking for atan in -lm" >&5
+ ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8655 "configure"
++#line 8544 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char atan();
+ 
+ int main() {
+ atan()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8691,63 +8580,63 @@
+ 
+ 
+ 
+ case $target in
+ *-darwin*)
+ 	;;
+ *)
+ 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:8700: checking for dlopen in -ldl" >&5
++echo "configure:8589: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8708 "configure"
++#line 8597 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char dlopen();
+ 
+ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+-echo "configure:8736: checking for dlfcn.h" >&5
++echo "configure:8625: checking for dlfcn.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8741 "configure"
++#line 8630 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -8773,36 +8662,36 @@
+ 
+ 	;;
+ esac
+ if test ! "$GNU_CXX"; then
+ 
+     case $target in
+     *-aix*)
+ 	echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
+-echo "configure:8782: checking for demangle in -lC_r" >&5
++echo "configure:8671: checking for demangle in -lC_r" >&5
+ ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lC_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8790 "configure"
++#line 8679 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char demangle();
+ 
+ int main() {
+ demangle()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8822,36 +8711,36 @@
+ 
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	;;
+      *)
+ 	echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
+-echo "configure:8831: checking for demangle in -lC" >&5
++echo "configure:8720: checking for demangle in -lC" >&5
+ ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lC  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8839 "configure"
++#line 8728 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char demangle();
+ 
+ int main() {
+ demangle()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8872,36 +8761,36 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	;;
+      esac
+ fi
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:8881: checking for socket in -lsocket" >&5
++echo "configure:8770: checking for socket in -lsocket" >&5
+ ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8889 "configure"
++#line 8778 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char socket();
+ 
+ int main() {
+ socket()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8936,36 +8825,36 @@
+     cat >> confdefs.h <<EOF
+ #define FUNCPROTO 15
+ EOF
+ 
+ 	XLIBS="-lX11 $XLIBS"
+ 	_SAVE_LDFLAGS="$LDFLAGS"
+ 	LDFLAGS="$XLDFLAGS $LDFLAGS"
+ 	echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
+-echo "configure:8945: checking for XDrawLines in -lX11" >&5
++echo "configure:8834: checking for XDrawLines in -lX11" >&5
+ ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8953 "configure"
++#line 8842 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XDrawLines();
+ 
+ int main() {
+ XDrawLines()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -8977,36 +8866,36 @@
+   echo "$ac_t""yes" 1>&6
+   X11_LIBS="-lX11"
+ else
+   echo "$ac_t""no" 1>&6
+ MISSING_X="$MISSING_X -lX11"
+ fi
+ 
+ 	echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
+-echo "configure:8986: checking for XextAddDisplay in -lXext" >&5
++echo "configure:8875: checking for XextAddDisplay in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8994 "configure"
++#line 8883 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XextAddDisplay();
+ 
+ int main() {
+ XextAddDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9020,36 +8909,36 @@
+ else
+   echo "$ac_t""no" 1>&6
+ MISSING_X="$MISSING_X -lXext"
+ fi
+ 
+    
+      
+ 	echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
+-echo "configure:9029: checking for XtFree in -lXt" >&5
++echo "configure:8918: checking for XtFree in -lXt" >&5
+ ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9037 "configure"
++#line 8926 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XtFree();
+ 
+ int main() {
+ XtFree()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9060,36 +8949,36 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+    XT_LIBS="-lXt"
+ else
+   echo "$ac_t""no" 1>&6
+ 
+         unset ac_cv_lib_Xt_XtFree
+ 	    echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
+-echo "configure:9069: checking for IceFlush in -lICE" >&5
++echo "configure:8958: checking for IceFlush in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9077 "configure"
++#line 8966 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char IceFlush();
+ 
+ int main() {
+ IceFlush()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9100,36 +8989,36 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   XT_LIBS="-lICE $XT_LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	    echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
+-echo "configure:9109: checking for SmcCloseConnection in -lSM" >&5
++echo "configure:8998: checking for SmcCloseConnection in -lSM" >&5
+ ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9117 "configure"
++#line 9006 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char SmcCloseConnection();
+ 
+ int main() {
+ SmcCloseConnection()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9140,36 +9029,36 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   XT_LIBS="-lSM $XT_LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+  
+         echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
+-echo "configure:9149: checking for XtFree in -lXt" >&5
++echo "configure:9038: checking for XtFree in -lXt" >&5
+ ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9157 "configure"
++#line 9046 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XtFree();
+ 
+ int main() {
+ XtFree()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9193,36 +9082,36 @@
+     # crashes in plugins linked against Motif - Bug #98892
+     case "${target_os}" in
+     aix*)
+         XT_LIBS="-lXm $XT_LIBS"
+         ;;
+     esac
+ 
+                 echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
+-echo "configure:9202: checking for XineramaIsActive in -lXinerama" >&5
++echo "configure:9091: checking for XineramaIsActive in -lXinerama" >&5
+ ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9210 "configure"
++#line 9099 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XineramaIsActive();
+ 
+ int main() {
+ XineramaIsActive()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9234,27 +9123,27 @@
+   echo "$ac_t""yes" 1>&6
+   MOZ_XINERAMA_LIBS="-lXinerama"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6
+-echo "configure:9243: checking for X11/extensions/Xinerama.h" >&5
++echo "configure:9132: checking for X11/extensions/Xinerama.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9248 "configure"
++#line 9137 "configure"
+ #include "confdefs.h"
+ #include <X11/extensions/Xinerama.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -9267,36 +9156,36 @@
+   echo "$ac_t""yes" 1>&6
+   :
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
+                 echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
+-echo "configure:9276: checking for XShmCreateImage in -lXext" >&5
++echo "configure:9165: checking for XShmCreateImage in -lXext" >&5
+ ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9284 "configure"
++#line 9173 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XShmCreateImage();
+ 
+ int main() {
+ XShmCreateImage()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9308,27 +9197,27 @@
+   echo "$ac_t""yes" 1>&6
+   _HAVE_XSHM_XEXT=1
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6
+-echo "configure:9317: checking for X11/extensions/XShm.h" >&5
++echo "configure:9206: checking for X11/extensions/XShm.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9322 "configure"
++#line 9211 "configure"
+ #include "confdefs.h"
+ #include <X11/extensions/XShm.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -9348,36 +9237,36 @@
+         test -n "$_HAVE_XSHM_XEXT"; then
+         cat >> confdefs.h <<\EOF
+ #define HAVE_XSHM 1
+ EOF
+ 
+     fi
+ 
+                 echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
+-echo "configure:9357: checking for XieFloGeometry in -lXIE" >&5
++echo "configure:9246: checking for XieFloGeometry in -lXIE" >&5
+ ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9365 "configure"
++#line 9254 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XieFloGeometry();
+ 
+ int main() {
+ XieFloGeometry()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -9389,27 +9278,27 @@
+   echo "$ac_t""yes" 1>&6
+   MOZ_XIE_LIBS="-lXIE"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+     ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6
+-echo "configure:9398: checking for X11/extensions/XIElib.h" >&5
++echo "configure:9287: checking for X11/extensions/XIElib.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9403 "configure"
++#line 9292 "configure"
+ #include "confdefs.h"
+ #include <X11/extensions/XIElib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -9473,17 +9362,17 @@
+   ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+   if test x${FT2_CONFIG+set} != xset ; then
+     FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+   fi
+ fi
+ # Extract the first word of "freetype-config", so it can be a program name with args.
+ set dummy freetype-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:9482: checking for $ac_word" >&5
++echo "configure:9371: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$FT2_CONFIG" in
+   /*)
+   ac_cv_path_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -9509,17 +9398,17 @@
+   echo "$ac_t""$FT2_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
+ min_ft_version=6.1.0
+ echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
+-echo "configure:9518: checking for FreeType - version >= $min_ft_version" >&5
++echo "configure:9407: checking for FreeType - version >= $min_ft_version" >&5
+ no_ft=""
+ if test "$FT2_CONFIG" = "no" ; then
+   no_ft=yes
+ else
+   FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+   FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+   ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+          sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -9557,17 +9446,17 @@
+       ac_save_CFLAGS="$CFLAGS"
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $FT2_CFLAGS"
+       LIBS="$FT2_LIBS $LIBS"
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9566 "configure"
++#line 9455 "configure"
+ #include "confdefs.h"
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int
+@@ -9583,17 +9472,17 @@
+   else
+   {
+     FT_Done_FreeType(library);
+     return 0;
+   }
+ }
+ 
+ EOF
+-if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_ft=yes
+ fi
+@@ -9635,17 +9524,17 @@
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
+-echo "configure:9644: checking for pthread_create in -lpthreads" >&5
++echo "configure:9533: checking for pthread_create in -lpthreads" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+             pthread_join(t, 0);
+         }
+@@ -9657,17 +9546,17 @@
+     rm -f dummy.c dummy${ac_exeext} ;
+     if test "$_res" = "0"; then
+         echo "$ac_t""yes" 1>&6
+         USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads"
+     else
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:9666: checking for pthread_create in -lpthread" >&5
++echo "configure:9555: checking for pthread_create in -lpthread" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+             pthread_join(t, 0);
+         }
+@@ -9679,17 +9568,17 @@
+     rm -f dummy.c dummy${ac_exeext} ;
+     if test "$_res" = "0"; then
+         echo "$ac_t""yes" 1>&6
+         USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread"
+     else
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+-echo "configure:9688: checking for pthread_create in -lc_r" >&5
++echo "configure:9577: checking for pthread_create in -lc_r" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+             pthread_join(t, 0);
+         }
+@@ -9701,17 +9590,17 @@
+     rm -f dummy.c dummy${ac_exeext} ;
+     if test "$_res" = "0"; then
+         echo "$ac_t""yes" 1>&6
+         USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r"
+     else
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
+-echo "configure:9710: checking for pthread_create in -lc" >&5
++echo "configure:9599: checking for pthread_create in -lc" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+             pthread_join(t, 0);
+         }
+@@ -9757,17 +9646,17 @@
+ fi
+ 
+ 
+ if test "$USE_PTHREADS"x != x
+ then
+ 				rm -f conftest*
+ 	ac_cv_have_dash_pthread=no
+ 	echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
+-echo "configure:9766: checking whether ${CC-cc} accepts -pthread" >&5
++echo "configure:9655: checking whether ${CC-cc} accepts -pthread" >&5
+ 	echo 'int main() { return 0; }' | cat > conftest.c
+ 	${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
+ 	if test $? -eq 0; then
+ 		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 			ac_cv_have_dash_pthread=yes
+ 	        case "$target_os" in
+ 	        freebsd*)
+ # Freebsd doesn't use -pthread for compiles, it uses them for linking
+@@ -9780,17 +9669,17 @@
+ 		fi
+ 	fi
+ 	rm -f conftest*
+     echo "$ac_t""$ac_cv_have_dash_pthread" 1>&6
+ 
+ 			    ac_cv_have_dash_pthreads=no
+     if test "$ac_cv_have_dash_pthread" = "no"; then
+ 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
+-echo "configure:9789: checking whether ${CC-cc} accepts -pthreads" >&5
++echo "configure:9678: checking whether ${CC-cc} accepts -pthreads" >&5
+     	echo 'int main() { return 0; }' | cat > conftest.c
+ 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
+     	if test $? -eq 0; then
+ 	    	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+ 			    ac_cv_have_dash_pthreads=yes
+ 			    CFLAGS="$CFLAGS -pthreads"
+ 			    CXXFLAGS="$CXXFLAGS -pthreads"
+ 		    fi
+@@ -9902,17 +9791,17 @@
+         esac
+     fi
+     ;;
+ esac
+ 
+ 
+ 
+ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
+-echo "configure:9911: checking whether mmap() sees write()s" >&5
++echo "configure:9800: checking whether mmap() sees write()s" >&5
+ 
+ 
+ mmap_test_prog='
+     #include <stdlib.h>
+     #include <unistd.h>
+     #include <sys/mman.h>
+     #include <sys/types.h>
+     #include <sys/stat.h>
+@@ -9941,21 +9830,21 @@
+     }
+ '
+ 
+ 
+ if test "$cross_compiling" = yes; then
+   result="yes"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9950 "configure"
++#line 9839 "configure"
+ #include "confdefs.h"
+ $mmap_test_prog 
+ EOF
+-if { (eval echo configure:9954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   result="no"
+ fi
+@@ -9970,23 +9859,23 @@
+ #define MMAP_MISSES_WRITES 1
+ EOF
+ 
+ fi
+ 
+ 
+ if test $ac_cv_prog_gcc = yes; then
+     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+-echo "configure:9979: checking whether ${CC-cc} needs -traditional" >&5
++echo "configure:9868: checking whether ${CC-cc} needs -traditional" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat > conftest.$ac_ext <<EOF
+-#line 9985 "configure"
++#line 9874 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "$ac_pattern" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_prog_gcc_traditional=yes
+@@ -9994,17 +9883,17 @@
+   rm -rf conftest*
+   ac_cv_prog_gcc_traditional=no
+ fi
+ rm -f conftest*
+ 
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 10003 "configure"
++#line 9892 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ Autoconf TCGETA
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "$ac_pattern" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_prog_gcc_traditional=yes
+@@ -10016,35 +9905,35 @@
+ 
+ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+   if test $ac_cv_prog_gcc_traditional = yes; then
+     CC="$CC -traditional"
+   fi
+ fi
+ 
+ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+-echo "configure:10025: checking for 8-bit clean memcmp" >&5
++echo "configure:9914: checking for 8-bit clean memcmp" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_memcmp_clean=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10033 "configure"
++#line 9922 "configure"
+ #include "confdefs.h"
+ 
+ main()
+ {
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+   exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+ }
+ 
+ EOF
+-if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_memcmp_clean=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_func_memcmp_clean=no
+ fi
+@@ -10054,22 +9943,22 @@
+ fi
+ 
+ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
+ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
+ 
+ for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:10063: checking for $ac_func" >&5
++echo "configure:9952: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10068 "configure"
++#line 9957 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+@@ -10082,17 +9971,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -10109,22 +9998,22 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ done
+ 
+ for ac_func in flockfile getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:10118: checking for $ac_func" >&5
++echo "configure:10007: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10123 "configure"
++#line 10012 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+@@ -10137,17 +10026,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -10166,22 +10055,22 @@
+ fi
+ done
+ 
+ 
+ if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100200"; then
+   for ac_func in localtime_r strtok_r
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:10175: checking for $ac_func" >&5
++echo "configure:10064: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10180 "configure"
++#line 10069 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+@@ -10194,17 +10083,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -10230,29 +10119,29 @@
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
+-echo "configure:10239: checking for wcrtomb" >&5
++echo "configure:10128: checking for wcrtomb" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10244 "configure"
++#line 10133 "configure"
+ #include "confdefs.h"
+ #include <wchar.h>
+ int main() {
+ mbstate_t ps={0};wcrtomb(0,'f',&ps);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_have_wcrtomb="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_wcrtomb="no"
+ fi
+@@ -10262,29 +10151,29 @@
+ echo "$ac_t""$ac_cv_have_wcrtomb" 1>&6
+ if test "$ac_cv_have_wcrtomb" = "yes"; then
+     cat >> confdefs.h <<\EOF
+ #define HAVE_WCRTOMB 1
+ EOF
+ 
+ fi
+ echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
+-echo "configure:10271: checking for mbrtowc" >&5
++echo "configure:10160: checking for mbrtowc" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10276 "configure"
++#line 10165 "configure"
+ #include "confdefs.h"
+ #include <wchar.h>
+ int main() {
+ mbstate_t ps={0};mbrtowc(0,0,0,&ps);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_have_mbrtowc="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_have_mbrtowc="no"
+ fi
+@@ -10303,34 +10192,34 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ fi
+ 
+ echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
+-echo "configure:10312: checking for res_ninit()" >&5
++echo "configure:10201: checking for res_ninit()" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10317 "configure"
++#line 10206 "configure"
+ #include "confdefs.h"
+ 
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
+         #include <resolv.h>
+         
+ int main() {
+ int foo = res_ninit(&_res);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_res_ninit=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_res_ninit=no
+ fi
+@@ -10350,33 +10239,33 @@
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
+-echo "configure:10359: checking for gnu_get_libc_version()" >&5
++echo "configure:10248: checking for gnu_get_libc_version()" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10364 "configure"
++#line 10253 "configure"
+ #include "confdefs.h"
+ 
+         #ifdef HAVE_GNU_LIBC_VERSION_H
+         #include <gnu/libc-version.h>
+         #endif
+         
+ int main() {
+ const char *glibc_version = gnu_get_libc_version();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_gnu_get_libc_version=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_gnu_get_libc_version=no 
+         
+@@ -10395,39 +10284,39 @@
+ fi
+ 
+ case $target_os in
+     os2*|msvc*|mks*|cygwin*|mingw*|darwin*|wince*)
+         ;;
+     *)
+     
+ echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
+-echo "configure:10404: checking for iconv in -lc" >&5
++echo "configure:10293: checking for iconv in -lc" >&5
+ ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10412 "configure"
++#line 10301 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char iconv();
+ 
+ int main() {
+ iconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -10436,39 +10325,39 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   _ICONV_LIBS="$_ICONV_LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
+-echo "configure:10445: checking for iconv in -liconv" >&5
++echo "configure:10334: checking for iconv in -liconv" >&5
+ ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-liconv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10453 "configure"
++#line 10342 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char iconv();
+ 
+ int main() {
+ iconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -10477,39 +10366,39 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   _ICONV_LIBS="$_ICONV_LIBS -liconv"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
+-echo "configure:10486: checking for libiconv in -liconv" >&5
++echo "configure:10375: checking for libiconv in -liconv" >&5
+ ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-liconv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10494 "configure"
++#line 10383 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char libiconv();
+ 
+ int main() {
+ libiconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -10526,36 +10415,36 @@
+ 
+ fi
+ 
+ fi
+ 
+ _SAVE_LIBS=$LIBS
+ LIBS="$LIBS $_ICONV_LIBS"
+ echo $ac_n "checking for iconv()""... $ac_c" 1>&6
+-echo "configure:10535: checking for iconv()" >&5
++echo "configure:10424: checking for iconv()" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10540 "configure"
++#line 10429 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdlib.h>
+         #include <iconv.h>
+         
+ int main() {
+ 
+             iconv_t h = iconv_open("", "");
+             iconv(h, NULL, NULL, NULL, NULL);
+             iconv_close(h);
+         
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_iconv=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_iconv=no 
+         
+@@ -10569,37 +10458,37 @@
+     cat >> confdefs.h <<\EOF
+ #define HAVE_ICONV 1
+ EOF
+ 
+     DYNAMIC_XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS $_ICONV_LIBS"
+     LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
+     LIBICONV="$_ICONV_LIBS"
+     echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
+-echo "configure:10578: checking for iconv() with const input" >&5
++echo "configure:10467: checking for iconv() with const input" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10583 "configure"
++#line 10472 "configure"
+ #include "confdefs.h"
+ 
+             #include <stdlib.h>
+             #include <iconv.h>
+             
+ int main() {
+ 
+                 const char *input = "testing";
+                 iconv_t h = iconv_open("", "");
+                 iconv(h, &input, NULL, NULL, NULL);
+                 iconv_close(h);
+             
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_func_const_iconv=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_const_iconv=no 
+             
+@@ -10618,29 +10507,29 @@
+ fi
+ LIBS=$_SAVE_LIBS
+ 
+     ;;
+ esac
+ 
+ 
+   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
+-echo "configure:10627: checking for nl_langinfo and CODESET" >&5
++echo "configure:10516: checking for nl_langinfo and CODESET" >&5
+ if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10632 "configure"
++#line 10521 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int main() {
+ char* cs = nl_langinfo(CODESET);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_langinfo_codeset=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   am_cv_langinfo_codeset=no
+ fi
+@@ -10662,123 +10551,123 @@
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ 
+ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
+-echo "configure:10671: checking for an implementation of va_copy()" >&5
++echo "configure:10560: checking for an implementation of va_copy()" >&5
+ if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     if test "$cross_compiling" = yes; then
+   ac_cv_va_copy=no
+     
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10681 "configure"
++#line 10570 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdarg.h>
+         void f (int i, ...) {
+             va_list args1, args2;
+             va_start (args1, i);
+             va_copy (args2, args1);
+             if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+                 exit (1);
+             va_end (args1); va_end (args2);
+         }
+         int main() { f (0, 42); return 0; }
+ EOF
+-if { (eval echo configure:10695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_va_copy=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_va_copy=no
+ fi
+ rm -fr conftest*
+ fi
+ 
+ 
+ fi
+ 
+ echo "$ac_t""$ac_cv_va_copy" 1>&6
+ echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6
+-echo "configure:10712: checking for an implementation of __va_copy()" >&5
++echo "configure:10601: checking for an implementation of __va_copy()" >&5
+ if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     if test "$cross_compiling" = yes; then
+   ac_cv___va_copy=no
+     
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10722 "configure"
++#line 10611 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdarg.h>
+         void f (int i, ...) {
+             va_list args1, args2;
+             va_start (args1, i);
+             __va_copy (args2, args1);
+             if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+                 exit (1);
+             va_end (args1); va_end (args2);
+         }
+         int main() { f (0, 42); return 0; }
+ EOF
+-if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv___va_copy=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv___va_copy=no
+ fi
+ rm -fr conftest*
+ fi
+ 
+ 
+ fi
+ 
+ echo "$ac_t""$ac_cv___va_copy" 1>&6
+ echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6
+-echo "configure:10753: checking whether va_lists can be copied by value" >&5
++echo "configure:10642: checking whether va_lists can be copied by value" >&5
+ if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     if test "$cross_compiling" = yes; then
+   ac_cv_va_val_copy=yes
+     
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10763 "configure"
++#line 10652 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdarg.h>
+         void f (int i, ...) {
+             va_list args1, args2;
+             va_start (args1, i);
+             args2 = args1;
+             if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
+                 exit (1);
+             va_end (args1); va_end (args2);
+         }
+         int main() { f (0, 42); return 0; }
+ EOF
+-if { (eval echo configure:10777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_va_val_copy=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_va_val_copy=no
+ fi
+@@ -10867,17 +10756,17 @@
+ 	    cd ${_curdir}
+ 	    rm -rf conftest* _conftest
+ 	    	    ;;
+ esac
+ 
+ if test "$GNU_CXX"; then
+ 
+   echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
+-echo "configure:10876: checking for C++ exceptions flag" >&5
++echo "configure:10765: checking for C++ exceptions flag" >&5
+ 
+     if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   echo "int main() { return 0; }" | cat > conftest.C
+ 
+   ${CXX-g++} ${CXXFLAGS} -c -fno-handle-exceptions conftest.C > conftest.out 2>&1
+ 
+@@ -10902,35 +10791,35 @@
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ 
+ HAVE_GCC3_ABI=
+ if test "$GNU_CC"; then
+   echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
+-echo "configure:10911: checking for gcc 3.0 ABI" >&5
++echo "configure:10800: checking for gcc 3.0 ABI" >&5
+ if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10916 "configure"
++#line 10805 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
+   return 0;
+ #else
+ #error Not gcc3.
+ #endif
+                       
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_gcc_three_abi="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_gcc_three_abi="no"
+ fi
+@@ -10944,32 +10833,32 @@
+   else
+       TARGET_COMPILER_ABI="${TARGET_COMPILER_ABI-gcc2}"
+   fi
+ fi
+ 
+ 
+ 
+ echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
+-echo "configure:10953: checking for C++ \"explicit\" keyword" >&5
++echo "configure:10842: checking for C++ \"explicit\" keyword" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10958 "configure"
++#line 10847 "configure"
+ #include "confdefs.h"
+ class X {
+                                public: explicit X(int i) : i_(i) {}
+                                private: int i_;
+                                };
+ int main() {
+ X x(3);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_explicit=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_explicit=no
+ fi
+@@ -10980,22 +10869,22 @@
+ if test "$ac_cv_cpp_explicit" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_EXPLICIT 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
+-echo "configure:10989: checking for C++ \"typename\" keyword" >&5
++echo "configure:10878: checking for C++ \"typename\" keyword" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10994 "configure"
++#line 10883 "configure"
+ #include "confdefs.h"
+ class param {
+                                public:
+                                    typedef unsigned long num_type;
+                                };
+ 
+                                template <class T> class tplt {
+                                public:
+@@ -11004,17 +10893,17 @@
+                                        return num;
+                                    }
+                                };
+ int main() {
+ tplt<param> A;
+                                A.foo(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_typename=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_typename=no
+ fi
+@@ -11025,32 +10914,32 @@
+ if test "$ac_cv_cpp_typename" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_TYPENAME 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
+-echo "configure:11034: checking for modern C++ template specialization syntax support" >&5
++echo "configure:10923: checking for modern C++ template specialization syntax support" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11039 "configure"
++#line 10928 "configure"
+ #include "confdefs.h"
+ template <class T> struct X { int a; };
+                                class Y {};
+                                template <> struct X<Y> { double a; };
+ int main() {
+ X<int> int_x;
+                                X<Y> y_x;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_modern_specialize_template_syntax=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_modern_specialize_template_syntax=no
+ fi
+@@ -11062,30 +10951,30 @@
+   cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
+-echo "configure:11071: checking whether partial template specialization works" >&5
++echo "configure:10960: checking whether partial template specialization works" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11076 "configure"
++#line 10965 "configure"
+ #include "confdefs.h"
+ template <class T> class Foo {};
+                                template <class T> class Foo<T*> {};
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_partial_specialization=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_partial_specialization=no
+ fi
+@@ -11096,34 +10985,34 @@
+ if test "$ac_cv_cpp_partial_specialization" = yes ; then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_PARTIAL_SPECIALIZATION 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
+-echo "configure:11105: checking whether operators must be re-defined for templates derived from templates" >&5
++echo "configure:10994: checking whether operators must be re-defined for templates derived from templates" >&5
+ if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11110 "configure"
++#line 10999 "configure"
+ #include "confdefs.h"
+ template <class T> class Base { };
+                                 template <class T>
+                                 Base<T> operator+(const Base<T>& lhs, const Base<T>& rhs) { return lhs; }
+                                 template <class T> class Derived : public Base<T> { };
+ int main() {
+ Derived<char> a, b;
+                                 Base<char> c = a + b;
+                                 return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_need_derived_template_operators=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_need_derived_template_operators=yes
+ fi
+@@ -11135,31 +11024,31 @@
+   cat >> confdefs.h <<\EOF
+ #define NEED_CPP_DERIVED_TEMPLATE_OPERATORS 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
+-echo "configure:11144: checking whether we need to cast a derived template to pass as its base class" >&5
++echo "configure:11033: checking whether we need to cast a derived template to pass as its base class" >&5
+ if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11149 "configure"
++#line 11038 "configure"
+ #include "confdefs.h"
+ template <class T> class Base { };
+                                 template <class T> class Derived : public Base<T> { };
+                                 template <class T> int foo(const Base<T>&) { return 0; }
+ int main() {
+ Derived<char> bar; return foo(bar);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_need_cpp_template_cast_to_base=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_need_cpp_template_cast_to_base=yes
+ fi
+@@ -11170,22 +11059,22 @@
+ if test "$ac_cv_need_cpp_template_cast_to_base" = yes ; then
+   cat >> confdefs.h <<\EOF
+ #define NEED_CPP_TEMPLATE_CAST_TO_BASE 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
+-echo "configure:11179: checking whether the compiler can resolve const ambiguities for templates" >&5
++echo "configure:11068: checking whether the compiler can resolve const ambiguities for templates" >&5
+ if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11184 "configure"
++#line 11073 "configure"
+ #include "confdefs.h"
+ 
+                                 template <class T> class ptrClass {
+                                   public: T* ptr;
+                                 };
+ 
+                                 template <class T> T* a(ptrClass<T> *arg) {
+                                   return arg->ptr;
+@@ -11196,17 +11085,17 @@
+                                   return arg->ptr;
+                                 }
+                                
+ int main() {
+  ptrClass<int> i;
+                                  a(&i); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_can_resolve_const_ambiguity=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_can_resolve_const_ambiguity=no
+ fi
+@@ -11218,41 +11107,41 @@
+   cat >> confdefs.h <<\EOF
+ #define CANT_RESOLVE_CPP_CONST_AMBIGUITY 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
+-echo "configure:11227: checking whether the C++ \"using\" keyword can change access" >&5
++echo "configure:11116: checking whether the C++ \"using\" keyword can change access" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11232 "configure"
++#line 11121 "configure"
+ #include "confdefs.h"
+ class A { protected: int foo() { return 0; } };
+                    class B : public A { public: using A::foo; };
+ int main() {
+ B b; return b.foo();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   cat > conftest.$ac_ext <<EOF
+-#line 11243 "configure"
++#line 11132 "configure"
+ #include "confdefs.h"
+ class A { public: int foo() { return 1; } };
+                        class B : public A { private: using A::foo; };
+ int main() {
+ B b; return b.foo();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_access_changing_using2=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_access_changing_using2=yes
+ fi
+@@ -11270,38 +11159,38 @@
+ if test "$ac_cv_cpp_access_changing_using2" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_ACCESS_CHANGING_USING 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
+-echo "configure:11279: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
++echo "configure:11168: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11284 "configure"
++#line 11173 "configure"
+ #include "confdefs.h"
+ class X { 
+                                  public: int go(const X&) {return 3;}
+                                          int jo(const X&) {return 3;}
+                                };
+                                class Y : public X {
+                                  public:  int go(int) {return 2;}
+                                           int jo(int) {return 2;}
+                                           using X::jo;
+                                  private: using X::go;
+                                };
+ int main() {
+ X x; Y y; y.jo(x);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_ambiguity_resolving_using=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_ambiguity_resolving_using=no
+ fi
+@@ -11312,29 +11201,29 @@
+ if test "$ac_cv_cpp_ambiguity_resolving_using" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
+-echo "configure:11321: checking for \"std::\" namespace" >&5
++echo "configure:11210: checking for \"std::\" namespace" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11326 "configure"
++#line 11215 "configure"
+ #include "confdefs.h"
+ #include <algorithm>
+ int main() {
+ return std::min(0, 1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_namespace_std=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_namespace_std=no
+ fi
+@@ -11345,32 +11234,32 @@
+ if test "$ac_cv_cpp_namespace_std" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_NAMESPACE_STD 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
+-echo "configure:11354: checking whether standard template operator!=() is ambiguous" >&5
++echo "configure:11243: checking whether standard template operator!=() is ambiguous" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11359 "configure"
++#line 11248 "configure"
+ #include "confdefs.h"
+ #include <algorithm>
+                                 struct T1 {};
+                                 int operator==(const T1&, const T1&) { return 0; }
+                                 int operator!=(const T1&, const T1&) { return 0; }
+ int main() {
+ T1 a,b; return a != b;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_unambiguous_std_notequal=unambiguous
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_unambiguous_std_notequal=ambiguous
+ fi
+@@ -11382,30 +11271,30 @@
+   cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_UNAMBIGUOUS_STD_NOTEQUAL 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
+-echo "configure:11391: checking for C++ reinterpret_cast" >&5
++echo "configure:11280: checking for C++ reinterpret_cast" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11396 "configure"
++#line 11285 "configure"
+ #include "confdefs.h"
+ struct X { int i; };
+                                struct Y { int i; };
+ int main() {
+ X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cpp_reinterpret_cast=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_reinterpret_cast=no
+ fi
+@@ -11416,41 +11305,44 @@
+ if test "$ac_cv_cpp_reinterpret_cast" = yes ; then
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_NEW_CASTS 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
+-echo "configure:11425: checking for C++ dynamic_cast to void*" >&5
++echo "configure:11314: checking for C++ dynamic_cast to void*" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+   ac_cv_cpp_dynamic_cast_void_ptr=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11433 "configure"
++#line 11322 "configure"
+ #include "confdefs.h"
++#ifdef __cplusplus
++extern "C" void exit(int);
++#endif
+ class X { int i; public: virtual ~X() { } };
+                             class Y { int j; public: virtual ~Y() { } };
+                             class Z : public X, public Y { int k; };
+ 
+                             int main() {
+                                  Z mdo;
+                                  X *subx = (X*)&mdo;
+                                  Y *suby = (Y*)&mdo;
+                                  return !((((void*)&mdo != (void*)subx) &&
+                                            ((void*)&mdo == dynamic_cast<void*>(subx))) ||
+                                           (((void*)&mdo != (void*)suby) &&
+                                            ((void*)&mdo == dynamic_cast<void*>(suby))));
+                             }
+ EOF
+-if { (eval echo configure:11449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_cpp_dynamic_cast_void_ptr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_cpp_dynamic_cast_void_ptr=no
+ fi
+@@ -11464,29 +11356,29 @@
+    cat >> confdefs.h <<\EOF
+ #define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
+ EOF
+ 
+ fi
+ 
+ 
+ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
+-echo "configure:11473: checking whether C++ requires implementation of unused virtual methods" >&5
++echo "configure:11365: checking whether C++ requires implementation of unused virtual methods" >&5
+ if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11478 "configure"
++#line 11370 "configure"
+ #include "confdefs.h"
+ class X {private: virtual void never_called();};
+ int main() {
+ X x;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_cpp_unused_required=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_cpp_unused_required=yes
+ fi
+@@ -11499,33 +11391,33 @@
+ #define NEED_CPP_UNUSED_IMPLEMENTATIONS 1
+ EOF
+ 
+ fi
+ 
+ 
+ 
+ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
+-echo "configure:11508: checking for trouble comparing to zero near std::operator!=()" >&5
++echo "configure:11400: checking for trouble comparing to zero near std::operator!=()" >&5
+ if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11513 "configure"
++#line 11405 "configure"
+ #include "confdefs.h"
+ #include <algorithm>
+                                 template <class T> class Foo {};
+                                 class T2;
+                                 template <class T> int operator==(const T2*, const T&) { return 0; }
+                                 template <class T> int operator!=(const T2*, const T&) { return 0; }
+ int main() {
+ Foo<int> f; return (0 != f);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_trouble_comparing_to_zero=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_trouble_comparing_to_zero=yes
+ fi
+@@ -11547,29 +11439,29 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ 
+ 
+ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:11556: checking for LC_MESSAGES" >&5
++echo "configure:11448: checking for LC_MESSAGES" >&5
+ if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11561 "configure"
++#line 11453 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ int category = LC_MESSAGES;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_i18n_lc_messages=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_i18n_lc_messages=no
+ fi
+@@ -11640,17 +11532,17 @@
+ 			NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config
+ 		fi
+ 	fi
+ 
+ 	unset ac_cv_path_NSPR_CONFIG
+ 	# Extract the first word of "nspr-config", so it can be a program name with args.
+ set dummy nspr-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:11649: checking for $ac_word" >&5
++echo "configure:11541: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$NSPR_CONFIG" in
+   /*)
+   ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -11675,17 +11567,17 @@
+ if test -n "$NSPR_CONFIG"; then
+   echo "$ac_t""$NSPR_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	min_nspr_version=4.0.0
+ 	echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
+-echo "configure:11684: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
++echo "configure:11576: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
+ 
+ 	no_nspr=""
+ 	if test "$NSPR_CONFIG" = "no"; then
+ 		no_nspr="yes"
+ 	else
+ 		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
+ 		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
+ 
+@@ -11777,17 +11669,17 @@
+ 			NSS_CONFIG=$nss_config_prefix/bin/nss-config
+ 		fi
+ 	fi
+ 
+ 	unset ac_cv_path_NSS_CONFIG
+ 	# Extract the first word of "nss-config", so it can be a program name with args.
+ set dummy nss-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:11786: checking for $ac_word" >&5
++echo "configure:11678: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$NSS_CONFIG" in
+   /*)
+   ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -11812,17 +11704,17 @@
+ if test -n "$NSS_CONFIG"; then
+   echo "$ac_t""$NSS_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ 	min_nss_version=3.0.0
+ 	echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
+-echo "configure:11821: checking for NSS - version >= $min_nss_version (skipping)" >&5
++echo "configure:11713: checking for NSS - version >= $min_nss_version (skipping)" >&5
+ 
+ 	no_nss=""
+ 	if test "$NSS_CONFIG" = "no"; then
+ 		no_nss="yes"
+ 	else
+ 		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+ 		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+ 
+@@ -11885,36 +11777,36 @@
+ if test -n "${JPEG_DIR}" -a "${JPEG_DIR}" != "yes"; then
+     CFLAGS="-I${JPEG_DIR}/include $CFLAGS"
+     LDFLAGS="-L${JPEG_DIR}/lib $LDFLAGS"
+ fi
+ if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then
+     SYSTEM_JPEG=
+ else
+     echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
+-echo "configure:11894: checking for jpeg_destroy_compress in -ljpeg" >&5
++echo "configure:11786: checking for jpeg_destroy_compress in -ljpeg" >&5
+ ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ljpeg $JPEG_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11902 "configure"
++#line 11794 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char jpeg_destroy_compress();
+ 
+ int main() {
+ jpeg_destroy_compress()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -11933,31 +11825,31 @@
+ fi
+ 
+ if test "$SYSTEM_JPEG" = 1; then
+     LIBS="$JPEG_LIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   SYSTEM_JPEG= 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11942 "configure"
++#line 11834 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ 	#include <sys/types.h>
+ 	#include <jpeglib.h>
+ 	int main () {
+ 	    #if JPEG_LIB_VERSION >= $MOZJPEG
+ 		exit(0);
+ 	    #else
+ 		exit(1);
+ 	    #endif
+ 	}
+ 	
+ EOF
+-if { (eval echo configure:11956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   SYSTEM_JPEG=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS=
+ fi
+@@ -11988,36 +11880,36 @@
+ if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then
+     CFLAGS="-I${ZLIB_DIR}/include $CFLAGS"
+     LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS"
+ fi
+ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then
+     SYSTEM_ZLIB=
+ else
+     echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
+-echo "configure:11997: checking for gzread in -lz" >&5
++echo "configure:11889: checking for gzread in -lz" >&5
+ ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lz $ZLIB_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12005 "configure"
++#line 11897 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char gzread();
+ 
+ int main() {
+ gzread()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -12035,17 +11927,17 @@
+ 
+ fi
+ if test "$SYSTEM_ZLIB" = 1; then
+     LIBS="$ZLIB_LIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   SYSTEM_ZLIB= 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12044 "configure"
++#line 11936 "configure"
+ #include "confdefs.h"
+ 
+     #include <stdio.h>
+     #include <string.h>
+     #include <zlib.h>
+     int parse_version(const char *str, int *ver) {
+       return (sscanf(str, "%d.%d.%d", ver, ver+1, ver+2)==3?0:1);
+     }
+@@ -12056,17 +11948,17 @@
+       if ((sys[0] == req[0]) &&
+           ((sys[1] > req[1]) || ((sys[1] == req[1]) && (sys[2] >= req[2]))))
+         exit(0);
+       else
+         exit(1);
+     }
+     
+ EOF
+-if { (eval echo configure:12065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   SYSTEM_ZLIB=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=
+ fi
+@@ -12099,36 +11991,36 @@
+ if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
+     CFLAGS="-I${PNG_DIR}/include $CFLAGS"
+     LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
+ fi
+ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
+     SYSTEM_PNG=
+ else
+     echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
+-echo "configure:12108: checking for png_get_valid in -lpng" >&5
++echo "configure:12000: checking for png_get_valid in -lpng" >&5
+ ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpng $PNG_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12116 "configure"
++#line 12008 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char png_get_valid();
+ 
+ int main() {
+ png_get_valid()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -12146,31 +12038,31 @@
+ 
+ fi
+ if test "$SYSTEM_PNG" = 1; then
+     LIBS="$PNG_LIBS $LIBS"
+     if test "$cross_compiling" = yes; then
+   SYSTEM_PNG= 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12155 "configure"
++#line 12047 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ 	#include <sys/types.h>
+ 	#include <png.h>
+ 	int main () {
+ 	    #if PNG_LIBPNG_VER >= $MOZPNG
+ 		exit(0);
+ 	    #else
+ 		exit(1);
+ 	    #endif
+ 	}
+ 	
+ EOF
+-if { (eval echo configure:12169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   SYSTEM_PNG=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   SYSTEM_PNG= PNG_CFLAGS= PNG_LIBS=
+ fi
+@@ -12185,16 +12077,38 @@
+ 
+ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
+     PNG_CFLAGS="-I${PNG_DIR}/include"
+     PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
+ fi
+ 
+ fi # SKIP_LIBRARY_CHECKS
+ 
++# Check whether --enable-system-myspell or --disable-system-myspell was given.
++if test "${enable_system_myspell+set}" = set; then
++  enableval="$enable_system_myspell"
++  if test "$enableval" = "yes"; then
++    SYSTEM_MYSPELL=1 
++  elif test "$enableval" = "no"; then
++    :
++  else
++    { echo "configure: error: Option, system-myspell, does not take an argument ($enableval)." 1>&2; exit 1; }
++  fi
++fi
++
++
++if test -n "$SYSTEM_MYSPELL"; then
++        MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell"
++    MOZ_MYSPELL_LIBS="-lhunspell"
++fi
++
++
++
++
++
+ JAVA_INCLUDE_PATH=
+ # Check whether --with-java-include-path or --without-java-include-path was given.
+ if test "${with_java_include_path+set}" = set; then
+   withval="$with_java_include_path"
+   JAVA_INCLUDE_PATH=$withval
+ fi
+ 
+ 
+@@ -12410,17 +12324,17 @@
+      fi
+   fi
+ 
+     unset ac_cv_path_GTK_CONFIG
+ 
+   # Extract the first word of "gtk-config", so it can be a program name with args.
+ set dummy gtk-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:12419: checking for $ac_word" >&5
++echo "configure:12333: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GTK_CONFIG" in
+   /*)
+   ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -12445,17 +12359,17 @@
+ if test -n "$GTK_CONFIG"; then
+   echo "$ac_t""$GTK_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_gtk_version=$GTK_VERSION
+   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+-echo "configure:12454: checking for GTK - version >= $min_gtk_version" >&5
++echo "configure:12368: checking for GTK - version >= $min_gtk_version" >&5
+   no_gtk=""
+   if test "$GTK_CONFIG" = "no" ; then
+     no_gtk=yes
+   else
+     GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+     GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+     gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -12468,17 +12382,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GTK_CFLAGS"
+       LIBS="$LIBS $GTK_LIBS"
+       rm -f conf.gtktest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12477 "configure"
++#line 12391 "configure"
+ #include "confdefs.h"
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -12546,17 +12460,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_gtk=yes
+ fi
+@@ -12581,27 +12495,27 @@
+      else
+        if test -f conf.gtktest ; then
+         :
+        else
+           echo "*** Could not run GTK test program, checking why..."
+           CFLAGS="$CFLAGS $GTK_CFLAGS"
+           LIBS="$LIBS $GTK_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 12590 "configure"
++#line 12504 "configure"
+ #include "confdefs.h"
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
+ 
+ int main() {
+  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GTK or finding the wrong"
+           echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -12643,17 +12557,17 @@
+ then
+     
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:12652: checking for $ac_word" >&5
++echo "configure:12566: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -12687,29 +12601,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6
+-echo "configure:12696: checking for gtk+-2.0 >= 1.3.7" >&5
++echo "configure:12610: checking for gtk+-2.0 >= 1.3.7" >&5
+ 
+         if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
+-echo "configure:12703: checking MOZ_GTK2_CFLAGS" >&5
++echo "configure:12617: checking MOZ_GTK2_CFLAGS" >&5
+             MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
+             echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
+-echo "configure:12708: checking MOZ_GTK2_LIBS" >&5
++echo "configure:12622: checking MOZ_GTK2_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`"
+             echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
+         else
+             MOZ_GTK2_CFLAGS=""
+             MOZ_GTK2_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -12764,17 +12678,17 @@
+     if test -x "$QTDIR/bin/moc"; then
+       HOST_MOC="$QTDIR/bin/moc"
+     else
+       for ac_prog in moc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:12773: checking for $ac_word" >&5
++echo "configure:12687: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$HOST_MOC"; then
+   ac_cv_prog_HOST_MOC="$HOST_MOC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -12816,32 +12730,32 @@
+     ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
+-echo "configure:12825: checking for main in -lqt" >&5
++echo "configure:12739: checking for main in -lqt" >&5
+ ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lqt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12833 "configure"
++#line 12747 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -12850,32 +12764,32 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   QT_LIB=-lqt
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
+-echo "configure:12859: checking for main in -lqt-mt" >&5
++echo "configure:12773: checking for main in -lqt-mt" >&5
+ ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lqt-mt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12867 "configure"
++#line 12781 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -12901,30 +12815,30 @@
+ 
+     _SAVE_CXXFLAGS=$CXXFLAGS
+     _SAVE_LIBS=$LIBS
+ 
+     CXXFLAGS="$CXXFLAGS $QT_CFLAGS"
+     LIBS="$LIBS $QT_LIBS"
+     
+     echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
+-echo "configure:12910: checking Qt - version >= $QT_VERSION" >&5
++echo "configure:12824: checking Qt - version >= $QT_VERSION" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 12912 "configure"
++#line 12826 "configure"
+ #include "confdefs.h"
+ #include <qglobal.h>
+ int main() {
+ 
+         #if (QT_VERSION < $QT_VERSION_NUM)
+             #error  "QT_VERSION too old"
+         #endif
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:12837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="no"
+ fi
+@@ -13198,21 +13112,22 @@
+   MOZ_APP_VERSION=0.17+
+   cat >> confdefs.h <<\EOF
+ #define MOZ_STANDALONE_COMPOSER 1
+ EOF
+ 
+   ;;
+ 
+ calendar)
+-  MOZ_APP_NAME=sunbird
+-  MOZ_APP_DISPLAYNAME=Calendar
++  MOZ_APP_NAME=iceowl
++  MOZ_APP_DISPLAYNAME=Iceowl
+   MOZ_XUL_APP=1
+   MOZ_SUNBIRD=1
+   MOZ_CALENDAR=1
++  MOZ_XPFE_COMPONENTS=
+   MOZ_APP_VERSION=$SUNBIRD_VERSION
+   MOZ_PLAINTEXT_EDITOR_ONLY=1
+   NECKO_PROTOCOLS_DEFAULT="about http ftp file res viewsource"
+   MOZ_NO_ACTIVEX_SUPPORT=1
+   MOZ_ACTIVEX_SCRIPTING_SUPPORT=
+   MOZ_INSTALLER=
+   MOZ_MATHML=
+   NECKO_DISK_CACHE=
+@@ -13510,17 +13425,17 @@
+ 
+     
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:13519: checking for $ac_word" >&5
++echo "configure:13434: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -13554,29 +13469,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for xft""... $ac_c" 1>&6
+-echo "configure:13563: checking for xft" >&5
++echo "configure:13478: checking for xft" >&5
+ 
+         if $PKG_CONFIG --exists "xft" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
+-echo "configure:13570: checking MOZ_XFT_CFLAGS" >&5
++echo "configure:13485: checking MOZ_XFT_CFLAGS" >&5
+             MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
+             echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
+-echo "configure:13575: checking MOZ_XFT_LIBS" >&5
++echo "configure:13490: checking MOZ_XFT_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`"
+             echo "$ac_t""$MOZ_XFT_LIBS" 1>&6
+         else
+             MOZ_XFT_CFLAGS=""
+             MOZ_XFT_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -13601,17 +13516,17 @@
+ 
+     
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:13610: checking for $ac_word" >&5
++echo "configure:13525: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -13645,29 +13560,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6
+-echo "configure:13654: checking for pango >= 1.1.0" >&5
++echo "configure:13569: checking for pango >= 1.1.0" >&5
+ 
+         if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
+-echo "configure:13661: checking _PANGOCHK_CFLAGS" >&5
++echo "configure:13576: checking _PANGOCHK_CFLAGS" >&5
+             _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
+             echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
+-echo "configure:13666: checking _PANGOCHK_LIBS" >&5
++echo "configure:13581: checking _PANGOCHK_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`"
+             echo "$ac_t""$_PANGOCHK_LIBS" 1>&6
+         else
+             _PANGOCHK_CFLAGS=""
+             _PANGOCHK_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -13717,17 +13632,17 @@
+ 
+     
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:13726: checking for $ac_word" >&5
++echo "configure:13641: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -13761,29 +13676,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6
+-echo "configure:13770: checking for pangoxft >= 1.6.0" >&5
++echo "configure:13685: checking for pangoxft >= 1.6.0" >&5
+ 
+         if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
+-echo "configure:13777: checking MOZ_PANGO_CFLAGS" >&5
++echo "configure:13692: checking MOZ_PANGO_CFLAGS" >&5
+             MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"`
+             echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
+-echo "configure:13782: checking MOZ_PANGO_LIBS" >&5
++echo "configure:13697: checking MOZ_PANGO_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0\"`"
+             echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
+         else
+             MOZ_PANGO_CFLAGS=""
+             MOZ_PANGO_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -13841,36 +13756,36 @@
+ fi
+ 
+ 
+ if test "$MOZ_X11"
+ then
+     _SAVE_LDFLAGS="$LDFLAGS"
+     LDFLAGS="$XLDFLAGS $LDFLAGS"
+     echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
+-echo "configure:13850: checking for XpGetPrinterList in -lXp" >&5
++echo "configure:13765: checking for XpGetPrinterList in -lXp" >&5
+ ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 13858 "configure"
++#line 13773 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char XpGetPrinterList();
+ 
+ int main() {
+ XpGetPrinterList()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -13933,17 +13848,17 @@
+     then
+         
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:13942: checking for $ac_word" >&5
++echo "configure:13857: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -13977,29 +13892,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6
+-echo "configure:13986: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
++echo "configure:13901: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
+ 
+         if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6
+-echo "configure:13993: checking MOZ_GNOMEVFS_CFLAGS" >&5
++echo "configure:13908: checking MOZ_GNOMEVFS_CFLAGS" >&5
+             MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"`
+             echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6
+-echo "configure:13998: checking MOZ_GNOMEVFS_LIBS" >&5
++echo "configure:13913: checking MOZ_GNOMEVFS_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`"
+             echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6
+         else
+             MOZ_GNOMEVFS_CFLAGS=""
+             MOZ_GNOMEVFS_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -14040,17 +13955,17 @@
+     then
+         
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:14049: checking for $ac_word" >&5
++echo "configure:13964: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -14084,29 +13999,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6
+-echo "configure:14093: checking for gconf-2.0 >= $GCONF_VERSION" >&5
++echo "configure:14008: checking for gconf-2.0 >= $GCONF_VERSION" >&5
+ 
+         if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6
+-echo "configure:14100: checking MOZ_GCONF_CFLAGS" >&5
++echo "configure:14015: checking MOZ_GCONF_CFLAGS" >&5
+             MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"`
+             echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6
+-echo "configure:14105: checking MOZ_GCONF_LIBS" >&5
++echo "configure:14020: checking MOZ_GCONF_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`"
+             echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6
+         else
+             MOZ_GCONF_CFLAGS=""
+             MOZ_GCONF_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -14143,17 +14058,17 @@
+     then
+         
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:14152: checking for $ac_word" >&5
++echo "configure:14067: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -14187,29 +14102,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6
+-echo "configure:14196: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
++echo "configure:14111: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
+ 
+         if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6
+-echo "configure:14203: checking MOZ_LIBGNOME_CFLAGS" >&5
++echo "configure:14118: checking MOZ_LIBGNOME_CFLAGS" >&5
+             MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"`
+             echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6
+-echo "configure:14208: checking MOZ_LIBGNOME_LIBS" >&5
++echo "configure:14123: checking MOZ_LIBGNOME_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`"
+             echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6
+         else
+             MOZ_LIBGNOME_CFLAGS=""
+             MOZ_LIBGNOME_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -14277,17 +14192,17 @@
+     then
+         
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:14286: checking for $ac_word" >&5
++echo "configure:14201: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -14321,29 +14236,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6
+-echo "configure:14330: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
++echo "configure:14245: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
+ 
+         if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6
+-echo "configure:14337: checking MOZ_GNOMEUI_CFLAGS" >&5
++echo "configure:14252: checking MOZ_GNOMEUI_CFLAGS" >&5
+             MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"`
+             echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6
+-echo "configure:14342: checking MOZ_GNOMEUI_LIBS" >&5
++echo "configure:14257: checking MOZ_GNOMEUI_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`"
+             echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6
+         else
+             MOZ_GNOMEUI_CFLAGS=""
+             MOZ_GNOMEUI_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -14507,16 +14422,127 @@
+   elif test "$enableval" = "no"; then
+     SUNCTL= 
+   else
+     { echo "configure: error: Option, ctl, does not take an argument ($enableval)." 1>&2; exit 1; }
+   fi
+ fi
+ 
+ 
++MOZ_ENABLE_LIBTHAI_COMPONENT=
++# Check whether --enable-libthai or --disable-libthai was given.
++if test "${enable_libthai+set}" = set; then
++  enableval="$enable_libthai"
++  if test "$enableval" = "no"; then
++    MOZ_ENABLE_LIBTHAI_COMPONENT=
++  elif test "$enableval" = "yes"; then
++    MOZ_ENABLE_LIBTHAI_COMPONENT=1
++  else
++    { echo "configure: error: Option, libthai, does not take an argument ($enableval)." 1>&2; exit 1; }
++  fi
++fi
++
++if test "$MOZ_ENABLE_LIBTHAI_COMPONENT"; then
++    
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:14452: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$PKG_CONFIG" in
++  /*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++  echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for libthai""... $ac_c" 1>&6
++echo "configure:14496: checking for libthai" >&5
++
++        if $PKG_CONFIG --exists "libthai" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking MOZ_LIBTHAI_CFLAGS""... $ac_c" 1>&6
++echo "configure:14503: checking MOZ_LIBTHAI_CFLAGS" >&5
++            MOZ_LIBTHAI_CFLAGS=`$PKG_CONFIG --cflags "libthai"`
++            echo "$ac_t""$MOZ_LIBTHAI_CFLAGS" 1>&6
++
++            echo $ac_n "checking MOZ_LIBTHAI_LIBS""... $ac_c" 1>&6
++echo "configure:14508: checking MOZ_LIBTHAI_LIBS" >&5
++            ## don't use --libs since that can do evil things like add
++            ## -Wl,--export-dynamic
++            MOZ_LIBTHAI_LIBS="`$PKG_CONFIG --libs-only-L \"libthai\"` `$PKG_CONFIG --libs-only-l \"libthai\"`"
++            echo "$ac_t""$MOZ_LIBTHAI_LIBS" 1>&6
++        else
++            MOZ_LIBTHAI_CFLAGS=""
++            MOZ_LIBTHAI_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            MOZ_LIBTHAI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libthai"`
++            
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     
++      MOZ_ENABLE_LIBTHAI_COMPONENT=1
++    
++  else
++     
++      MOZ_ENABLE_LIBTHAI_COMPONENT=
++    
++  fi
++
++fi
++
+ # Check whether --enable-view-source or --disable-view-source was given.
+ if test "${enable_view_source+set}" = set; then
+   enableval="$enable_view_source"
+   if test "$enableval" = "no"; then
+     MOZ_VIEW_SOURCE=
+   elif test "$enableval" = "yes"; then
+     MOZ_VIEW_SOURCE=1 
+   else
+@@ -14819,17 +14845,17 @@
+         JAVA_PATH="$JAVA_BIN_PATH"
+   else
+         JAVA_PATH="$JAVA_HOME/bin:$PATH"
+   fi
+ 
+   # Extract the first word of "javac", so it can be a program name with args.
+ set dummy javac; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:14828: checking for $ac_word" >&5
++echo "configure:14854: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$JAVAC" in
+   /*)
+   ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -14855,17 +14881,17 @@
+   echo "$ac_t""$JAVAC" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   # Extract the first word of "jar", so it can be a program name with args.
+ set dummy jar; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:14864: checking for $ac_word" >&5
++echo "configure:14890: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$JAR" in
+   /*)
+   ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -15102,36 +15128,36 @@
+    SVG_RENDERER=$SVG_DEFAULT_RENDERER
+ fi
+ 
+ 
+   case "$SVG_RENDERER" in
+   gdiplus)
+     MOZ_SVG_RENDERER_GDIPLUS=1
+                         echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
+-echo "configure:15111: checking for Gdiplus.h" >&5
++echo "configure:15137: checking for Gdiplus.h" >&5
+     
+     ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     cat > conftest.$ac_ext <<EOF
+-#line 15121 "configure"
++#line 15147 "configure"
+ #include "confdefs.h"
+ #include <windows.h>
+                     #include <unknwn.h>
+                     #include <Gdiplus.h>
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: Building the SVG GDI+ renderer requires an appropriate Microsoft SDK." 1>&2; exit 1; }
+ fi
+@@ -15201,17 +15227,17 @@
+ if test -n "$MOZ_INSTALLER" -a -n "$MOZ_XUL_APP" -a "$OS_ARCH" = "WINNT"; then
+     # Disable installer for Windows builds that use the new toolkit if NSIS
+     # isn't in the path.
+     for ac_prog in makensis
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:15210: checking for $ac_word" >&5
++echo "configure:15236: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$MAKENSIS" in
+   /*)
+   ac_cv_path_MAKENSIS="$MAKENSIS" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -15246,17 +15272,17 @@
+     fi
+     # The Windows build for NSIS requires the iconv command line utility to
+     # convert the charset of the locale files.
+     for ac_prog in $HOST_ICONV "iconv"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:15255: checking for $ac_word" >&5
++echo "configure:15281: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$HOST_ICONV" in
+   /*)
+   ac_cv_path_HOST_ICONV="$HOST_ICONV" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -15315,23 +15341,23 @@
+ fi
+ 
+ # The Windows build requires the iconv command line utility
+ # in order to build the updater.
+ case "$target_os" in
+     msvc*|mks*|cygwin*|mingw*|wince*)
+         if test -n "$MOZ_UPDATER"; then
+             echo $ac_n "checking for iconv""... $ac_c" 1>&6
+-echo "configure:15324: checking for iconv" >&5
++echo "configure:15350: checking for iconv" >&5
+             for ac_prog in $HOST_ICONV "iconv"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:15330: checking for $ac_word" >&5
++echo "configure:15356: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$HOST_ICONV"; then
+   ac_cv_prog_HOST_ICONV="$HOST_ICONV" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+@@ -15667,28 +15693,28 @@
+         ;;
+   esac
+ MOZ_DEBUG_ENABLE_DEFS="$MOZ_DEBUG_ENABLE_DEFS -DTRACING"
+ 
+ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED"
+ 
+ if test -n "$MOZ_DEBUG"; then
+     echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
+-echo "configure:15676: checking for valid debug flags" >&5
++echo "configure:15702: checking for valid debug flags" >&5
+     _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
+     cat > conftest.$ac_ext <<EOF
+-#line 15680 "configure"
++#line 15706 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _results=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _results=no
+ fi
+@@ -15719,28 +15745,28 @@
+ else
+   MOZ_OPTIMIZE=1
+ fi
+ 
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ if test -n "$MOZ_OPTIMIZE"; then
+     echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
+-echo "configure:15728: checking for valid optimization flags" >&5
++echo "configure:15754: checking for valid optimization flags" >&5
+     _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
+     cat > conftest.$ac_ext <<EOF
+-#line 15732 "configure"
++#line 15758 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _results=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _results=no
+ fi
+@@ -15947,36 +15973,36 @@
+     _ENABLE_EFENCE= 
+   else
+     { echo "configure: error: Option, efence, does not take an argument ($enableval)." 1>&2; exit 1; }
+   fi
+ fi
+ 
+ if test -n "$_ENABLE_EFENCE"; then
+     echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
+-echo "configure:15956: checking for malloc in -lefence" >&5
++echo "configure:15982: checking for malloc in -lefence" >&5
+ ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lefence  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 15964 "configure"
++#line 15990 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char malloc();
+ 
+ int main() {
+ malloc()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+@@ -16067,22 +16093,22 @@
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:16076: checking for $ac_func" >&5
++echo "configure:16102: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 16081 "configure"
++#line 16107 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -16098,17 +16124,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -16341,22 +16367,22 @@
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+     for ac_func in __cxa_demangle
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:16350: checking for $ac_func" >&5
++echo "configure:16376: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 16355 "configure"
++#line 16381 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+@@ -16372,17 +16398,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -16451,16 +16477,23 @@
+ 
+ if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && 
+     test "$MOZ_CHROME_FILE_FORMAT" != "flat" &&
+     test "$MOZ_CHROME_FILE_FORMAT" != "symlink" &&
+     test "$MOZ_CHROME_FILE_FORMAT" != "both"; then
+     { echo "configure: error: --enable-chrome-format must be set to either jar, flat, both, or symlink" 1>&2; exit 1; }
+ fi
+ 
++if test "$MOZ_CHROME_FILE_FORMAT" = "jar" ||
++    test "$MOZ_CHROME_FILE_FORMAT" = "both"; then
++    if test -z "$ZIP" || test "$ZIP" = ":"; then
++        { echo "configure: error: zip is required for chrome format $MOZ_CHROME_FILE_FORMAT" 1>&2; exit 1; }
++    fi
++fi
++
+ # Check whether --with-default-mozilla-five-home or --without-default-mozilla-five-home was given.
+ if test "${with_default_mozilla_five_home+set}" = set; then
+   withval="$with_default_mozilla_five_home"
+    val=`echo $withval`
+   cat >> confdefs.h <<EOF
+ #define MOZ_DEFAULT_MOZILLA_FIVE_HOME "$val"
+ EOF
+  
+@@ -16510,39 +16543,39 @@
+ fi
+ 
+ 
+ 
+ if test -z "$SKIP_COMPILER_CHECKS"; then
+ # Compiler Options
+ 
+ echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
+-echo "configure:16519: checking for gcc -pipe support" >&5
++echo "configure:16552: checking for gcc -pipe support" >&5
+ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
+     echo '#include <stdio.h>' > dummy-hello.c
+     echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
+     ${CC} -S dummy-hello.c -o dummy-hello.s 2>&5
+     cat dummy-hello.s | ${AS_BIN} -o dummy-hello.S - 2>&5
+     if test $? = 0; then
+         _res_as_stdin="yes"
+     else
+         _res_as_stdin="no"
+     fi
+     if test "$_res_as_stdin" = "yes"; then
+         _SAVE_CFLAGS=$CFLAGS
+         CFLAGS="$CFLAGS -pipe"
+         cat > conftest.$ac_ext <<EOF
+-#line 16534 "configure"
++#line 16567 "configure"
+ #include "confdefs.h"
+  #include <stdio.h> 
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _res_gcc_pipe="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   _res_gcc_pipe="no" 
+ fi
+@@ -16574,26 +16607,26 @@
+   fi
+ fi
+ 
+ 
+ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
+      _SAVE_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
+      echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
+-echo "configure:16583: checking whether compiler supports -Wno-long-long" >&5
++echo "configure:16616: checking whether compiler supports -Wno-long-long" >&5
+      cat > conftest.$ac_ext <<EOF
+-#line 16585 "configure"
++#line 16618 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+    _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
+ 	  _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
+ 	  result="yes" 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+@@ -16604,26 +16637,26 @@
+      CFLAGS="$_SAVE_CFLAGS"
+ fi
+ 
+ 
+ _SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fprofile-generate"
+ 
+ echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
+-echo "configure:16613: checking whether C compiler supports -fprofile-generate" >&5
++echo "configure:16646: checking whether C compiler supports -fprofile-generate" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 16615 "configure"
++#line 16648 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+    PROFILE_GEN_CFLAGS="-fprofile-generate"
+                  result="yes" 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="no"
+@@ -16631,26 +16664,26 @@
+ rm -f conftest*
+ echo "$ac_t""$result" 1>&6
+ 
+ if test $result = "yes"; then
+   PROFILE_USE_CFLAGS="-fprofile-use"
+ else
+   CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
+   echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
+-echo "configure:16640: checking whether C compiler supports -fprofile-arcs" >&5
++echo "configure:16673: checking whether C compiler supports -fprofile-arcs" >&5
+   cat > conftest.$ac_ext <<EOF
+-#line 16642 "configure"
++#line 16675 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+    PROFILE_GEN_CFLAGS="-fprofile-arcs"
+                    result="yes" 
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="no"
+@@ -16686,26 +16719,26 @@
+     { echo "configure: error: Option, pedantic, does not take an argument ($enableval)." 1>&2; exit 1; }
+   fi
+ fi
+ 
+ if test "$_PEDANTIC"; then
+     _SAVE_CXXFLAGS=$CXXFLAGS
+     CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
+     echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
+-echo "configure:16695: checking whether C++ compiler has -pedantic long long bug" >&5
++echo "configure:16728: checking whether C++ compiler has -pedantic long long bug" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 16697 "configure"
++#line 16730 "configure"
+ #include "confdefs.h"
+ $configure_static_assert_macros
+ int main() {
+ CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   result="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   result="yes" 
+ fi
+@@ -16720,23 +16753,26 @@
+         ;;
+     yes)
+         { echo "configure: error: Your compiler appears to have a known bug where long long is miscompiled when using -pedantic.  Reconfigure using --disable-pedantic. " 1>&2; exit 1; }
+         ;;
+     esac
+ fi
+ 
+ echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
+-echo "configure:16729: checking for correct temporary object destruction order" >&5
++echo "configure:16762: checking for correct temporary object destruction order" >&5
+ if test "$cross_compiling" = yes; then
+   result="maybe"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 16734 "configure"
++#line 16767 "configure"
+ #include "confdefs.h"
++#ifdef __cplusplus
++extern "C" void exit(int);
++#endif
+  class A {
+              public:  A(int& x) : mValue(x) {}
+                       ~A() { mValue--; }
+                       operator char**() { return 0; }
+              private:  int& mValue;
+              };
+              void func(char **arg) {}
+              int m=2;
+@@ -16745,17 +16781,17 @@
+                   if (m==1) m = 0;
+              }
+              int main() {
+                  test();
+                  return(m);
+              }
+              
+ EOF
+-if { (eval echo configure:16754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   result="no"
+ fi
+@@ -16766,22 +16802,22 @@
+ 
+ if test "$result" = "no"; then
+     { echo "configure: error: Your compiler does not follow the C++ specification for temporary object destruction order." 1>&2; exit 1; }
+ fi
+ 
+ _SAVE_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
+ echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
+-echo "configure:16775: checking for correct overload resolution with const and templates" >&5
++echo "configure:16811: checking for correct overload resolution with const and templates" >&5
+ if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 16780 "configure"
++#line 16816 "configure"
+ #include "confdefs.h"
+ 
+                       template <class T>
+                       class Pointer
+                         {
+                         public:
+                           T* myPtr;
+                         };
+@@ -16801,17 +16837,17 @@
+ int main() {
+ 
+                       Pointer<int> foo;
+                       const int* bar;
+                       return foo == bar;
+                     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:16810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_nscap_nonconst_opeq_bug="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_nscap_nonconst_opeq_bug="yes"
+ fi
+@@ -17093,17 +17129,17 @@
+     if test "$MOZ_ENABLE_GTK2"; then
+         
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:17102: checking for $ac_word" >&5
++echo "configure:17138: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -17137,29 +17173,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
+-echo "configure:17146: checking for libIDL-2.0 >= 0.8.0" >&5
++echo "configure:17182: checking for libIDL-2.0 >= 0.8.0" >&5
+ 
+         if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
+-echo "configure:17153: checking LIBIDL_CFLAGS" >&5
++echo "configure:17189: checking LIBIDL_CFLAGS" >&5
+             LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
+             echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
+-echo "configure:17158: checking LIBIDL_LIBS" >&5
++echo "configure:17194: checking LIBIDL_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"
+             echo "$ac_t""$LIBIDL_LIBS" 1>&6
+         else
+             LIBIDL_CFLAGS=""
+             LIBIDL_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -17272,17 +17308,17 @@
+       esac
+   done
+ 
+     unset ac_cv_path_GLIB_CONFIG
+ 
+   # Extract the first word of "glib-config", so it can be a program name with args.
+ set dummy glib-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:17281: checking for $ac_word" >&5
++echo "configure:17317: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GLIB_CONFIG" in
+   /*)
+   ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -17307,17 +17343,17 @@
+ if test -n "$GLIB_CONFIG"; then
+   echo "$ac_t""$GLIB_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_glib_version=1.2.0
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:17316: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:17352: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+   else
+     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -17330,17 +17366,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+       LIBS="$GLIB_LIBS $LIBS"
+       rm -f conf.glibtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 17339 "configure"
++#line 17375 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -17406,17 +17442,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:17415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_glib=yes
+ fi
+@@ -17440,27 +17476,27 @@
+      else
+        if test -f conf.glibtest ; then
+         :
+        else
+           echo "*** Could not run GLIB test program, checking why..."
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 17449 "configure"
++#line 17485 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ 
+ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:17459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -17494,17 +17530,17 @@
+   rm -f conf.glibtest
+ 
+ 
+     unset ac_cv_path_LIBIDL_CONFIG
+ 
+   # Extract the first word of "libIDL-config", so it can be a program name with args.
+ set dummy libIDL-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:17503: checking for $ac_word" >&5
++echo "configure:17539: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$LIBIDL_CONFIG" in
+   /*)
+   ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -17529,17 +17565,17 @@
+ if test -n "$LIBIDL_CONFIG"; then
+   echo "$ac_t""$LIBIDL_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_libIDL_version=$LIBIDL_VERSION
+   echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
+-echo "configure:17538: checking for libIDL - version >= $min_libIDL_version" >&5
++echo "configure:17574: checking for libIDL - version >= $min_libIDL_version" >&5
+   no_libIDL=""
+   if test "$LIBIDL_CONFIG" = "no" ; then
+     no_libIDL=yes
+   else
+     LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`
+     LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`
+     # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove
+     # this after we start requiring libIDL 0.6.8 or anything higher
+@@ -17556,17 +17592,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+       LIBS="$LIBIDL_LIBS $LIBS"
+       rm -f conf.libIDLtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 17565 "configure"
++#line 17601 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ 
+ int 
+ main ()
+@@ -17642,17 +17678,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:17651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_libIDL=yes
+ fi
+@@ -17676,28 +17712,28 @@
+      else
+        if test -f conf.libIDLtest ; then
+         :
+        else
+           echo "*** Could not run libIDL test program, checking why..."
+           CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+           LIBS="$LIBS $LIBIDL_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 17685 "configure"
++#line 17721 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ 
+ int main() {
+  return IDL_get_libver_string ? 1 : 0; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding libIDL or finding the wrong"
+           echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -17815,17 +17851,17 @@
+       esac
+   done
+ 
+     unset ac_cv_path_GLIB_CONFIG
+ 
+   # Extract the first word of "glib-config", so it can be a program name with args.
+ set dummy glib-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:17824: checking for $ac_word" >&5
++echo "configure:17860: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GLIB_CONFIG" in
+   /*)
+   ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -17850,17 +17886,17 @@
+ if test -n "$GLIB_CONFIG"; then
+   echo "$ac_t""$GLIB_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_glib_version=1.2.0
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:17859: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:17895: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+   else
+     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -17873,17 +17909,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+       LIBS="$GLIB_LIBS $LIBS"
+       rm -f conf.glibtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 17882 "configure"
++#line 17918 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -17949,17 +17985,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:17958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_glib=yes
+ fi
+@@ -17983,27 +18019,27 @@
+      else
+        if test -f conf.glibtest ; then
+         :
+        else
+           echo "*** Could not run GLIB test program, checking why..."
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 17992 "configure"
++#line 18028 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ 
+ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -18037,17 +18073,17 @@
+   rm -f conf.glibtest
+ 
+ 
+     unset ac_cv_path_LIBIDL_CONFIG
+ 
+   # Extract the first word of "libIDL-config", so it can be a program name with args.
+ set dummy libIDL-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:18046: checking for $ac_word" >&5
++echo "configure:18082: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$LIBIDL_CONFIG" in
+   /*)
+   ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -18072,17 +18108,17 @@
+ if test -n "$LIBIDL_CONFIG"; then
+   echo "$ac_t""$LIBIDL_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_libIDL_version=$LIBIDL_VERSION
+   echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
+-echo "configure:18081: checking for libIDL - version >= $min_libIDL_version" >&5
++echo "configure:18117: checking for libIDL - version >= $min_libIDL_version" >&5
+   no_libIDL=""
+   if test "$LIBIDL_CONFIG" = "no" ; then
+     no_libIDL=yes
+   else
+     LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`
+     LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`
+     # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove
+     # this after we start requiring libIDL 0.6.8 or anything higher
+@@ -18099,17 +18135,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+       LIBS="$LIBIDL_LIBS $LIBS"
+       rm -f conf.libIDLtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18108 "configure"
++#line 18144 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ 
+ int 
+ main ()
+@@ -18185,17 +18221,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:18194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_libIDL=yes
+ fi
+@@ -18219,28 +18255,28 @@
+      else
+        if test -f conf.libIDLtest ; then
+         :
+        else
+           echo "*** Could not run libIDL test program, checking why..."
+           CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+           LIBS="$LIBS $LIBIDL_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 18228 "configure"
++#line 18264 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ 
+ int main() {
+  return IDL_get_libver_string ? 1 : 0; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding libIDL or finding the wrong"
+           echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -18271,17 +18307,17 @@
+         if test -z "$_LIBIDL_FOUND"; then
+             
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:18280: checking for $ac_word" >&5
++echo "configure:18316: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -18315,29 +18351,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
+-echo "configure:18324: checking for libIDL-2.0 >= 0.8.0" >&5
++echo "configure:18360: checking for libIDL-2.0 >= 0.8.0" >&5
+ 
+         if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
+-echo "configure:18331: checking LIBIDL_CFLAGS" >&5
++echo "configure:18367: checking LIBIDL_CFLAGS" >&5
+             LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
+             echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
+-echo "configure:18336: checking LIBIDL_LIBS" >&5
++echo "configure:18372: checking LIBIDL_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"
+             echo "$ac_t""$LIBIDL_LIBS" 1>&6
+         else
+             LIBIDL_CFLAGS=""
+             LIBIDL_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -18363,17 +18399,17 @@
+         fi
+     fi
+                     if test -z "$_LIBIDL_FOUND" && test -z "$CROSS_COMPILE"; then
+         for ac_prog in $ORBIT_CONFIG orbit-config
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:18372: checking for $ac_word" >&5
++echo "configure:18408: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$ORBIT_CONFIG" in
+   /*)
+   ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -18400,49 +18436,49 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ test -n "$ORBIT_CONFIG" && break
+ done
+ 
+         if test -n "$ORBIT_CONFIG"; then
+             echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
+-echo "configure:18409: checking for ORBit libIDL usability" >&5
++echo "configure:18445: checking for ORBit libIDL usability" >&5
+         	_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
+     	    _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`
+             _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`
+             _ORBIT_LIB_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-L/); } }' -- ${_ORBIT_LIBS}`
+             LIBIDL_CFLAGS="$_ORBIT_INC_PATH"
+             LIBIDL_LIBS="$_ORBIT_LIB_PATH -lIDL -lglib"
+             LIBIDL_CONFIG=
+             _SAVE_CFLAGS="$CFLAGS"
+             _SAVE_LIBS="$LIBS"
+             CFLAGS="$LIBIDL_CFLAGS $CFLAGS"
+             LIBS="$LIBIDL_LIBS $LIBS"
+             if test "$cross_compiling" = yes; then
+   _LIBIDL_FOUND=1
+                 result="maybe" 
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18426 "configure"
++#line 18462 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+ #include <libIDL/IDL.h>
+ int main() {
+   char *s;
+   s=strdup(IDL_get_libver_string());
+   if(s==NULL) {
+     exit(1);
+   }
+   exit(0);
+ }
+             
+ EOF
+-if { (eval echo configure:18441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   _LIBIDL_FOUND=1
+                 result="yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   LIBIDL_CFLAGS=
+@@ -18489,17 +18525,17 @@
+     if test "$MOZ_ENABLE_GTK2"; then
+         
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:18498: checking for $ac_word" >&5
++echo "configure:18534: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -18533,29 +18569,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6
+-echo "configure:18542: checking for glib-2.0 >= 1.3.7" >&5
++echo "configure:18578: checking for glib-2.0 >= 1.3.7" >&5
+ 
+         if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6
+-echo "configure:18549: checking GLIB_CFLAGS" >&5
++echo "configure:18585: checking GLIB_CFLAGS" >&5
+             GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"`
+             echo "$ac_t""$GLIB_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6
+-echo "configure:18554: checking GLIB_LIBS" >&5
++echo "configure:18590: checking GLIB_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`"
+             echo "$ac_t""$GLIB_LIBS" 1>&6
+         else
+             GLIB_CFLAGS=""
+             GLIB_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -18629,17 +18665,17 @@
+       esac
+   done
+ 
+     unset ac_cv_path_GLIB_CONFIG
+ 
+   # Extract the first word of "glib-config", so it can be a program name with args.
+ set dummy glib-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:18638: checking for $ac_word" >&5
++echo "configure:18674: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$GLIB_CONFIG" in
+   /*)
+   ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -18664,17 +18700,17 @@
+ if test -n "$GLIB_CONFIG"; then
+   echo "$ac_t""$GLIB_CONFIG" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+   min_glib_version=${GLIB_VERSION}
+   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
+-echo "configure:18673: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:18709: checking for GLIB - version >= $min_glib_version" >&5
+   no_glib=""
+   if test "$GLIB_CONFIG" = "no" ; then
+     no_glib=yes
+   else
+     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+@@ -18687,17 +18723,17 @@
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+       LIBS="$GLIB_LIBS $LIBS"
+       rm -f conf.glibtest
+       if test "$cross_compiling" = yes; then
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18696 "configure"
++#line 18732 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ int 
+ main ()
+@@ -18763,17 +18799,17 @@
+         printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
+         printf("*** so that the correct libraries are found at run-time))\n");
+       }
+     }
+   return 1;
+ }
+ 
+ EOF
+-if { (eval echo configure:18772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   no_glib=yes
+ fi
+@@ -18797,27 +18833,27 @@
+      else
+        if test -f conf.glibtest ; then
+         :
+        else
+           echo "*** Could not run GLIB test program, checking why..."
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+           cat > conftest.$ac_ext <<EOF
+-#line 18806 "configure"
++#line 18842 "configure"
+ #include "confdefs.h"
+ 
+ #include <glib.h>
+ #include <stdio.h>
+ 
+ int main() {
+  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+           echo "*** is required on your system"
+ 	  echo "***"
+@@ -18887,29 +18923,29 @@
+       ;;
+   *)
+       MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'
+       ;;
+   esac
+   # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:18896: checking for working alloca.h" >&5
++echo "configure:18932: checking for working alloca.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18901 "configure"
++#line 18937 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_header_alloca_h=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_header_alloca_h=no
+ fi
+@@ -18920,22 +18956,22 @@
+ if test $ac_cv_header_alloca_h = yes; then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_ALLOCA_H 1
+ EOF
+ 
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:18929: checking for alloca" >&5
++echo "configure:18965: checking for alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18934 "configure"
++#line 18970 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+ # define alloca __builtin_alloca
+ #else
+ # ifdef _MSC_VER
+ #  include <malloc.h>
+ #  define alloca _alloca
+@@ -18953,17 +18989,17 @@
+ #  endif
+ # endif
+ #endif
+ 
+ int main() {
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:18962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_alloca_works=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   ac_cv_func_alloca_works=no
+ fi
+@@ -18985,22 +19021,22 @@
+   # use ar to extract alloca.o from them instead of compiling alloca.c.
+   ALLOCA=alloca.${ac_objext}
+   cat >> confdefs.h <<\EOF
+ #define C_ALLOCA 1
+ EOF
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:18994: checking whether alloca needs Cray hooks" >&5
++echo "configure:19030: checking whether alloca needs Cray hooks" >&5
+ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 18999 "configure"
++#line 19035 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+ #else
+ wenotbecray
+ #endif
+ 
+ EOF
+@@ -19015,22 +19051,22 @@
+ rm -f conftest*
+ 
+ fi
+ 
+ echo "$ac_t""$ac_cv_os_cray" 1>&6
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:19024: checking for $ac_func" >&5
++echo "configure:19060: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 19029 "configure"
++#line 19065 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char $ac_func();
+@@ -19043,17 +19079,17 @@
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+ $ac_func();
+ #endif
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:19052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=no"
+ fi
+@@ -19070,25 +19106,25 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ done
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:19079: checking stack direction for C alloca" >&5
++echo "configure:19115: checking stack direction for C alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 19087 "configure"
++#line 19123 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+   static char *addr = 0;
+   auto char dummy;
+   if (addr == 0)
+     {
+       addr = &dummy;
+@@ -19097,17 +19133,17 @@
+   else
+     return (&dummy > addr) ? 1 : -1;
+ }
+ main ()
+ {
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:19106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_stack_direction=1
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   ac_cv_c_stack_direction=-1
+ fi
+@@ -19146,27 +19182,27 @@
+ 
+ 
+    if test "$MOZ_TREE_CAIRO"; then
+        # Check for headers defining standard int types.
+        for ac_hdr in stdint.h inttypes.h sys/int_types.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:19155: checking for $ac_hdr" >&5
++echo "configure:19191: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 19160 "configure"
++#line 19196 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:19165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:19201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+   eval "ac_cv_header_$ac_safe=yes"
+ else
+   echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -19247,17 +19283,17 @@
+    else
+       
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:19256: checking for $ac_word" >&5
++echo "configure:19292: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PKG_CONFIG" in
+   /*)
+   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -19291,29 +19327,29 @@
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
+-echo "configure:19300: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:19336: checking for cairo >= $CAIRO_VERSION" >&5
+ 
+         if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
+             echo "$ac_t""yes" 1>&6
+             succeeded=yes
+ 
+             echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
+-echo "configure:19307: checking CAIRO_CFLAGS" >&5
++echo "configure:19343: checking CAIRO_CFLAGS" >&5
+             CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
+             echo "$ac_t""$CAIRO_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
+-echo "configure:19312: checking CAIRO_LIBS" >&5
++echo "configure:19348: checking CAIRO_LIBS" >&5
+             ## don't use --libs since that can do evil things like add
+             ## -Wl,--export-dynamic
+             CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
+             echo "$ac_t""$CAIRO_LIBS" 1>&6
+         else
+             CAIRO_CFLAGS=""
+             CAIRO_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but 
+@@ -19333,23 +19369,220 @@
+   if test $succeeded = yes; then
+      :
+   else
+      { echo "configure: error: Library requirements (cairo >= $CAIRO_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; }
+   fi
+ 
+       MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
+       MOZ_CAIRO_LIBS=$CAIRO_LIBS
++
++      if test "$MOZ_X11"; then
++          if test "$MOZ_SVG_RENDERER_CAIRO"; then
++              
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:19388: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$PKG_CONFIG" in
++  /*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++  echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for cairo-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6
++echo "configure:19432: checking for cairo-xlib >= $CAIRO_VERSION" >&5
++
++        if $PKG_CONFIG --exists "cairo-xlib >= $CAIRO_VERSION" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking CAIRO_XLIB_CFLAGS""... $ac_c" 1>&6
++echo "configure:19439: checking CAIRO_XLIB_CFLAGS" >&5
++            CAIRO_XLIB_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib >= $CAIRO_VERSION"`
++            echo "$ac_t""$CAIRO_XLIB_CFLAGS" 1>&6
++
++            echo $ac_n "checking CAIRO_XLIB_LIBS""... $ac_c" 1>&6
++echo "configure:19444: checking CAIRO_XLIB_LIBS" >&5
++            ## don't use --libs since that can do evil things like add
++            ## -Wl,--export-dynamic
++            CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`"
++            echo "$ac_t""$CAIRO_XLIB_LIBS" 1>&6
++        else
++            CAIRO_XLIB_CFLAGS=""
++            CAIRO_XLIB_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            CAIRO_XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib >= $CAIRO_VERSION"`
++            
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     :
++  else
++     :
++  fi
++
++              MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS
++              MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS"
++          fi
++          if test "$MOZ_ENABLE_CANVAS"; then
++              
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:19483: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  case "$PKG_CONFIG" in
++  /*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  ?:/*)			 
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
++  ;;
++  *)
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do 
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++  echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6
++echo "configure:19527: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5
++
++        if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then
++            echo "$ac_t""yes" 1>&6
++            succeeded=yes
++
++            echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6
++echo "configure:19534: checking CAIRO_XRENDER_CFLAGS" >&5
++            CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"`
++            echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6
++
++            echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6
++echo "configure:19539: checking CAIRO_XRENDER_LIBS" >&5
++            ## don't use --libs since that can do evil things like add
++            ## -Wl,--export-dynamic
++            CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`"
++            echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6
++        else
++            CAIRO_XRENDER_CFLAGS=""
++            CAIRO_XRENDER_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            CAIRO_XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib-xrender >= $CAIRO_VERSION"`
++            
++        fi
++
++        
++        
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     :
++  else
++     :
++  fi
++
++              MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS
++              MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS"
++          fi
++      fi
+    fi
+ fi
+ 
+ 
+ 
+ 
+ 
++
++
++
++
+ # Check whether --enable-xul or --disable-xul was given.
+ if test "${enable_xul+set}" = set; then
+   enableval="$enable_xul"
+   if test "$enableval" = "no"; then
+     MOZ_XUL= 
+   elif test "$enableval" = "yes"; then
+     :
+   else
+@@ -19368,17 +19601,17 @@
+ 
+ 
+ 
+ if test `echo "$MOZ_EXTENSIONS" | grep -c python/xpcom` -ne 0; then
+         if test -z "$PYTHON"; then
+         # Extract the first word of "python", so it can be a program name with args.
+ set dummy python; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:19377: checking for $ac_word" >&5
++echo "configure:19610: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$PYTHON" in
+   /*)
+   ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+@@ -19644,24 +19877,24 @@
+     ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+     cat > conftest.$ac_ext <<EOF
+-#line 19653 "configure"
++#line 19886 "configure"
+ #include "confdefs.h"
+ #include <gmodule.h>
+ int main() {
+  int x = 1; x++; 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:19660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   { echo "configure: error: Cannot build ctl without gmodule support in glib." 1>&2; exit 1; }
+ fi
+ rm -f conftest*
+@@ -19835,16 +20068,17 @@
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
++
+ CFLAGS=`echo \
+ 	$_WARNINGS_CFLAGS \
+ 	$CFLAGS`
+ 
+ CXXFLAGS=`echo \
+ 	$_MOZ_RTTI_FLAGS \
+ 	$_MOZ_EXCEPTIONS_FLAGS \
+ 	$_WARNINGS_CXXFLAGS \
+@@ -19958,33 +20192,33 @@
+    
+ fi
+ 
+ if test "$COMPILE_ENVIRONMENT"; then
+ if test "$MOZ_X11"; then
+                 _SAVE_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS $XCFLAGS"
+     cat > conftest.$ac_ext <<EOF
+-#line 19967 "configure"
++#line 20201 "configure"
+ #include "confdefs.h"
+ 
+         #include <stdio.h>
+         #include <X11/Xlib.h>
+     
+ int main() {
+ 
+         Display *dpy = 0;
+         if ((dpy = XOpenDisplay(NULL)) == NULL) {
+             fprintf(stderr, ": can't open %s\n", XDisplayName(NULL));
+             exit(1);
+         }
+     
+ ; return 0; }
+ EOF
+-if { (eval echo configure:19983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:20217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+    { echo "configure: error: Could not compile basic X program." 1>&2; exit 1; } 
+ fi
+ rm -f conftest*
+@@ -20192,44 +20426,25 @@
+   fi
+ 
+ rm -f confdefs.h.save
+ mv confdefs.h confdefs.h.save
+ egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
+ # Transform confdefs.h into DEFS.
+ # Protect against shell expansion while executing Makefile rules.
+ # Protect against Makefile macro expansion.
+-#
+-# If the first sed substitution is executed (which looks for macros that
+-# take arguments), then we branch to the quote section.  Otherwise,
+-# look for a macro that doesn't take arguments.
+-cat >confdef2opt.sed <<\_ACEOF
+-t clear
+-: clear
+-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+-t quote
+-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+-t quote
+-d
+-: quote
+-s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+-s,\[,\\&,g
+-s,\],\\&,g
+-s,\$,$$,g
+-p
+-_ACEOF
+-# We use echo to avoid assuming a particular line-breaking character.
+-# The extra dot is to prevent the shell from consuming trailing
+-# line-breaks from the sub-command output.  A line-break within
+-# single-quotes doesn't work because, if this script is created in a
+-# platform that uses two characters for line-breaks (e.g., DOS), tr
+-# would break.
+-ac_LF_and_DOT=`echo; echo .`
+-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+-rm -f confdef2opt.sed
++cat > conftest.defs <<\EOF
++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
++s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
++s%\[%\\&%g
++s%\]%\\&%g
++s%\$%$$%g
++EOF
++DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
++rm -f conftest.defs
+ 
+ MOZ_DEFINES=$DEFS
+ 
+ rm -f confdefs.h
+ mv confdefs.h.save confdefs.h
+ 
+ . ${srcdir}/allmakefiles.sh
+ if test -z "${AS_PERL}"; then
+@@ -20459,16 +20674,19 @@
+ s%@LIBOBJS@%$LIBOBJS%g
+ s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g
+ s%@NSPR_CONFIG@%$NSPR_CONFIG%g
+ s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
+ s%@NSPR_LIBS@%$NSPR_LIBS%g
+ s%@NSS_CONFIG@%$NSS_CONFIG%g
+ s%@NSS_CFLAGS@%$NSS_CFLAGS%g
+ s%@NSS_LIBS@%$NSS_LIBS%g
++s%@SYSTEM_MYSPELL@%$SYSTEM_MYSPELL%g
++s%@MOZ_MYSPELL_LIBS@%$MOZ_MYSPELL_LIBS%g
++s%@MOZ_MYSPELL_CFLAGS@%$MOZ_MYSPELL_CFLAGS%g
+ s%@GTK_CONFIG@%$GTK_CONFIG%g
+ s%@GTK_CFLAGS@%$GTK_CFLAGS%g
+ s%@GTK_LIBS@%$GTK_LIBS%g
+ s%@PKG_CONFIG@%$PKG_CONFIG%g
+ s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g
+ s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g
+ s%@HOST_MOC@%$HOST_MOC%g
+ s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g
+@@ -20521,16 +20739,18 @@
+ s%@MOZ_GCONF_LIBS@%$MOZ_GCONF_LIBS%g
+ s%@MOZ_LIBGNOME_CFLAGS@%$MOZ_LIBGNOME_CFLAGS%g
+ s%@MOZ_LIBGNOME_LIBS@%$MOZ_LIBGNOME_LIBS%g
+ s%@MOZ_ENABLE_GNOME_COMPONENT@%$MOZ_ENABLE_GNOME_COMPONENT%g
+ s%@MOZ_GNOMEUI_CFLAGS@%$MOZ_GNOMEUI_CFLAGS%g
+ s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g
+ s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g
+ s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g
++s%@MOZ_LIBTHAI_CFLAGS@%$MOZ_LIBTHAI_CFLAGS%g
++s%@MOZ_LIBTHAI_LIBS@%$MOZ_LIBTHAI_LIBS%g
+ s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g
+ s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g
+ s%@MOZ_NO_FAST_LOAD@%$MOZ_NO_FAST_LOAD%g
+ s%@JAVAC@%$JAVAC%g
+ s%@JAR@%$JAR%g
+ s%@MAKENSIS@%$MAKENSIS%g
+ s%@HOST_ICONV@%$HOST_ICONV%g
+ s%@MOZ_INSTALLER@%$MOZ_INSTALLER%g
+@@ -20583,19 +20803,27 @@
+ s%@OS2_SURFACE_FEATURE@%$OS2_SURFACE_FEATURE%g
+ s%@GLITZ_SURFACE_FEATURE@%$GLITZ_SURFACE_FEATURE%g
+ s%@FT_FONT_FEATURE@%$FT_FONT_FEATURE%g
+ s%@WIN32_FONT_FEATURE@%$WIN32_FONT_FEATURE%g
+ s%@ATSUI_FONT_FEATURE@%$ATSUI_FONT_FEATURE%g
+ s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g
+ s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g
+ s%@CAIRO_LIBS@%$CAIRO_LIBS%g
++s%@CAIRO_XLIB_CFLAGS@%$CAIRO_XLIB_CFLAGS%g
++s%@CAIRO_XLIB_LIBS@%$CAIRO_XLIB_LIBS%g
++s%@CAIRO_XRENDER_CFLAGS@%$CAIRO_XRENDER_CFLAGS%g
++s%@CAIRO_XRENDER_LIBS@%$CAIRO_XRENDER_LIBS%g
+ s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g
+ s%@MOZ_CAIRO_CFLAGS@%$MOZ_CAIRO_CFLAGS%g
+ s%@MOZ_CAIRO_LIBS@%$MOZ_CAIRO_LIBS%g
++s%@MOZ_CAIRO_XLIB_CFLAGS@%$MOZ_CAIRO_XLIB_CFLAGS%g
++s%@MOZ_CAIRO_XLIB_LIBS@%$MOZ_CAIRO_XLIB_LIBS%g
++s%@MOZ_CAIRO_XRENDER_CFLAGS@%$MOZ_CAIRO_XRENDER_CFLAGS%g
++s%@MOZ_CAIRO_XRENDER_LIBS@%$MOZ_CAIRO_XRENDER_LIBS%g
+ s%@MOZ_XUL@%$MOZ_XUL%g
+ s%@MOZ_PYTHON@%$MOZ_PYTHON%g
+ s%@MOZ_PYTHON_PREFIX@%$MOZ_PYTHON_PREFIX%g
+ s%@MOZ_PYTHON_INCLUDES@%$MOZ_PYTHON_INCLUDES%g
+ s%@MOZ_PYTHON_LIBS@%$MOZ_PYTHON_LIBS%g
+ s%@MOZ_PYTHON_VER@%$MOZ_PYTHON_VER%g
+ s%@MOZ_PYTHON_VER_DOTTED@%$MOZ_PYTHON_VER_DOTTED%g
+ s%@MOZ_PYTHON_DEBUG_SUFFIX@%$MOZ_PYTHON_DEBUG_SUFFIX%g
+@@ -20696,16 +20924,17 @@
+ s%@XPCOM_USE_LEA@%$XPCOM_USE_LEA%g
+ s%@BUILD_SHARED_LIBS@%$BUILD_SHARED_LIBS%g
+ s%@BUILD_STATIC_LIBS@%$BUILD_STATIC_LIBS%g
+ s%@MOZ_STATIC_COMPONENT_LIBS@%$MOZ_STATIC_COMPONENT_LIBS%g
+ s%@MOZ_ENABLE_LIBXUL@%$MOZ_ENABLE_LIBXUL%g
+ s%@ENABLE_TESTS@%$ENABLE_TESTS%g
+ s%@IBMBIDI@%$IBMBIDI%g
+ s%@SUNCTL@%$SUNCTL%g
++s%@MOZ_ENABLE_LIBTHAI_COMPONENT@%$MOZ_ENABLE_LIBTHAI_COMPONENT%g
+ s%@ACCESSIBILITY@%$ACCESSIBILITY%g
+ s%@MOZ_XPINSTALL@%$MOZ_XPINSTALL%g
+ s%@MOZ_VIEW_SOURCE@%$MOZ_VIEW_SOURCE%g
+ s%@MOZ_SINGLE_PROFILE@%$MOZ_SINGLE_PROFILE%g
+ s%@MOZ_XPFE_COMPONENTS@%$MOZ_XPFE_COMPONENTS%g
+ s%@MOZ_USER_DIR@%$MOZ_USER_DIR%g
+ s%@ENABLE_STRIP@%$ENABLE_STRIP%g
+ s%@USE_ELF_DYNSTR_GC@%$USE_ELF_DYNSTR_GC%g
+@@ -21158,17 +21387,17 @@
+       # The eval makes quoting arguments work.
+       if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+       then :
+       else
+         { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+       fi
+     fi
+ 
+-    cd $ac_popdir
++    cd "$ac_popdir"
+   done
+ fi
+ 
+     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ fi
+ 
+ if test -z "$MOZ_NATIVE_NSPR"; then
+     # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
+@@ -21301,15 +21530,15 @@
+       # The eval makes quoting arguments work.
+       if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+       then :
+       else
+         { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+       fi
+     fi
+ 
+-    cd $ac_popdir
++    cd "$ac_popdir"
+   done
+ fi
+ 
+     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+ fi
+ fi # COMPILE_ENVIRONMENT
--- iceowl-0.7.orig/debian/patches/trunk-fsh
+++ iceowl-0.7/debian/patches/trunk-fsh
@@ -0,0 +1,142 @@
+---
+ browser/app/Makefile.in |    4 ++--
+ build/unix/Makefile.in  |   16 ++++++++--------
+ config/autoconf.mk.in   |    8 ++++----
+ 3 files changed, 14 insertions(+), 14 deletions(-)
+
+Index: mozilla/browser/app/Makefile.in
+===================================================================
+--- mozilla.orig/browser/app/Makefile.in	2007-02-03 02:24:35.000000000 +0100
++++ mozilla/browser/app/Makefile.in	2007-03-22 02:21:42.000000000 +0100
+@@ -82,19 +82,19 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ else
+ # Build a binary bootstrapping with XRE_main
+ 
+ MOZILLA_INTERNAL_API = 1
+ 
+ ifeq ($(USE_SHORT_LIBNAME), 1)
+-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
++PROGRAM = $(MOZ_APP_NAME)-trunk$(BIN_SUFFIX)
+ else
+-PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
++PROGRAM = $(MOZ_APP_NAME)-trunk-bin$(BIN_SUFFIX)
+ endif
+ 
+ REQUIRES = \
+ 	xpcom \
+ 	xulapp \
+ 	$(NULL)
+ 
+ CPPSRCS = nsBrowserApp.cpp
+Index: mozilla/build/unix/Makefile.in
+===================================================================
+--- mozilla.orig/build/unix/Makefile.in	2006-04-28 16:54:52.000000000 +0200
++++ mozilla/build/unix/Makefile.in	2007-03-22 02:21:42.000000000 +0100
+@@ -62,64 +62,64 @@
+ endif
+ 
+ ifdef MOZ_ENABLE_GTK
+ SUPERWIN_LIBS=-lgtksuperwin
+ endif
+ 
+ _DEFS = $(subst \,\\\\\,$(ACDEFINES))
+ 
+-pkg_config_files=$(MOZ_APP_NAME)-nspr.pc $(MOZ_APP_NAME)-xpcom.pc \
+-	$(MOZ_APP_NAME)-js.pc \
+-	$(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc
++pkg_config_files=$(MOZ_APP_NAME)-trunk-nspr.pc $(MOZ_APP_NAME)-trunk-xpcom.pc \
++	$(MOZ_APP_NAME)-trunk-js.pc \
++	$(MOZ_APP_NAME)-trunk-nss.pc $(MOZ_APP_NAME)-trunk-plugin.pc
+ 
+-GARBAGE	= $(pkg_config_files) $(MOZ_APP_NAME)-config
++GARBAGE	= $(pkg_config_files) $(MOZ_APP_NAME)-trunk-config
+ 
+-$(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
++$(MOZ_APP_NAME)-trunk-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ 	cat $< | sed \
+ 	-e "s|%prefix%|$(prefix)|" \
+ 	-e "s|%exec_prefix%|$(exec_prefix)|" \
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%libdir%|$(mozappdir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%DEFS%|$(_DEFS)|" \
+ 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
+ 	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@
+ 
+-$(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
++$(MOZ_APP_NAME)-trunk-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ 	cat $< | sed \
+ 	-e "s|%prefix%|$(prefix)|" \
+ 	-e "s|%exec_prefix%|$(exec_prefix)|" \
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%libdir%|$(mozappdir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%SUPERWIN_LIBS%|$(SUPERWIN_LIBS)|" \
+ 	-e "s|%DEFS%|$(_DEFS)|" \
+ 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
+ 	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
+ 	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
+ 	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
+ 
+-libs:: $(MOZ_APP_NAME)-config
++libs:: $(MOZ_APP_NAME)-trunk-config
+ 	chmod 755 $<
+ 	$(INSTALL) -m 755 $< $(DIST)/bin
+ 
+ libs:: $(srcdir)/run-mozilla.sh $(pkg_config_files)
+ 	$(INSTALL) $< $(DIST)/bin
+ 
+ ifeq ($(OS_ARCH),OpenVMS)
+ libs:: vms/mozilla.com vms/install.com vms/getinfo.com
+ 	$(INSTALL) $? $(DIST)/bin
+ endif
+ 
+ install:: run-mozilla.sh
+ 	$(SYSINSTALL) $(IFLAGS2) $< $(DESTDIR)$(mozappdir)
+ 
+-install:: $(MOZ_APP_NAME)-config
++install:: $(MOZ_APP_NAME)-trunk-config
+ 	$(SYSINSTALL) $(IFLAGS2) $< $(DESTDIR)$(bindir)
+ 
+ install:: $(pkg_config_files)
+ 	chmod 644 $<
+ 	$(SYSINSTALL) $(IFLAGS1) $(pkg_config_files) \
+ 		$(DESTDIR)$(libdir)/pkgconfig
+Index: mozilla/config/autoconf.mk.in
+===================================================================
+--- mozilla.orig/config/autoconf.mk.in	2007-01-17 21:38:56.000000000 +0100
++++ mozilla/config/autoconf.mk.in	2007-03-22 02:21:42.000000000 +0100
+@@ -53,24 +53,24 @@
+ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
+ MOZ_APP_VERSION = @MOZ_APP_VERSION@
+ 
+ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ 
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)-trunk
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @datadir@/idl/$(MOZ_APP_NAME)-trunk
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/$(MOZ_APP_NAME)-trunk
++mredir		= $(libdir)/mre/mre-trunk
+ mrelibdir	= $(mredir)/lib
+ 
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+ 
+ ifdef LIBXUL_SDK
+ LIBXUL_DIST = $(LIBXUL_SDK)
+ else
--- iceowl-0.7.orig/debian/patches/ubuntu-disable-welcome-update-url.patch
+++ iceowl-0.7/debian/patches/ubuntu-disable-welcome-update-url.patch
@@ -0,0 +1,60 @@
+From 3c34bdc00acb0323ad11d8a6ec4a455d43957550 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Mon, 19 Mar 2007 14:08:43 +0100
+Subject: [PATCH] ubuntu-disable-welcome-update-url
+
+TODO: can this be moved to distromods somehow?
+
+---
+ browser/components/nsBrowserContentHandler.js |   27 ++------------------------
+ 1 file changed, 3 insertions(+), 24 deletions(-)
+
+Index: mozilla/browser/components/nsBrowserContentHandler.js
+===================================================================
+--- mozilla.orig/browser/components/nsBrowserContentHandler.js	2007-04-03 17:14:04.000000000 +0000
++++ mozilla/browser/components/nsBrowserContentHandler.js	2007-06-01 10:24:48.000000000 +0000
+@@ -470,41 +470,20 @@
+   get defaultArgs() {
+     var prefb = Components.classes["@mozilla.org/preferences-service;1"]
+                           .getService(nsIPrefBranch);
+     var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
+                               .getService(Components.interfaces.nsIURLFormatter);
+ 
+     var overridePage = "";
+     var haveUpdateSession = false;
+-    try {
+-      switch (needHomepageOverride(prefb)) {
+-        case OVERRIDE_NEW_PROFILE:
+-          // New profile.
+-          overridePage = formatter.formatURLPref("startup.homepage_welcome_url");
+-          break;
+-        case OVERRIDE_NEW_MSTONE:
+-          // Existing profile.
+-          copyPrefOverride();
+-
+-          // Check whether we have a session to restore. If we do, we assume
+-          // that this is an "update" session.
+-          var ss = Components.classes["@mozilla.org/browser/sessionstartup;1"]
+-                             .getService(Components.interfaces.nsISessionStartup);
+-          haveUpdateSession = ss.doRestore();
+-          overridePage = formatter.formatURLPref("startup.homepage_override_url");
+-          break;
+-      }
+-    } catch (e) {}
+-
+-    // formatURLPref might return "about:blank" if getting the pref fails
+-    if (overridePage == "about:blank")
+-      overridePage = "";
+-
+     var startPage = "";
++
++    // needHomepageOverride actually *updates* the mstone pref
++    var overrideState = needHomepageOverride(prefb);
+     try {
+       var choice = prefb.getIntPref("browser.startup.page");
+       if (choice == 1)
+         startPage = this.startPage;
+ 
+       if (choice == 2)
+         startPage = Components.classes["@mozilla.org/browser/global-history;2"]
+                               .getService(nsIBrowserHistory).lastPageVisited;
--- iceowl-0.7.orig/debian/patches/bz331818-fix-crash-xpidl-zero-arguments.patch
+++ iceowl-0.7/debian/patches/bz331818-fix-crash-xpidl-zero-arguments.patch
@@ -0,0 +1,38 @@
+From 30b1bbc3c3d380aa459b932cf3c0c4b448a91086 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:16 +0100
+Subject: [PATCH] bz331818-fix-crash-xpidl-zero-arguments
+
+  + patch that fixes a crash if xpidl gets not enough arguments
+---
+ xpcom/typelib/xpidl/xpidl.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: mozilla/xpcom/typelib/xpidl/xpidl.c
+===================================================================
+--- mozilla.orig/xpcom/typelib/xpidl/xpidl.c	2006-02-03 15:41:11.000000000 +0100
++++ mozilla/xpcom/typelib/xpidl/xpidl.c	2007-04-04 18:49:07.000000000 +0200
+@@ -255,21 +255,21 @@
+         }
+     }
+  done_options:
+     if (!mode) {
+         fprintf(stderr, "ERROR: must specify output mode\n");
+         xpidl_usage(argc, argv);
+         return 1;
+     }
+-    if (argc != i + 1) {
++    if (argc > i + 1) {
+         fprintf(stderr, "ERROR: extra arguments after input file\n");
+     }
+ 
+     /*
+      * Don't try to process multiple files, given that we don't handle -o
+      * multiply.
+      */
+-    if (xpidl_process_idl(argv[i], inc_head, file_basename, mode))
++    if ((i < argc) && xpidl_process_idl(argv[i], inc_head, file_basename, mode))
+         return 0;
+ 
+     return 1;
+ }
--- iceowl-0.7.orig/debian/patches/bzXXX-syntax-fixes-for-.m4-files-needed-for-proper-embedding.patch
+++ iceowl-0.7/debian/patches/bzXXX-syntax-fixes-for-.m4-files-needed-for-proper-embedding.patch
@@ -0,0 +1,345 @@
+From efddcc063cb31a0c48072f2f50181a6bf4f592d3 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:15 +0100
+Subject: [PATCH] bzXXX-syntax fixes for .m4 files needed for proper embedding
+
+---
+ build/autoconf/altoptions.m4            |   20 ++++++++++----------
+ build/autoconf/freetype2.m4             |    2 +-
+ build/autoconf/glib.m4                  |    2 +-
+ build/autoconf/gtk.m4                   |    2 +-
+ build/autoconf/libIDL-2.m4              |    2 +-
+ build/autoconf/libIDL.m4                |    2 +-
+ build/autoconf/libart.m4                |    2 +-
+ build/autoconf/nspr.m4                  |    2 +-
+ build/autoconf/pkg.m4                   |    2 +-
+ directory/c-sdk/config/autoconf/nspr.m4 |    2 +-
+ nsprpub/config/nspr.m4                  |    2 +-
+ 11 files changed, 20 insertions(+), 20 deletions(-)
+
+Index: mozilla/build/autoconf/altoptions.m4
+===================================================================
+--- mozilla.orig/build/autoconf/altoptions.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/altoptions.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -50,80 +50,80 @@
+ dnl MOZ_ARG_WITHOUT_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE])
+ dnl MOZ_ARG_WITH_STRING(           NAME, HELP, IF-SET [, ELSE])
+ dnl MOZ_ARG_HEADER(Comment)
+ dnl MOZ_CHECK_PTHREADS(            NAME, IF-YES [, ELSE ])
+ dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+ 
+ 
+ dnl MOZ_TWO_STRING_TEST(NAME, VAL, STR1, IF-STR1, STR2, IF-STR2 [, ELSE])
+-AC_DEFUN(MOZ_TWO_STRING_TEST,
++AC_DEFUN([MOZ_TWO_STRING_TEST],
+ [if test "[$2]" = "[$3]"; then
+     ifelse([$4], , :, [$4])
+   elif test "[$2]" = "[$5]"; then
+     ifelse([$6], , :, [$6])
+   else
+     ifelse([$7], ,
+       [AC_MSG_ERROR([Option, [$1], does not take an argument ([$2]).])],
+       [$7])
+   fi])
+ 
+ dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]])
+-AC_DEFUN(MOZ_ARG_ENABLE_BOOL,
++AC_DEFUN([MOZ_ARG_ENABLE_BOOL],
+ [AC_ARG_ENABLE([$1], [$2], 
+  [MOZ_TWO_STRING_TEST([$1], [$enableval], yes, [$3], no, [$4])],
+  [$5])])
+ 
+ dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]])
+-AC_DEFUN(MOZ_ARG_DISABLE_BOOL,
++AC_DEFUN([MOZ_ARG_DISABLE_BOOL],
+ [AC_ARG_ENABLE([$1], [$2],
+  [MOZ_TWO_STRING_TEST([$1], [$enableval], no, [$3], yes, [$4])],
+  [$5])])
+ 
+ dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
+-AC_DEFUN(MOZ_ARG_ENABLE_STRING,
++AC_DEFUN([MOZ_ARG_ENABLE_STRING],
+ [AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
+ 
+ dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
+-AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING,
++AC_DEFUN([MOZ_ARG_ENABLE_BOOL_OR_STRING],
+ [ifelse([$5], , 
+  [errprint([Option, $1, needs an "IF-SET" argument.
+ ])
+   m4exit(1)],
+  [AC_ARG_ENABLE([$1], [$2],
+   [MOZ_TWO_STRING_TEST([$1], [$enableval], yes, [$3], no, [$4], [$5])],
+   [$6])])])
+ 
+ dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
+-AC_DEFUN(MOZ_ARG_WITH_BOOL,
++AC_DEFUN([MOZ_ARG_WITH_BOOL],
+ [AC_ARG_WITH([$1], [$2],
+  [MOZ_TWO_STRING_TEST([$1], [$withval], yes, [$3], no, [$4])],
+  [$5])])
+ 
+ dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
+-AC_DEFUN(MOZ_ARG_WITHOUT_BOOL,
++AC_DEFUN([MOZ_ARG_WITHOUT_BOOL],
+ [AC_ARG_WITH([$1], [$2],
+  [MOZ_TWO_STRING_TEST([$1], [$withval], no, [$3], yes, [$4])],
+  [$5])])
+ 
+ dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
+-AC_DEFUN(MOZ_ARG_WITH_STRING,
++AC_DEFUN([MOZ_ARG_WITH_STRING],
+ [AC_ARG_WITH([$1], [$2], [$3], [$4])])
+ 
+ dnl MOZ_ARG_HEADER(Comment)
+ dnl This is used by webconfig to group options
+ define(MOZ_ARG_HEADER, [# $1])
+ 
+ dnl
+ dnl Apparently, some systems cannot properly check for the pthread
+ dnl library unless <pthread.h> is included so we need to test
+ dnl using it
+ dnl
+ dnl MOZ_CHECK_PTHREADS(lib, success, failure)
+-AC_DEFUN(MOZ_CHECK_PTHREADS,
++AC_DEFUN([MOZ_CHECK_PTHREADS],
+ [
+ AC_MSG_CHECKING([for pthread_create in -l$1])
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+     int main() { 
+         pthread_t t;
+         if (!pthread_create(&t, 0, &foo, 0)) {
+@@ -140,17 +140,17 @@
+         [$2]
+     else
+         AC_MSG_RESULT([no])
+         [$3]
+     fi
+ ])
+ 
+ dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+-AC_DEFUN(MOZ_READ_MOZCONFIG,
++AC_DEFUN([MOZ_READ_MOZCONFIG],
+ [AC_REQUIRE([AC_INIT_BINSH])dnl
+ # Read in '.mozconfig' script to set the initial options.
+ # See the mozconfig2configure script for more details.
+ _AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
+ . $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
+ 
+ dnl This gets inserted at the top of the configure script
+ MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR)
+Index: mozilla/build/autoconf/freetype2.m4
+===================================================================
+--- mozilla.orig/build/autoconf/freetype2.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/freetype2.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,15 +1,15 @@
+ # Configure paths for FreeType2
+ # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
+ 
+ dnl AM_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
+ dnl
+-AC_DEFUN(AC_CHECK_FT2,
++AC_DEFUN([AC_CHECK_FT2],
+ [dnl
+ dnl Get the cflags and libraries from the freetype-config script
+ dnl
+ AC_ARG_WITH(freetype-prefix,
+ [  --with-ft-prefix=PFX    Prefix where FreeType is installed (optional)],
+             ft_config_prefix="$withval", ft_config_prefix="")
+ AC_ARG_WITH(freetype-exec-prefix,
+ [  --with-ft-exec-prefix=PFX
+Index: mozilla/build/autoconf/glib.m4
+===================================================================
+--- mozilla.orig/build/autoconf/glib.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/glib.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,16 +1,16 @@
+ # Configure paths for GLIB
+ # Owen Taylor     97-11-3
+ 
+ dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+ dnl gthread is specified in MODULES, pass to glib-config
+ dnl
+-AC_DEFUN(AM_PATH_GLIB,
++AC_DEFUN([AM_PATH_GLIB],
+ [dnl 
+ dnl Get the cflags and libraries from the glib-config script
+ dnl
+ AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX  Prefix where GLIB is installed (optional)],
+             glib_config_prefix="$withval", glib_config_prefix="")
+ AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX
+                           Exec prefix where GLIB is installed (optional)],
+             glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
+Index: mozilla/build/autoconf/gtk.m4
+===================================================================
+--- mozilla.orig/build/autoconf/gtk.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/gtk.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,16 +1,16 @@
+ # Configure paths for GTK+
+ # Owen Taylor     97-11-3
+ # (copy of gtk.m4 (public domain))
+ 
+ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_GTK,
++AC_DEFUN([AM_PATH_GTK],
+ [dnl 
+ dnl Get the cflags and libraries from the gtk-config script
+ dnl
+ AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+             gtk_config_prefix="$withval", gtk_config_prefix="")
+ AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX 
+                           Exec prefix where GTK is installed (optional)],
+             gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+Index: mozilla/build/autoconf/libIDL-2.m4
+===================================================================
+--- mozilla.orig/build/autoconf/libIDL-2.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/libIDL-2.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,14 +1,14 @@
+ # Configure paths for LIBIDL
+ 
+ dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_LIBIDL_2,
++AC_DEFUN([AM_PATH_LIBIDL_2],
+ [dnl 
+ dnl Get the cflags and libraries from the libIDL-config-2 script
+ dnl
+ AC_ARG_WITH(libIDL-prefix,[  --with-libIDL-prefix=PFX
+                           Prefix where libIDL is installed (optional)],
+             libIDL_config_prefix="$withval", libIDL_config_prefix="")
+ AC_ARG_WITH(libIDL-exec-prefix,[  --with-libIDL-exec-prefix=PFX
+                           Exec prefix where libIDL is installed (optional)],
+Index: mozilla/build/autoconf/libIDL.m4
+===================================================================
+--- mozilla.orig/build/autoconf/libIDL.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/libIDL.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,14 +1,14 @@
+ # Configure paths for LIBIDL
+ 
+ dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_LIBIDL,
++AC_DEFUN([AM_PATH_LIBIDL],
+ [dnl 
+ dnl Get the cflags and libraries from the libIDL-config script
+ dnl
+ AC_ARG_WITH(libIDL-prefix,[  --with-libIDL-prefix=PFX
+                           Prefix where libIDL is installed (optional)],
+             libIDL_config_prefix="$withval", libIDL_config_prefix="")
+ AC_ARG_WITH(libIDL-exec-prefix,[  --with-libIDL-exec-prefix=PFX
+                           Exec prefix where libIDL is installed (optional)],
+Index: mozilla/build/autoconf/libart.m4
+===================================================================
+--- mozilla.orig/build/autoconf/libart.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/libart.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -3,17 +3,17 @@
+ # stolen from Manish Singh    98-9-30
+ # stolen back from Frank Belew
+ # stolen from Manish Singh
+ # Shamelessly stolen from Owen Taylor
+ 
+ dnl AM_PATH_LIBART([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for LIBART, and define LIBART_CFLAGS and LIBART_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_LIBART,
++AC_DEFUN([AM_PATH_LIBART],
+ [dnl 
+ dnl Get the cflags and libraries from the libart-config script
+ dnl
+ AC_ARG_WITH(libart-prefix,[  --with-libart-prefix=PFX   Prefix where LIBART is installed (optional)],
+             libart_prefix="$withval", libart_prefix="")
+ AC_ARG_WITH(libart-exec-prefix,[  --with-libart-exec-prefix=PFX Exec prefix where LIBART is installed (optional)],
+             libart_exec_prefix="$withval", libart_exec_prefix="")
+ AC_ARG_ENABLE(libarttest, [  --disable-libarttest       Do not try to compile and run a test LIBART program],
+Index: mozilla/build/autoconf/nspr.m4
+===================================================================
+--- mozilla.orig/build/autoconf/nspr.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/nspr.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,16 +1,16 @@
+ # -*- tab-width: 4; -*-
+ # Configure paths for NSPR
+ # Public domain - Chris Seawood <cls@seawood.org> 2001-04-05
+ # Based upon gtk.m4 (also PD) by Owen Taylor
+ 
+ dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
+-AC_DEFUN(AM_PATH_NSPR,
++AC_DEFUN([AM_PATH_NSPR],
+ [dnl
+ 
+ AC_ARG_WITH(nspr-prefix,
+ 	[  --with-nspr-prefix=PFX  Prefix where NSPR is installed],
+ 	nspr_config_prefix="$withval",
+ 	nspr_config_prefix="")
+ 
+ AC_ARG_WITH(nspr-exec-prefix,
+Index: mozilla/build/autoconf/pkg.m4
+===================================================================
+--- mozilla.orig/build/autoconf/pkg.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/build/autoconf/pkg.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,13 +1,13 @@
+ 
+ dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+ dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+ dnl also defines GSTUFF_PKG_ERRORS on error
+-AC_DEFUN(PKG_CHECK_MODULES, [
++AC_DEFUN([PKG_CHECK_MODULES], [
+   succeeded=no
+ 
+   if test -z "$PKG_CONFIG"; then
+     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+      echo "*** The pkg-config script could not be found. Make sure it is"
+Index: mozilla/directory/c-sdk/config/autoconf/nspr.m4
+===================================================================
+--- mozilla.orig/directory/c-sdk/config/autoconf/nspr.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/directory/c-sdk/config/autoconf/nspr.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,16 +1,16 @@
+ # -*- tab-width: 4; -*-
+ # Configure paths for NSPR
+ # Public domain - Chris Seawood <cls@seawood.org> 2001-04-05
+ # Based upon gtk.m4 (also PD) by Owen Taylor
+ 
+ dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
+-AC_DEFUN(AM_PATH_NSPR,
++AC_DEFUN([AM_PATH_NSPR],
+ [dnl
+ 
+ AC_ARG_WITH(nspr-prefix,
+ 	[  --with-nspr-prefix=PFX  Prefix where NSPR is installed],
+ 	nspr_config_prefix="$withval",
+ 	nspr_config_prefix="")
+ 
+ AC_ARG_WITH(nspr-exec-prefix,
+Index: mozilla/nsprpub/config/nspr.m4
+===================================================================
+--- mozilla.orig/nsprpub/config/nspr.m4	2007-04-04 18:47:47.000000000 +0200
++++ mozilla/nsprpub/config/nspr.m4	2007-04-04 18:48:27.000000000 +0200
+@@ -1,16 +1,16 @@
+ # -*- tab-width: 4; -*-
+ # Configure paths for NSPR
+ # Public domain - Chris Seawood <cls@seawood.org> 2001-04-05
+ # Based upon gtk.m4 (also PD) by Owen Taylor
+ 
+ dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
+-AC_DEFUN(AM_PATH_NSPR,
++AC_DEFUN([AM_PATH_NSPR],
+ [dnl
+ 
+ AC_ARG_WITH(nspr-prefix,
+ 	[  --with-nspr-prefix=PFX  Prefix where NSPR is installed],
+ 	nspr_config_prefix="$withval",
+ 	nspr_config_prefix="")
+ 
+ AC_ARG_WITH(nspr-exec-prefix,
--- iceowl-0.7.orig/debian/patches/submakefiles-fix
+++ iceowl-0.7/debian/patches/submakefiles-fix
@@ -0,0 +1,13 @@
+Index: mozilla/browser/branding/unofficial/Makefile.in
+===================================================================
+--- mozilla.orig/browser/branding/unofficial/Makefile.in	2007-03-21 03:49:39.000000000 +0100
++++ mozilla/browser/branding/unofficial/Makefile.in	2007-03-21 03:50:18.000000000 +0100
+@@ -4,7 +4,7 @@
+ #    resources
+ 
+ DEPTH = ../../..
+-topsrcdir = @top_srcdir@
++topsrcdir = $(DEPTH)
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
--- iceowl-0.7.orig/debian/patches/sparc64_unichar_alignment
+++ iceowl-0.7/debian/patches/sparc64_unichar_alignment
@@ -0,0 +1,87 @@
+---
+ gfx/src/gtk/nsFontMetricsPango.cpp     |   19 ++++++++++++++++---
+ intl/unicharutil/util/nsUnicharUtils.h |    2 +-
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+Index: mozilla/gfx/src/gtk/nsFontMetricsPango.cpp
+===================================================================
+--- mozilla.orig/gfx/src/gtk/nsFontMetricsPango.cpp
++++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp
+@@ -531,21 +531,33 @@
+ nsresult
+ nsFontMetricsPango::GetTextDimensions(const PRUnichar* aString,
+                                       PRUint32 aLength,
+                                       nsTextDimensions& aDimensions, 
+                                       PRInt32* aFontID,
+                                       nsRenderingContextGTK *aContext)
+ {
+     nsresult rv = NS_OK;
+-
++    gchar *text = NULL;
+     PangoLayout *layout = pango_layout_new(mPangoContext);
+ 
+-    gchar *text = g_utf16_to_utf8(aString, aLength,
+-                                  NULL, NULL, NULL);
++    // Just copy the aString to ensure the alignment,
++    // it is not used anywhere else.
++    PRUnichar* dummy = (PRUnichar *) PR_Malloc(aLength*sizeof(PRUnichar));
++    if(!dummy) {
++#ifdef DEBUG
++        NS_WARNING("nsFontMetricsPango::GetTextDimensions malloc() failed");
++#endif
++        rv = NS_ERROR_FAILURE;
++        goto out;
++    }
++    memcpy(dummy, aString, aLength*sizeof(PRUnichar));
++    text = g_utf16_to_utf8(dummy, aLength,
++                           NULL, NULL, NULL);
++    PR_Free(dummy);
+ 
+     if (!text) {
+ #ifdef DEBUG
+         NS_WARNING("nsFontMetricsPango::GetTextDimensions invalid unicode to follow");
+         DUMP_PRUNICHAR(aString, aLength)
+ #endif
+         aDimensions.width = 0;
+         aDimensions.ascent = 0;
+@@ -576,16 +588,17 @@
+     aDimensions.ascent = NSToCoordRound(PANGO_ASCENT(rect) * P2T / PANGO_SCALE);
+     aDimensions.descent = NSToCoordRound(PANGO_DESCENT(rect) * P2T / PANGO_SCALE);
+ 
+     //    printf("GetTextDimensions %d %d %d\n", aDimensions.width,
+     //aDimensions.ascent, aDimensions.descent);
+ 
+  loser:
+     g_free(text);
++ out:
+     g_object_unref(layout);
+ 
+     return rv;
+ }
+ 
+ nsresult
+ nsFontMetricsPango::GetTextDimensions(const char*         aString,
+                                       PRInt32             aLength,
+Index: mozilla/intl/unicharutil/util/nsUnicharUtils.h
+===================================================================
+--- mozilla.orig/intl/unicharutil/util/nsUnicharUtils.h
++++ mozilla/intl/unicharutil/util/nsUnicharUtils.h
+@@ -77,17 +77,17 @@
+                         aHay.BeginReading(searchBegin),
+                         aHay.EndReading(searchEnd),
+                         nsCaseInsensitiveStringComparator());
+ }
+ 
+ PRUnichar ToUpperCase(PRUnichar);
+ PRUnichar ToLowerCase(PRUnichar);
+ 
+-#define NEED_STRICT_ALIGNMENT defined(__sparc__) || defined(__alpha__) || defined(__mips__)
++#define NEED_STRICT_ALIGNMENT defined(__sparc__) || defined(__alpha__) || defined(__mips__) || defined(__ia64)
+ 
+ PRUnichar GetUnichar(const void *);
+ void SetUnichar(void *, PRUnichar);
+ 
+ inline PRBool IsUpperCase(PRUnichar c) {
+     return ToLowerCase(c) != c;
+ }
+ 
--- iceowl-0.7.orig/debian/patches/bz335810-pango-cursor-up-down-fix.patch
+++ iceowl-0.7/debian/patches/bz335810-pango-cursor-up-down-fix.patch
@@ -0,0 +1,70 @@
+From 7e5f042887d5def556944aa82e4eb74df4acc54b Mon Sep 17 00:00:00 2001
+From: Alexander Sack <asac@jwsdot.com>
+Date: Tue, 3 Apr 2007 12:33:47 +0200
+Subject: [PATCH] bz335810-pango-cursor-up-down-fix
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ * Bug 335810 – cursor up/down keypresses do not preserve horizontal
+   position when using pango
+---
+ gfx/src/gtk/nsFontMetricsPango.cpp |   15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+Index: mozilla/gfx/src/gtk/nsFontMetricsPango.cpp
+===================================================================
+--- mozilla.orig/gfx/src/gtk/nsFontMetricsPango.cpp	2006-09-26 08:42:55.000000000 +0200
++++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2007-04-04 18:52:39.000000000 +0200
+@@ -946,17 +946,16 @@
+ }
+ 
+ PRInt32
+ nsFontMetricsPango::GetPosition(const PRUnichar *aText, PRUint32 aLength,
+                                 nsPoint aPt)
+ {
+     int trailing = 0;
+     int inx = 0;
+-    gboolean found = FALSE;
+     const gchar *curChar;
+     PRInt32 retval = 0;
+ 
+     float f = mDeviceContext->AppUnitsToDevUnits();
+     
+     PangoLayout *layout = pango_layout_new(mPangoContext);
+     PRUint32 localX = (PRUint32)(aPt.x * PANGO_SCALE * f);
+     PRUint32 localY = (PRUint32)(aPt.y * PANGO_SCALE * f);
+@@ -972,32 +971,22 @@
+         retval = -1;
+         goto loser;
+     }
+ 
+     // Set up the pango layout
+     pango_layout_set_text(layout, text, strlen(text));
+     FixupSpaceWidths(layout, text);
+     
+-    found = pango_layout_xy_to_index(layout, localX, localY,
+-                                     &inx, &trailing);
++    pango_layout_xy_to_index(layout, localX, localY,
++                             &inx, &trailing);
+ 
+     // Convert the index back to the utf-16 index
+     curChar = text;
+ 
+-    // Jump to the end if it's not found.
+-    if (!found) {
+-        if (inx == 0)
+-            retval = 0;
+-        else if (trailing)
+-            retval = aLength;
+-
+-        goto loser;
+-    }
+-
+     for (PRUint32 curOffset=0; curOffset < aLength;
+          curOffset++, curChar = g_utf8_find_next_char(curChar, NULL)) {
+ 
+         // Check for a match before checking for a surrogate pair
+         if (curChar - text == inx) {
+             retval = curOffset;
+             break;
+         }
--- iceowl-0.7.orig/debian/patches/bz241535-Assertion-failure-on-destroying-XEmbed-plug-in.patch
+++ iceowl-0.7/debian/patches/bz241535-Assertion-failure-on-destroying-XEmbed-plug-in.patch
@@ -0,0 +1,55 @@
+From e7e6dbd0957507df85863b89cb5dcb213507f78b Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:15 +0100
+Subject: [PATCH] =?utf-8?q?bz241535_=E2=80=93_Assertion_failure_on_destroying_XEmbed_plug-in?=
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp
+===================================================================
+--- mozilla.orig/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp	2003-12-17 20:49:44.000000000 +0100
++++ mozilla/modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp	2007-04-04 18:48:47.000000000 +0200
+@@ -83,16 +83,19 @@
+   ws_info = nsnull;
+   type = nsPluginWindowType_Window;
+   mGtkSocket = 0;
+ }
+ 
+ nsPluginNativeWindowGtk2::~nsPluginNativeWindowGtk2() 
+ {
+   if(mGtkSocket) {
++    GtkWidget **widget = &mGtkSocket;
++    g_object_remove_weak_pointer(G_OBJECT(mGtkSocket), (gpointer*)widget);
++
+     gtk_widget_destroy(mGtkSocket);
+     mGtkSocket = 0;
+   }
+ }
+ 
+ nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow)
+ {
+   NS_ENSURE_ARG_POINTER(aPluginNativeWindow);
+@@ -142,16 +145,19 @@
+   return NS_OK;
+ }
+ 
+ nsresult nsPluginNativeWindowGtk2::CreateXEmbedWindow() {
+   if(!mGtkSocket) {
+     GdkWindow *win = gdk_window_lookup((XID)window);
+     mGtkSocket = gtk_socket_new();
+ 
++    GtkWidget **widget = &mGtkSocket;
++    g_object_add_weak_pointer(G_OBJECT(mGtkSocket), (gpointer*)widget);
++
+     //attach the socket to the container widget
+     gtk_widget_set_parent_window(mGtkSocket, win);
+ 
+     // Make sure to handle the plug_removed signal.  If we don't the
+     // socket will automatically be destroyed when the plug is
+     // removed, which means we're destroying it more than once.
+     // SYNTAX ERROR.
+     g_signal_connect(mGtkSocket, "plug_removed",
--- iceowl-0.7.orig/debian/patches/ubuntu-look-and-feel-patch.patch
+++ iceowl-0.7/debian/patches/ubuntu-look-and-feel-patch.patch
@@ -0,0 +1,239 @@
+From 63f6dfe9758ca3726a93cb0d2bd575176d7a6cfe Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:15 +0100
+Subject: [PATCH] ubuntu look and feel patch
+
+DONE moved prefs from .js files to distromods extenions
+TODO -> migrate modified properties, bookmarks and xul-overlay and js modifications
+contained in this patch to distromods
+
+  + browser/app/profile/firefox.js: set pref browser.startup.homepage_override.mstone
+    to "ignore" (Closes LP#91798)
+---
+ browser/base/content/baseMenuOverlay.xul                      |    7 ++
+ browser/base/content/browser-menubar.inc                      |    7 ++
+ browser/base/content/utilityOverlay.js                        |   10 +++
+ browser/locales/en-US/chrome/browser-region/region.properties |    5 +
+ browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd      |    3 
+ browser/locales/en-US/profile/bookmarks.html                  |   12 +++
+ gfx/src/gtk/fontEncoding.properties                           |    4 -
+ widget/src/gtk2/nsWindow.cpp                                  |    5 +
+ xpfe/browser/resources/locale/en-US/region.properties         |    8 +-
+ 12 files changed, 81 insertions(+), 33 deletions(-)
+
+Index: mozilla/browser/base/content/baseMenuOverlay.xul
+===================================================================
+--- mozilla.orig/browser/base/content/baseMenuOverlay.xul	2006-09-29 08:24:25.000000000 +0000
++++ mozilla/browser/base/content/baseMenuOverlay.xul	2007-06-01 10:05:56.000000000 +0000
+@@ -92,16 +92,23 @@
+                   accesskey="&helpForIEUsers.accesskey;"
+                   oncommand="openHelp('ieusers', 'chrome://browser/locale/help/help.rdf');"/>
+ #endif
+         <menuitem id="releaseNotes"
+                   accesskey="&helpReleaseNotes.accesskey;"
+                   label="&helpReleaseNotes.label;"
+                   oncommand="openReleaseNotes(event)"
+                   onclick="checkForMiddleClick(this, event);"/>
++        <menuitem label="Get Help Online ..."
++                  oncommand="getHelpOnline(event);"/>
++                <!-- label="&helpGetHelpOnline.label;" at some point -->
++        <menuitem label="Translate This Application..."
++                  oncommand="helpTranslateLaunchpad(event);"/>
++                <!-- LP doesn't, yet but mdz asked to have this anyway -->
++                <!-- label="&helpTranslate.label;" at some point -->
+         <menuseparator id="aboutSeparator"/>
+         <menuitem id="checkForUpdates"
+                   accesskey="&updateCmd.accesskey;"
+                   label="&updateCmd.label;"
+                   class="menuitem-iconic"
+                   oncommand="checkForUpdates();"/>
+ #ifndef XP_MACOSX
+         <menuseparator/>
+Index: mozilla/browser/base/content/utilityOverlay.js
+===================================================================
+--- mozilla.orig/browser/base/content/utilityOverlay.js	2006-11-21 21:01:04.000000000 +0000
++++ mozilla/browser/base/content/utilityOverlay.js	2007-06-01 10:05:56.000000000 +0000
+@@ -481,8 +481,18 @@
+     }
+   }
+   checkForUpdates.label = getStringWithUpdateName("updatesItem_" + key);
+   if (um.activeUpdate && updates.isDownloading)
+     checkForUpdates.setAttribute("loading", "true");
+   else
+     checkForUpdates.removeAttribute("loading");
+ }
++  
++function getHelpOnline(event)
++{
++  openUILink("https://launchpad.net/distros/ubuntu/feisty/+sources/firefox/+gethelp", event, false, true);
++}
++
++function helpTranslateLaunchpad(event)
++{
++  openUILink("https://launchpad.net/distros/ubuntu/feisty/+sources/firefox/+translate", event, false, true);
++}
+Index: mozilla/browser/locales/en-US/chrome/browser-region/region.properties
+===================================================================
+--- mozilla.orig/browser/locales/en-US/chrome/browser-region/region.properties	2007-04-30 17:56:12.000000000 +0000
++++ mozilla/browser/locales/en-US/chrome/browser-region/region.properties	2007-06-01 10:06:35.000000000 +0000
+@@ -8,10 +8,15 @@
+ # These are the default web service based feed readers
+ browser.contentHandlers.types.0.title=Bloglines
+ browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
+ browser.contentHandlers.types.1.title=My Yahoo
+ browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+ browser.contentHandlers.types.2.title=Google
+ browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
+ 
++releaseNotesURL=http://www.ubuntu.com/download/releasenotes/610
++homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html
++browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/index.html
++browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
++
+ # Keyword URL (for location bar searches)
+ keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
+Index: mozilla/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd
+===================================================================
+--- mozilla.orig/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd	2006-02-22 05:00:24.000000000 +0000
++++ mozilla/browser/locales/en-US/chrome/browser/baseMenuOverlay.dtd	2007-06-01 10:05:56.000000000 +0000
+@@ -27,16 +27,19 @@
+ <!ENTITY openHelpMac2.frontendCommandkey   "?">
+ <!ENTITY openHelpMac2.frontendModifiers    "accel">
+ 
+ <!ENTITY helpReleaseNotes.label         "Release Notes">
+ <!ENTITY helpReleaseNotes.accesskey     "N">
+ <!ENTITY updateCmd.label                "Check for Updates...">
+ <!ENTITY updateCmd.accesskey            "o">
+ 
++<!ENTITY helpGetHelpOnline.label        "Get Help Online...">
++<!ENTITY helpTranslate.label            "Translate This Application...">
++
+ <!ENTITY preferencesCmdMac.label        "Preferences...">
+ <!ENTITY preferencesCmdMac.commandkey   ",">
+ <!ENTITY preferencesCmdMac.modifiers    "accel">
+ 
+ <!ENTITY servicesMenuMac.label          "Services">
+ 
+ <!ENTITY hideThisAppCmdMac.label        "Hide &brandShortName;">
+ <!ENTITY hideThisAppCmdMac.commandkey   "H">
+Index: mozilla/browser/locales/en-US/profile/bookmarks.html
+===================================================================
+--- mozilla.orig/browser/locales/en-US/profile/bookmarks.html	2006-08-19 06:04:11.000000000 +0000
++++ mozilla/browser/locales/en-US/profile/bookmarks.html	2007-06-01 10:05:56.000000000 +0000
+@@ -8,19 +8,27 @@
+ 
+ <DL><p>
+     <DT><A HREF="http://en-US.add-ons.mozilla.com/en-US/firefox/bookmarks/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAFo9M%2F3AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAPkSURBVHjaYmAAgrjyOnOGiKxqxT9%2F%2FvwHCCCGuNJKLpAo49KTL%2F5%2F%2F8PMABBADJFZFWwXnn%2F%2FDxJYeOLNf0aQ9AIg48%2Ff%2Fwwfvv1hAAggZpBAYlWdnrqJLcPVE4e%2Bsuy7%2FfH%2F%2B88%2FGdjY2Bj%2BcCqHMey6%2Ben%2F379%2F%2F%2F8B6unZ9ew%2Fy54jV249f6%2Bm9uXnX4Y9qyaoAAQAhAB7%2FwEAAAAAY3h%2BG1RdbeMMCgkB9%2Fr%2BAPL2%2FAC3vsyi5NG6YQFcbnwdZ3F44uru9gAAAQAAUjEVALPT7wDu9v4A5erz%2FgL19vr16PD6AAUHBgDu9PwA%2F%2F8AAO%2F2%2FgD0%2BP0A7e7x8QPYzsX38vj9g%2BPk6hkLFiAxy%2BP4AeHj5%2FXFtp9GonxaagII7AawXyprpf%2F%2FZ5L5%2Fe%2Fv9%2B%2Fff91ZN7nrG0icJSqrkknJxHm1h5Nl0J8%2F%2Fxg%2B%2FwDa%2Febzv39%2FWKQ2TG97ycIvq%2Bvn52oVxMHGxHDj8RcGQT4uEGZyCct98e3LL3YmJ2enNYxAi%2B48%2B8QQaizGIMLFBLaSlYWZgYWDWZaJhY2V%2BcvPfwz%2BeiIMf%2F%2F%2BY9CV4GAQ42Zh%2BPPvP8O%2Fv%2F%2BZmG7cff7u49c%2FDNtufGZgYmJiOHLvG8Pt1z8Yfv3%2Bz%2FDn19%2B3TCd2LNV7%2F%2FU3w7vPvxkWnHzDcOPFd4ZvQBPv3L79aM%2BS3nfMN88d%2BfyXkW0Lq6BiGAs7J8fHT9%2F%2FXTy%2BY82Lp0cdb5889hcgQJNU85JYFMXP%2B5aHqRmmZJ9kKMGAEBgtDCYYY6BFa%2BlrPc6yRf0LYYtZzG4YaNGibUNJVLuIcBNUTLMQM8ZoppdiaXnf9Xlf5z4ounDu4p57f%2Ff8Pt50SH9ZEfUuLehy93yMRBNroVAg6PV2yBbO9c94tK5v7suF3%2FlMs1o8oU27ltvIMic7fJv7uuqLJGa2UpPxlCILICBtGz1pYWooakeoDaTFgBtNWm04zl%2Fkbs53FnZ%2FZO%2BldGbFP5aaP50cj41pigi8XFjF2zp8ivpgsFMFHp0GgrQZL4DuYGCE6f3pzoBnUwRB8sYi4QGKHf7b5d8HiHWpMBsPvLKDeFiHmVEPBN0yMJyMIUhfb6gXbMkr4xtq1J6Z36eLpmiDH508LNShbDzB4kTIATguNsBqA1CHElJDhGdCGWsDkYY%2FTJh3lUelu384yTlzrtgDWVaggvG8qhDnYcEwwWi0wET%2FTNTh9Gh%2FvVn7v%2B2I%2BHlpWXS59ORgfOr7UGRkVNMUAWPtCMnHdbjjATFNKJeKpdLZYQY0crDzLUvfbHxdqfllj6a7p2VVjUqyGhYwPpZFqxYlf6hZ%2F7X3c736%2Fv4LV1blv94gEvsAAAAASUVORK5CYII%3D" ID="rdf:#$CnoJ1">Get Bookmark Add-ons</A>
+     <HR>
+     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
+ <DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+     <DL><p>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/central/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$GvPhC3">Getting Started</A>
+-        <DT><A HREF="http://en-US.fxfeeds.mozilla.com/en-US/firefox/livebookmarks/" FEEDURL="http://en-US.fxfeeds.mozilla.com/en-US/firefox/headlines.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
++        <DT><A HREF="http://news.bbc.co.uk/" LAST_MODIFIED="1141921369" FEEDURL="http://newsrss.bbc.co.uk/rss/newsonline_world_edition/front_page/rss.xml" ID="rdf:#$LxoCU1">Latest BBC Headlines</A>
+     </DL><p>
+     <HR>
+-    <DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3>
++    <DT><H3 ID="rdf:#$QwFMN2">Ubuntu and Free Software links</H3>
++<DD>Information and resources about Ubuntu, Debian and Free Software in general
+     <DL><p>
++        <DT><A HREF="http://www.ubuntulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAICAAAAAAAACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////7+///9/v7//v/+//3////8/v3/+//9//v+/////f///v/+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////v/7//39/v/8/P7/+vz8//X9/v/6/v///v/8//7/+//+/v/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/v7/+v76/6XX+P88p/b/I6D0/2/A8//f9Pz//P/9//3//v/////////////////////////////////////////////////////////////////////////////////+/v7//v7///z+/v/+/f7///78///9///+/v3//v3+//z9/P+84Pn/D5X4/wGS/v8Dkf//BJX4/1y29v/5/P7//P/9/////////////////////////////////////////////////////////////////////////////////////f/+//3//v78//r5/f/o6/r/6en5/+jq+P/z8/3//Pz+/3TB8/8Dk/z/BZL+/wCU/P8GkP//GJr2/+T3/f///f//////////////////////////////////////////////////////////////////////////////////8/T9/6+17v9iZtj/LS3X/xQU0/8SENL/FBLO/yMizP/S2vL/eMX0/wOQ/v8Dkv3/AJL+/wSR/v8dm/T/6ff+//7+/v///////////////////////////////////////////////////////////////////////v////7///+mrN//BgXK/wAE1f8AAdv/AAHZ/wEB2f8AAN3/AQTX/4+Q5//J6fz/G5b3/wKU+/8Bkv7/BZT7/3TG9v/4/f7//v/9///////////////////////////////////////+//3///3///3//f/9//7//v7+/+n5+/96wvH/4PL8//T2+v84OdP/AQDc/wAB2v8CANr/AwDZ/wEA2/8AAdj/Hx/N/9vZ9f/A5vr/XLr3/0yx9/+T0ff/8vr9//n+/v///v7///////////////////////////////////7///z+/v/7//3///79//n+///t+f3/UrL2/wmP+f9uv/X/9vz//7m98P8GBtD/AwHY/wEA3f8BANv/AQHY/wAA2f8AAdn/IyPP/6Kk6P/o6vz/8/P7/87N8//Bx+z//f35//3+/P/////////////////////////////////////////+//3+///9/v7/+v37/2e6+P8Gkvz/AZX6/xCU+f/C5/n//Pr+/1hb2P8FB8z/IiHO/zQz1f8rLNf/Dg7Q/wQD0v8BAd3/AQLW/wsK0P8NDsr/BAbT/xgXzf/SzfD/+/39///////////////////////////////////////8//7//v3///v++/+n2fj/DJP6/wGU/P8Bkv7/ApP8/0+v9//x/Pv/4eL1/8/K8v/x9fz/+/39//f5/v/m5Pr/nKDo/yss0f8CAtb/AgLV/wIA2/8BANz/AgLX/0A+zv/29P3////////////////////+//7+///+//7//v7+//z//P/5//7/8vf8/zak8/8Bkv//AZL+/wOS/v8Bkv7/JZnx/93v+f/+/vz//vz+//3////+/v///////////f/8/vv/7Or8/19Z2/8BA9T/AQHb/wEA3P8AAtf/BgPW/5+f6P/+/f///v7+///+///6//7//v7+//39///8/v3/+/7+///+/f+o2vb/BJT4/wKT+/8Ckf//A5L9/w+V9v+v3Pj//Pz9//r//v/9//7//f/+//////////////////v//v/+/f7/8PP+/0ZJ0/8BAtf/AQDb/wEA2/8CAdr/PDvQ//b5/v/9//7//v7///7/+P/9/v3/7/j+/8LP9P+yx/H/3O77/9Pr+/8woPf/A5H+/wGS/v8FlPr/abz5//n+/P/8//7//P/+///9/////////////////////////f7+//7/+//+/P//29v3/wsMzv8BAtj/AgHa/wAA2/8JCc7/z9X0//3//P/+/v//+v3+/+rx/P9Ceuj/CUnx/wZI9v8bXez/wdP2/77j+P8Kk/n/ApL8/wyW+P/R7vv//v3///z//v/+//7//P7///3//////////////////////f///f7+///9/v/6/P3/XlzX/wEB2/8BAtb/AgDc/wED1P+cnuP//v7+//7+/v///vv/j6vy/wVK+f8DSPr/BEn8/wNI/P84bev/8Pr//yqj8/8Fkf7/NqLx//D8/f/9//7//v/9///+//////3////+//////////////////7//v/9//////7///z//v+pqOn/KCjU/yco0v8uKNb/KCbU/4mJ3v///v7/+//+//v+/v9fje//Akr9/wFL/P8ASf7/A0n9/xBS6P/z+/3/SK7y/wKS/v9Grvb/9v3////////////////////////////////////////////////+/////v/8/////P7///z9/v/4+/7/9/v///r8/f/6+v7/+f39//7+/f/+/v7//v3+/4ir9P8GSvn/BEj5/wRI/f8ESfr/NWvr//L7/f8vo/T/AZL//0Kr9P/1/v3//v////////////////////////////////////////////3//P////z//v/+//3/6PD6/8rZ8v/H2PP/yNn0/8fZ8//f6fb/+v78///+/v/7/v7/6/H8/0l67P8JSe7/BUn0/x1g7f/C0fj/uOP6/weT+v8Bkv3/JZn1/+n4/P/+/////////////////////////////////////////////v/8///////7//z9/P+CqfL/B03w/whM9f8IS/f/CEv1/4qk7v/9/vz//f/9/////P/7//3/9Pj+/8nW9/++y/P/5O77/83o+v8rn/j/A5H//wGV+v8Ikvv/sd34//3+/v/+/v///v/+//z////////////////////+/////v////3+///8/v3/8Pn//zdw6/8BSf7/Akf//wFK/v8ESvj/rMby//7+/f/+//3///////////////////////7//v/8//7/f8Xy/wOV+/8Ck/3/AZL//wSR/v9BqvP/6/r9//z+/v/+/vz//f7+//z//f/9//3//v7//////f/+//3///7+//v9/P+jvvX/Bkr1/wBK/v8BSf3/BEf+/xZY8P/g7v3//P/8//39/v/////////////////+//7//f3+//v+/P/P6Pr/DJP3/wSS/v8Ckv//BJL+/wWS/P9svPn/8vv8//r+/v/9/vz//v3+//7+///+//3//f3+//n+/v/9/vz/0d36/x1b7v8FSfz/Akj//wFK/v8DSvr/YIzx//z9/v/8/v3///3+//////////////////7////+/v///P/+//b++/9Yufb/BJH+/wGT/v8BlPz/A5P8/xmY+P/Z7fv/+v77//z8+//8/vr/+f7+///+/f/8/vr/9/n8/6jB9/8dX+v/AEr6/wFI//8BSP7/BUr4/xFS8f/N2vj///7///3+//////7//////////////////v////3//v/9//7///3//9vt+/8Wl/X/BZL9/wKQ/v8Ck/r/dMX4//n8/v+zx/D/bZnt/7jI8//J1/v/v9L3/5Sw8/9Kee7/CEz0/wxM8/8vZ/T/NW/w/w5Q8P8FSPf/c6Dt//v9/v/8//3//v/+//3//f///////////////////////////////////////v///6/b+P8Vlff/AZP9/yuc8v/j8/3/8PP9/zds7P8BSP3/A0v5/wlJ9v8DSfr/Akj+/wJL9v9Jeuv/zt77//X4///y+f//5O3+/6K67//t9/3///7+////////////////////////////////////////////////////////////+v38/6DY+P8alvP/nNT2//v+/v+Mr/T/Bkj0/wRK+P8BSf3/AEn9/wNI/f8BSfz/O3Hu/+zx/f+Um+X/MjHS/ycmzf9zct3/7O/4//z+/P/6//3////////////////////////////////////////////////////////////+/v//+v7+/8jr/P/u+f7/1+n8/x9Z8P8FSfv/AUj+/wVG//8BSv3/BEj8/wZM9P+vxPP/tLPs/wgH1P8EAdj/AQHa/wED1P9oatj//vv+//7+/v////////////////////////////////////////////////////////////7+//////v/+f79//7+/P+/0vH/L2Xt/wtM9P8FSfz/Akn+/wBJ//8CSf3/FE/y/9vl+f9gX9//AQLT/wMA2v8AAtf/BQDW/x8fzv/w7/3//v39//////////////////////////////////////////////////////////////////////////////////z+/f/y8/7/yNX4/46t8v9ok+7/X4rr/2aM6/+DoO7/7fH8/2ln4P8CAtX/AQDe/wEC1f8BA9T/JiTK/+/0/v///v7//////////////////////////////////////////////////////////////////////////////////f3+//7++f/+/vz/+/7+//v+/v/8/f7/+vz+//n+/P/+/fr/x8bu/xEPyv8BANv/AgHb/wYD1P+FgeD//v38//z//v/////////////////////////////////////////////////////////////////////////////////9/v///f7///z//v/+//7//f7//////f////3////4//z8/v/9/P3/xsDw/1lb1P9ST9T/nZ/i//j5/f/+//7///3///////////////////////////////////////////////////////////////////////////////////7//f////7///7+//3+/P/9/v7//v79//v9///+/vz/+//9//79///8/v3/+/39//n7/f/9/vz//v3+//79/v/9//z/////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" LAST_CHARSET="UTF-8" ID="rdf:#$RwFMN2">Ubuntu</A>
++        <DT><A HREF="http://www.ubuntu.com/support" ICON="data:image/x-icon;base64,AAABAAEAICAAAAAAAACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////7+///9/v7//v/+//3////8/v3/+//9//v+/////f///v/+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////v/7//39/v/8/P7/+vz8//X9/v/6/v///v/8//7/+//+/v/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/v7/+v76/6XX+P88p/b/I6D0/2/A8//f9Pz//P/9//3//v/////////////////////////////////////////////////////////////////////////////////+/v7//v7///z+/v/+/f7///78///9///+/v3//v3+//z9/P+84Pn/D5X4/wGS/v8Dkf//BJX4/1y29v/5/P7//P/9/////////////////////////////////////////////////////////////////////////////////////f/+//3//v78//r5/f/o6/r/6en5/+jq+P/z8/3//Pz+/3TB8/8Dk/z/BZL+/wCU/P8GkP//GJr2/+T3/f///f//////////////////////////////////////////////////////////////////////////////////8/T9/6+17v9iZtj/LS3X/xQU0/8SENL/FBLO/yMizP/S2vL/eMX0/wOQ/v8Dkv3/AJL+/wSR/v8dm/T/6ff+//7+/v///////////////////////////////////////////////////////////////////////v////7///+mrN//BgXK/wAE1f8AAdv/AAHZ/wEB2f8AAN3/AQTX/4+Q5//J6fz/G5b3/wKU+/8Bkv7/BZT7/3TG9v/4/f7//v/9///////////////////////////////////////+//3///3///3//f/9//7//v7+/+n5+/96wvH/4PL8//T2+v84OdP/AQDc/wAB2v8CANr/AwDZ/wEA2/8AAdj/Hx/N/9vZ9f/A5vr/XLr3/0yx9/+T0ff/8vr9//n+/v///v7///////////////////////////////////7///z+/v/7//3///79//n+///t+f3/UrL2/wmP+f9uv/X/9vz//7m98P8GBtD/AwHY/wEA3f8BANv/AQHY/wAA2f8AAdn/IyPP/6Kk6P/o6vz/8/P7/87N8//Bx+z//f35//3+/P/////////////////////////////////////////+//3+///9/v7/+v37/2e6+P8Gkvz/AZX6/xCU+f/C5/n//Pr+/1hb2P8FB8z/IiHO/zQz1f8rLNf/Dg7Q/wQD0v8BAd3/AQLW/wsK0P8NDsr/BAbT/xgXzf/SzfD/+/39///////////////////////////////////////8//7//v3///v++/+n2fj/DJP6/wGU/P8Bkv7/ApP8/0+v9//x/Pv/4eL1/8/K8v/x9fz/+/39//f5/v/m5Pr/nKDo/yss0f8CAtb/AgLV/wIA2/8BANz/AgLX/0A+zv/29P3////////////////////+//7+///+//7//v7+//z//P/5//7/8vf8/zak8/8Bkv//AZL+/wOS/v8Bkv7/JZnx/93v+f/+/vz//vz+//3////+/v///////////f/8/vv/7Or8/19Z2/8BA9T/AQHb/wEA3P8AAtf/BgPW/5+f6P/+/f///v7+///+///6//7//v7+//39///8/v3/+/7+///+/f+o2vb/BJT4/wKT+/8Ckf//A5L9/w+V9v+v3Pj//Pz9//r//v/9//7//f/+//////////////////v//v/+/f7/8PP+/0ZJ0/8BAtf/AQDb/wEA2/8CAdr/PDvQ//b5/v/9//7//v7///7/+P/9/v3/7/j+/8LP9P+yx/H/3O77/9Pr+/8woPf/A5H+/wGS/v8FlPr/abz5//n+/P/8//7//P/+///9/////////////////////////f7+//7/+//+/P//29v3/wsMzv8BAtj/AgHa/wAA2/8JCc7/z9X0//3//P/+/v//+v3+/+rx/P9Ceuj/CUnx/wZI9v8bXez/wdP2/77j+P8Kk/n/ApL8/wyW+P/R7vv//v3///z//v/+//7//P7///3//////////////////////f///f7+///9/v/6/P3/XlzX/wEB2/8BAtb/AgDc/wED1P+cnuP//v7+//7+/v///vv/j6vy/wVK+f8DSPr/BEn8/wNI/P84bev/8Pr//yqj8/8Fkf7/NqLx//D8/f/9//7//v/9///+//////3////+//////////////////7//v/9//////7///z//v+pqOn/KCjU/yco0v8uKNb/KCbU/4mJ3v///v7/+//+//v+/v9fje//Akr9/wFL/P8ASf7/A0n9/xBS6P/z+/3/SK7y/wKS/v9Grvb/9v3////////////////////////////////////////////////+/////v/8/////P7///z9/v/4+/7/9/v///r8/f/6+v7/+f39//7+/f/+/v7//v3+/4ir9P8GSvn/BEj5/wRI/f8ESfr/NWvr//L7/f8vo/T/AZL//0Kr9P/1/v3//v////////////////////////////////////////////3//P////z//v/+//3/6PD6/8rZ8v/H2PP/yNn0/8fZ8//f6fb/+v78///+/v/7/v7/6/H8/0l67P8JSe7/BUn0/x1g7f/C0fj/uOP6/weT+v8Bkv3/JZn1/+n4/P/+/////////////////////////////////////////////v/8///////7//z9/P+CqfL/B03w/whM9f8IS/f/CEv1/4qk7v/9/vz//f/9/////P/7//3/9Pj+/8nW9/++y/P/5O77/83o+v8rn/j/A5H//wGV+v8Ikvv/sd34//3+/v/+/v///v/+//z////////////////////+/////v////3+///8/v3/8Pn//zdw6/8BSf7/Akf//wFK/v8ESvj/rMby//7+/f/+//3///////////////////////7//v/8//7/f8Xy/wOV+/8Ck/3/AZL//wSR/v9BqvP/6/r9//z+/v/+/vz//f7+//z//f/9//3//v7//////f/+//3///7+//v9/P+jvvX/Bkr1/wBK/v8BSf3/BEf+/xZY8P/g7v3//P/8//39/v/////////////////+//7//f3+//v+/P/P6Pr/DJP3/wSS/v8Ckv//BJL+/wWS/P9svPn/8vv8//r+/v/9/vz//v3+//7+///+//3//f3+//n+/v/9/vz/0d36/x1b7v8FSfz/Akj//wFK/v8DSvr/YIzx//z9/v/8/v3///3+//////////////////7////+/v///P/+//b++/9Yufb/BJH+/wGT/v8BlPz/A5P8/xmY+P/Z7fv/+v77//z8+//8/vr/+f7+///+/f/8/vr/9/n8/6jB9/8dX+v/AEr6/wFI//8BSP7/BUr4/xFS8f/N2vj///7///3+//////7//////////////////v////3//v/9//7///3//9vt+/8Wl/X/BZL9/wKQ/v8Ck/r/dMX4//n8/v+zx/D/bZnt/7jI8//J1/v/v9L3/5Sw8/9Kee7/CEz0/wxM8/8vZ/T/NW/w/w5Q8P8FSPf/c6Dt//v9/v/8//3//v/+//3//f///////////////////////////////////////v///6/b+P8Vlff/AZP9/yuc8v/j8/3/8PP9/zds7P8BSP3/A0v5/wlJ9v8DSfr/Akj+/wJL9v9Jeuv/zt77//X4///y+f//5O3+/6K67//t9/3///7+////////////////////////////////////////////////////////////+v38/6DY+P8alvP/nNT2//v+/v+Mr/T/Bkj0/wRK+P8BSf3/AEn9/wNI/f8BSfz/O3Hu/+zx/f+Um+X/MjHS/ycmzf9zct3/7O/4//z+/P/6//3////////////////////////////////////////////////////////////+/v//+v7+/8jr/P/u+f7/1+n8/x9Z8P8FSfv/AUj+/wVG//8BSv3/BEj8/wZM9P+vxPP/tLPs/wgH1P8EAdj/AQHa/wED1P9oatj//vv+//7+/v////////////////////////////////////////////////////////////7+//////v/+f79//7+/P+/0vH/L2Xt/wtM9P8FSfz/Akn+/wBJ//8CSf3/FE/y/9vl+f9gX9//AQLT/wMA2v8AAtf/BQDW/x8fzv/w7/3//v39//////////////////////////////////////////////////////////////////////////////////z+/f/y8/7/yNX4/46t8v9ok+7/X4rr/2aM6/+DoO7/7fH8/2ln4P8CAtX/AQDe/wEC1f8BA9T/JiTK/+/0/v///v7//////////////////////////////////////////////////////////////////////////////////f3+//7++f/+/vz/+/7+//v+/v/8/f7/+vz+//n+/P/+/fr/x8bu/xEPyv8BANv/AgHb/wYD1P+FgeD//v38//z//v/////////////////////////////////////////////////////////////////////////////////9/v///f7///z//v/+//7//f7//////f////3////4//z8/v/9/P3/xsDw/1lb1P9ST9T/nZ/i//j5/f/+//7///3///////////////////////////////////////////////////////////////////////////////////7//f////7///7+//3+/P/9/v7//v79//v9///+/vz/+//9//79///8/v3/+/39//n7/f/9/vz//v3+//79/v/9//z/////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" LAST_CHARSET="UTF-8" ID="rdf:#$SwFMN2">Ubuntu Support Home</A>
++        <DT><A HREF="http://www.ubuntulinux.org/wiki/FrontPage" ID="rdf:#$TwFMN2">Ubuntu Wiki (community-edited website)</A>
++        <DT><A HREF="https://launchpad.net/distros/ubuntu/+addticket" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QoFEDIS8aZJ5gAAAjxJREFUOMuVk99LU2Ecxj/v2dnO3NhyO66xTDFLMbGgC7WwLoKiulGiqMvA/oAoioQgKMi8yIqCIOpCoi7yIoouFLpLu8hgRXXR/ImkrjPnqjW3HXe200WbtImZX3h4+cL7fHgeeF/BOidw6aWlttzWeqBOPRpZNPxiPeZ9Nwb3Hm9Ue/ds8TZXqS4evp29Kf+P0XOxn44634WTO9TugHeD7LTbTC2eZjA0/2wVgEnz9cH99arS8FFLj26vUHae2uXrqfS6JElxmLqui+GJ6LvJWHpkBcDX9VycaHx9q70+cMZhlZj8voRTsVKlunE5HdmkrlvmYnHj6af5c+HudmMFwGOXj8iSaBqaenM5kVHiVZ7qnrZtDXa302HomYw8u/Ar9+RDpGvo/KFhgGWAOVUDuUTniHbN1ewfCwm4AggtudGYTj7QFVutEpxeoC+oXR3+mugt+GRzvMKKoJVcogk43OIfCwAqEAdcfkdEllKneRS8m/SVeRxuRcrN93QsJ5YQ1AO7gRogCswB4bxigOEri/YPjGY7q902Kt3Whr8ry4DIX86sohRwP52l3MQklsqGiwHC1DBFAbBUcmaAH8D7lk3OO58j6dkXoZ+3SxPoJQmMPMDI79+29N0L1HlT7oHxeFu4u32mGCBlE2Tl0gqFBBrweDFjj706e/DYn7bFIwDMGbdAtzpBqEBFXioQFFujX/71zGUAsTlumlMkyKoZhCgkiGCxhNb6J0WZTBOY8MpIwgUkRe2CvhbgN4G73+hz2ow4AAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8" ID="rdf:#$UwFMN2">Make a Support Request to the Ubuntu Community</A>
++        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8" ID="rdf:#$VwFMN2">Free Software Foundation</A>
++        <DT><A HREF="http://www.debian.org/" ICON="data:image/x-icon;base64,AAABAAQAICAAAAEACACoCAAARgAAACAgEAABAAQA6AIAAO4IAAAQEAAAAQAIAGgFAADWCwAAEBAQAAEABAAoAQAAPhEAACgAAAAgAAAAQAAAAAEACAAAAAAAgAQAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAMDcwADwyqYAACBAAAAgYAAAIIAAACCgAAAgwAAAIOAAAEAAAABAIAAAQEAAAEBgAABAgAAAQKAAAEDAAABA4AAAYAAAAGAgAABgQAAAYGAAAGCAAABgoAAAYMAAAGDgAACAAAAAgCAAAIBAAACAYAAAgIAAAICgAACAwAAAgOAAAKAAAACgIAAAoEAAAKBgAACggAAAoKAAAKDAAACg4AAAwAAAAMAgAADAQAAAwGAAAMCAAADAoAAAwMAAAMDgAADgAAAA4CAAAOBAAADgYAAA4IAAAOCgAADgwAAA4OAAQAAAAEAAIABAAEAAQABgAEAAgABAAKAAQADAAEAA4ABAIAAAQCAgAEAgQABAIGAAQCCAAEAgoABAIMAAQCDgAEBAAABAQCAAQEBAAEBAYABAQIAAQECgAEBAwABAQOAAQGAAAEBgIABAYEAAQGBgAEBggABAYKAAQGDAAEBg4ABAgAAAQIAgAECAQABAgGAAQICAAECAoABAgMAAQIDgAECgAABAoCAAQKBAAECgYABAoIAAQKCgAECgwABAoOAAQMAAAEDAIABAwEAAQMBgAEDAgABAwKAAQMDAAEDA4ABA4AAAQOAgAEDgQABA4GAAQOCAAEDgoABA4MAAQODgAIAAAACAACAAgABAAIAAYACAAIAAgACgAIAAwACAAOAAgCAAAIAgIACAIEAAgCBgAIAggACAIKAAgCDAAIAg4ACAQAAAgEAgAIBAQACAQGAAgECAAIBAoACAQMAAgEDgAIBgAACAYCAAgGBAAIBgYACAYIAAgGCgAIBgwACAYOAAgIAAAICAIACAgEAAgIBgAICAgACAgKAAgIDAAICA4ACAoAAAgKAgAICgQACAoGAAgKCAAICgoACAoMAAgKDgAIDAAACAwCAAgMBAAIDAYACAwIAAgMCgAIDAwACAwOAAgOAAAIDgIACA4EAAgOBgAIDggACA4KAAgODAAIDg4ADAAAAAwAAgAMAAQADAAGAAwACAAMAAoADAAMAAwADgAMAgAADAICAAwCBAAMAgYADAIIAAwCCgAMAgwADAIOAAwEAAAMBAIADAQEAAwEBgAMBAgADAQKAAwEDAAMBA4ADAYAAAwGAgAMBgQADAYGAAwGCAAMBgoADAYMAAwGDgAMCAAADAgCAAwIBAAMCAYADAgIAAwICgAMCAwADAgOAAwKAAAMCgIADAoEAAwKBgAMCggADAoKAAwKDAAMCg4ADAwAAAwMAgAMDAQADAwGAAwMCAAMDAoADw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAADnTpenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAl0YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAl0ZOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACXRpcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABORgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRkYAAAAAAAAAAAAA75ef7wAAAAAAAAAAAAAAAAAAAJ9GAAAAAAAAAAAAV05ORkZGRp8AAAAAAAAAAAAAAAAARkYAAAAAAAAAp05OTqcAAADvRkbvAAAAAAAAAAAAAKdGRgAAAAAAAADvTp8AAAAAAAAA70aXAAAAAAAAAAAAp0aXAAAAAAAAAE5GAAAAp1cAAAAA70bvAAAAAAAAAACnRqcAAAAAAACnRu8AAAAAAABXAAAATkbvAAAAAAAAAJdGlwAAAAAAAKdGAAAAAAAAAKcAAAAARu8AAAAAAAAAp0ZOAAAAAAAAp0YAAAAAAAAAAAAAAABGTgAAAAAAAACnRkYAAAAAAAAARgAAAAAAAAAA5wAAAEZG7wAAAAAAAJ9GRgAAAAAAAADvnwAAAAAAAAAAAAAARkbvAAAAAAAA70ZGpwAAAAAAAABO7wAAAAAApwAAAABGTqcAAAAAAADvV0ZOAAAAAAAAAKdGpwAAAADvAAAA70ZO7wAAAAAAAO9GRkYAAAAAAAAAAO9ORkZGpwAAAACfRlfvAAAAAAAAAABGRk4AAAAAAAAAAAAAAAAAAAAAAEZGp6cAAAAAAAAApwBGRk4AAAAAAAAAAAAAAAAAAACnRkZGAAAAAAAAAAAAAJ9GRkbvAAAAAAAAAAAAAAAAAEZGRk4AAAAAAAAAAAAAAEZGRkanAAAAAAAAAAAAAABGRkZGAAAAAAAAAAAAAAAAAEZGRkZGlwAAAAAAAABORkZGRgAAAAAAAAAAAAAAAAAAAE5GRkZGRkZGRkZGRkZGRkYAAAAAAAAAAAAAAAAAAAAAAABGRkZGRkZGRkZGRk7vAAAAAAAAAAAAAAAAAAAAAAAAAAAATkZGTleXn6cAAAAAAAAAAAAAAP/8P///+f///+P////P////n////z////5////8f////P////n////5////8f+H//P+Af/z+Dh/4/j+P+P5zx/j8fuP4/P7z+Pz/8/j+/3H4/n/x+H8+8fh/HuH4f4Hh/j//4f0f/8P/B//D/4P/h//A/g//4AAf//gAP//+Af/KAAAACAAAABAAAAAAQAEAAAAAACAAgAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAACZkAAAAAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAAACZkAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmQAAAAAAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmZAAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmZAAAAAAAAAAAAAAAAAAAJmQAAAAAAAAAAAAAAAAAACZAAAAAAAJkAAAAAAAAAAJkAAAAACZmZmZAAAAAAAACZAAAAAJmQAACZkAAAAAAAmQAAAAmQAAAAAJkAAAAAAJkAAAAJAAAJAAAJkAAAAAmZAAAAmQAAAAkACZAAAAAJmQAAAJkAAAAAkACQAAAACZkAAACQAAAAAAAAmQAAAAmZAAAAmQAAAACQAJkAAAAJmQAAAAmQAAAAAACZkAAAAJkAAAAAkAAAAJAAmZAAAACZkAAAAAkAAAkAAJmQAAAACZAAAAAAmZkAAAmZAAAAAAmZAAAAAAAAAAAJmQAAAAAAmZAAAAAAAAAAmZkAAAAAAJmZAAAAAAAAAJmQAAAAAAAJmZAAAAAAAAmZkAAAAAAAAJmZmQAAAAmZmQAAAAAAAAAJmZmZmZmZmZAAAAAAAAAAAAmZmZmZmZAAAAAAAAAAAAAACZmZmQAAAAAAAP/+P///+f///+P////P////n////z////5////8f////P////j////4////+f/P//P+Af/z/Hx/8/n/P/P775/j8/uf4/P93+P3/8/j8/3P4/n/x/P9/cfx/vvH+f8Pj/j//4/8f/8P/D//H/4f/h//A/g//4AAf//gAf//+A//KAAAABAAAAAgAAAAAQAIAAAAAABAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAADAwMAAwNzAAPDKpgAAIEAAACBgAAAggAAAIKAAACDAAAAg4AAAQAAAAEAgAABAQAAAQGAAAECAAABAoAAAQMAAAEDgAABgAAAAYCAAAGBAAABgYAAAYIAAAGCgAABgwAAAYOAAAIAAAACAIAAAgEAAAIBgAACAgAAAgKAAAIDAAACA4AAAoAAAAKAgAACgQAAAoGAAAKCAAACgoAAAoMAAAKDgAADAAAAAwCAAAMBAAADAYAAAwIAAAMCgAADAwAAAwOAAAOAAAADgIAAA4EAAAOBgAADggAAA4KAAAODAAADg4ABAAAAAQAAgAEAAQABAAGAAQACAAEAAoABAAMAAQADgAEAgAABAICAAQCBAAEAgYABAIIAAQCCgAEAgwABAIOAAQEAAAEBAIABAQEAAQEBgAEBAgABAQKAAQEDAAEBA4ABAYAAAQGAgAEBgQABAYGAAQGCAAEBgoABAYMAAQGDgAECAAABAgCAAQIBAAECAYABAgIAAQICgAECAwABAgOAAQKAAAECgIABAoEAAQKBgAECggABAoKAAQKDAAECg4ABAwAAAQMAgAEDAQABAwGAAQMCAAEDAoABAwMAAQMDgAEDgAABA4CAAQOBAAEDgYABA4IAAQOCgAEDgwABA4OAAgAAAAIAAIACAAEAAgABgAIAAgACAAKAAgADAAIAA4ACAIAAAgCAgAIAgQACAIGAAgCCAAIAgoACAIMAAgCDgAIBAAACAQCAAgEBAAIBAYACAQIAAgECgAIBAwACAQOAAgGAAAIBgIACAYEAAgGBgAIBggACAYKAAgGDAAIBg4ACAgAAAgIAgAICAQACAgGAAgICAAICAoACAgMAAgIDgAICgAACAoCAAgKBAAICgYACAoIAAgKCgAICgwACAoOAAgMAAAIDAIACAwEAAgMBgAIDAgACAwKAAgMDAAIDA4ACA4AAAgOAgAIDgQACA4GAAgOCAAIDgoACA4MAAgODgAMAAAADAACAAwABAAMAAYADAAIAAwACgAMAAwADAAOAAwCAAAMAgIADAIEAAwCBgAMAggADAIKAAwCDAAMAg4ADAQAAAwEAgAMBAQADAQGAAwECAAMBAoADAQMAAwEDgAMBgAADAYCAAwGBAAMBgYADAYIAAwGCgAMBgwADAYOAAwIAAAMCAIADAgEAAwIBgAMCAgADAgKAAwIDAAMCA4ADAoAAAwKAgAMCgQADAoGAAwKCAAMCgoADAoMAAwKDgAMDAAADAwCAAwMBAAMDAYADAwIAAwMCgAPD7/wCkoKAAgICAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAADvTqfvAAAAAAAAAAAAAACXTu8AAAAAAAAAAAAAAACfTu8AAAAAAAAAAAAAAACfTu8AAAAAAAAAAAAAAADvRqcAAAAAAAAAAAAAAAAAVkYAAAAAp6fvAAAAAAAA70bvAACnl05GRpfvAAAAAKdGAAAAl6cAAABOTu8AAACfRgAAp1YA76cAAJeXAAAAn04AAKdWAAAApwCfTu8AAKdGAAAAnwAAAAAAp0bvAADvRp8AAACfl58AAJdO7wAAAJdO7wAAAAAAAO9GlwAAAADvTkanAAAAAO+XRu8AAAAAAO9ORlaXl1ZORu8AAAAAAAAA76dWRkZWp+8AAAAA/D/vgfj/74Hx/wAA4/86AMf/AgDPHysBjAcAApzjAgCZM0oBmdEAAp3xBACOMVgBx+OBAcPDAALgB08C8A/OAigAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAACZAAAAAAAAmQAAAAAAAAmQAAAAAAAAmQAAAAAAAAmQAAAAAAAACQAAmZkAAACZAAmQCZkAAJkAmQAACZAAmQCQCZAJkACZAJAACQCZAJkACQAJAJkACZAAmZAAmQAJmQAAAAmQAACZkAAAmZAAAAmZmZmZAAAAAJmZmQAAD+f++B+f/vgfP/PALn/+sCz/8CAN4fCgKcx+sCmfMGAJszJwKb2RICndmAAs456wLH8wIA4+M1AvAH6wL4H++B" LAST_CHARSET="ISO-8859-1" ID="rdf:#$WwFMN2">Debian (Ubuntu is based on Debian)</A>
++    <DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">Help and Tutorials</A>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">Customize Firefox</A>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">Get Involved</A>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">About Us</A>
+     </DL><p>
+ </DL><p>
+Index: mozilla/gfx/src/gtk/fontEncoding.properties
+===================================================================
+--- mozilla.orig/gfx/src/gtk/fontEncoding.properties	2005-06-10 08:36:34.000000000 +0000
++++ mozilla/gfx/src/gtk/fontEncoding.properties	2007-06-01 10:05:56.000000000 +0000
+@@ -65,18 +65,18 @@
+ # - the 'value' for ftcmap is either mac_roman 
+ #   or unicode.
+ 
+ # If you have Symbol (Adobe) type 1 font, keep the following lines 
+ # commented out (you do NOT need them). However,  with  truetype Symbol 
+ # font,  you do need them. 
+ 
+ # Symbol font
+-#encoding.symbol.ttf = Adobe-Symbol-Encoding
+-#encoding.symbol.ftcmap = mac_roman
++encoding.symbol.ttf = Adobe-Symbol-Encoding
++encoding.symbol.ftcmap = mac_roman
+ 
+ # TeX's Computer Modern fonts (Roman, Math Italic, Symbol and Extension)
+ 
+ encoding.cmr10.ttf  = x-ttf-cmr
+ encoding.cmmi10.ttf = x-ttf-cmmi
+ encoding.cmsy10.ttf = x-ttf-cmsy
+ encoding.cmex10.ttf = x-ttf-cmex
+ 
+Index: mozilla/widget/src/gtk2/nsWindow.cpp
+===================================================================
+--- mozilla.orig/widget/src/gtk2/nsWindow.cpp	2007-04-19 18:46:03.000000000 +0000
++++ mozilla/widget/src/gtk2/nsWindow.cpp	2007-06-01 10:05:56.000000000 +0000
+@@ -1654,24 +1654,27 @@
+         containerWindow->mActivatePending = PR_FALSE;
+         DispatchActivateEvent();
+     }
+     if (check_for_rollup(aEvent->window, aEvent->x_root, aEvent->y_root,
+                          PR_FALSE))
+         return;
+ 
+     switch (aEvent->button) {
++    case 1:
++        eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
++        break;
+     case 2:
+         eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN;
+         break;
+     case 3:
+         eventType = NS_MOUSE_RIGHT_BUTTON_DOWN;
+         break;
+     default:
+-        eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
++        return;
+         break;
+     }
+ 
+     nsCOMPtr<nsIWidget> kungFuDeathGrip = this;
+ 
+     nsMouseEvent event(PR_TRUE, eventType, this, nsMouseEvent::eReal);
+     InitButtonEvent(event, aEvent);
+ 
+Index: mozilla/xpfe/browser/resources/locale/en-US/region.properties
+===================================================================
+--- mozilla.orig/xpfe/browser/resources/locale/en-US/region.properties	2006-06-28 03:35:13.000000000 +0000
++++ mozilla/xpfe/browser/resources/locale/en-US/region.properties	2007-06-01 10:05:56.000000000 +0000
+@@ -1,20 +1,20 @@
+ # navigator.properties
+-homePageDefault=http://www.mozilla.org/
++homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html
+ keywordList=http://home.netscape.com/escapes/keywords
+ webmailKeyword=http://webmail.netscape.com
+ fallbackDefaultSearchURL=http://www.google.com/search?q=
+ otherSearchURL=http://www.google.com
+ #
+ # all.js
+ #
+-browser.startup.homepage=http://www.mozilla.org/projects/seamonkey/start/
+-browser.throbber.url=http://www.mozilla.org/projects/seamonkey/
++browser.startup.homepage=file:///usr/share/ubuntu-artwork/home/index.html
++browser.throbber.url=file:///usr/share/ubuntu-artwork/home/index.html
+ browser.search.defaulturl=http://www.google.com/search?q=
+ general.useragent.contentlocale=US
+ 
+ browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
+ browser.translation.serviceDomain=translate.google.com
+ 
+ #config.js
+ #
+-startup.homepage_override_url=http://www.mozilla.org/projects/seamonkey/start/
++startup.homepage_override_url=file:///usr/share/ubuntu-artwork/home/index.html
--- iceowl-0.7.orig/debian/patches/mips_xpcom
+++ iceowl-0.7/debian/patches/mips_xpcom
@@ -0,0 +1,573 @@
+---
+ xpcom/reflect/xptcall/src/md/unix/Makefile.in           |   12 
+ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s |  233 +++++++---------
+ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp   |   16 -
+ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s  |  142 +++++++++
+ 4 files changed, 263 insertions(+), 140 deletions(-)
+
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -223,21 +223,17 @@
+ endif
+ endif
+ endif
+ 
+ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(findstring mips, $(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_mips.cpp xptcstubs_mips.cpp
+ ASFILES		:= xptcinvoke_asm_mips.s xptcstubs_asm_mips.s
+-#xptcstubs_mips.cpp
+-# xptcstubs_asm_mips.s
+-ifdef GNU_CC
+-ASFLAGS		+= $(INCLUDES) -x assembler-with-cpp -D__GNUC__
+-endif
++AS		:= $(CC) $(CFLAGS) $(INCLUDES) -c -x assembler-with-cpp
+ endif
+ endif
+ 
+ ######################################################################
+ # PowerPC
+ ######################################################################
+ #
+ # AIX/PPC
+@@ -374,20 +370,18 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ DEFINES		+= -DEXPORT_XPTC_API
+ 
+ INCLUDES	+= -I$(srcdir)/../..
+ 
+ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(findstring mips, $(OS_TEST)))
+-xptcstubs_asm_mips.o: xptcstubs_asm_mips.s.m4 $(PUBLIC)/xptcstubsdef.inc
+-	m4 $(INCLUDES) $< > ./xptcstubs_asm_mips.s && \
+-	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_mips.s
+-	$(RM) -f ./xptcstubs_asm_mips.s
++xptcstubs_asm_mips.o: xptcstubs_asm_mips.s $(PUBLIC)/xptcstubsdef.inc
++	$(AS) -o $@ $<
+ endif
+ endif
+ 
+ ifeq ($(OS_ARCH),Darwin)
+ xptcstubs_asm_ppc_darwin.o: xptcstubs_asm_ppc_darwin.s.m4 $(PUBLIC)/xptcstubsdef.inc Makefile
+ 	gm4 $(INCLUDES) $< > ./xptcstubs_asm_ppc_darwin.s && \
+ 	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_ppc_darwin.s
+ 	$(RM) -f ./xptcstubs_asm_ppc_darwin.s
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
+@@ -16,151 +16,136 @@
+  * The Initial Developer of the Original Code is
+  * Netscape Communications Corp, Inc.
+  * Portions created by the Initial Developer are Copyright (C) 2001
+  * the Initial Developer. All Rights Reserved.
+  *
+  * Contributor(s):
+  *   Brendan Eich     <brendan@mozilla.org>
+  *   Stuart Parmenter <pavlov@netscape.com>
++ *   Thiemo Seufer    <seufer@csv.ica.uni-stuttgart.de>
+  */
+ 
+ /* This code is for MIPS using the O32 ABI. */
+ 
+ #include <sys/regdef.h>
+ #include <sys/asm.h>
+ 
+-.text
+-.globl  invoke_count_words
+-.globl	invoke_copy_to_stack 
+-
+-# We need a variable number of words allocated from the stack for copies of
+-# the params, and this space must come between the high frame (where ra, gp,
+-# and s0 are saved) and the low frame (where a0-a3 are saved by the callee
+-# functions we invoke). 
+-
+-LOCALSZ=4		# s0, s1, ra, gp
+-NARGSAVE=4		# a0, a1, a2, a3
+-HIFRAMESZ=(LOCALSZ*SZREG)
+-LOFRAMESZ=(NARGSAVE*SZREG)
+-FRAMESZ=(HIFRAMESZ+LOFRAMESZ+ALSZ)&ALMASK
+-
+-# XXX these 2*SZREG, etc. are very magic -- we *know* that ALSZ&ALMASK cause
+-# FRAMESZ to be 0 mod 8, in this case to be 16 and not 12.
+-RAOFF=FRAMESZ - (2*SZREG)
+-GPOFF=FRAMESZ - (3*SZREG)
+-S0OFF=FRAMESZ - (4*SZREG)
+-S1OFF=FRAMESZ - (5*SZREG)
+-
+-# These are not magic -- they are just our argsave slots in the caller frame.
+-A0OFF=FRAMESZ
+-A1OFF=FRAMESZ + (1*SZREG)
+-A2OFF=FRAMESZ + (2*SZREG)
+-A3OFF=FRAMESZ + (3*SZREG)
+-
+-	#	
+-	# _XPTC_InvokeByIndex(that, methodIndex, paramCount, params)
+-	#                      a0       a1          a2         a3
+-
+-NESTED(_XPTC_InvokeByIndex, FRAMESZ, ra)
+-
+-	.set	noreorder
+-	.cpload	t9
+-	.set	reorder
+-
++# NARGSAVE is the argument space in the callers frame, including extra
++# 'shadowed' space for the argument registers. The minimum of 4
++# argument slots is sometimes predefined in the header files.
++#ifndef NARGSAVE
++#define NARGSAVE 4
++#endif
++
++#define LOCALSZ 3	/* gp, fp, ra */
++#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK)
++
++#define RAOFF (FRAMESZ - (1*SZREG))
++#define FPOFF (FRAMESZ - (2*SZREG))
++#define GPOFF (FRAMESZ - (3*SZREG))
++
++#define A0OFF (FRAMESZ + (0*SZREG))
++#define A1OFF (FRAMESZ + (1*SZREG))
++#define A2OFF (FRAMESZ + (2*SZREG))
++#define A3OFF (FRAMESZ + (3*SZREG))
++
++	.text
++
++#	
++# _XPTC_InvokeByIndex(that, methodIndex, paramCount, params)
++#                      a0       a1          a2         a3
++
++	.globl	_XPTC_InvokeByIndex
++	.align	2
++	.type	_XPTC_InvokeByIndex,@function
++	.ent	_XPTC_InvokeByIndex,0
++	.frame	fp, FRAMESZ, ra
++_XPTC_InvokeByIndex:
++	SETUP_GP
+ 	subu	sp, FRAMESZ
+ 
+-	# specify the save register mask -- XXX do we want the a0-a3 here, given
+-	# our "split" frame where the args are saved below a dynamicly allocated
+-	# region under the high frame?
+-	#
+-	# 10010000000000010000000011110000
+-	.mask 0x900100F0, -((NARGSAVE+LOCALSZ)*SZREG)
+-
+-	# thou shalt not use .cprestore if yer frame has variable size...
+-	# .cprestore GPOFF
+-
+-	REG_S	ra, RAOFF(sp)
+-
+-	# this happens automatically with .cprestore, but we cannot use that op...
+-	REG_S	gp, GPOFF(sp)
+-	REG_S	s0, S0OFF(sp)
+-	REG_S	s1, S1OFF(sp)
+-
+-	REG_S	a0, A0OFF(sp)
+-	REG_S	a1, A1OFF(sp)
+-	REG_S	a2, A2OFF(sp)
+-	REG_S	a3, A3OFF(sp)
++	# specify the save register mask for gp, fp, ra, a3 - a0
++	.mask 0xD00000F0, RAOFF-FRAMESZ
+ 
+-	# invoke_count_words(paramCount, params)
+-	move	a0, a2
+-	move	a1, a3
++	sw	ra, RAOFF(sp)
++	sw	fp, FPOFF(sp)
+ 
+-	jal	invoke_count_words
+-	lw	gp, GPOFF(sp)
++	# we can't use .cprestore in a variable stack frame
++	sw	gp, GPOFF(sp)
+ 
+-	# save the old sp so we can pop the param area and any "low frame"
+-	# needed as an argsave area below the param block for callees that
+-	# we invoke.
+-	move	s0, sp
+-
+-	REG_L	a1, A2OFF(sp)	# a1 = paramCount
+-	REG_L	a2, A3OFF(sp)	# a2 = params
+-
+-	# we define a word as 4 bytes, period end of story!
+-	sll	v0, 2		# 4 bytes * result of invoke_copy_words
+-	subu	v0, LOFRAMESZ	# but we take back the argsave area built into
+-				# our stack frame -- SWEET!
+-	subu	sp, sp, v0	# make room
+-	move	a0, sp		# a0 = param stack address
+-	move	s1, a0		# save it for later -- it should be safe here
+-
+-	# the old sp is still saved in s0, but we now need another argsave
+-	# area ("low frame") for the invoke_copy_to_stack call.
+-	subu	sp, sp, LOFRAMESZ
++	sw	a0, A0OFF(sp)
++	sw	a1, A1OFF(sp)
++	sw	a2, A2OFF(sp)
++	sw	a3, A3OFF(sp)
++
++	# save bottom of fixed frame
++	move	fp, sp
++
++	# extern "C" uint32
++	# invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s);
++	la	t9, invoke_count_words
++	move	a0, a2
++	move	a1, a3
++	jalr	t9
++	lw  	gp, GPOFF(fp)
+ 
+-	# copy the param into the stack areas
++	# allocate variable stack, with a size of:
++	# wordsize (of 4 bytes) * result (already aligned to dword)
++	# but a minimum of 16 byte
++	sll	v0, 2
++	slt	t0, v0, 16
++	beqz	t0, 1f
++	li	v0, 16
++1:	subu	sp, v0
++
++	# let a0 point to the bottom of the variable stack, allocate
++	# another fixed stack for:
++	# extern "C" void
+ 	# invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount,
+-	#                      nsXPTCVariant* s)
+-	jal     invoke_copy_to_stack
+-	lw  	gp, GPOFF(s0)
+-
+-	move	sp, s0		# get orig sp back, popping params and argsave
+-
+-	REG_L	a0, A0OFF(sp)	# a0 = set "that" to be "this"
+-	REG_L	a1, A1OFF(sp)	# a1 = methodIndex
+-
+-	# t1 = methodIndex * 4
+-	# (use shift instead of mult)
+-	sll	t1, a1, 2
+-
+-	# calculate the function we need to jump to,
+-	# which must then be saved in t9
++	#		       nsXPTCVariant* s);
++	la	t9, invoke_copy_to_stack
++	move	a0, sp
++	lw	a1, A2OFF(fp)
++	lw	a2, A3OFF(fp)
++	subu	sp, 16
++	jalr	t9
++	lw  	gp, GPOFF(fp)
++
++	# back to the variable stack frame
++	addu	sp, 16
++
++	# calculate the function we need to jump to, which must then be
++	# stored in t9
++	lw	a0, A0OFF(fp)	# a0 = set "that" to be "this"
++	lw	t0, A1OFF(fp)	# a1 = methodIndex
+ 	lw	t9, 0(a0)
+-	addu	t9, t9, t1
+-	lw	t9, 8(t9)
+-
+-	# a1..a3 and f13..f14 should now be set to what
+-	# invoke_copy_to_stack told us. skip a0 and f12
+-	# because that is the "this" pointer
+-
+-	REG_L	a1, 1*SZREG(s1)
+-	REG_L	a2, 2*SZREG(s1)
+-	REG_L	a3, 3*SZREG(s1)
+-
+-	l.d	$f13, 8(s1)
+-	l.d	$f14, 16(s1)
+-
+-	# Create the stack pointer for the function, which must have 4 words
+-	# of space for callee-saved args.  invoke_count_words allocated space
+-        # for a0 starting at s1, so we just move s1 into sp.
+-	move	sp, s1
++	# t0 = methodIndex << PTRLOG
++	sll	t0, t0, PTRLOG
++	addu	t9, t0
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++	lw	t9, (t9)
++#else /* not G++ V3 ABI */
++	lw	t9, 2*PTRSIZE(t9)
++#endif /* G++ V3 ABI */
++
++	# Set a1-a3 to what invoke_copy_to_stack told us. a0 is already
++	# the "this" pointer. We don't have to care about floating
++	# point arguments, the non-FP "this" pointer as first argument
++	# means they'll never be used.
++	lw	a1, 1*SZREG(sp)
++	lw	a2, 2*SZREG(sp)
++	lw	a3, 3*SZREG(sp)
++
++	jalr	t9
++	# Micro-optimization: There's no gp usage below this point, so
++	# we don't reload.
++	# lw	gp, GPOFF(fp)
+ 
+-	jalr	ra, t9
+-	lw	gp, GPOFF(s0)
++	# leave variable stack frame
++	move	sp, fp
+ 
+-	move	sp, s0
++	lw	ra, RAOFF(sp)
++	lw	fp, FPOFF(sp)
+ 
+-	REG_L	ra, RAOFF(sp)
+-	REG_L	s0, S0OFF(sp)
+-	addu	sp, FRAMESZ
++	addiu	sp, FRAMESZ
+ 	j	ra
+-.end _XPTC_InvokeByIndex
++END(_XPTC_InvokeByIndex)
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
+@@ -19,16 +19,17 @@
+  * The Initial Developer of the Original Code is
+  * Netscape Communications Corp, Inc.
+  * Portions created by the Initial Developer are Copyright (C) 2001
+  * the Initial Developer. All Rights Reserved.
+  *
+  * Contributor(s):
+  *   Stuart Parmenter <pavlov@netscape.com>
+  *   Brendan Eich     <brendan@mozilla.org>
++ *   Thiemo Seufer    <seufer@csv.ica.uni-stuttgart.de>
+  *
+  * Alternatively, the contents of this file may be used under the terms of
+  * either of 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
+@@ -47,32 +48,33 @@
+ 
+ 
+ extern "C" uint32
+ invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
+ {
+     // Count a word for a0 even though it's never stored or loaded
+     // We do this only for alignment of register pairs.
+     PRUint32 result = 1;
+-    for (PRUint32 i = 0; i < paramCount; i++, s++)
++    for (PRUint32 i = 0; i < paramCount; i++, result++, s++)
+     {
+-        result++;
+-
+         if (s->IsPtrData())
+             continue;
+ 
+         switch(s->type)
+         {
+         case nsXPTType::T_I64    :
+         case nsXPTType::T_U64    :
+         case nsXPTType::T_DOUBLE :
+ 	    if (result & 1)
+ 		result++;
+ 	    result++;
+ 	    break;
++
++        default:
++            break;
+         }
+     }
+     return (result + 1) & ~(PRUint32)1;
+ }
+ 
+ extern "C" void
+ invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount,
+                      nsXPTCVariant* s)
+@@ -83,40 +85,40 @@
+     for (PRUint32 i = 0; i < paramCount; i++, d++, s++)
+     {
+         if (s->IsPtrData())
+         {
+             *((void**)d) = s->ptr;
+             continue;
+         }
+ 
+-        *((void**)d) = s->val.p;
+-
+         switch(s->type)
+         {
+         case nsXPTType::T_I64    :
+             if ((PRWord)d & 4) d++;
+             *((PRInt64*) d)  = s->val.i64;    d++;
+             break;
+         case nsXPTType::T_U64    :
+             if ((PRWord)d & 4) d++;
+             *((PRUint64*) d) = s->val.u64;    d++;
+             break;
+         case nsXPTType::T_DOUBLE :
+             if ((PRWord)d & 4) d++;
+             *((double*)   d) = s->val.d;      d++;
+             break;
++        default:
++            *((void**)d) = s->val.p;
++            break;
+         }
+     }
+ }
+ 
+ extern "C" nsresult _XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                                         PRUint32 paramCount,
+                                         nsXPTCVariant* params);
+ 
+ extern "C"
+ XPTC_PUBLIC_API(nsresult)
+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+                    PRUint32 paramCount, nsXPTCVariant* params)
+ {
+     return _XPTC_InvokeByIndex(that, methodIndex, paramCount, params);
+-}    
+-
++}
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
+===================================================================
+--- /dev/null
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
+@@ -0,0 +1,142 @@
++/* -*- Mode: asm; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
++ * Version: MPL 1.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 Corp, Inc.
++ * Portions created by the Initial Developer are Copyright (C) 2001
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *   Stuart Parmenter <pavlov@netscape.com>
++ *   Chris Waterson   <waterson@netscape.com>
++ *   Thiemo Seufer    <seufer@csv.ica.uni-stuttgart.de>
++ */
++
++/* This code is for MIPS using the O32 ABI. */
++
++#include <sys/regdef.h>
++#include <sys/asm.h>
++
++# NARGSAVE is the argument space in the callers frame, including extra
++# 'shadowed' space for the argument registers. The minimum of 4
++# argument slots is sometimes predefined in the header files.
++#ifndef NARGSAVE
++#define NARGSAVE 4
++#endif
++
++#define LOCALSZ 2	/* gp, ra */
++#define FRAMESZ ((((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK)
++
++#define RAOFF (FRAMESZ - (1*SZREG))
++#define GPOFF (FRAMESZ - (2*SZREG))
++
++#define A0OFF (FRAMESZ + (0*SZREG))
++#define A1OFF (FRAMESZ + (1*SZREG))
++#define A2OFF (FRAMESZ + (2*SZREG))
++#define A3OFF (FRAMESZ + (3*SZREG))
++
++	.text
++
++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++#define STUB_ENTRY(x)						\
++	.if x < 10;						\
++	.globl	_ZN14nsXPTCStubBase5Stub ##x ##Ev;		\
++	.type	_ZN14nsXPTCStubBase5Stub ##x ##Ev,@function;	\
++	.aent	_ZN14nsXPTCStubBase5Stub ##x ##Ev,0;		\
++_ZN14nsXPTCStubBase5Stub ##x ##Ev:;				\
++	SETUP_GP;						\
++	li	t0,x;						\
++	b	sharedstub;					\
++	.elseif x < 100;					\
++	.globl	_ZN14nsXPTCStubBase6Stub ##x ##Ev;		\
++	.type	_ZN14nsXPTCStubBase6Stub ##x ##Ev,@function;	\
++	.aent	_ZN14nsXPTCStubBase6Stub ##x ##Ev,0;		\
++_ZN14nsXPTCStubBase6Stub ##x ##Ev:;				\
++	SETUP_GP;						\
++	li	t0,x;						\
++	b	sharedstub;					\
++	.elseif x < 1000;					\
++	.globl	_ZN14nsXPTCStubBase7Stub ##x ##Ev;		\
++	.type	_ZN14nsXPTCStubBase7Stub ##x ##Ev,@function;	\
++	.aent	_ZN14nsXPTCStubBase7Stub ##x ##Ev,0;		\
++_ZN14nsXPTCStubBase7Stub ##x ##Ev:;				\
++	SETUP_GP;						\
++	li	t0,x;						\
++	b	sharedstub;					\
++	.else;							\
++	.err;							\
++	.endif
++#else /* not G++ V3 ABI */
++#define STUB_ENTRY(x)						\
++	.globl	Stub ##x ##__14nsXPTCStubBase;			\
++	.type	Stub ##x ##__14nsXPTCStubBase,@function;	\
++	.aent	Stub ##x ##__14nsXPTCStubBase,0;		\
++Stub ##x ##__14nsXPTCStubBase:;					\
++	SETUP_GP;						\
++	li	t0,x;						\
++	b	sharedstub
++#endif /* G++ V3 ABI */
++
++# SENTINEL_ENTRY is handled in the cpp file.
++#define SENTINEL_ENTRY(x)
++
++#
++# open a dummy frame for the function entries
++#
++	.align	2
++	.type	dummy,@function
++	.ent	dummy, 0
++	.frame	sp, FRAMESZ, ra 
++dummy:
++	SETUP_GP
++
++#include "xptcstubsdef.inc"
++
++sharedstub:
++	subu	sp, FRAMESZ
++
++	# specify the save register mask for gp, ra, a0-a3
++	.mask 0x900000F0, RAOFF-FRAMESZ
++
++	sw	ra, RAOFF(sp)
++	SAVE_GP(GPOFF)
++
++	# Micro-optimization: a0 is already loaded, and its slot gets
++	# ignored by PrepareAndDispatch, so no need to save it here.
++	# sw	a0, A0OFF(sp)
++	sw	a1, A1OFF(sp)
++	sw	a2, A2OFF(sp)
++	sw	a3, A3OFF(sp)
++
++	la	t9, PrepareAndDispatch
++
++	# t0 is methodIndex
++	move	a1, t0
++	# have a2 point to the begin of the argument space on stack
++	addiu	a2, sp, FRAMESZ
++
++	# PrepareAndDispatch(that, methodIndex, args)
++	jalr	t9
++
++	# Micro-optimization: Using jalr explicitly has the side-effect
++	# of not triggering .cprestore. This is ok because we have no
++	# gp reference below this point. It also allows better
++	# instruction sscheduling.
++	# lw	gp, GPOFF(fp)
++ 
++ 	lw	ra, RAOFF(sp)
++	addiu	sp, FRAMESZ
++	j	ra
++	END(dummy)
--- iceowl-0.7.orig/debian/patches/deb299697-lp42559-use-FC_ANY_METRICS.patch
+++ iceowl-0.7/debian/patches/deb299697-lp42559-use-FC_ANY_METRICS.patch
@@ -0,0 +1,141 @@
+From f32be5dff40a8243f6cfc0061ede2c67c0cc93d1 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Mon, 12 Mar 2007 17:02:56 +0100
+Subject: [PATCH] deb299697-lp42559-use-FC_ANY_METRICS
+
+---
+ gfx/cairo/cairo/src/cairo-ft-font.c |    1 +
+ gfx/src/cairo/nsFontMetricsXft.cpp  |    4 ++++
+ gfx/src/gtk/nsFontMetricsXft.cpp    |    4 ++++
+ gfx/src/ps/nsFontMetricsPS.cpp      |    2 ++
+ 4 files changed, 11 insertions(+)
+
+Index: mozilla/gfx/cairo/cairo/src/cairo-ft-font.c
+===================================================================
+--- mozilla.orig/gfx/cairo/cairo/src/cairo-ft-font.c	2007-04-04 18:45:11.000000000 +0200
++++ mozilla/gfx/cairo/cairo/src/cairo-ft-font.c	2007-04-04 18:45:33.000000000 +0200
+@@ -1583,16 +1583,17 @@
+ 	goto FREE_PATTERN;
+     if (!FcPatternAddInteger (pattern, FC_WEIGHT, fcweight))
+ 	goto FREE_PATTERN;
+ 
+     cairo_matrix_multiply (&scale, font_matrix, ctm);
+     _compute_transform (&sf, &scale);
+ 
+     FcPatternAddInteger (pattern, FC_PIXEL_SIZE, sf.y_scale);
++    FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
+ 
+     FcConfigSubstitute (NULL, pattern, FcMatchPattern);
+     cairo_ft_font_options_substitute (options, pattern);
+     FcDefaultSubstitute (pattern);
+     
+     resolved = FcFontMatch (NULL, pattern, &result);
+     if (!resolved)
+ 	goto FREE_PATTERN;
+Index: mozilla/gfx/src/cairo/nsFontMetricsXft.cpp
+===================================================================
+--- mozilla.orig/gfx/src/cairo/nsFontMetricsXft.cpp	2007-04-04 18:45:11.000000000 +0200
++++ mozilla/gfx/src/cairo/nsFontMetricsXft.cpp	2007-04-04 18:45:33.000000000 +0200
+@@ -1054,16 +1054,18 @@
+     // Add the slant type
+     FcPatternAddInteger(mPattern, FC_SLANT,
+                         NS_CalculateSlant(mFont.style));
+ 
+     // Add the weight
+     FcPatternAddInteger(mPattern, FC_WEIGHT,
+                         NS_CalculateWeight(mFont.weight));
+ 
++    FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
++
+     // Set up the default substitutions for this font
+     FcConfigSubstitute(0, mPattern, FcMatchPattern);
+     XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
+                          mPattern);
+ }
+ 
+ void
+ nsFontMetricsXft::DoMatch(PRBool aMatchAll)
+@@ -1216,16 +1218,18 @@
+ 
+     FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)"monospace");
+ 
+     FcPatternAddInteger(pattern, FC_PIXEL_SIZE, int(0.5 * mPixelSize));
+ 
+     FcPatternAddInteger(pattern, FC_WEIGHT,
+                         NS_CalculateWeight(mFont.weight));
+ 
++    FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
++
+     FcConfigSubstitute(0, pattern, FcMatchPattern);
+     XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
+                          pattern);
+ 
+     FcResult res;
+     
+     FcPattern *pat = FcFontMatch(0, pattern, &res);
+ 
+Index: mozilla/gfx/src/gtk/nsFontMetricsXft.cpp
+===================================================================
+--- mozilla.orig/gfx/src/gtk/nsFontMetricsXft.cpp	2007-04-04 18:45:11.000000000 +0200
++++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2007-04-04 18:45:33.000000000 +0200
+@@ -1112,16 +1112,18 @@
+     // Add the slant type
+     FcPatternAddInteger(mPattern, FC_SLANT,
+                         NS_CalculateSlant(mFont.style));
+ 
+     // Add the weight
+     FcPatternAddInteger(mPattern, FC_WEIGHT,
+                         NS_CalculateWeight(mFont.weight));
+ 
++    FcPatternAddBool (mPattern, FC_ANY_METRICS, FcTrue);
++
+     // Set up the default substitutions for this font
+     FcConfigSubstitute(0, mPattern, FcMatchPattern);
+     XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
+                          mPattern);
+ }
+ 
+ void
+ nsFontMetricsXft::DoMatch(PRBool aMatchAll)
+@@ -1274,16 +1276,18 @@
+ 
+     FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)"monospace");
+ 
+     FcPatternAddInteger(pattern, FC_PIXEL_SIZE, int(0.5 * mPixelSize));
+ 
+     FcPatternAddInteger(pattern, FC_WEIGHT,
+                         NS_CalculateWeight(mFont.weight));
+ 
++    FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
++
+     FcConfigSubstitute(0, pattern, FcMatchPattern);
+     XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
+                          pattern);
+ 
+     FcResult res;
+     
+     FcPattern *pat = FcFontMatch(0, pattern, &res);
+ 
+Index: mozilla/gfx/src/ps/nsFontMetricsPS.cpp
+===================================================================
+--- mozilla.orig/gfx/src/ps/nsFontMetricsPS.cpp	2007-04-04 18:45:11.000000000 +0200
++++ mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2007-04-04 18:45:33.000000000 +0200
+@@ -945,16 +945,18 @@
+       NS_AddFFRE(pattern, fpi.mGenericFont, PR_FALSE);
+ 
+     // Add the slant type
+     FcPatternAddInteger(pattern, FC_SLANT, NS_CalculateSlant(aFont.style));
+ 
+     // Add the weight
+     FcPatternAddInteger(pattern, FC_WEIGHT, NS_CalculateWeight(aFont.weight));
+ 
++    FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue);
++
+     // Set up the default substitutions for this font
+     FcConfigSubstitute(0, pattern, FcMatchPattern);
+     FcDefaultSubstitute(pattern);
+ 
+     FcResult   result;
+     FcFontSet *set = FcFontSort(0, pattern, FcTrue, 0, &result);
+     if (!set) {
+        return nsnull;
--- iceowl-0.7.orig/debian/patches/iceowl-install-rdf
+++ iceowl-0.7/debian/patches/iceowl-install-rdf
@@ -0,0 +1,51 @@
+---
+ calendar/lightning/install.rdf |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+Index: mozilla/calendar/lightning/install.rdf
+===================================================================
+--- mozilla.orig/calendar/lightning/install.rdf
++++ mozilla/calendar/lightning/install.rdf
+@@ -1,14 +1,14 @@
+ <?xml version="1.0"?>
+ 
+ #filter substitution
+ <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+-
++5A
+   <Description about="urn:mozilla:install-manifest">
+     <!-- Target Application this extension can install into, 
+         with minimum and maximum supported versions. --> 
+     <em:targetApplication>
+       <Description>
+         <!-- thunderbird -->
+         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+ #ifdef MOZILLA_1_8_BRANCH
+@@ -47,22 +47,22 @@
+         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+         <em:minVersion>@SEAMONKEY_VERSION@</em:minVersion>
+         <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+ #endif
+ 
+     <em:id>{e2fda1a4-762b-4020-b5ad-a41df1933103}</em:id>
+-    <em:name>Lightning</em:name>
++    <em:name>Iceowl</em:name>
+     <em:version>@LIGHTNING_VERSION@</em:version>
+ #ifdef MOZILLA_1_8_BRANCH
+-    <em:description>An integrated calendar for Thunderbird (build @BUILD_ID@)</em:description>
++    <em:description>An integrated calendar for Icedove/Thunderbird (build @BUILD_ID@)</em:description>
+ #else
+-    <em:description>An integrated calendar for Thunderbird (build @GRE_BUILDID@)</em:description>
++    <em:description>An integrated calendar for Icedove/Thunderbird (build @GRE_BUILDID@)</em:description>
+ #endif
+     <em:creator>Mozilla Calendar Project</em:creator>
+-    <em:homepageURL>http://www.mozilla.org/projects/calendar/releases/lightning@LIGHTNING_VERSION@.html</em:homepageURL>
++    <em:homepageURL>http://www.asoftsite.org</em:homepageURL>
+     <em:iconURL>chrome://calendar/skin/cal-icon32.png</em:iconURL>
+     <em:optionsURL>chrome://messenger/content/preferences/preferences.xul</em:optionsURL>
+     <em:targetPlatform>@TARGET_PLATFORM@</em:targetPlatform>
+   </Description>
+ </RDF>
--- iceowl-0.7.orig/debian/patches/bz344818_att264996.patch
+++ iceowl-0.7/debian/patches/bz344818_att264996.patch
@@ -0,0 +1,97 @@
+--- mozilla/configure.in.bak	2007-04-27 12:06:53.000000000 -0700
++++ mozilla/configure.in	2007-04-27 13:51:40.000000000 -0700
+@@ -6731,12 +6731,29 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$M
+       PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION)
+       MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
+       MOZ_CAIRO_LIBS=$CAIRO_LIBS
++
++      if test "$MOZ_X11"; then
++          if test "$MOZ_SVG_RENDERER_CAIRO"; then
++              PKG_CHECK_MODULES(CAIRO_XLIB, cairo-xlib >= $CAIRO_VERSION,,:)
++              MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS
++              MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS"
++          fi
++          if test "$MOZ_ENABLE_CANVAS"; then
++              PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION,,:)
++              MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS
++              MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS"
++          fi
++      fi
+    fi
+ fi
+ 
+ AC_SUBST(MOZ_TREE_CAIRO)
+ AC_SUBST(MOZ_CAIRO_CFLAGS)
+ AC_SUBST(MOZ_CAIRO_LIBS)
++AC_SUBST(MOZ_CAIRO_XLIB_CFLAGS)
++AC_SUBST(MOZ_CAIRO_XLIB_LIBS)
++AC_SUBST(MOZ_CAIRO_XRENDER_CFLAGS)
++AC_SUBST(MOZ_CAIRO_XRENDER_LIBS)
+ 
+ dnl ========================================================
+ dnl disable xul
+--- mozilla/layout/build/Makefile.in.bak	2007-04-27 12:13:22.000000000 -0700
++++ mozilla/layout/build/Makefile.in	2007-04-27 13:53:00.000000000 -0700
+@@ -234,6 +234,17 @@ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ 		    $(NULL)
+ endif
+ 
++ifdef MOZ_X11
++ifdef MOZ_SVG_RENDERER_CAIRO
++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XLIB_LIBS) \
++		    $(NULL)
++endif
++ifdef MOZ_ENABLE_CANVAS
++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XRENDER_LIBS) \
++		    $(NULL)
++endif
++endif
++
+ ifneq (,$(filter mac cocoa gtk,$(MOZ_WIDGET_TOOLKIT)))
+ EXTRA_DSO_LDOPTS += \
+ 	$(TK_LIBS) \
+--- mozilla/layout/svg/renderer/src/cairo/Makefile.in.bak	2007-04-27 13:55:51.000000000 -0700
++++ mozilla/layout/svg/renderer/src/cairo/Makefile.in	2007-04-27 13:49:51.000000000 -0700
+@@ -93,6 +93,11 @@ LOCAL_INCLUDES  = \
+                 -I$(topsrcdir)/gfx/src \
+                 $(NULL)
+ 
++ifdef MOZ_X11
++CFLAGS		+= $(MOZ_CAIRO_XLIB_CFLAGS)
++CXXFLAGS	+= $(MOZ_CAIRO_XLIB_CFLAGS)
++endif
++
+ ifdef MOZ_ENABLE_GTK
+ LOCAL_INCLUDES +=  -I$(topsrcdir)/gfx/src/gtk
+ CFLAGS         += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
+--- mozilla/config/autoconf.mk.in.bak	2007-04-27 12:12:12.000000000 -0700
++++ mozilla/config/autoconf.mk.in	2007-04-27 13:47:28.000000000 -0700
+@@ -207,6 +207,8 @@ MOZ_SVG_RENDERER_CAIRO = @MOZ_SVG_RENDER
+ MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@
+ MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@
+ MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
++MOZ_CAIRO_XLIB_CFLAGS = @MOZ_CAIRO_XLIB_CFLAGS@
++MOZ_CAIRO_XRENDER_CFLAGS = @MOZ_CAIRO_XRENDER_CFLAGS@
+ TX_EXE = @TX_EXE@
+ 
+ # Mac's don't like / in a #include, so we include the libart
+@@ -218,6 +220,8 @@ endif
+ endif
+ MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@
+ MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@
++MOZ_CAIRO_XLIB_LIBS = @MOZ_CAIRO_XLIB_LIBS@
++MOZ_CAIRO_XRENDER_LIBS = @MOZ_CAIRO_XRENDER_LIBS@
+ 
+ MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@
+ MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@
+--- mozilla/content/canvas/src/Makefile.in.bak	2007-04-27 12:25:38.000000000 -0700
++++ mozilla/content/canvas/src/Makefile.in	2007-04-27 12:25:00.000000000 -0700
+@@ -94,7 +94,7 @@ FORCE_STATIC_LIB = 1
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
++CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS) $(MOZ_CAIRO_XRENDER_CFLAGS) $(TK_CFLAGS)
+ 
+ ifneq (,$(filter mac cocoa,$(MOZ_GFX_TOOLKIT)))
+ # needed for nsDrawingSurfaceMac.h
--- iceowl-0.7.orig/debian/patches/test
+++ iceowl-0.7/debian/patches/test
@@ -0,0 +1,31 @@
+---
+ browser/locales/Makefile.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: mozilla/browser/locales/Makefile.in
+===================================================================
+--- mozilla.orig/browser/locales/Makefile.in	2007-03-20 22:14:00.000000000 +0000
++++ mozilla/browser/locales/Makefile.in	2007-03-20 22:14:16.000000000 +0000
+@@ -47,20 +47,20 @@
+ 
+ vpath %.xml @srcdir@/en-US/searchplugins
+ vpath %.xml $(LOCALE_SRCDIR)/searchplugins
+ 
+ run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if ! test -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
+ _ABS_DIST := $(shell cd $(DIST) && pwd)
+ 
+ ifdef MOZ_BRANDING_DIRECTORY
+ SUBMAKEFILES += \
+-	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
+-	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
++	$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
++	$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
+ 	$(NULL)
+ endif
+ 
+ # This makefile uses variable overrides from the libs-% target to
+ # build non-default locales to non-default dist/ locations. Be aware!
+ 
+ AB = $(firstword $(subst -, ,$(AB_CD)))
+ 
+ APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)
--- iceowl-0.7.orig/debian/patches/bz7969-a-thai-patch.patch
+++ iceowl-0.7/debian/patches/bz7969-a-thai-patch.patch
@@ -0,0 +1,1094 @@
+From e6370628c3b2c49dc093adea3b81e09b938e8d19 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Tue, 13 Mar 2007 20:10:08 +0100
+Subject: [PATCH] bz7969-a-thai-patch
+
+  * updated to latest on Mar 7 2006, received from Theppitak
+    Karoonboonyanan <thep@linux.thai.net>
+---
+ Makefile.in                                            |    4 
+ allmakefiles.sh                                        |    2 
+ config/autoconf.mk.in                                  |    3 
+ configure.in                                           |   18 +
+ intl/lwbrk/components/Makefile.in                      |   48 +++
+ intl/lwbrk/components/libthai/Makefile.in              |   74 +++++
+ intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp |  221 +++++++++++++++++
+ intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h   |  148 +++++++++++
+ intl/lwbrk/components/libthai/nsLibThaiModule.cpp      |   52 ++++
+ intl/lwbrk/idl/Makefile.in                             |    1 
+ intl/lwbrk/idl/nsIThaiLineBreaker.idl                  |   61 ++++
+ intl/lwbrk/src/nsJISx4501LineBreaker.cpp               |   68 ++++-
+ intl/lwbrk/src/nsJISx4501LineBreaker.h                 |    7 
+ 13 files changed, 694 insertions(+), 13 deletions(-)
+
+Index: mozilla/Makefile.in
+===================================================================
+--- mozilla.orig/Makefile.in	2007-04-04 18:47:46.000000000 +0200
++++ mozilla/Makefile.in	2007-04-04 18:48:32.000000000 +0200
+@@ -284,16 +284,20 @@
+ ifndef MINIMO
+ ifdef MOZ_XUL_APP
+ ifdef MOZ_ENABLE_GTK2
+ tier_50_dirs    += toolkit/components/gnome
+ endif
+ endif
+ endif
+ 
++ifdef MOZ_ENABLE_LIBTHAI_COMPONENT
++tier_50_dirs    += intl/lwbrk/components/libthai
++endif
++
+ ifdef MOZ_LEAKY
+ tier_50_dirs        += tools/leaky
+ endif
+ 
+ ifdef MOZ_MAPINFO
+ tier_50_dirs	+= tools/codesighs
+ endif
+ 
+Index: mozilla/allmakefiles.sh
+===================================================================
+--- mozilla.orig/allmakefiles.sh	2007-04-04 18:47:46.000000000 +0200
++++ mozilla/allmakefiles.sh	2007-04-04 18:48:32.000000000 +0200
+@@ -220,16 +220,18 @@
+ intl/locale/public/Makefile
+ intl/locale/idl/Makefile
+ intl/locale/src/Makefile
+ intl/locale/src/unix/Makefile
+ intl/locale/src/os2/Makefile
+ intl/locale/src/windows/Makefile
+ intl/locale/tests/Makefile
+ intl/lwbrk/Makefile
++intl/lwbrk/components/Makefile
++intl/lwbrk/components/libthai/Makefile
+ intl/lwbrk/src/Makefile
+ intl/lwbrk/public/Makefile
+ intl/lwbrk/tests/Makefile
+ intl/unicharutil/Makefile
+ intl/unicharutil/idl/Makefile
+ intl/unicharutil/src/Makefile
+ intl/unicharutil/public/Makefile
+ intl/unicharutil/tables/Makefile
+Index: mozilla/config/autoconf.mk.in
+===================================================================
+--- mozilla.orig/config/autoconf.mk.in	2007-04-04 18:47:46.000000000 +0200
++++ mozilla/config/autoconf.mk.in	2007-04-04 18:48:32.000000000 +0200
+@@ -111,16 +111,19 @@
+ MOZ_COMPOSER = @MOZ_COMPOSER@
+ BUILD_SHARED_LIBS = @BUILD_SHARED_LIBS@
+ BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@
+ MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@
+ MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@
+ ENABLE_TESTS	= @ENABLE_TESTS@
+ IBMBIDI = @IBMBIDI@
+ SUNCTL = @SUNCTL@
++MOZ_ENABLE_LIBTHAI_COMPONENT = @MOZ_ENABLE_LIBTHAI_COMPONENT@
++MOZ_LIBTHAI_CFLAGS = @MOZ_LIBTHAI_CFLAGS@
++MOZ_LIBTHAI_LIBS = @MOZ_LIBTHAI_LIBS@
+ ACCESSIBILITY = @ACCESSIBILITY@
+ MOZ_VIEW_SOURCE = @MOZ_VIEW_SOURCE@
+ MOZ_XPINSTALL = @MOZ_XPINSTALL@
+ MOZ_JSLOADER  = @MOZ_JSLOADER@
+ MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
+ MOZ_SINGLE_PROFILE = @MOZ_SINGLE_PROFILE@
+ MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
+ MOZ_LDAP_XPCOM_EXPERIMENTAL = @MOZ_LDAP_XPCOM_EXPERIMENTAL@
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-04-04 18:47:46.000000000 +0200
++++ mozilla/configure.in	2007-04-04 18:48:32.000000000 +0200
+@@ -4878,16 +4878,33 @@
+ dnl complex text support off by default
+ dnl ========================================================
+ MOZ_ARG_ENABLE_BOOL(ctl,
+ [  --enable-ctl            Enable Thai Complex Script support],
+     SUNCTL=1,
+     SUNCTL= )
+ 
+ dnl ========================================================
++dnl mozlibthai word break component,
++dnl built on libthai existence
++dnl ========================================================
++MOZ_ENABLE_LIBTHAI_COMPONENT=
++MOZ_ARG_DISABLE_BOOL(libthai,
++[  --disable-libthai       Disable Thai word break support with libthai],
++    MOZ_ENABLE_LIBTHAI_COMPONENT=,
++    MOZ_ENABLE_LIBTHAI_COMPONENT=1)
++if test "$MOZ_ENABLE_LIBTHAI_COMPONENT"; then
++    PKG_CHECK_MODULES(MOZ_LIBTHAI, libthai,[
++      MOZ_ENABLE_LIBTHAI_COMPONENT=1
++    ],[
++      MOZ_ENABLE_LIBTHAI_COMPONENT=
++    ])
++fi
++
++dnl ========================================================
+ dnl view source support on by default
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(view-source,
+ [  --disable-view-source     Disable view source support],
+     MOZ_VIEW_SOURCE=,
+     MOZ_VIEW_SOURCE=1 )
+ if test "$MOZ_VIEW_SOURCE"; then
+     AC_DEFINE(MOZ_VIEW_SOURCE)
+@@ -7115,16 +7132,17 @@
+ AC_SUBST(XPCOM_USE_LEA)
+ AC_SUBST(BUILD_SHARED_LIBS)
+ AC_SUBST(BUILD_STATIC_LIBS)
+ AC_SUBST(MOZ_STATIC_COMPONENT_LIBS)
+ AC_SUBST(MOZ_ENABLE_LIBXUL)
+ AC_SUBST(ENABLE_TESTS)
+ AC_SUBST(IBMBIDI)
+ AC_SUBST(SUNCTL)
++AC_SUBST(MOZ_ENABLE_LIBTHAI_COMPONENT)
+ AC_SUBST(ACCESSIBILITY)
+ AC_SUBST(MOZ_XPINSTALL)
+ AC_SUBST(MOZ_VIEW_SOURCE)
+ AC_SUBST(MOZ_SINGLE_PROFILE)
+ AC_SUBST(MOZ_XPFE_COMPONENTS)
+ AC_SUBST(MOZ_USER_DIR)
+ 
+ AC_SUBST(ENABLE_STRIP)
+Index: mozilla/intl/lwbrk/components/Makefile.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/intl/lwbrk/components/Makefile.in	2007-04-04 18:48:32.000000000 +0200
+@@ -0,0 +1,48 @@
++#
++# ***** 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) 1998
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either of 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 *****
++
++DEPTH		= ../../..
++topsrcdir	= @top_srcdir@
++srcdir		= @srcdir@
++VPATH		= @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++DIRS		= libthai
++
++include $(topsrcdir)/config/rules.mk
++
+Index: mozilla/intl/lwbrk/components/libthai/Makefile.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/intl/lwbrk/components/libthai/Makefile.in	2007-04-04 18:48:32.000000000 +0200
+@@ -0,0 +1,74 @@
++# ***** 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 the Mozilla GNOME integration code.
++#
++# The Initial Developer of the Original Code is
++# IBM Corporation.
++# Portions created by the Initial Developer are Copyright (C) 2004
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#
++# 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 *****
++
++DEPTH     = ../../../..
++topsrcdir = @top_srcdir@
++srcdir	  = @srcdir@
++VPATH	  = @srcdir@
++
++include $(DEPTH)/config/autoconf.mk
++
++MODULE		= mozlibthai
++MOZILLA_INTERNAL_API = 1
++
++ifeq ($(MOZ_ENABLE_LIBTHAI_COMPONENT), 1)
++
++LIBRARY_NAME	= mozlibthai
++FORCE_SHARED_LIB = 1
++IS_COMPONENT	= 1
++
++REQUIRES = \
++	xpcom \
++	unicharutil \
++	lwbrk \
++	$(NULL)
++
++CPPSRCS = \
++	nsLibThaiLineBreaker.cpp \
++	nsLibThaiModule.cpp \
++	$(NULL)
++
++CXXFLAGS += $(MOZ_LIBTHAI_CFLAGS)
++EXTRA_DSO_LDOPTS += \
++	$(MOZ_COMPONENT_LIBS) \
++	$(NSPR_LIBS) \
++	$(MOZ_LIBTHAI_LIBS) \
++	$(NULL)
++
++endif
++
++include $(topsrcdir)/config/rules.mk
++
+Index: mozilla/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.cpp	2007-04-04 18:48:32.000000000 +0200
+@@ -0,0 +1,221 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** 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) 1998
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * - Theppitak Karoonboonyanan <thep@linux.thai.net>
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either of 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 ***** */
++
++#include <thai/thbrk.h>
++#include <thai/thwchar.h>
++
++#include "nsLibThaiLineBreaker.h"
++
++
++//// class BreakEntry implementation ////
++
++void  BreakEntry::Set (const PRUnichar* pText, PRUint32 textLen,
++                       int* pvPos, int posLen)
++{
++  Clear();
++
++  mText = new PRUnichar [textLen+1];
++  for (PRUnichar i = 0; i < textLen; i++)
++    mText[i] = pText[i];
++  mText[textLen] = 0;
++  mTextLen = textLen;
++
++  mPos = new int [posLen];
++  for (int j = 0; j < posLen; j++)
++    mPos[j] = pvPos[j];
++  mPosLen = posLen;
++}
++
++//// class BreakCache implementation ////
++
++static PRUint16 StringHash (const PRUnichar* pText, PRUint32 textLen)
++{
++  PRUint16 h = 0;
++  for (PRUint32 i = 0; i < textLen; i++) {
++    h = (h >> 12) ^ (h << 4) ^ pText[i];
++  }
++  return h;
++}
++
++BreakEntry& BreakCache::LookUp (const PRUnichar* pText, PRUint32 textLen)
++{
++  return mvBucket [StringHash (pText, textLen) % N_BUCKETS];
++}
++
++
++//// class nsLibThaiLineBreaker implementation ////
++
++static thchar_t* GetTISText (const PRUnichar* pText, PRUint32 textLen)
++{
++  thchar_t* pTISText = new thchar_t [textLen + 1];
++  PRUint32 i;
++  for (i = 0; i < textLen; i++)
++    pTISText[i] = th_uni2tis (pText[i]);
++  pTISText[i] = '\0';
++
++  return pTISText;
++}
++
++static void FreeTISText (thchar_t* pTISText)
++{
++  delete pTISText;
++}
++
++static PRBool IsStrEqual (const PRUnichar* pText1, PRUint32 len1,
++                          const PRUnichar* pText2, PRUint32 len2)
++{
++  if (len1 != len2)
++    return PR_FALSE;
++
++  for (PRUint32 i = 0; i < len1; ++i)
++    if (pText1[i] != pText2[i])
++      return PR_FALSE;
++
++  return PR_TRUE;
++}
++
++int nsLibThaiLineBreaker::GetBreaks (
++  const PRUnichar* pText, PRUint32 textLen, int vPos[], int nPos)
++{
++  // Call the expensive th_brk() only if uncached
++  BreakEntry& breakEntry = mBreakCache.LookUp (pText, textLen);
++  if (!IsStrEqual (breakEntry.Text(), breakEntry.TextLength(), pText, textLen))
++  {
++    thchar_t* pTISText = GetTISText (pText, textLen);
++    int* pBreaks = new int [nPos];
++    int  nBreaks = th_brk (pTISText, pBreaks, nPos);
++    FreeTISText (pTISText);
++
++    breakEntry.Set (pText, textLen, pBreaks, nBreaks);
++    delete pBreaks;
++  }
++
++  for (int i = 0; i < breakEntry.PosLength(); ++i)
++    vPos [i] = breakEntry.Pos (i);
++  return breakEntry.PosLength();
++}
++
++NS_IMPL_ISUPPORTS1 (nsLibThaiLineBreaker, nsIThaiLineBreaker)
++
++
++NS_IMETHODIMP nsLibThaiLineBreaker::BreakInBetween(
++  const PRUnichar* aText1 , PRUint32 aTextLen1,
++  const PRUnichar* aText2 , PRUint32 aTextLen2,
++  PRBool* oCanBreak)
++{
++  if (!aText1 || !aText2 || (0 == aTextLen1) || (0 == aTextLen2))
++  {
++    *oCanBreak = PR_FALSE;
++    return NS_OK;
++  }
++
++  PRBool result = PR_FALSE;
++
++  PRUnichar *pConcat = new PRUnichar [aTextLen1 + aTextLen2];
++  for (PRUint32 i = 0; i < aTextLen1; i++)
++    pConcat[i] = aText1[i];
++  for (PRUint32 i = 0; i < aTextLen2; i++)
++    pConcat[aTextLen1 + i] = aText2[i];
++
++  int* pBreaks = new int [aTextLen1 + aTextLen2 + 1];
++  int  nBreaks = GetBreaks (pConcat, aTextLen1 + aTextLen2,
++                            pBreaks, int (aTextLen1 + aTextLen2 + 1));
++  for (int i = 0; i < nBreaks; i++) {
++    if (PRUint32 (pBreaks[i]) == aTextLen1) {
++      result = PR_TRUE;
++      break;
++    }
++  }
++  delete pBreaks;
++
++  delete pConcat;
++
++  *oCanBreak = result;
++  return NS_OK;
++}
++
++
++NS_IMETHODIMP nsLibThaiLineBreaker::Next(
++  const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
++  PRUint32* oNext, PRBool* oNeedMoreText)
++{
++  NS_ASSERTION(aText, "aText shouldn't be null");
++  NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
++
++  *oNeedMoreText = PR_TRUE;
++  *oNext = aLen;
++
++  int* pBreaks = new int [aLen + 1];
++  int  nBreaks = GetBreaks (aText, aLen, pBreaks, int (aLen + 1));
++  for (int i = 0; i < nBreaks; i++) {
++    if (PRUint32 (pBreaks[i]) > aPos) {
++      *oNext = pBreaks[i];
++      *oNeedMoreText = PR_FALSE;
++      break;
++    }
++  }
++  delete pBreaks;
++
++  return NS_OK;
++}
++
++
++NS_IMETHODIMP nsLibThaiLineBreaker::Prev( 
++  const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
++  PRUint32* oPrev, PRBool* oNeedMoreText)
++{
++  NS_ASSERTION(aText, "aText shouldn't be null");
++  NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
++
++  *oNeedMoreText = PR_TRUE;
++  *oPrev = 0;
++
++  int* pBreaks = new int [aLen + 1];
++  int  nBreaks = GetBreaks (aText, aLen, pBreaks, int (aLen + 1));
++  for (int i = nBreaks - 1; i >= 0; i--) {
++    if (PRUint32 (pBreaks[i]) < aPos) {
++      *oPrev = pBreaks[i];
++      *oNeedMoreText = PR_FALSE;
++      break;
++    }
++  }
++  delete pBreaks;
++
++  return NS_OK;
++}
++
+Index: mozilla/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/intl/lwbrk/components/libthai/nsLibThaiLineBreaker.h	2007-04-04 18:48:32.000000000 +0200
+@@ -0,0 +1,148 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** 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) 1998
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ * - Theppitak Karoonboonyanan <thep@linux.thai.net>
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either of 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 ***** */
++
++#ifndef nsLibThaiLineBreaker_h__
++#define nsLibThaiLineBreaker_h__
++
++#include "nsIThaiLineBreaker.h"
++
++/*
++ * Break Positions Info Entry
++ */
++class BreakEntry {
++public:
++  BreakEntry();
++  ~BreakEntry();
++
++  void  Set (const PRUnichar* pText, PRUint32 textLen, int* pvPos, int posLen);
++
++  const PRUnichar* Text() const;
++  PRUint32         TextLength() const;
++  int              Pos(int index) const;
++  int              PosLength() const;
++
++private:
++  void Clear();
++
++private:
++  PRUnichar* mText;
++  PRUint32   mTextLen;
++  int*       mPos;
++  int        mPosLen;
++};
++
++inline BreakEntry::BreakEntry()
++  : mText (nsnull), mTextLen (0), mPos (nsnull), mPosLen (0)
++{
++}
++
++inline BreakEntry::~BreakEntry()
++{
++  Clear();
++}
++
++inline void BreakEntry::Clear()
++{
++  if (mText)
++    delete mText;
++  if (mPos)
++    delete mPos;
++}
++
++inline const PRUnichar* BreakEntry::Text() const
++{
++  return mText;
++}
++
++inline PRUint32 BreakEntry::TextLength() const
++{
++  return mTextLen;
++}
++
++inline int BreakEntry::Pos (int index) const
++{
++  return (mPos && index < mPosLen) ? mPos[index] : -1;
++}
++
++inline int BreakEntry::PosLength() const
++{
++  return mPosLen;
++}
++
++
++/*
++ * Break Positions Info Cache
++ */
++class BreakCache
++{
++public:
++  BreakEntry& LookUp (const PRUnichar* pText, PRUint32 textLen);
++
++private:
++  enum { N_BUCKETS = 19 };
++  BreakEntry mvBucket[N_BUCKETS];
++};
++
++
++/*
++ * Thai Line Breaker using LibThai
++ */
++class nsLibThaiLineBreaker : public nsIThaiLineBreaker
++{
++  NS_DECL_ISUPPORTS
++
++public:
++  NS_IMETHOD BreakInBetween (const PRUnichar* aText1 , PRUint32 aTextLen1,
++                             const PRUnichar* aText2 , PRUint32 aTextLen2,
++                             PRBool* oCanBreak);
++
++  NS_IMETHOD Next (const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
++                   PRUint32* oNext, PRBool* oNeedMoreText);
++
++  NS_IMETHOD Prev (const PRUnichar* aText, PRUint32 aLen, PRUint32 aPos,
++                   PRUint32* oPrev, PRBool* oNeedMoreText);
++
++protected:
++  int GetBreaks (const PRUnichar* pText, PRUint32 textLen,
++                 int vPos[], int nPos);
++
++private:
++  BreakCache  mBreakCache;
++};
++
++#endif  /* nsLibThaiLineBreaker_h__ */
+Index: mozilla/intl/lwbrk/components/libthai/nsLibThaiModule.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/intl/lwbrk/components/libthai/nsLibThaiModule.cpp	2007-04-04 18:48:32.000000000 +0200
+@@ -0,0 +1,52 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** 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 the Mozilla GNOME integration code.
++ *
++ * The Initial Developer of the Original Code is
++ * IBM Corporation.
++ * Portions created by the Initial Developer are Copyright (C) 2004
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *  Theppitak Karoonboonyanan <thep@linux.thai.net>
++ *
++ * 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 ***** */
++
++#include "nsLibThaiLineBreaker.h"
++#include "nsIGenericFactory.h"
++
++NS_GENERIC_FACTORY_CONSTRUCTOR(nsLibThaiLineBreaker)
++
++static const nsModuleComponentInfo components[] = {
++  { "LibThai Line Breaker",
++    NS_THAILINEBREAKER_CID,
++    NS_THAILINEBREAKER_CONTRACTID,
++    nsLibThaiLineBreakerConstructor }
++};
++
++NS_IMPL_NSGETMODULE(mozlibthai, components)
++
+Index: mozilla/intl/lwbrk/idl/Makefile.in
+===================================================================
+--- mozilla.orig/intl/lwbrk/idl/Makefile.in	2007-04-04 18:47:46.000000000 +0200
++++ mozilla/intl/lwbrk/idl/Makefile.in	2007-04-04 18:48:32.000000000 +0200
+@@ -41,11 +41,12 @@
+ VPATH		= @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+ MODULE		= lwbrk
+ 
+ XPIDLSRCS	= \
+ 	nsISemanticUnitScanner.idl \
++	nsIThaiLineBreaker.idl \
+ 	$(NULL)
+ 
+ include $(topsrcdir)/config/rules.mk
+Index: mozilla/intl/lwbrk/idl/nsIThaiLineBreaker.idl
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mozilla/intl/lwbrk/idl/nsIThaiLineBreaker.idl	2007-04-04 18:48:32.000000000 +0200
+@@ -0,0 +1,61 @@
++/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
++/* ***** 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) 1998
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *   Theppitak Karoonboonyanan <thep@linux.thai.net>
++ *
++ * Alternatively, the contents of this file may be used under the terms of
++ * either of 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 ***** */
++
++#include "nsISupports.idl"
++
++%{C++
++// {5E1CD5F3-C757-45A5-BDA2-60D530236473}
++#define NS_THAILINEBREAKER_CID { 0x5e1cd5f3, 0xc757, 0x45a5, { 0xbd, 0xa2, 0x60, 0xd5, 0x30, 0x23, 0x64, 0x73}}
++#define NS_THAILINEBREAKER_CONTRACTID "@mozilla.org/intl/thailinebreaker;1"
++%}
++
++/**
++ * Provides Thai line breaker
++ */
++[scriptable, uuid(5e1cd5f3-c757-45a5-bda2-60d530236473)]
++interface nsIThaiLineBreaker : nsISupports {
++  boolean breakInBetween (in wstring aText1, in unsigned long aTextLen1,
++                          in wstring aText2, in unsigned long aTextLen2);
++
++  void next (in wstring aText, in unsigned long aLen, in unsigned long aPos,
++             out unsigned long pos, out boolean needMoreText);
++
++  void prev (in wstring aText, in unsigned long aLen, in unsigned long aPos,
++             out unsigned long pos, out boolean needMoreText);
++};
++
+Index: mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp
+===================================================================
+--- mozilla.orig/intl/lwbrk/src/nsJISx4501LineBreaker.cpp	2007-04-04 18:47:46.000000000 +0200
++++ mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.cpp	2007-04-04 18:48:32.000000000 +0200
+@@ -44,16 +44,17 @@
+ #include "pratom.h"
+ #include "nsLWBRKDll.h"
+ #include "jisx4501class.h"
+ #define TH_UNICODE
+ #include "th_char.h"
+ #include "rulebrk.h"
+ #include "nsUnicharUtils.h"
+ 
++#include "nsIServiceManager.h"
+ 
+ /* 
+ 
+    Simplification of Pair Table in JIS X 4051
+ 
+    1. The Origion Table - in 4.1.3
+ 
+    In JIS x 4051. The pair table is defined as below
+@@ -233,33 +234,39 @@
+ {
+   return ((0x1100 <= (u) && (u) <= 0x11ff) ||
+           (0x2e80 <= (u) && (u) <= 0xd7ff) ||
+           (0xf900 <= (u) && (u) <= 0xfaff) ||
+           (0xff00 <= (u) && (u) <= 0xffef) );
+ }
+ 
+ static inline int
++IS_THAI(PRUnichar u)
++{
++  return (0x0e01 <= (u) && (u) <= 0x0e5b);
++}
++
++static inline int
+ IS_SPACE(PRUnichar u)
+ {
+   return ((u) == 0x0020 || (u) == 0x0009 || (u) == 0x000a || (u) == 0x000d || (u)==0x200b);
+ }
+ 
+ PRInt8 nsJISx4051LineBreaker::GetClass(PRUnichar u)
+ {
+    PRUint16 h = u & 0xFF00;
+    PRUint16 l = u & 0x00ff;
+    PRInt8 c;
+    
+    // Handle 3 range table first
+    if( 0x0000 == h)
+    {
+      c = GETCLASSFROMTABLE(gLBClass00, l);
+    } 
+-   else if(th_isthai(u))
++   else if(IS_THAI(u))
+    {
+      c = CLASS_THAI;
+    }
+    else if( 0x2000 == h)
+    {
+      c = GETCLASSFROMTABLE(gLBClass20, l);
+    } 
+    else if( 0x2100 == h)
+@@ -337,21 +344,27 @@
+ PRBool nsJISx4051LineBreaker::GetPair(PRInt8 c1, PRInt8 c2)
+ {
+   NS_ASSERTION( c1 < MAX_CLASSES ,"illegal classes 1");
+   NS_ASSERTION( c2 < MAX_CLASSES ,"illegal classes 2");
+ 
+   return (0 == ((gPair[c1] >> c2 ) & 0x0001));
+ }
+ 
++nsCOMPtr<nsIThaiLineBreaker> nsJISx4051LineBreaker::GetThaiLineBreaker()
++{
++  if (!mThaiLineBreaker)
++    mThaiLineBreaker = do_GetService (NS_THAILINEBREAKER_CONTRACTID);
++  return mThaiLineBreaker;
++}
+ 
+ nsJISx4051LineBreaker::nsJISx4051LineBreaker(
+    const PRUnichar* aNoBegin, PRInt32 aNoBeginLen,
+    const PRUnichar* aNoEnd, PRInt32 aNoEndLen
+-)
++)  : mThaiLineBreaker(nsnull)
+ {
+ }
+ 
+ nsJISx4051LineBreaker::~nsJISx4051LineBreaker()
+ {
+ }
+ 
+ NS_IMPL_ISUPPORTS1(nsJISx4051LineBreaker, nsILineBreaker)
+@@ -422,25 +435,25 @@
+   //search for CJK characters until a space is found. 
+   //if CJK char is found before space, use 4051, otherwise western
+   PRInt32 cur;
+ 
+   for (cur= aTextLen1-1; cur>=0; cur--)
+   {
+     if (IS_SPACE(aText1[cur]))
+       break;
+-    if (IS_CJK_CHAR(aText1[cur]))
++    if (IS_CJK_CHAR(aText1[cur]) || IS_THAI(aText1[cur]))
+       goto ROUTE_CJK_BETWEEN;
+   }
+ 
+   for (cur= 0; cur < (PRInt32)aTextLen2; cur++)
+   {
+     if (IS_SPACE(aText2[cur]))
+       break;
+-    if (IS_CJK_CHAR(aText2[cur]))
++    if (IS_CJK_CHAR(aText2[cur]) || IS_THAI(aText2[cur]))
+       goto ROUTE_CJK_BETWEEN;
+   }
+ 
+   //now apply western rule.
+   *oCanBreak = IS_SPACE(aText1[aTextLen1-1]) || IS_SPACE(aText2[0]);
+   return NS_OK;
+ 
+ ROUTE_CJK_BETWEEN:
+@@ -458,17 +471,22 @@
+                                   aText2[0],
+                                   (aTextLen2>1)?aText2[1]:0);
+   else 
+     c2 = this->GetClass(aText2[0]);
+ 
+   /* Handle cases for THAI */
+   if((CLASS_THAI == c1) && (CLASS_THAI == c2))
+   {
+-     *oCanBreak = (0 == TrbWordBreakPos(aText1, aTextLen1, aText2, aTextLen2));
++    nsCOMPtr<nsIThaiLineBreaker> pThaiLineBreaker = GetThaiLineBreaker();
++    if (pThaiLineBreaker)
++      return pThaiLineBreaker->BreakInBetween(aText1, aTextLen1,
++                                              aText2, aTextLen2, oCanBreak);
++    else
++      *oCanBreak = (0 == TrbWordBreakPos(aText1, aTextLen1, aText2, aTextLen2));
+   }
+   else 
+   {
+      *oCanBreak = GetPair(c1,c2);
+   }
+   return NS_OK;
+ }
+ 
+@@ -488,16 +506,19 @@
+   for (cur = aPos; cur < aLen; ++cur)
+   {
+     if (IS_SPACE(GetUnichar(&aText[cur])))
+     {
+       *oNext = cur;
+       *oNeedMoreText = PR_FALSE;
+       return NS_OK;
+     }
++    // [thep's version]:
++    // if (IS_CJK_CHAR(&aText[cur]) || IS_THAI(&aText[cur]))
++    // [with RISC unichar fix]:
+     if (IS_CJK_CHAR(GetUnichar(&aText[cur])) || IS_THAI(GetUnichar(&aText[cur])))
+       goto ROUTE_CJK_NEXT;
+   }
+   *oNext = aLen;
+   *oNeedMoreText = PR_TRUE;
+   return NS_OK;
+ 
+ ROUTE_CJK_NEXT:
+@@ -509,19 +530,24 @@
+                                   GetUnichar(&aText[cur]),
+                                   (cur<(aLen-1)) ?GetUnichar(&aText[cur+1]):0);
+   } else  {
+     c1 = this->GetClass(GetUnichar(&aText[cur]));
+   }
+   
+   if(CLASS_THAI == c1) 
+   {
+-     *oNext = PRUint32(TrbFollowing(aText, aLen, aPos));
+-     *oNeedMoreText = PR_FALSE;
+-     return NS_OK;
++    nsCOMPtr<nsIThaiLineBreaker> pThaiLineBreaker = GetThaiLineBreaker();
++    if (pThaiLineBreaker) {
++      return pThaiLineBreaker->Next(aText, aLen, aPos, oNext, oNeedMoreText);
++    } else {
++      *oNext = PRUint32(TrbFollowing(aText, aLen, aPos));
++      *oNeedMoreText = PR_FALSE;
++      return NS_OK;
++    }
+   }
+ 
+   for(cur++; cur <aLen; cur++)
+   {
+      if(NEED_CONTEXTUAL_ANALYSIS(GetUnichar(&aText[cur])))
+      {
+        c2= this->ContextualAnalysis((cur>0)?GetUnichar(&aText[cur-1]):0,
+                                   GetUnichar(&aText[cur]),
+@@ -558,17 +584,17 @@
+     if (IS_SPACE(aText[cur]))
+     {
+       if (cur != aPos - 1) // XXXldb Why?
+         ++cur;
+       *oPrev = cur;
+       *oNeedMoreText = PR_FALSE;
+       return NS_OK;
+     }
+-    if (IS_CJK_CHAR(aText[cur]))
++    if (IS_CJK_CHAR(aText[cur]) || IS_THAI(aText[cur]))
+       goto ROUTE_CJK_PREV;
+   }
+ 
+   *oPrev = 0;
+   *oNeedMoreText = PR_TRUE;
+   return NS_OK;
+ 
+ ROUTE_CJK_PREV:
+@@ -577,20 +603,36 @@
+   if(NEED_CONTEXTUAL_ANALYSIS(aText[cur-1]))
+   {
+     c2 = this->ContextualAnalysis(((cur-1)>0)?aText[cur-2]:0,
+                                   aText[cur-1],
+                                   (cur<aLen) ?aText[cur]:0);
+   } else  {
+     c2 = this->GetClass(aText[cur-1]);
+   }
+-  // To Do: 
+-  //
+-  // Should handle CLASS_THAI here
+-  //
++
++  if(CLASS_THAI == c2) 
++  {
++    nsCOMPtr<nsIThaiLineBreaker> pThaiLineBreaker = GetThaiLineBreaker();
++    if (pThaiLineBreaker) {
++      return pThaiLineBreaker->Prev(aText, aLen, aPos, oPrev, oNeedMoreText);
++    } else {
++      // TODO: do some fallback analysis instead
++      for (aPos--; aPos > 0; aPos--) {
++        if (!IS_THAI(aText[aPos])) {
++          *oPrev = aPos;
++          *oNeedMoreText = PR_FALSE;
++          return NS_OK;
++        }
++      }
++      *oNeedMoreText = PR_TRUE;
++      return NS_OK;
++    }
++  }
++
+   for(cur--; cur > 0; cur--)
+   {
+      if(NEED_CONTEXTUAL_ANALYSIS(aText[cur-1]))
+      {
+        c1= this->ContextualAnalysis(((cur-1)>0)?aText[cur-2]:0,
+                                   aText[cur-1],
+                                   (cur<aLen) ?aText[cur]:0);
+      } else {
+Index: mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.h
+===================================================================
+--- mozilla.orig/intl/lwbrk/src/nsJISx4501LineBreaker.h	2007-04-04 18:47:46.000000000 +0200
++++ mozilla/intl/lwbrk/src/nsJISx4501LineBreaker.h	2007-04-04 18:48:32.000000000 +0200
+@@ -35,16 +35,19 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ #ifndef nsJISx4501LineBreaker_h__
+ #define nsJISx4501LineBreaker_h__
+ 
+ 
+ #include "nsILineBreaker.h"
+ 
++#include "nsCOMPtr.h"
++#include "nsIThaiLineBreaker.h"
++
+ class nsJISx4051LineBreaker : public nsILineBreaker
+ {
+   NS_DECL_ISUPPORTS
+ 
+ public:
+   nsJISx4051LineBreaker(const PRUnichar *aNoBegin, PRInt32 aNoBeginLen, 
+                         const PRUnichar* aNoEnd, PRInt32 aNoEndLen);
+   virtual ~nsJISx4051LineBreaker();
+@@ -61,11 +64,15 @@
+ 
+ 
+ protected:
+ 
+   PRInt8   GetClass(PRUnichar u);
+   PRInt8   ContextualAnalysis(PRUnichar prev, PRUnichar cur, PRUnichar next );
+   PRBool   GetPair(PRInt8 c1, PRInt8 c2);
+ 
++  nsCOMPtr<nsIThaiLineBreaker> GetThaiLineBreaker();
++
++protected:
++  nsCOMPtr<nsIThaiLineBreaker>  mThaiLineBreaker;
+ };
+ 
+ #endif  /* nsJISx4501LineBreaker_h__ */
--- iceowl-0.7.orig/debian/patches/bz345077-make-install-installs-extensions-in-chrome-and-extensions.patch
+++ iceowl-0.7/debian/patches/bz345077-make-install-installs-extensions-in-chrome-and-extensions.patch
@@ -0,0 +1,47 @@
+From 37ede619fcb71435d153d565a6f6c82dac225e20 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Mon, 12 Mar 2007 17:03:02 +0100
+Subject: [PATCH] bz345077-make-install-installs-extensions-in-chrome-and-extensions
+
+  * https://bugzilla.mozilla.org/show_bug.cgi?id=345077
+  * https://bugzilla.mozilla.org/attachment.cgi?id=229687
+---
+ config/rules.mk |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: mozilla/config/rules.mk
+===================================================================
+--- mozilla.orig/config/rules.mk	2007-04-04 18:45:08.000000000 +0200
++++ mozilla/config/rules.mk	2007-04-04 18:45:44.000000000 +0200
+@@ -1564,29 +1564,31 @@
+ 	    $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \
+ 	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \
+ 	    $(FINAL_TARGET)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \
+ 	fi
+ endif
+ 
+ install:: $(CHROME_DEPS)
+ ifndef NO_INSTALL
++ifndef XPI_NAME
+ 	@$(EXIT_ON_ERROR) \
+ 	if test -f $(JAR_MANIFEST); then \
+ 	  if test ! -d $(DESTDIR)$(mozappdir)/chrome; then $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/chrome; fi; \
+ 	  if test ! -d $(MAKE_JARS_TARGET)/chrome; then $(NSINSTALL) -D $(MAKE_JARS_TARGET)/chrome; fi; \
+ 	  $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
+ 	    $(JAR_MANIFEST) | \
+ 	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \
+ 	    -d $(MAKE_JARS_TARGET) -j $(DESTDIR)$(mozappdir)/chrome \
+ 	    $(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \
+ 	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl \
+ 	    $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); \
+ 	fi
+ endif
++endif
+ 
+ ifneq ($(DIST_FILES),)
+ libs:: $(DIST_FILES)
+ 	@$(EXIT_ON_ERROR) \
+ 	for f in $(DIST_FILES); do \
+ 		$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl \
+ 			$(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) \
+ 			$(srcdir)/$$f > $(FINAL_TARGET)/`basename $$f`; \
--- iceowl-0.7.orig/debian/patches/bz273524-gnome-mime-registry-ubuntu.patch
+++ iceowl-0.7/debian/patches/bz273524-gnome-mime-registry-ubuntu.patch
@@ -0,0 +1,380 @@
+=== uriloader/exthandler/Makefile.in
+==================================================================
+--- xulrunner/uriloader/exthandler/Makefile.in	(revision 116)
++++ xulrunner/uriloader/exthandler/Makefile.in	(local)
+@@ -102,7 +102,7 @@
+ LOCAL_INCLUDES = -I$(srcdir)
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+-OSHELPER	+= nsGNOMERegistry.cpp
++OSHELPER	+= nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
+ endif
+ 
+ ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+=== uriloader/exthandler/unix/nsGNOMERegistry.cpp
+--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp	(revision 116)
++++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp	(local)
+@@ -42,7 +42,6 @@
+ #include "nsString.h"
+ #include "nsIComponentManager.h"
+ #include "nsILocalFile.h"
+-#include "nsMIMEInfoImpl.h"
+ #include "nsAutoPtr.h"
+ 
+ #include <glib.h>
+@@ -56,12 +55,12 @@
+ typedef struct _GnomeProgram GnomeProgram;
+ typedef struct _GnomeModuleInfo GnomeModuleInfo;
+ 
+-typedef struct {
++struct GnomeVFSMimeApplication {
+   char *id;
+   char *name;
+   char *command;
+   /* there is more here, but we don't need it */
+-} GnomeVFSMimeApplication;
++};
+ 
+ typedef GConfClient * (*_gconf_client_get_default_fn)();
+ typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
+@@ -264,7 +263,7 @@
+ }
+ 
+ 
+-/* static */ already_AddRefed<nsMIMEInfoBase>
++/* static */ already_AddRefed<nsMIMEInfoUnix>
+ nsGNOMERegistry::GetFromExtension(const char *aFileExt)
+ {
+   if (!gconfLib)
+@@ -286,7 +285,7 @@
+   return GetFromType(mimeType);
+ }
+ 
+-/* static */ already_AddRefed<nsMIMEInfoBase>
++/* static */ already_AddRefed<nsMIMEInfoUnix>
+ nsGNOMERegistry::GetFromType(const char *aMIMEType)
+ {
+   if (!gconfLib)
+@@ -296,7 +295,7 @@
+   if (!handlerApp)
+     return nsnull;
+ 
+-  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
++  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
+   NS_ENSURE_TRUE(mimeInfo, nsnull);
+ 
+   // Get the list of extensions and append then to the mimeInfo.
+@@ -320,11 +319,21 @@
+     return nsnull;
+   }
+ 
+-  gchar *commandPath = g_find_program_in_path(nativeCommand);
++  gchar **argv;
++  gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
++  if (!res) {
++    NS_ERROR("Could not convert helper app command to filesystem encoding");
++    _gnome_vfs_mime_application_free(handlerApp);
++    return nsnull;
++  }
+ 
++  gchar *commandPath = g_find_program_in_path(argv[0]);
++
+   g_free(nativeCommand);
++  g_strfreev(argv);
+ 
+   if (!commandPath) {
++    NS_WARNING("could not find command in path");
+     _gnome_vfs_mime_application_free(handlerApp);
+     return nsnull;
+   }
+@@ -342,7 +351,7 @@
+ 
+   _gnome_vfs_mime_application_free(handlerApp);
+ 
+-  nsMIMEInfoBase* retval;
++  nsMIMEInfoUnix* retval;
+   NS_ADDREF((retval = mimeInfo));
+   return retval;
+ }
+=== uriloader/exthandler/unix/nsGNOMERegistry.h
+--- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h	(revision 116)
++++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h	(local)
+@@ -35,10 +35,13 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
++#ifndef nsGNOMERegistry_h__
++#define nsGNOMERegistry_h__
++
+ #include "nsIURI.h"
+ #include "nsCOMPtr.h"
+ 
+-class nsMIMEInfoBase;
++#include "nsMIMEInfoUnix.h"
+ 
+ class nsGNOMERegistry
+ {
+@@ -52,7 +55,9 @@
+   static void GetAppDescForScheme(const nsACString& aScheme,
+                                   nsAString& aDesc);
+ 
+-  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt);
++  static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt);
+ 
+-  static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType);
++  static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType);
+ };
++
++#endif // nsGNOMERegistry_h__
+=== uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	(revision 116)
++++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	(local)
+@@ -0,0 +1,196 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.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
++ * Red Hat, Inc.
++ * Portions created by the Initial Developer are Copyright (C) 2005
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *   Christopher Aillon <caillon@redhat.com> (Original author)
++ *
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#include <glib.h>
++#include <glib-object.h>
++#include "nsMIMEInfoUnix.h"
++#include "prlink.h"
++#include "prmem.h"
++
++static PRLibrary *gnomeLib;
++static PRLibrary *vfsLib;
++
++typedef struct _GnomeProgram GnomeProgram;
++typedef struct _GnomeModuleInfo GnomeModuleInfo;
++
++typedef enum {
++  GNOME_VFS_OK // there's more but we don't care about them.
++} GnomeVFSResult;
++
++typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
++                              (GnomeVFSMimeApplication *app,
++                               GList *uris);
++typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *);
++typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
++typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
++						 const GnomeModuleInfo *, int,
++						 char **, const char *, ...);
++typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
++typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
++typedef GnomeProgram * (*_gnome_program_get_fn)();
++typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
++
++#define DECL_FUNC_PTR(func) static _##func##_fn _##func
++
++DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
++DECL_FUNC_PTR(gnome_vfs_mime_application_free);
++DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
++DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
++DECL_FUNC_PTR(gnome_program_init);
++DECL_FUNC_PTR(gnome_program_get);
++DECL_FUNC_PTR(libgnome_module_info_get);
++DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
++
++static PRLibrary *
++LoadVersionedLibrary(const char* libName, const char* libVersion)
++{
++  char *platformLibName = PR_GetLibraryName(nsnull, libName);
++  nsCAutoString versionLibName(platformLibName);
++  versionLibName.Append(libVersion);
++  PR_Free(platformLibName);
++  return PR_LoadLibrary(versionLibName.get());
++}
++
++static void
++Cleanup()
++{
++  // Unload all libraries
++  if (gnomeLib)
++    PR_UnloadLibrary(gnomeLib);
++  if (vfsLib)
++    PR_UnloadLibrary(vfsLib);
++
++  gnomeLib = vfsLib = nsnull;
++}
++
++static void
++InitGnomeVFS()
++{
++  static PRBool initialized = PR_FALSE;
++
++  if (initialized)
++    return;
++
++  #define ENSURE_LIB(lib) \
++    PR_BEGIN_MACRO \
++    if (!lib) { \
++      Cleanup(); \
++      return; \
++    } \
++    PR_END_MACRO
++
++  #define GET_LIB_FUNCTION(lib, func, failure) \
++    PR_BEGIN_MACRO \
++    _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
++    if (!_##func) { \
++      failure; \
++    } \
++    PR_END_MACRO
++
++  // Attempt to open libgnome
++  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
++  ENSURE_LIB(gnomeLib);
++
++  GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
++  GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
++  GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
++
++  // Attempt to open libgnomevfs
++  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
++  ENSURE_LIB(vfsLib);
++
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */);
++  GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
++  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
++
++  // Initialize GNOME, if it's not already initialized.  It's not
++  // necessary to tell GNOME about our actual command line arguments.
++
++  if (!_gnome_program_get()) {
++    char *argv[1] = { "gecko" };
++    _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
++                        1, argv, NULL);
++  }
++
++  // Note: after GNOME has been initialized, do not ever unload these
++  // libraries.  They register atexit handlers, so if they are unloaded, we'll
++  // crash on exit.  
++}
++
++void
++nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app)
++{
++  if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) {
++    mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
++
++    mPreferredAction = nsIMIMEInfo::useSystemDefault;
++
++    const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
++    if (name) 
++      mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
++  }
++}
++
++nsMIMEInfoUnix::~nsMIMEInfoUnix()
++{
++  if (mDefaultVFSApplication)
++    _gnome_vfs_mime_application_free(mDefaultVFSApplication);
++}
++
++nsresult
++nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
++{
++  NS_ENSURE_ARG_POINTER(aFile);
++
++  InitGnomeVFS();
++
++  if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
++    nsCAutoString nativePath;
++    aFile->GetNativePath(nativePath);
++
++    gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
++
++    GList *uris = NULL;
++    uris = g_list_append(uris, uri);
++
++    GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
++
++    g_free(uri);
++    g_list_free(uris);
++
++    if (result != GNOME_VFS_OK)
++      return NS_ERROR_FAILURE;
++
++    return NS_OK;
++  }
++
++  if (!mDefaultApplication)
++    return NS_ERROR_FILE_NOT_FOUND;
++
++  return LaunchWithIProcess(mDefaultApplication, aFile);
++}
+=== uriloader/exthandler/unix/nsMIMEInfoUnix.h
+--- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h	(revision 116)
++++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h	(local)
+@@ -0,0 +1,48 @@
++/* ***** BEGIN LICENSE BLOCK *****
++ * Version: MPL 1.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
++ * Red Hat, Inc.
++ * Portions created by the Initial Developer are Copyright (C) 2005
++ * the Initial Developer. All Rights Reserved.
++ *
++ * Contributor(s):
++ *   Christopher Aillon <caillon@redhat.com> (Original author)
++ *
++ *
++ * ***** END LICENSE BLOCK ***** */
++
++#ifndef nsMimeInfoUnix_h__
++#define nsMimeInfoUnix_h__
++
++#include "nsMIMEInfoImpl.h"
++
++struct GnomeVFSMimeApplication;
++
++class nsMIMEInfoUnix : public nsMIMEInfoImpl
++{
++public:
++  nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {}
++  virtual ~nsMIMEInfoUnix();
++
++  void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
++
++protected:
++  virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
++
++  GnomeVFSMimeApplication *mDefaultVFSApplication;
++};
++ 
++#endif // nsMimeInfoUnix_h__
--- iceowl-0.7.orig/debian/patches/ubuntu-look-and-feel-home-folder.patch
+++ iceowl-0.7/debian/patches/ubuntu-look-and-feel-home-folder.patch
@@ -0,0 +1,67 @@
+From a7cd308f5185d050a02141ae0575d7fea2529850 Mon Sep 17 00:00:00 2001
+From: asac <asac@hector.personalfree.com>
+Date: Wed, 21 Feb 2007 03:34:15 +0100
+Subject: [PATCH] ubuntu-look-and-feel-home-folder
+
+  + use desktop folder instead of home
+---
+ browser/components/preferences/main.js         |    4 ++++
+ toolkit/mozapps/downloads/content/downloads.js |    4 ++++
+ 2 files changed, 8 insertions(+)
+
+Index: mozilla/browser/components/preferences/main.js
+===================================================================
+--- mozilla.orig/browser/components/preferences/main.js	2007-04-04 18:47:53.000000000 +0200
++++ mozilla/browser/components/preferences/main.js	2007-04-04 18:48:08.000000000 +0200
+@@ -350,19 +350,23 @@
+ 
+     if (aFolderType == "Downloads")
+ #ifdef XP_WIN
+       return "Pers";
+ #else
+ #ifdef XP_MACOSX
+       return "UsrDocs";
+ #else
++#ifdef XP_UNIX
++    return aFolderType == "Desktop" ? "Desk" : "Home";
++#else
+       return "Home";
+ #endif
+ #endif
++#endif
+ 
+       throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
+   },
+ 
+   /**
+    * Returns the textual path of a folder in readable form.
+    */
+   _getDisplayNameOfFile: function (aFolder)
+Index: mozilla/toolkit/mozapps/downloads/content/downloads.js
+===================================================================
+--- mozilla.orig/toolkit/mozapps/downloads/content/downloads.js	2007-04-04 18:47:53.000000000 +0200
++++ mozilla/toolkit/mozapps/downloads/content/downloads.js	2007-04-04 18:48:08.000000000 +0200
+@@ -785,19 +785,23 @@
+       throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
+ 
+ #ifdef XP_WIN
+     return "Pers";
+ #else
+ #ifdef XP_MACOSX
+     return "UsrDocs";
+ #else
++#ifdef XP_UNIX
++    return aFolderType == "Desktop" ? "Desk" : "Home";
++#else
+     return "Home";
+ #endif
+ #endif
++#endif
+     }
+     
+     function getDownloadsFolder(aFolder)
+     {
+       var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"]
+                                   .getService(Components.interfaces.nsIProperties);
+       var dir = fileLocator.get(getSpecialFolderKey(aFolder), Components.interfaces.nsILocalFile);
+       
--- iceowl-0.7.orig/debian/patches/bz364093-thebes-system-cairo-fix
+++ iceowl-0.7/debian/patches/bz364093-thebes-system-cairo-fix
@@ -0,0 +1,53 @@
+---
+ gfx/thebes/public/gfxMatrix.h |    2 --
+ gfx/thebes/src/gfxMatrix.cpp  |   12 ------------
+ 2 files changed, 14 deletions(-)
+
+Index: mozilla/gfx/thebes/public/gfxMatrix.h
+===================================================================
+--- mozilla.orig/gfx/thebes/public/gfxMatrix.h	2007-03-22 02:52:47.000000000 +0100
++++ mozilla/gfx/thebes/public/gfxMatrix.h	2007-03-22 03:07:52.000000000 +0100
+@@ -160,18 +160,16 @@
+      */
+     gfxSize Transform(const gfxSize& size) const;
+ 
+     /**
+      * Transforms both the point and distance according to this matrix.
+      */
+     gfxRect Transform(const gfxRect& rect) const;
+ 
+-    gfxRect TransformBounds(const gfxRect& rect) const;
+-
+     /**
+      * Returns the translation component of this matrix.
+      */
+     gfxPoint GetTranslation() const {
+         return gfxPoint(x0, y0);
+     }
+ 
+     /**
+Index: mozilla/gfx/thebes/src/gfxMatrix.cpp
+===================================================================
+--- mozilla.orig/gfx/thebes/src/gfxMatrix.cpp	2007-03-22 02:52:47.000000000 +0100
++++ mozilla/gfx/thebes/src/gfxMatrix.cpp	2007-03-22 03:08:18.000000000 +0100
+@@ -100,20 +100,8 @@
+ }
+ 
+ gfxRect
+ gfxMatrix::Transform(const gfxRect& rect) const
+ {
+     return gfxRect(Transform(rect.pos), Transform(rect.size));
+ }
+ 
+-gfxRect
+-gfxMatrix::TransformBounds(const gfxRect& rect) const
+-{
+-    double x0 = rect.pos.x;
+-    double y0 = rect.pos.y;
+-    double x1 = rect.pos.x + rect.size.width;
+-    double y1 = rect.pos.y + rect.size.height;
+-
+-    cairo_matrix_transform_bounding_box(CONST_CAIRO_MATRIX(this), &x0, &y0, &x1, &y1, NULL);
+-
+-    return gfxRect(x0, y0, x1 - x0, y1 - y0);
+-}
--- iceowl-0.7.orig/debian/patches/no-have-stdint-h-ftbfs.patch
+++ iceowl-0.7/debian/patches/no-have-stdint-h-ftbfs.patch
@@ -0,0 +1,42 @@
+
+TODO: submit upstream ... fix properly before?
+
+---
+ configure.in |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in	2007-01-31 17:12:09.000000000 +0100
++++ mozilla/configure.in	2007-03-22 02:21:42.000000000 +0100
+@@ -7193,24 +7193,24 @@
+    MOZ_CAIRO_CFLAGS='-I$(LIBXUL_DIST)/include/cairo'
+ 
+    MOZ_TREE_CAIRO=1
+    MOZ_ARG_ENABLE_BOOL(system-cairo,
+    [ --enable-system-cairo Use system cairo (located with pkgconfig)],
+    MOZ_TREE_CAIRO=,
+    MOZ_TREE_CAIRO=1 )
+ 
+-   if test "$MOZ_TREE_CAIRO"; then
+-       # Check for headers defining standard int types.
+-       AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h)
++   # Check for headers defining standard int types.
++   AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h)
+ 
+-       # For now we assume that we will have a uint64_t available through
+-       # one of the above headers or mozstdint.h.
+-       AC_DEFINE(HAVE_UINT64_T)
++   # For now we assume that we will have a uint64_t available through
++   # one of the above headers or mozstdint.h.
++   AC_DEFINE(HAVE_UINT64_T)
+ 
++   if test "$MOZ_TREE_CAIRO"; then
+        # Define macros for cairo-features.h
+        if test "$MOZ_X11"; then
+            XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1"
+            PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
+            PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
+            FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
+            MOZ_ENABLE_CAIRO_FT=1
+            CAIRO_FT_CFLAGS="$FT2_CFLAGS"
--- iceowl-0.7.orig/debian/patches/ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch
+++ iceowl-0.7/debian/patches/ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls.patch
@@ -0,0 +1,37 @@
+From b6dda891d023ce4251c69adcac8a69d375c298e5 Mon Sep 17 00:00:00 2001
+From: Alexander Sack <asac@jwsdot.com>
+Date: Mon, 2 Apr 2007 15:37:15 +0200
+Subject: [PATCH] ubuntu-look-and-feel-patch-fix-bookmarks-ubuntu-urls
+
+TODO -> migrate bookmarks fix together with original bookmarks fix in look-and-feel patch to distromods
+
+---
+ browser/locales/en-US/profile/bookmarks.html |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: mozilla/browser/locales/en-US/profile/bookmarks.html
+===================================================================
+--- mozilla.orig/browser/locales/en-US/profile/bookmarks.html	2007-04-04 18:52:09.000000000 +0200
++++ mozilla/browser/locales/en-US/profile/bookmarks.html	2007-04-04 18:52:31.000000000 +0200
+@@ -14,19 +14,19 @@
+     <DL><p>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/central/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$GvPhC3">Getting Started</A>
+         <DT><A HREF="http://news.bbc.co.uk/" LAST_MODIFIED="1141921369" FEEDURL="http://newsrss.bbc.co.uk/rss/newsonline_world_edition/front_page/rss.xml" ID="rdf:#$LxoCU1">Latest BBC Headlines</A>
+     </DL><p>
+     <HR>
+     <DT><H3 ID="rdf:#$QwFMN2">Ubuntu and Free Software links</H3>
+ <DD>Information and resources about Ubuntu, Debian and Free Software in general
+     <DL><p>
+-        <DT><A HREF="http://www.ubuntulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAICAAAAAAAACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////7+///9/v7//v/+//3////8/v3/+//9//v+/////f///v/+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////v/7//39/v/8/P7/+vz8//X9/v/6/v///v/8//7/+//+/v/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/v7/+v76/6XX+P88p/b/I6D0/2/A8//f9Pz//P/9//3//v/////////////////////////////////////////////////////////////////////////////////+/v7//v7///z+/v/+/f7///78///9///+/v3//v3+//z9/P+84Pn/D5X4/wGS/v8Dkf//BJX4/1y29v/5/P7//P/9/////////////////////////////////////////////////////////////////////////////////////f/+//3//v78//r5/f/o6/r/6en5/+jq+P/z8/3//Pz+/3TB8/8Dk/z/BZL+/wCU/P8GkP//GJr2/+T3/f///f//////////////////////////////////////////////////////////////////////////////////8/T9/6+17v9iZtj/LS3X/xQU0/8SENL/FBLO/yMizP/S2vL/eMX0/wOQ/v8Dkv3/AJL+/wSR/v8dm/T/6ff+//7+/v///////////////////////////////////////////////////////////////////////v////7///+mrN//BgXK/wAE1f8AAdv/AAHZ/wEB2f8AAN3/AQTX/4+Q5//J6fz/G5b3/wKU+/8Bkv7/BZT7/3TG9v/4/f7//v/9///////////////////////////////////////+//3///3///3//f/9//7//v7+/+n5+/96wvH/4PL8//T2+v84OdP/AQDc/wAB2v8CANr/AwDZ/wEA2/8AAdj/Hx/N/9vZ9f/A5vr/XLr3/0yx9/+T0ff/8vr9//n+/v///v7///////////////////////////////////7///z+/v/7//3///79//n+///t+f3/UrL2/wmP+f9uv/X/9vz//7m98P8GBtD/AwHY/wEA3f8BANv/AQHY/wAA2f8AAdn/IyPP/6Kk6P/o6vz/8/P7/87N8//Bx+z//f35//3+/P/////////////////////////////////////////+//3+///9/v7/+v37/2e6+P8Gkvz/AZX6/xCU+f/C5/n//Pr+/1hb2P8FB8z/IiHO/zQz1f8rLNf/Dg7Q/wQD0v8BAd3/AQLW/wsK0P8NDsr/BAbT/xgXzf/SzfD/+/39///////////////////////////////////////8//7//v3///v++/+n2fj/DJP6/wGU/P8Bkv7/ApP8/0+v9//x/Pv/4eL1/8/K8v/x9fz/+/39//f5/v/m5Pr/nKDo/yss0f8CAtb/AgLV/wIA2/8BANz/AgLX/0A+zv/29P3////////////////////+//7+///+//7//v7+//z//P/5//7/8vf8/zak8/8Bkv//AZL+/wOS/v8Bkv7/JZnx/93v+f/+/vz//vz+//3////+/v///////////f/8/vv/7Or8/19Z2/8BA9T/AQHb/wEA3P8AAtf/BgPW/5+f6P/+/f///v7+///+///6//7//v7+//39///8/v3/+/7+///+/f+o2vb/BJT4/wKT+/8Ckf//A5L9/w+V9v+v3Pj//Pz9//r//v/9//7//f/+//////////////////v//v/+/f7/8PP+/0ZJ0/8BAtf/AQDb/wEA2/8CAdr/PDvQ//b5/v/9//7//v7///7/+P/9/v3/7/j+/8LP9P+yx/H/3O77/9Pr+/8woPf/A5H+/wGS/v8FlPr/abz5//n+/P/8//7//P/+///9/////////////////////////f7+//7/+//+/P//29v3/wsMzv8BAtj/AgHa/wAA2/8JCc7/z9X0//3//P/+/v//+v3+/+rx/P9Ceuj/CUnx/wZI9v8bXez/wdP2/77j+P8Kk/n/ApL8/wyW+P/R7vv//v3///z//v/+//7//P7///3//////////////////////f///f7+///9/v/6/P3/XlzX/wEB2/8BAtb/AgDc/wED1P+cnuP//v7+//7+/v///vv/j6vy/wVK+f8DSPr/BEn8/wNI/P84bev/8Pr//yqj8/8Fkf7/NqLx//D8/f/9//7//v/9///+//////3////+//////////////////7//v/9//////7///z//v+pqOn/KCjU/yco0v8uKNb/KCbU/4mJ3v///v7/+//+//v+/v9fje//Akr9/wFL/P8ASf7/A0n9/xBS6P/z+/3/SK7y/wKS/v9Grvb/9v3////////////////////////////////////////////////+/////v/8/////P7///z9/v/4+/7/9/v///r8/f/6+v7/+f39//7+/f/+/v7//v3+/4ir9P8GSvn/BEj5/wRI/f8ESfr/NWvr//L7/f8vo/T/AZL//0Kr9P/1/v3//v////////////////////////////////////////////3//P////z//v/+//3/6PD6/8rZ8v/H2PP/yNn0/8fZ8//f6fb/+v78///+/v/7/v7/6/H8/0l67P8JSe7/BUn0/x1g7f/C0fj/uOP6/weT+v8Bkv3/JZn1/+n4/P/+/////////////////////////////////////////////v/8///////7//z9/P+CqfL/B03w/whM9f8IS/f/CEv1/4qk7v/9/vz//f/9/////P/7//3/9Pj+/8nW9/++y/P/5O77/83o+v8rn/j/A5H//wGV+v8Ikvv/sd34//3+/v/+/v///v/+//z////////////////////+/////v////3+///8/v3/8Pn//zdw6/8BSf7/Akf//wFK/v8ESvj/rMby//7+/f/+//3///////////////////////7//v/8//7/f8Xy/wOV+/8Ck/3/AZL//wSR/v9BqvP/6/r9//z+/v/+/vz//f7+//z//f/9//3//v7//////f/+//3///7+//v9/P+jvvX/Bkr1/wBK/v8BSf3/BEf+/xZY8P/g7v3//P/8//39/v/////////////////+//7//f3+//v+/P/P6Pr/DJP3/wSS/v8Ckv//BJL+/wWS/P9svPn/8vv8//r+/v/9/vz//v3+//7+///+//3//f3+//n+/v/9/vz/0d36/x1b7v8FSfz/Akj//wFK/v8DSvr/YIzx//z9/v/8/v3///3+//////////////////7////+/v///P/+//b++/9Yufb/BJH+/wGT/v8BlPz/A5P8/xmY+P/Z7fv/+v77//z8+//8/vr/+f7+///+/f/8/vr/9/n8/6jB9/8dX+v/AEr6/wFI//8BSP7/BUr4/xFS8f/N2vj///7///3+//////7//////////////////v////3//v/9//7///3//9vt+/8Wl/X/BZL9/wKQ/v8Ck/r/dMX4//n8/v+zx/D/bZnt/7jI8//J1/v/v9L3/5Sw8/9Kee7/CEz0/wxM8/8vZ/T/NW/w/w5Q8P8FSPf/c6Dt//v9/v/8//3//v/+//3//f///////////////////////////////////////v///6/b+P8Vlff/AZP9/yuc8v/j8/3/8PP9/zds7P8BSP3/A0v5/wlJ9v8DSfr/Akj+/wJL9v9Jeuv/zt77//X4///y+f//5O3+/6K67//t9/3///7+////////////////////////////////////////////////////////////+v38/6DY+P8alvP/nNT2//v+/v+Mr/T/Bkj0/wRK+P8BSf3/AEn9/wNI/f8BSfz/O3Hu/+zx/f+Um+X/MjHS/ycmzf9zct3/7O/4//z+/P/6//3////////////////////////////////////////////////////////////+/v//+v7+/8jr/P/u+f7/1+n8/x9Z8P8FSfv/AUj+/wVG//8BSv3/BEj8/wZM9P+vxPP/tLPs/wgH1P8EAdj/AQHa/wED1P9oatj//vv+//7+/v////////////////////////////////////////////////////////////7+//////v/+f79//7+/P+/0vH/L2Xt/wtM9P8FSfz/Akn+/wBJ//8CSf3/FE/y/9vl+f9gX9//AQLT/wMA2v8AAtf/BQDW/x8fzv/w7/3//v39//////////////////////////////////////////////////////////////////////////////////z+/f/y8/7/yNX4/46t8v9ok+7/X4rr/2aM6/+DoO7/7fH8/2ln4P8CAtX/AQDe/wEC1f8BA9T/JiTK/+/0/v///v7//////////////////////////////////////////////////////////////////////////////////f3+//7++f/+/vz/+/7+//v+/v/8/f7/+vz+//n+/P/+/fr/x8bu/xEPyv8BANv/AgHb/wYD1P+FgeD//v38//z//v/////////////////////////////////////////////////////////////////////////////////9/v///f7///z//v/+//7//f7//////f////3////4//z8/v/9/P3/xsDw/1lb1P9ST9T/nZ/i//j5/f/+//7///3///////////////////////////////////////////////////////////////////////////////////7//f////7///7+//3+/P/9/v7//v79//v9///+/vz/+//9//79///8/v3/+/39//n7/f/9/vz//v3+//79/v/9//z/////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" LAST_CHARSET="UTF-8" ID="rdf:#$RwFMN2">Ubuntu</A>
++        <DT><A HREF="http://www.ubuntu.com/" ICON="data:image/x-icon;base64,AAABAAEAICAAAAAAAACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////7+///9/v7//v/+//3////8/v3/+//9//v+/////f///v/+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////v/7//39/v/8/P7/+vz8//X9/v/6/v///v/8//7/+//+/v/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/v7/+v76/6XX+P88p/b/I6D0/2/A8//f9Pz//P/9//3//v/////////////////////////////////////////////////////////////////////////////////+/v7//v7///z+/v/+/f7///78///9///+/v3//v3+//z9/P+84Pn/D5X4/wGS/v8Dkf//BJX4/1y29v/5/P7//P/9/////////////////////////////////////////////////////////////////////////////////////f/+//3//v78//r5/f/o6/r/6en5/+jq+P/z8/3//Pz+/3TB8/8Dk/z/BZL+/wCU/P8GkP//GJr2/+T3/f///f//////////////////////////////////////////////////////////////////////////////////8/T9/6+17v9iZtj/LS3X/xQU0/8SENL/FBLO/yMizP/S2vL/eMX0/wOQ/v8Dkv3/AJL+/wSR/v8dm/T/6ff+//7+/v///////////////////////////////////////////////////////////////////////v////7///+mrN//BgXK/wAE1f8AAdv/AAHZ/wEB2f8AAN3/AQTX/4+Q5//J6fz/G5b3/wKU+/8Bkv7/BZT7/3TG9v/4/f7//v/9///////////////////////////////////////+//3///3///3//f/9//7//v7+/+n5+/96wvH/4PL8//T2+v84OdP/AQDc/wAB2v8CANr/AwDZ/wEA2/8AAdj/Hx/N/9vZ9f/A5vr/XLr3/0yx9/+T0ff/8vr9//n+/v///v7///////////////////////////////////7///z+/v/7//3///79//n+///t+f3/UrL2/wmP+f9uv/X/9vz//7m98P8GBtD/AwHY/wEA3f8BANv/AQHY/wAA2f8AAdn/IyPP/6Kk6P/o6vz/8/P7/87N8//Bx+z//f35//3+/P/////////////////////////////////////////+//3+///9/v7/+v37/2e6+P8Gkvz/AZX6/xCU+f/C5/n//Pr+/1hb2P8FB8z/IiHO/zQz1f8rLNf/Dg7Q/wQD0v8BAd3/AQLW/wsK0P8NDsr/BAbT/xgXzf/SzfD/+/39///////////////////////////////////////8//7//v3///v++/+n2fj/DJP6/wGU/P8Bkv7/ApP8/0+v9//x/Pv/4eL1/8/K8v/x9fz/+/39//f5/v/m5Pr/nKDo/yss0f8CAtb/AgLV/wIA2/8BANz/AgLX/0A+zv/29P3////////////////////+//7+///+//7//v7+//z//P/5//7/8vf8/zak8/8Bkv//AZL+/wOS/v8Bkv7/JZnx/93v+f/+/vz//vz+//3////+/v///////////f/8/vv/7Or8/19Z2/8BA9T/AQHb/wEA3P8AAtf/BgPW/5+f6P/+/f///v7+///+///6//7//v7+//39///8/v3/+/7+///+/f+o2vb/BJT4/wKT+/8Ckf//A5L9/w+V9v+v3Pj//Pz9//r//v/9//7//f/+//////////////////v//v/+/f7/8PP+/0ZJ0/8BAtf/AQDb/wEA2/8CAdr/PDvQ//b5/v/9//7//v7///7/+P/9/v3/7/j+/8LP9P+yx/H/3O77/9Pr+/8woPf/A5H+/wGS/v8FlPr/abz5//n+/P/8//7//P/+///9/////////////////////////f7+//7/+//+/P//29v3/wsMzv8BAtj/AgHa/wAA2/8JCc7/z9X0//3//P/+/v//+v3+/+rx/P9Ceuj/CUnx/wZI9v8bXez/wdP2/77j+P8Kk/n/ApL8/wyW+P/R7vv//v3///z//v/+//7//P7///3//////////////////////f///f7+///9/v/6/P3/XlzX/wEB2/8BAtb/AgDc/wED1P+cnuP//v7+//7+/v///vv/j6vy/wVK+f8DSPr/BEn8/wNI/P84bev/8Pr//yqj8/8Fkf7/NqLx//D8/f/9//7//v/9///+//////3////+//////////////////7//v/9//////7///z//v+pqOn/KCjU/yco0v8uKNb/KCbU/4mJ3v///v7/+//+//v+/v9fje//Akr9/wFL/P8ASf7/A0n9/xBS6P/z+/3/SK7y/wKS/v9Grvb/9v3////////////////////////////////////////////////+/////v/8/////P7///z9/v/4+/7/9/v///r8/f/6+v7/+f39//7+/f/+/v7//v3+/4ir9P8GSvn/BEj5/wRI/f8ESfr/NWvr//L7/f8vo/T/AZL//0Kr9P/1/v3//v////////////////////////////////////////////3//P////z//v/+//3/6PD6/8rZ8v/H2PP/yNn0/8fZ8//f6fb/+v78///+/v/7/v7/6/H8/0l67P8JSe7/BUn0/x1g7f/C0fj/uOP6/weT+v8Bkv3/JZn1/+n4/P/+/////////////////////////////////////////////v/8///////7//z9/P+CqfL/B03w/whM9f8IS/f/CEv1/4qk7v/9/vz//f/9/////P/7//3/9Pj+/8nW9/++y/P/5O77/83o+v8rn/j/A5H//wGV+v8Ikvv/sd34//3+/v/+/v///v/+//z////////////////////+/////v////3+///8/v3/8Pn//zdw6/8BSf7/Akf//wFK/v8ESvj/rMby//7+/f/+//3///////////////////////7//v/8//7/f8Xy/wOV+/8Ck/3/AZL//wSR/v9BqvP/6/r9//z+/v/+/vz//f7+//z//f/9//3//v7//////f/+//3///7+//v9/P+jvvX/Bkr1/wBK/v8BSf3/BEf+/xZY8P/g7v3//P/8//39/v/////////////////+//7//f3+//v+/P/P6Pr/DJP3/wSS/v8Ckv//BJL+/wWS/P9svPn/8vv8//r+/v/9/vz//v3+//7+///+//3//f3+//n+/v/9/vz/0d36/x1b7v8FSfz/Akj//wFK/v8DSvr/YIzx//z9/v/8/v3///3+//////////////////7////+/v///P/+//b++/9Yufb/BJH+/wGT/v8BlPz/A5P8/xmY+P/Z7fv/+v77//z8+//8/vr/+f7+///+/f/8/vr/9/n8/6jB9/8dX+v/AEr6/wFI//8BSP7/BUr4/xFS8f/N2vj///7///3+//////7//////////////////v////3//v/9//7///3//9vt+/8Wl/X/BZL9/wKQ/v8Ck/r/dMX4//n8/v+zx/D/bZnt/7jI8//J1/v/v9L3/5Sw8/9Kee7/CEz0/wxM8/8vZ/T/NW/w/w5Q8P8FSPf/c6Dt//v9/v/8//3//v/+//3//f///////////////////////////////////////v///6/b+P8Vlff/AZP9/yuc8v/j8/3/8PP9/zds7P8BSP3/A0v5/wlJ9v8DSfr/Akj+/wJL9v9Jeuv/zt77//X4///y+f//5O3+/6K67//t9/3///7+////////////////////////////////////////////////////////////+v38/6DY+P8alvP/nNT2//v+/v+Mr/T/Bkj0/wRK+P8BSf3/AEn9/wNI/f8BSfz/O3Hu/+zx/f+Um+X/MjHS/ycmzf9zct3/7O/4//z+/P/6//3////////////////////////////////////////////////////////////+/v//+v7+/8jr/P/u+f7/1+n8/x9Z8P8FSfv/AUj+/wVG//8BSv3/BEj8/wZM9P+vxPP/tLPs/wgH1P8EAdj/AQHa/wED1P9oatj//vv+//7+/v////////////////////////////////////////////////////////////7+//////v/+f79//7+/P+/0vH/L2Xt/wtM9P8FSfz/Akn+/wBJ//8CSf3/FE/y/9vl+f9gX9//AQLT/wMA2v8AAtf/BQDW/x8fzv/w7/3//v39//////////////////////////////////////////////////////////////////////////////////z+/f/y8/7/yNX4/46t8v9ok+7/X4rr/2aM6/+DoO7/7fH8/2ln4P8CAtX/AQDe/wEC1f8BA9T/JiTK/+/0/v///v7//////////////////////////////////////////////////////////////////////////////////f3+//7++f/+/vz/+/7+//v+/v/8/f7/+vz+//n+/P/+/fr/x8bu/xEPyv8BANv/AgHb/wYD1P+FgeD//v38//z//v/////////////////////////////////////////////////////////////////////////////////9/v///f7///z//v/+//7//f7//////f////3////4//z8/v/9/P3/xsDw/1lb1P9ST9T/nZ/i//j5/f/+//7///3///////////////////////////////////////////////////////////////////////////////////7//f////7///7+//3+/P/9/v7//v79//v9///+/vz/+//9//79///8/v3/+/39//n7/f/9/vz//v3+//79/v/9//z/////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" LAST_CHARSET="UTF-8" ID="rdf:#$RwFMN2">Ubuntu</A>
+         <DT><A HREF="http://www.ubuntu.com/support" ICON="data:image/x-icon;base64,AAABAAEAICAAAAAAAACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////7+///9/v7//v/+//3////8/v3/+//9//v+/////f///v/+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////v/7//39/v/8/P7/+vz8//X9/v/6/v///v/8//7/+//+/v/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/v7/+v76/6XX+P88p/b/I6D0/2/A8//f9Pz//P/9//3//v/////////////////////////////////////////////////////////////////////////////////+/v7//v7///z+/v/+/f7///78///9///+/v3//v3+//z9/P+84Pn/D5X4/wGS/v8Dkf//BJX4/1y29v/5/P7//P/9/////////////////////////////////////////////////////////////////////////////////////f/+//3//v78//r5/f/o6/r/6en5/+jq+P/z8/3//Pz+/3TB8/8Dk/z/BZL+/wCU/P8GkP//GJr2/+T3/f///f//////////////////////////////////////////////////////////////////////////////////8/T9/6+17v9iZtj/LS3X/xQU0/8SENL/FBLO/yMizP/S2vL/eMX0/wOQ/v8Dkv3/AJL+/wSR/v8dm/T/6ff+//7+/v///////////////////////////////////////////////////////////////////////v////7///+mrN//BgXK/wAE1f8AAdv/AAHZ/wEB2f8AAN3/AQTX/4+Q5//J6fz/G5b3/wKU+/8Bkv7/BZT7/3TG9v/4/f7//v/9///////////////////////////////////////+//3///3///3//f/9//7//v7+/+n5+/96wvH/4PL8//T2+v84OdP/AQDc/wAB2v8CANr/AwDZ/wEA2/8AAdj/Hx/N/9vZ9f/A5vr/XLr3/0yx9/+T0ff/8vr9//n+/v///v7///////////////////////////////////7///z+/v/7//3///79//n+///t+f3/UrL2/wmP+f9uv/X/9vz//7m98P8GBtD/AwHY/wEA3f8BANv/AQHY/wAA2f8AAdn/IyPP/6Kk6P/o6vz/8/P7/87N8//Bx+z//f35//3+/P/////////////////////////////////////////+//3+///9/v7/+v37/2e6+P8Gkvz/AZX6/xCU+f/C5/n//Pr+/1hb2P8FB8z/IiHO/zQz1f8rLNf/Dg7Q/wQD0v8BAd3/AQLW/wsK0P8NDsr/BAbT/xgXzf/SzfD/+/39///////////////////////////////////////8//7//v3///v++/+n2fj/DJP6/wGU/P8Bkv7/ApP8/0+v9//x/Pv/4eL1/8/K8v/x9fz/+/39//f5/v/m5Pr/nKDo/yss0f8CAtb/AgLV/wIA2/8BANz/AgLX/0A+zv/29P3////////////////////+//7+///+//7//v7+//z//P/5//7/8vf8/zak8/8Bkv//AZL+/wOS/v8Bkv7/JZnx/93v+f/+/vz//vz+//3////+/v///////////f/8/vv/7Or8/19Z2/8BA9T/AQHb/wEA3P8AAtf/BgPW/5+f6P/+/f///v7+///+///6//7//v7+//39///8/v3/+/7+///+/f+o2vb/BJT4/wKT+/8Ckf//A5L9/w+V9v+v3Pj//Pz9//r//v/9//7//f/+//////////////////v//v/+/f7/8PP+/0ZJ0/8BAtf/AQDb/wEA2/8CAdr/PDvQ//b5/v/9//7//v7///7/+P/9/v3/7/j+/8LP9P+yx/H/3O77/9Pr+/8woPf/A5H+/wGS/v8FlPr/abz5//n+/P/8//7//P/+///9/////////////////////////f7+//7/+//+/P//29v3/wsMzv8BAtj/AgHa/wAA2/8JCc7/z9X0//3//P/+/v//+v3+/+rx/P9Ceuj/CUnx/wZI9v8bXez/wdP2/77j+P8Kk/n/ApL8/wyW+P/R7vv//v3///z//v/+//7//P7///3//////////////////////f///f7+///9/v/6/P3/XlzX/wEB2/8BAtb/AgDc/wED1P+cnuP//v7+//7+/v///vv/j6vy/wVK+f8DSPr/BEn8/wNI/P84bev/8Pr//yqj8/8Fkf7/NqLx//D8/f/9//7//v/9///+//////3////+//////////////////7//v/9//////7///z//v+pqOn/KCjU/yco0v8uKNb/KCbU/4mJ3v///v7/+//+//v+/v9fje//Akr9/wFL/P8ASf7/A0n9/xBS6P/z+/3/SK7y/wKS/v9Grvb/9v3////////////////////////////////////////////////+/////v/8/////P7///z9/v/4+/7/9/v///r8/f/6+v7/+f39//7+/f/+/v7//v3+/4ir9P8GSvn/BEj5/wRI/f8ESfr/NWvr//L7/f8vo/T/AZL//0Kr9P/1/v3//v////////////////////////////////////////////3//P////z//v/+//3/6PD6/8rZ8v/H2PP/yNn0/8fZ8//f6fb/+v78///+/v/7/v7/6/H8/0l67P8JSe7/BUn0/x1g7f/C0fj/uOP6/weT+v8Bkv3/JZn1/+n4/P/+/////////////////////////////////////////////v/8///////7//z9/P+CqfL/B03w/whM9f8IS/f/CEv1/4qk7v/9/vz//f/9/////P/7//3/9Pj+/8nW9/++y/P/5O77/83o+v8rn/j/A5H//wGV+v8Ikvv/sd34//3+/v/+/v///v/+//z////////////////////+/////v////3+///8/v3/8Pn//zdw6/8BSf7/Akf//wFK/v8ESvj/rMby//7+/f/+//3///////////////////////7//v/8//7/f8Xy/wOV+/8Ck/3/AZL//wSR/v9BqvP/6/r9//z+/v/+/vz//f7+//z//f/9//3//v7//////f/+//3///7+//v9/P+jvvX/Bkr1/wBK/v8BSf3/BEf+/xZY8P/g7v3//P/8//39/v/////////////////+//7//f3+//v+/P/P6Pr/DJP3/wSS/v8Ckv//BJL+/wWS/P9svPn/8vv8//r+/v/9/vz//v3+//7+///+//3//f3+//n+/v/9/vz/0d36/x1b7v8FSfz/Akj//wFK/v8DSvr/YIzx//z9/v/8/v3///3+//////////////////7////+/v///P/+//b++/9Yufb/BJH+/wGT/v8BlPz/A5P8/xmY+P/Z7fv/+v77//z8+//8/vr/+f7+///+/f/8/vr/9/n8/6jB9/8dX+v/AEr6/wFI//8BSP7/BUr4/xFS8f/N2vj///7///3+//////7//////////////////v////3//v/9//7///3//9vt+/8Wl/X/BZL9/wKQ/v8Ck/r/dMX4//n8/v+zx/D/bZnt/7jI8//J1/v/v9L3/5Sw8/9Kee7/CEz0/wxM8/8vZ/T/NW/w/w5Q8P8FSPf/c6Dt//v9/v/8//3//v/+//3//f///////////////////////////////////////v///6/b+P8Vlff/AZP9/yuc8v/j8/3/8PP9/zds7P8BSP3/A0v5/wlJ9v8DSfr/Akj+/wJL9v9Jeuv/zt77//X4///y+f//5O3+/6K67//t9/3///7+////////////////////////////////////////////////////////////+v38/6DY+P8alvP/nNT2//v+/v+Mr/T/Bkj0/wRK+P8BSf3/AEn9/wNI/f8BSfz/O3Hu/+zx/f+Um+X/MjHS/ycmzf9zct3/7O/4//z+/P/6//3////////////////////////////////////////////////////////////+/v//+v7+/8jr/P/u+f7/1+n8/x9Z8P8FSfv/AUj+/wVG//8BSv3/BEj8/wZM9P+vxPP/tLPs/wgH1P8EAdj/AQHa/wED1P9oatj//vv+//7+/v////////////////////////////////////////////////////////////7+//////v/+f79//7+/P+/0vH/L2Xt/wtM9P8FSfz/Akn+/wBJ//8CSf3/FE/y/9vl+f9gX9//AQLT/wMA2v8AAtf/BQDW/x8fzv/w7/3//v39//////////////////////////////////////////////////////////////////////////////////z+/f/y8/7/yNX4/46t8v9ok+7/X4rr/2aM6/+DoO7/7fH8/2ln4P8CAtX/AQDe/wEC1f8BA9T/JiTK/+/0/v///v7//////////////////////////////////////////////////////////////////////////////////f3+//7++f/+/vz/+/7+//v+/v/8/f7/+vz+//n+/P/+/fr/x8bu/xEPyv8BANv/AgHb/wYD1P+FgeD//v38//z//v/////////////////////////////////////////////////////////////////////////////////9/v///f7///z//v/+//7//f7//////f////3////4//z8/v/9/P3/xsDw/1lb1P9ST9T/nZ/i//j5/f/+//7///3///////////////////////////////////////////////////////////////////////////////////7//f////7///7+//3+/P/9/v7//v79//v9///+/vz/+//9//79///8/v3/+/39//n7/f/9/vz//v3+//79/v/9//z/////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" LAST_CHARSET="UTF-8" ID="rdf:#$SwFMN2">Ubuntu Support Home</A>
+-        <DT><A HREF="http://www.ubuntulinux.org/wiki/FrontPage" ID="rdf:#$TwFMN2">Ubuntu Wiki (community-edited website)</A>
++        <DT><A HREF="http://wiki.ubuntu.com" ID="rdf:#$TwFMN2">Ubuntu Wiki (community-edited website)</A>
+         <DT><A HREF="https://launchpad.net/distros/ubuntu/+addticket" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QoFEDIS8aZJ5gAAAjxJREFUOMuVk99LU2Ecxj/v2dnO3NhyO66xTDFLMbGgC7WwLoKiulGiqMvA/oAoioQgKMi8yIqCIOpCoi7yIoouFLpLu8hgRXXR/ImkrjPnqjW3HXe200WbtImZX3h4+cL7fHgeeF/BOidw6aWlttzWeqBOPRpZNPxiPeZ9Nwb3Hm9Ue/ds8TZXqS4evp29Kf+P0XOxn44634WTO9TugHeD7LTbTC2eZjA0/2wVgEnz9cH99arS8FFLj26vUHae2uXrqfS6JElxmLqui+GJ6LvJWHpkBcDX9VycaHx9q70+cMZhlZj8voRTsVKlunE5HdmkrlvmYnHj6af5c+HudmMFwGOXj8iSaBqaenM5kVHiVZ7qnrZtDXa302HomYw8u/Ar9+RDpGvo/KFhgGWAOVUDuUTniHbN1ewfCwm4AggtudGYTj7QFVutEpxeoC+oXR3+mugt+GRzvMKKoJVcogk43OIfCwAqEAdcfkdEllKneRS8m/SVeRxuRcrN93QsJ5YQ1AO7gRogCswB4bxigOEri/YPjGY7q902Kt3Whr8ry4DIX86sohRwP52l3MQklsqGiwHC1DBFAbBUcmaAH8D7lk3OO58j6dkXoZ+3SxPoJQmMPMDI79+29N0L1HlT7oHxeFu4u32mGCBlE2Tl0gqFBBrweDFjj706e/DYn7bFIwDMGbdAtzpBqEBFXioQFFujX/71zGUAsTlumlMkyKoZhCgkiGCxhNb6J0WZTBOY8MpIwgUkRe2CvhbgN4G73+hz2ow4AAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8" ID="rdf:#$UwFMN2">Make a Support Request to the Ubuntu Community</A>
+         <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC" LAST_CHARSET="UTF-8" ID="rdf:#$VwFMN2">Free Software Foundation</A>
+         <DT><A HREF="http://www.debian.org/" ICON="data:image/x-icon;base64,AAABAAQAICAAAAEACACoCAAARgAAACAgEAABAAQA6AIAAO4IAAAQEAAAAQAIAGgFAADWCwAAEBAQAAEABAAoAQAAPhEAACgAAAAgAAAAQAAAAAEACAAAAAAAgAQAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAMDcwADwyqYAACBAAAAgYAAAIIAAACCgAAAgwAAAIOAAAEAAAABAIAAAQEAAAEBgAABAgAAAQKAAAEDAAABA4AAAYAAAAGAgAABgQAAAYGAAAGCAAABgoAAAYMAAAGDgAACAAAAAgCAAAIBAAACAYAAAgIAAAICgAACAwAAAgOAAAKAAAACgIAAAoEAAAKBgAACggAAAoKAAAKDAAACg4AAAwAAAAMAgAADAQAAAwGAAAMCAAADAoAAAwMAAAMDgAADgAAAA4CAAAOBAAADgYAAA4IAAAOCgAADgwAAA4OAAQAAAAEAAIABAAEAAQABgAEAAgABAAKAAQADAAEAA4ABAIAAAQCAgAEAgQABAIGAAQCCAAEAgoABAIMAAQCDgAEBAAABAQCAAQEBAAEBAYABAQIAAQECgAEBAwABAQOAAQGAAAEBgIABAYEAAQGBgAEBggABAYKAAQGDAAEBg4ABAgAAAQIAgAECAQABAgGAAQICAAECAoABAgMAAQIDgAECgAABAoCAAQKBAAECgYABAoIAAQKCgAECgwABAoOAAQMAAAEDAIABAwEAAQMBgAEDAgABAwKAAQMDAAEDA4ABA4AAAQOAgAEDgQABA4GAAQOCAAEDgoABA4MAAQODgAIAAAACAACAAgABAAIAAYACAAIAAgACgAIAAwACAAOAAgCAAAIAgIACAIEAAgCBgAIAggACAIKAAgCDAAIAg4ACAQAAAgEAgAIBAQACAQGAAgECAAIBAoACAQMAAgEDgAIBgAACAYCAAgGBAAIBgYACAYIAAgGCgAIBgwACAYOAAgIAAAICAIACAgEAAgIBgAICAgACAgKAAgIDAAICA4ACAoAAAgKAgAICgQACAoGAAgKCAAICgoACAoMAAgKDgAIDAAACAwCAAgMBAAIDAYACAwIAAgMCgAIDAwACAwOAAgOAAAIDgIACA4EAAgOBgAIDggACA4KAAgODAAIDg4ADAAAAAwAAgAMAAQADAAGAAwACAAMAAoADAAMAAwADgAMAgAADAICAAwCBAAMAgYADAIIAAwCCgAMAgwADAIOAAwEAAAMBAIADAQEAAwEBgAMBAgADAQKAAwEDAAMBA4ADAYAAAwGAgAMBgQADAYGAAwGCAAMBgoADAYMAAwGDgAMCAAADAgCAAwIBAAMCAYADAgIAAwICgAMCAwADAgOAAwKAAAMCgIADAoEAAwKBgAMCggADAoKAAwKDAAMCg4ADAwAAAwMAgAMDAQADAwGAAwMCAAMDAoADw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAAAAAAAAAAAAAAAADnTpenAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAl0YAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAl0ZOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARkYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACXRpcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABORgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEZGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRkYAAAAAAAAAAAAA75ef7wAAAAAAAAAAAAAAAAAAAJ9GAAAAAAAAAAAAV05ORkZGRp8AAAAAAAAAAAAAAAAARkYAAAAAAAAAp05OTqcAAADvRkbvAAAAAAAAAAAAAKdGRgAAAAAAAADvTp8AAAAAAAAA70aXAAAAAAAAAAAAp0aXAAAAAAAAAE5GAAAAp1cAAAAA70bvAAAAAAAAAACnRqcAAAAAAACnRu8AAAAAAABXAAAATkbvAAAAAAAAAJdGlwAAAAAAAKdGAAAAAAAAAKcAAAAARu8AAAAAAAAAp0ZOAAAAAAAAp0YAAAAAAAAAAAAAAABGTgAAAAAAAACnRkYAAAAAAAAARgAAAAAAAAAA5wAAAEZG7wAAAAAAAJ9GRgAAAAAAAADvnwAAAAAAAAAAAAAARkbvAAAAAAAA70ZGpwAAAAAAAABO7wAAAAAApwAAAABGTqcAAAAAAADvV0ZOAAAAAAAAAKdGpwAAAADvAAAA70ZO7wAAAAAAAO9GRkYAAAAAAAAAAO9ORkZGpwAAAACfRlfvAAAAAAAAAABGRk4AAAAAAAAAAAAAAAAAAAAAAEZGp6cAAAAAAAAApwBGRk4AAAAAAAAAAAAAAAAAAACnRkZGAAAAAAAAAAAAAJ9GRkbvAAAAAAAAAAAAAAAAAEZGRk4AAAAAAAAAAAAAAEZGRkanAAAAAAAAAAAAAABGRkZGAAAAAAAAAAAAAAAAAEZGRkZGlwAAAAAAAABORkZGRgAAAAAAAAAAAAAAAAAAAE5GRkZGRkZGRkZGRkZGRkYAAAAAAAAAAAAAAAAAAAAAAABGRkZGRkZGRkZGRk7vAAAAAAAAAAAAAAAAAAAAAAAAAAAATkZGTleXn6cAAAAAAAAAAAAAAP/8P///+f///+P////P////n////z////5////8f////P////n////5////8f+H//P+Af/z+Dh/4/j+P+P5zx/j8fuP4/P7z+Pz/8/j+/3H4/n/x+H8+8fh/HuH4f4Hh/j//4f0f/8P/B//D/4P/h//A/g//4AAf//gAP//+Af/KAAAACAAAABAAAAAAQAEAAAAAACAAgAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAACZkAAAAAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAAACZkAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmQAAAAAAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmZAAAAAAAAAAAAAAAAAAAJkAAAAAAAAAAAAAAAAAAAmZAAAAAAAAAAAAAAAAAAAJmQAAAAAAAAAAAAAAAAAACZAAAAAAAJkAAAAAAAAAAJkAAAAACZmZmZAAAAAAAACZAAAAAJmQAACZkAAAAAAAmQAAAAmQAAAAAJkAAAAAAJkAAAAJAAAJAAAJkAAAAAmZAAAAmQAAAAkACZAAAAAJmQAAAJkAAAAAkACQAAAACZkAAACQAAAAAAAAmQAAAAmZAAAAmQAAAACQAJkAAAAJmQAAAAmQAAAAAACZkAAAAJkAAAAAkAAAAJAAmZAAAACZkAAAAAkAAAkAAJmQAAAACZAAAAAAmZkAAAmZAAAAAAmZAAAAAAAAAAAJmQAAAAAAmZAAAAAAAAAAmZkAAAAAAJmZAAAAAAAAAJmQAAAAAAAJmZAAAAAAAAmZkAAAAAAAAJmZmQAAAAmZmQAAAAAAAAAJmZmZmZmZmZAAAAAAAAAAAAmZmZmZmZAAAAAAAAAAAAAACZmZmQAAAAAAAP/+P///+f///+P////P////n////z////5////8f////P////j////4////+f/P//P+Af/z/Hx/8/n/P/P775/j8/uf4/P93+P3/8/j8/3P4/n/x/P9/cfx/vvH+f8Pj/j//4/8f/8P/D//H/4f/h//A/g//4AAf//gAf//+A//KAAAABAAAAAgAAAAAQAIAAAAAABAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICAAADAwMAAwNzAAPDKpgAAIEAAACBgAAAggAAAIKAAACDAAAAg4AAAQAAAAEAgAABAQAAAQGAAAECAAABAoAAAQMAAAEDgAABgAAAAYCAAAGBAAABgYAAAYIAAAGCgAABgwAAAYOAAAIAAAACAIAAAgEAAAIBgAACAgAAAgKAAAIDAAACA4AAAoAAAAKAgAACgQAAAoGAAAKCAAACgoAAAoMAAAKDgAADAAAAAwCAAAMBAAADAYAAAwIAAAMCgAADAwAAAwOAAAOAAAADgIAAA4EAAAOBgAADggAAA4KAAAODAAADg4ABAAAAAQAAgAEAAQABAAGAAQACAAEAAoABAAMAAQADgAEAgAABAICAAQCBAAEAgYABAIIAAQCCgAEAgwABAIOAAQEAAAEBAIABAQEAAQEBgAEBAgABAQKAAQEDAAEBA4ABAYAAAQGAgAEBgQABAYGAAQGCAAEBgoABAYMAAQGDgAECAAABAgCAAQIBAAECAYABAgIAAQICgAECAwABAgOAAQKAAAECgIABAoEAAQKBgAECggABAoKAAQKDAAECg4ABAwAAAQMAgAEDAQABAwGAAQMCAAEDAoABAwMAAQMDgAEDgAABA4CAAQOBAAEDgYABA4IAAQOCgAEDgwABA4OAAgAAAAIAAIACAAEAAgABgAIAAgACAAKAAgADAAIAA4ACAIAAAgCAgAIAgQACAIGAAgCCAAIAgoACAIMAAgCDgAIBAAACAQCAAgEBAAIBAYACAQIAAgECgAIBAwACAQOAAgGAAAIBgIACAYEAAgGBgAIBggACAYKAAgGDAAIBg4ACAgAAAgIAgAICAQACAgGAAgICAAICAoACAgMAAgIDgAICgAACAoCAAgKBAAICgYACAoIAAgKCgAICgwACAoOAAgMAAAIDAIACAwEAAgMBgAIDAgACAwKAAgMDAAIDA4ACA4AAAgOAgAIDgQACA4GAAgOCAAIDgoACA4MAAgODgAMAAAADAACAAwABAAMAAYADAAIAAwACgAMAAwADAAOAAwCAAAMAgIADAIEAAwCBgAMAggADAIKAAwCDAAMAg4ADAQAAAwEAgAMBAQADAQGAAwECAAMBAoADAQMAAwEDgAMBgAADAYCAAwGBAAMBgYADAYIAAwGCgAMBgwADAYOAAwIAAAMCAIADAgEAAwIBgAMCAgADAgKAAwIDAAMCA4ADAoAAAwKAgAMCgQADAoGAAwKCAAMCgoADAoMAAwKDgAMDAAADAwCAAwMBAAMDAYADAwIAAwMCgAPD7/wCkoKAAgICAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAADvTqfvAAAAAAAAAAAAAACXTu8AAAAAAAAAAAAAAACfTu8AAAAAAAAAAAAAAACfTu8AAAAAAAAAAAAAAADvRqcAAAAAAAAAAAAAAAAAVkYAAAAAp6fvAAAAAAAA70bvAACnl05GRpfvAAAAAKdGAAAAl6cAAABOTu8AAACfRgAAp1YA76cAAJeXAAAAn04AAKdWAAAApwCfTu8AAKdGAAAAnwAAAAAAp0bvAADvRp8AAACfl58AAJdO7wAAAJdO7wAAAAAAAO9GlwAAAADvTkanAAAAAO+XRu8AAAAAAO9ORlaXl1ZORu8AAAAAAAAA76dWRkZWp+8AAAAA/D/vgfj/74Hx/wAA4/86AMf/AgDPHysBjAcAApzjAgCZM0oBmdEAAp3xBACOMVgBx+OBAcPDAALgB08C8A/OAigAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAAAACZAAAAAAAAmQAAAAAAAAmQAAAAAAAAmQAAAAAAAAmQAAAAAAAACQAAmZkAAACZAAmQCZkAAJkAmQAACZAAmQCQCZAJkACZAJAACQCZAJkACQAJAJkACZAAmZAAmQAJmQAAAAmQAACZkAAAmZAAAAmZmZmZAAAAAJmZmQAAD+f++B+f/vgfP/PALn/+sCz/8CAN4fCgKcx+sCmfMGAJszJwKb2RICndmAAs456wLH8wIA4+M1AvAH6wL4H++B" LAST_CHARSET="ISO-8859-1" ID="rdf:#$WwFMN2">Debian (Ubuntu is based on Debian)</A>
+     <DT><H3 ID="rdf:#$ZvPhC3">Mozilla Firefox</H3>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">Help and Tutorials</A>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">Customize Firefox</A>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">Get Involved</A>
+         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">About Us</A>
--- iceowl-0.7.orig/debian/debsearch.gif.uu
+++ iceowl-0.7/debian/debsearch.gif.uu
@@ -0,0 +1,20 @@
+begin 664 debsearch.gif
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```]A```/80&H/Z=I````!W1)344'U`D3$C`=J25#
+MK0```GA)1$%4>-J%DUM(5&$0QW_?.6=WL337-A<C)#6$B*`>I-*B"Y)&]=I#
+M)@6!3T$0!`4%/522#VD4=*.')**2BB(A,;4+^516$!1=UBZ&ZU+8;KIZ])SO
+MFU[,Q+;ZPS#,,`S_F?F/$A$RX5=6`6;")SN[DB8]1-ZFS6'+M@%P^`O,R!"Z
+M[[7H>"\J',4=A'AU-5K[Z.9FB6[?KC(V,("88=S;I\2Y<("0!B\:06\^"C@8
+M?,0WD_5_-/"?-8KTM1,H.X1_,XJ=_HZ52A+Z?(_H^4;\X6%RJ\HGZ]74'?C]
+MCX4;ZU&NB]EP%C]4ANTXX'MX#UNP7MPEZ+J,9643JN]HL&=%]B,BB`A:!+=M
+MFT@#XIV+BM??+4:$J3;2>EJ\-8B_$G%O-8D1P3%C:=SK)P0WC;-H*3IX#;.P
+MEL#<"J6FC1?<6*?<QRT2['F*?MN#`1SO>6?2.7,01F%\7SW!>8NQ\DI1&<YJ
+M*P=GST6\1#\J.Q<E!DL5E.`5%:(+(]ASPJBA!"8=G]#![_VHB2B^]Q!]FVI(
+M'#L)*"RG:'$XV-2-=?8)5N`]]K<XZLT5=#(F3..1ZNR0D:N7,7T?"13D8RF%
+M8P%6?J$2P/NQ7"0`=N(=WJ<V_/&M@W;(*E,"J=8[L8%=N[$\'XGD,WO'SFDZ
+M$,$IW:+TDBZ1@4=(UC(^KEN;IX:2,8S&'TR14UN#RLDA5+&*K)+B/Y5H*06K
+MCROC)F2@\1+ZU4ML0`.1IB-$*[Y`ZCU27I=92%,Q\B$FZ?L/\'M[878!X:HY
+MA-IK8!1TY4$"*PZK?S[3C.(%:D;Q@LE8CR;$GU^)C'[%*MKX?P:9WEN,A\@X
+;ECUS\CX_`4&C,>`7?>FF`````$E%3D2N0F""
+`
+end
--- iceowl-0.7.orig/debian/iceowl.png.uu
+++ iceowl-0.7/debian/iceowl.png.uu
@@ -0,0 +1,146 @@
+begin 644 iceowl.png
+MB5!.1PT*&@H````-24A$4@```$````!`"`8```"J:7'>````!F)+1T0`_P#_
+M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U`8=!!(VV`_#
+M[0``&*Y)1$%4>-KMFWF,7==]WS_GW.7M\]ZLG(WD<+B9I$QM=F18LFI;L1"G
+M-EHD7H`T5ERT!EH@2(.@@.T4!5H!7=(B0`H42%P;@1T[:9JXDMO85BS9KA?)
+MUF)J,2DN0W)(:3B<?7_K/5O_./<M0U&VO,AQVKS!#^>^B_OFWN_W]_TMY]Q[
+MX>\^_W]_Q-_$29]XXNSPA0O+<F.C3K.IR&8CRN4<DY,5)B;*6V]\XW3S_QD"
+M'G[XJ>PW'I_=(S+QL:IQO_K,E4UN/3[ZCVJ6W*81&$`*03&`4@@K2]O?"!-]
+MZ9VWC28FT7\Z4(@N?>0C]RW_K2+@D4>>S7S^H1>FDCC\M7,KS;O=:.6^>1EC
+M!\I$(V6B?)8@"I"A1`0!A"$N##"`;BF2E2W$R@;%S1TF6O6%BE%?S=:;GWS_
+M>T]<^M5?><O"SRT!G_SDU^)GSR[>/;?=^MALPOUS<8[LOA&*I2R#I2SE0H9"
+M+B:;B\C$$4$F0D0!+@A0#IJ)H=94U.H)F_46V[46C4:"6MDBN[C&='7GI6/#
+M^4_<,E7YD]_^K5^:_[DAX#O?.1L\^O69>T^]M/Z[9[;5+ZZ5^RB.5!CM+S#8
+MEZ4OGR&,0\(H(,C$1$-E@BA$2`D"G`.M#4E3D;0422LA:2J:346UGK!1:[%5
+M;]&L-0F7-IANU*^\=:+PJ0^^Y\2?W'WWB6M_HP0\]/!34__M+Y_[R)6F_MVY
+M7([RGG[&!XOT]^7(9B*B."2,>BP3$O7W$10R2"D10F`=&&-I-1*:M29),^F0
+MT6HF)"U%LYFP56NQ64MH-9ID5C:Y4YK9$Z-]O_$'__F#C_^XUQ_\).!_[_>_
+M?-]G'SWWA:?J^CWU_CXF1RM,]A<H9"/"0!($DD!VQS"0!$(0.$=8R!)(@10"
+MB4`(D%*@&BU,2V.UP2@_6F5PVA`80\89,):ZE%Q-3/_RRO:'[SKY'GWQS)>^
+M_>-@D#\N^'_S[Q[^MY]]_.*C3S;,OOQ`D?V#1<K9$.$<6(NPZ>@<PCID.@KG
+MMP,A"($`1X`E!&AII#8(TV/:]GRW!,91$([^`*(PX&H4RV]OU![\!Q_^Q-<_
+M][EO[ON9$/`;_^Q3#_[18R_^JPN)E4/E'"/%+(%P8"S.6)QQ.&/!.IRUX/RV
+M<"DA`B0."03.R]!_=Z`T:`O:^-%XCZ--NNU)"9VE)`59`<U\+GCTVN8[/O._
+MGOWRQ_[UY_>_K@3\_??]_H-?>.[*Q]>B.!@L92EF0@_26)SUAK4XEY+0L]^E
+M"@@*640;M'`$PA$`<29$2@'&2[X#O+UM/"'.>'*$->1P9'&H*.*;2]437SMU
+MZ4L/_L?_O?]U(>"W/_8_'GQRK?'Q:B875O(9,E)@M<4:B[5^="8=M<4)`<4<
+M3@BL32\\$R%R&?\/G4.F"@AP"&MQB>X`=MJDBK+^M\;@M.V2D:HB=H[8.4PV
+MQPMCXR>^=6GC2W_V9Z\M',+7"OZ__N&C#_ZG[Z]_?./0_K#XTCR!<!ZX,3@3
+M8+7!!8$'&F61AR8(*D5D'"+6MW$;VY#/0E\!B\,YBVLG/P<."`)):;1":W8)
+MIS1H[4E(P\&UPT![,D4@*;[Q`'*XG_KR!CM-16W/((]OUDZ,/[_XR+ESL^\^
+M=FSZY9^X"GSZL]]XQZ>^M_B'YXY.Q1ECB!=6D5(@`TDP/N0;FD3YC"XE,I\E
+M.C!.$$FD$`3Y+$%_B;!<0$8A,JV_HJ<.6P=;"QMLSJ^1-!)THM'*8)3"*(U6
+M&J.,M[0RF)9";59Q4M`X/P>;.X1OV$>CD.7*<FVX^MQ53GWW?W[E)PJ!LV<O
+M37_YR;D_/C4TE!%Q@$@2K#%>Y@-EQ%VWP"W3<&@26\AZ192+&,!8AW$.`]C`
+MM[K&.;3U9JQ#68M*CXM+.:PR6*W!.:SV9=!I@Y""N)('UPX-OU]O5JD^?1ZU
+MM(Y9V227)(0"MJ=&^?JV_1>_\]$_O^<G(N`S?_[\/WE,1U.F7$`8AYU?P>9S
+MV%(.=_(0QCEL7P&#P&SL8#,QC`][\+WF'-I:M&F#MQZ\<2ACT<8B<Q&%T0K9
+M@1(R$_H>0!L*XP/LO>\VAF\_Z%-'2HHS72(P!A%'A(4LQ5`B!%R>W"-?6&E\
+MYK&O?F_RQ\H!?_!?OCC]J>\N/+!Q9#^DR<V^\\W8V/?O1@HO14".#T&Y`*4\
+M)@R0SJ*M1`J;2CW]DQ:LW^,$6.'+H3.6I-:DL=U@<VX5E2B,\E(780@"DNTZ
+MIIGL!MZC!F$-S6=G"`Y-D!&29B[BJ3`W_=!?SSP`_/L?20'GSU^,OO&]^7\^
+M4RA.$DA?VHSU'5KJ1?V5%VC]T:/HC1HF"K&#94PN1EO;\;SN&;5Q'04H8TF,
+M11E+=;/&XKEK+)V?9VMQP\>[-ABM,5JS=O8EEIZ9(1XHT7=X@GBPY$/#F&Z_
+M82QZ91.[4T=&$1E`6D=UN,*W7][YI__A]QZ>^)$(>/*IEVZ;M_)WDH'2KCIL
+MM<48B[$6>]=A;#&+*69W@?7;-C4?Y[HC^=32X[=7=UB]LD2CUO03H6:"5J:;
+M!+5/?$FM!5(P\*9#9$8JB##`:4-F<HCL@5%$&!`,ELG]PG%`$%A'Y(!`<C'*
+M'C@WN_Z/+U^>%:\Y!)XYO?@/3]M(@DMKK@5I<=)ZV4N!*68(?NT>C`!MK"]I
+M0B*P""$1.`06G$"XE&OA<$BL<U@AV+J^CFTIG$I[_T2G6=]_-\JK(#M2QDF)
+MM9;^-QTAW-//XF.G*-UV"#DV0'9M&YN-,4)BFQJL)<*1&$MKN,+5U:7?//7L
+MW*>!:S]4`8\^^N3^BVO-#S=+^;0=M9TV%).6(&70QG:E[79+7)O4XSTJ:'O>
+MJ\#O<T&`4H8DT2BE4<JDHR>A383,9SQISF&M(S,VP-#]=Y+9-P(+&X3/OXS<
+M:7:O5UNDL03.@A"<:;!G=:/^H=<4`C.7UMYZ;E.-(T77^VU+9V9M$I1.I6XL
+MNM%"+:VCM$7MU%&+ZZAZJRO[-.-WR-"6>*R"BT)L(#SX1*7@-3K-`48;"`),
+MFENL\U4ES.>P3\Y@S\SYUCN*.M6A?;V!GVNSD<GRS-G5=Y\]>[[P`PFX>/%B
+M-+]<_?4E&W1!I]U79X+20X#1QA-0K:,OS:&-02^NDERZAII?0<TM>8]:BS+&
+MDZ`MRAH2:[%12.'P&'W']Q&6\UWPJ5D@.SZ([,OWE%6+M0X+V-4=G)2XN]^`
+M"V6/P]+2:"S"6%P^9GZK];8K5]:F?F`.J%8;>V<7JF]/XB@%+D`*$!:D`2%`
+M:]A>Q0[T8;(QHM%$K&_ZI9U6XK-R*"$(8+,*C19.9G%"8ITA%`+C!(%PF/9Z
+M0!A0.#2!BT.2K;I/:OD,4:5`V%?`!;)37:QU?NZ1"7'W'O-S!=TMBV@_9W#:
+M=@DPCN<6ZFAC'P`^^JH$+"[N'+ZR7,L3]WDF>X'+M&>]^C+4&[BY"),N;8DX
+MA#A$*`.1Q)D`%_IY@EO9Q`6#N$R(=0(K!8$3&`&!$'YF*$"$DMST&#DZ<Z6.
+MW.VNTIIN:X.5TA/0:.%4"ESU*%;YZ3/:L.DD%V?7)F9F9N(C1XXD-R6@7D\.
+MSJZU8/@&X$*`-7!M'G:JWKO&X)(`$P8($_E%BR@$$T!H04L(#>ZE19S2N`/C
+M6.$\"<*O!AGA//AVLR3\S,BE#%@'KD-"VEH;Z\$G&GMM&;NVA5U8P24*F\WB
+M#DU[1:C=JE`R8'ZY5E%*98%7$C`S,Y-_^IFK4YO--(:D`)&2(`QLK,/**LA4
+MWD$`@9\1:F/`1/YW48"+0@@DF``7&-BI^V4M*0BMP$B!%*1+8EV>=WU2!;B>
+M[&^MP6B+5;XGL?4F=G$%M[F-:R4XO8Z5`6YXCR=`]>2N4')MJ2J!_<#I5Q"@
+ME,JO;]9/$@C_H]HV)`T8GP"1@;5U2!3MSA!C(?`9ND."#E/3G?5^F\O@*B6L
+ML81.8(0/@4"`Q!,ATE`0WO=I"+B4!+^8XM+I=Y<`@QWHQRZL8I,U;**P28([
+M?18;7\(5^W`CXS@1>#S6L55-[FTV]<F;$J"U9G.KB;/X'VQN0'4+HMB[8WW#
+MCT9"D(*W/A20?DU`=V(OP$4&P@!7R.&T]5+M[R.0PG,G=JN`5`FB`]YUEM7:
+MRVQ6^\61-@G&@=T[@;W\D@>?)%X)V]O86@,G(URV",*K<Z>N"ZU6$M\T"89A
+M.%2K)YAV&<D68'T9KE[V7I=!5_[6=HF0TN>+0&*U1+>]K[4G8&$%M[J!VS.(
+M/7D8&P9>1&D>\#E`^,[1I6L$/02TYR'.N,YJD]4I"5ICEM>PC49'`58E6*5P
+MM67<PCQ.!E`>@&R1ZIXAE-+![.RLF)Z>=KL($$),ZG;?KPS$>8AST-CQGI8I
+M6-L&'?ACI4SC78*46*W1@<:I`!=VS=::!$V%"ZVO!*GW.WFVAX3=!+15D)*@
+M?2C8I16_?6D6DRA,DG@"$H55J24)Z`2VU\%I3.$7D%(.6&LE8'81X)PK!%)X
+M\,I`?0=J6RG@'M"VQ^L=(D2J$.%)$`87R"[X(""0`:ZEL<H02(GM)$(/7K9S
+M@$M'BU]1-JZSJ.IT=U9J6P;[PO>QU5KJ>855"28=K?:&U;Z"64T8Y0A#V6^M
+M#5Y!`!`5<I+(&90VT&Q`JYEZ7:9@V^!3$[U$F/2[)\%IB5'"DY#+XLI]N(9"
+M!B(%WVNNNTSFND1T0L!V5YFMMKBSY[`KJ]A:'=MJ=3QN4OE;[4>,!N?!XPRE
+MK$!*PO9JW(TA4*N4L\JU-,0&ME=!JZZ7G4A#(04I4H^+&PD1:5V3."$QI2+N
+M^%%<%&.;"8&4Z>%=`CK-$/B;*ZX]]N8!3X*K-7`OS6&;3;]LIA*LTJGW=4I"
+MXG-0"ASGG92-Q'-!()M""'NS1FAM<K*T$AH_"_/S``U.IC<W4@6TU2!2-8@>
+M$E+@G7UA"`>FL'$&UU3(5/J!%#T$=+._0/B;)VTB;`\!;1+FK^,:#5P'N.YX
+MW&B%U0IKE)>]T_[:<1!$#`SDKPO!JI32W*P,OES(9QC*"ZXI#:4Q#Z:QX9DD
+M!=_V<I@V/NWOMI>,%%4<^F-:"B=\`V1%&@(=$GISP&X5M.\J]:J`M75LLXE3
+M"JLU3JMT`55US(-/S?\C!#%3^\H((;8.'CSX2@5(*76QF)&C_='5:]?-%%$`
+M?7NA/`&Z#JTZ5.M>^F.#7ATKU_Q)>D&+E(@@@""$,R_"OGTP-.QOATN)$6D[
+M#,BE342MA9@<1.:B3AGL5`/;)<&MK?J;)ZT$IY.4`(TU/@>X=L)SINOYU,*H
+MP(ECPTMA&-I7ZP-T'$?-PP>*ET]=69UR[0L(`XC[O-4V(930-P)6@6K"ZG4/
+MVO:`%_X6%RO+?KM>AY-9F+T$(WM@9!0G\$OF:U7$BW.(/>5T%2E-A+TYP#EH
+M-'&GGX?:#LYXX.W16NW/Y]HQ[WK`>[QC8Z,,CY1D&(;77XV`[2`(SK_UKK'X
+MH<<6:2D!+DC+D?,>'>GSA"0:%F:@NNX9%S>`I_<[OJ+,S\/B`BPMPG$+@R->
+M$:,57#D/VB"T2<M@J@+;0\+\'&QMI(NA&HS&6=,%;MM>W^UY'_\YIO8./-57
+MRD?.N1=N2L"A0X?LZ=.GE_?MZW=3>R(N+)IN0^(""%TZ#TCG_9M+/C?T@N\`
+MQX^DA%1WX.+9[G,9ERY`L9+^!H@#:&GO./P$J$.\=1[8SK8'JY*TKG?+6Q>\
+MNZD%83]WOW7O7"83KP=!4'O5]0`AQ'?Z^TOO/GFL?&KFY:4[G0U[DE"[#78^
+M#*SR%R1Z8K\-N$-&S[85W8:_5H6F\D2UFJEDT\0:A#W$I^=.$@@R4!Z&0C\L
+M78'ME9XR=R-XNDH0DO'Q26X].;H31='9*(H:KTI`%$4KN5SNVKWWC)NO?7/I
+MSO6&]MYWSO<`84J$E?Z"U'8/R-3SR*YGVVJ@APCP(*M5F#T#29L`_,1KXB"4
+MAFYHAP44AR`_F.(+86=E=YGK`-_M?1%4>-,=X\\.#Y>C.(Z?/GCPH'O5-<&C
+M1X_6,IG,]Z>GA]VM)TI+0FD?[[W6WM<WG4[:TX;#JIZQ9SN-5V_I_E8#7CH/
+M6RO0J$*SYFUGP^^O[O@P:RD_!4\4*.LMT>!"R%72,F=O2'B])A@<W,<[WKYO
+MIE0J;4DI+_W05>$P#+]5J93MN^Z;^&XYRRN!M]*1K"^)'0)N8D:_DB"C0#=A
+M9:Y+BE%=XFI;</X[,'<>FHD_7_N<B?+;]1W?F78\;F\84Y/]W/7FO=<.'=S3
+MRF:S3\5QO/-#"8BBZ'H^GW_VEEO&U^]Z<V5=ZINHH'U147^:@75WO*FIFQ"C
+M=JO%].Q7#5A_&:K;716T5)<(6009DQ;2'NM50<C8Z#3WOVOJR4JEHL(P?*Q7
+M_J]*P.'#AUT<QU\>&!@0O_S+^[X],1Z`;KV2A$1#-`GY(Y`=3Y.1[BE)[6WU
+M@U72SN8=<E)2C/+)KY?P1'>)(/LJ\O??HV@/][_KP%</'1JKYO/Y)Z(H6GK-
+M]P:C*+I:+!:?/G1H8N.][YW\6BZ;@-GQ)6@7"0[(0;+2TX28W:KH_=[9=Q,B
+MVMG<:?_L1FD:7/:5X-OGED.0V7<3!1B$R'+\^.$+]]UWX-K`P$`KCN-'#A\^
+M[%XS`4>.''&93.:AP<'!ZCWW3,V_[6UC7PR"*KCUE(A6-SG59T%O[59`+\B;
+M[;,W$F)`9J'O"!2/0/^;(!Q*P=\0`JU>%>R#\#B(@T`&T(!@SYXCUQ]XX-@3
+MX^.C8:%0>.3X\>-+/_+S`<>.'5L^<^;,E\;&QG[]?>^K+Z^NUJX___S%<6OK
+MX')@LMYZVLWN0R\]HWN5_>WR*'-0NLW_#U'P;E$V)93=[;#=/3GR5DB?]ID"
+MZO3W]YL/?>CVIZ:GQ^/^_OXKV6SVL1_[(:E\/O]8?W__P;U[)][RP`/-K]1J
+MS?MG9BY,.%=+8S"7GERE@I(W>0+7W?S)W'86-PW0SGO0:7]\9S9XPWR@W14Z
+M#2X!6JDU@2;%8K_^P`>./7S''?N:HZ.C]7P^_\='CARI_T3/"I\_?WZ@6JU^
+M='Y^?N_%BU>;G_C$L_=?OGQFPEJ;DD!ZUUG2?N@-QH!\"GXUE:9Z]<L(AD#N
+M]PIP/4].N51=G=R@4NL%WP(22J41_?[WW_GPV]]^6$]-3:F!@8%/WW+++?_G
+MI_*P]-FS9_?L[.Q\[-JU:\-7KLPEG_O<Z?M/GWYFPIA&&GL;*<@0B('#J3K"
+ME)`&<#G];^8FE^#2#G(:W%!/4M/I\3>";UL3L`P,'%`?_."=7[CKKFF]?_]^
+M/3`P\-]OO?761WZJ3XN?.W?NX-;6UF_-S\\/S<W-M_[JK\[?\<033]W:;"ZD
+M_ZJ1>IU4`5%*0)BJH`J,`@N=+NV5GWY@/`7=:ZJ'A"X!0F38O_^-BQ_XP.W?
+M/'%BK]V[=Z\9'!S\8JE4^LOIZ6G[4W]<_MRY<P>WM[=_<W%Q<<_\_+QYYIEK
+MQ:]\Y7OO7%@XW>?<5NK]&"CT@`_3"P[24ZZF'A<W/+(XD(:42`DR/=[7-Q``
+M^?PD=]SQIC/O><^1IR<G1W.3DY.J4JD\5"J5OGSPX$'UNKTO\.*++XXTF\U_
+MN;R\/';]^G5S[=JR^>I7+]WQW'-/WU:K7<6YY`;OM\.@G2#;TA4]U2/?DS/L
+M#R#`$8;#3$W=>OV^^TY\Y\2)L>;X^)@9&QNSI5+I+TZ>//G7/Y,7)LZ?/]_?
+M;#8_L+FY^?<6%A;4RLJ*N'IU53_^^.P=%RZ\>.OV]BS.[?2T&VWORY[V0_1T
+M<<$-'=V-1,3$\1[&QHXOO.4MQY^X_?;1G>'A`3DZ.AH/#P\O%HO%/SU^_/BI
+MG^D;([.SL[)>K]];J]5^975U=6!U=56NKZ_K^?DM?>K4]8,S,U>.+RU='=)Z
+M&=CN*8<_Z-2]QV0(@D'*Y0GV[IV>N?WV?=\_<F2H.C!0CH>&AMS(R(@LE\O?
+MBN/X+XX=.[;^-_;.T+ESYX9;K=9[:[7:/>OKZ_'Z^KK8VMJRFYM5O;Q<=^?.
+MK>R[?GWMC1L;*R-;6\LH50,46K=2-3BDC-*PR5`L]C,PL&=K:*C_V3>\861]
+M__[R5G]_0?;UE:)*I<+@X*"H5"I7LMGLYW.YW/=?2[)[W=\:FYF9$4JI2:74
+M+S4:C;=L;FYFM[:V],[.3E"KU6RKE=AZ/;'-IF)[.REN;R=]]7I"K6;)9`39
+M;$0N%U*I9!:+Q=#F\QF1SV?"7"Y'H5"PY7)95BJ5H%`HS&2SV<>B*'KNZ-&C
+M]9^[]P8O7KPHE%)#QIA[6ZW6'8U&XT"M5K/U>MTU&@V3)$FLE$)KG1ACG+56
+M"B&L$((@"&3D/S:?S^M<+A<7BT5;*!3J<1P_%T71M\(PO'STZ-&?VINEK^N;
+MHQ<N7,AJK2O.N;N54H/6VA-*J2&MM5!*66,,UEHAA'!22H(@$%$4B2B*5!`$
+M9Z,HF@_#\!0P%\=Q[="A0^YOW:NS[<_ERY>%UCK66@=`&`3!"##BG*L`B1!B
+KQSEW52FU$X8A412U#A\^;/B[S^O[^;\Z\7.<>GK+0@````!)14Y$KD)@@@``
+`
+end
--- iceowl-0.7.orig/debian/docs
+++ iceowl-0.7/debian/docs
@@ -0,0 +1 @@
+debian/MPL
--- iceowl-0.7.orig/debian/wikipedia.gif.uu
+++ iceowl-0.7/debian/wikipedia.gif.uu
@@ -0,0 +1,9 @@
+begin 664 wikipedia.gif
+M1TE&.#EA$``0`/0```0"!!D8&2@H*#PZ/$A'2%=85VEJ:7I[>H2#A)B8F*FH
+MJ;FZN<C'R-C9V.GHZ?S]_,S,S```````````````````````````````````
+M`````````````````````````"'Y!`$``!``+``````0`!````5VX"..9&F>
+M:#HN!;$\"G$TSU$TC5$\B/`^!$'#@4@\'`9C(V!P/!(!!<,@0HX*`<:C$40H
+M1(LO.(`0)0"[(^(G(A!HC0%!U#B4$(!OW/<TE@0%#@H&`U0(3G<#!PIU`@EE
+8)@H"`E\+DUHG;C0/!@(I"YA;;"HG(0`[
+`
+end
--- iceowl-0.7.orig/debian/iceowl-extension.links
+++ iceowl-0.7/debian/iceowl-extension.links
@@ -0,0 +1,3 @@
+usr/lib/iceowl-extension usr/lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
+usr/lib/iceowl-extension usr/lib/icedove/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
+
--- iceowl-0.7.orig/debian/iceowl-gnome-support.postinst
+++ iceowl-0.7/debian/iceowl-gnome-support.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then
+    update-alternatives --install /usr/bin/gnome-www-browser \
+        gnome-www-browser /usr/bin/firefox 70 \
+        --slave /usr/share/man/man1/gnome-www-browser.1.gz \
+        gnome-www-browser.1.gz /usr/share/man/man1/firefox.1.gz
+    touch /usr/lib/firefox/.autoreg
+fi
+
+#DEBHELPER#
--- iceowl-0.7.orig/debian/iceowl.1
+++ iceowl-0.7/debian/iceowl.1
@@ -0,0 +1,167 @@
+.TH FIREFOX 1 "November 4, 2004" firefox "Linux User's Manual"
+.SH NAME
+firefox - a Web browser for X11 derived from the Mozilla browser
+
+.SH SYNOPSIS
+.B firefox
+[\fIOPTIONS\fR] [\fIURL\fR]
+
+.B /usr/lib/firefox/firefox\-bin
+[\fIOPTIONS\fR] [\fIURL\fR]
+
+.SH DESCRIPTION
+\fBFirefox\fR is an open-source web browser, designed for
+standards compliance, performance and portability.
+
+.SH USAGE
+\fBfirefox\fR is a simple shell script that will set up the
+environment for the actual executable, \fBfirefox\-bin\fR.
+If there is a Firefox browser already running, \fBfirefox\fR will
+arrange for it to create a new browser window; otherwise it will start
+the Firefox application.
+
+.SH OPTIONS
+A summary of the options supported by \fBfirefox\fR is included below.
+
+.SS "GTK options"
+\fB\-\-gdk\-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to set
+.TP
+\fB\-\-gdk\-no\-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to unset
+.TP
+\fB\-\-gtk\-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to set
+.TP
+\fB\-\-gtk\-no\-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to unset
+.TP
+\fB\-\-gtk\-module=\fR\fIMODULE\fR
+Load an additional Gtk module
+
+.SS "X11 options"
+.TP
+.BI \-\-display= DISPLAY
+X display to use
+.TP
+.B \-\-sync
+Make X calls synchronous
+.TP
+.B \-\-no\-xshm
+Don't use X shared memory extension
+.TP
+.BI \-\-xim\-preedit= STYLE
+.TP
+.BI \-\-xim\-status= STYLE
+.TP
+.B \-\-g\-fatal\-warnings
+Make all warnings fatal
+
+.SS "Mozilla options"
+.TP
+\fB\-height\fR \fIvalue\fR
+Set height of startup window to \fIvalue\fR pixels.
+.TP
+.B \-h, \-help
+Show summary of options.
+.TP
+.B \-installer
+Start with Mozilla 4.x migration window.
+.TP
+\fB\-width\fR \fIvalue\fR
+Set width of startup window to \fIvalue\fR pixels.
+.TP
+.B \-v, \-version
+Print Firefox version.
+.TP
+.B \-no\-remote
+Don't connect to a running firefox instance.
+.TP
+\fB\-a\fR \fIapplication\-id\fR
+Check for a running Firefox started with the specified
+\fIapplication\-id\fR.  When \fBfirefox\fR is invoked for
+the first time with a particular \fIapplication\-id\fR, a new Firefox
+application is started; subsequent invocations of \fBfirefox\fR
+with the same \fIapplication\-id\fR will cause the already-running
+Firefox to bring up a new window.
+
+The default is \fB\-a firefox\fR.
+.TP
+\fB\-CreateProfile\fR \fIprofile\fR
+Create \fIprofile\fR.
+Implies \fB\-a firefox\-\-\fR\fIprofile\fR, or \fB\-a default\fR
+if \fIprofile\fR is \fBdefault\fR.
+.TP
+\fB\-P\fR \fIprofile\fR
+Start with \fIprofile\fR.
+Implies \fB\-a firefox\-\-\fR\fIprofile\fR, or \fB\-a default\fR
+if \fIprofile\fR is \fBdefault\fR.
+.TP
+.B \-ProfileManager
+Start with profile manager.
+Implies \fB\-a\fR with a fresh unique \fIapplication\-id\fR.
+.TP
+\fB\-UILocale\fR \fIlocale\fR
+Start with \fIlocale\fR resources as User Interface locale. By default, it is
+guessed from environment and available locales for Firefox.
+.TP
+\fB\-contentLocale\fR \fIlocale\fR
+Start with \fIlocale\fR resources as content locale. By default, it is
+guessed from environment and available locales for Firefox.
+.TP
+\fB\-new-window\fR \fIURL\fR
+Open \fIURL\fR in a new window in an already running Firefox process.
+\fB\-new-tab\fR \fIURL\fR
+Open \fIURL\fR in a new tab in an already running Firefox process.
+
+.TP
+.B \-jsconsole
+Start with Javascript Console
+.TP
+\fB\-chrome\fR \fIurl\fR
+Load the specified chrome.
+.TP
+.B \-safe\-mode
+Starts Firefox in safe mode, that is disabling all extensions and
+showing a bit more debugging messages.
+
+.SS "Debugger options"
+.TP
+.B \-g, \-debug
+Starts Firefox through a debugger (gdb by default).
+.TP
+\fB\-\-debugger\fR \fIprogram\fR
+Use \fIprogram\fR as a debugger for Firefox. Implies \fB\-debug\fR.
+
+.SH ENVIRONMENT
+\fIFIREFOX_DSP\fR - configures the /dev/dsp wrapper to use. Accepted values
+are "auto", "arts", "esd" or "none" (default).  Do not use this
+feature to select "auto" or "esd" as this will involve using "esddsp"
+which is known to be buggy and to make Firefox unstable.
+
+.SH FILES
+\fI/usr/bin/firefox\fR - shell script wrapping
+\fBfirefox\-bin\fR
+.br
+
+\fI/usr/lib/firefox/firefox\-bin\fR - \fBfirefox\fR
+executable
+.br
+
+\fI/etc/firefox/firefoxrc\fR - file containing environment
+variables to be passed to Firefox.
+.br
+
+\fI${HOME}/.mozilla/firefox/rc\fR - file containing environment variables to
+be passed to Firefox. Overrides \fI/etc/firefox/firefoxrc\fR
+
+.SH BUGS
+To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR
+
+.SH "SEE ALSO"
+.BR mozilla(1)
+
+.SH AUTHORS
+.TP
+.B The Mozilla Organization
+.I http://www.mozilla.org/about.html
--- iceowl-0.7.orig/debian/iceowl-libthai.install
+++ iceowl-0.7/debian/iceowl-libthai.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/iceowl/components/libmozlibthai.so usr/lib/iceowl/components
--- iceowl-0.7.orig/debian/iceowl.cfg.source
+++ iceowl-0.7/debian/iceowl.cfg.source
@@ -0,0 +1,3 @@
+//
+lockPref("app.update.enabled", false);
+lockPref("app.update.auto", false);
--- iceowl-0.7.orig/debian/debsearch.src
+++ iceowl-0.7/debian/debsearch.src
@@ -0,0 +1,27 @@
+# Firefox plugin file
+#
+# Debian package lookup
+# by Fergus McKenzie-Kay copying code 
+# by Spencer Wysinger <http://wysinger.com/>
+# ported to Ubuntu by Alex Converse
+#
+# Last updated: June 5, 2005
+
+<search 
+	name="Ubuntu Package Search"
+	description="Perform a search for Ubuntu packages"
+	action="http://packages.ubuntu.com/cgi-bin/search_packages.pl"
+	searchForm="http://packages.ubuntu.com/"
+	queryEncoding="utf-8"
+	queryCharset="utf-8"
+	method="GET"
+>
+
+<input name="searchon" value="names">
+<input name="subword" value="1">
+<input name="version" value="feisty">
+<input name="release" value="all">
+<input name="keywords" user="">
+<input name="sourceid" value="mozilla-search">
+
+</search>
--- iceowl-0.7.orig/debian/wikipedia.src
+++ iceowl-0.7/debian/wikipedia.src
@@ -0,0 +1,24 @@
+# Firefox plugin file
+#
+# Wikipedia search
+# by Ian Jackson for Ubuntu copying code 
+# by Fergus McKenzie-Kay copying code 
+# by Spencer Wysinger <http://wysinger.com/>
+# ported to Ubuntu by Alex Converse
+#
+# Last updated: June 5, 2005
+
+<search 
+	name="Wikipedia topic"
+	description="Look up as a topic on Wikipedia"
+	action="http://en.wikipedia.org/wiki/Special:Search"
+	searchForm="http://en.wikipedia.org/"
+	queryEncoding="utf-8"
+	queryCharset="utf-8"
+	method="GET"
+>
+
+<input name="search" user="">
+<input name="go" value="Go">
+
+</search>
--- iceowl-0.7.orig/debian/apport/firefox.py
+++ iceowl-0.7/debian/apport/firefox.py
@@ -0,0 +1,137 @@
+'''firefox apport hook draft
+
+/usr/share/apport/package-hooks/firefox.py
+
+Appends to apport's firefox default report: the files pluginreg.dat and
+profiles.ini, and also a summary of all the extensions loaded on each firefox
+profile (the summary is the extension's name, it's version, and the id)
+obtained by parsing each extension's install.rdf file.
+
+Copyright (c) 2007: Hilario J. Montoliu <hmontoliu@gmail.com>
+
+This program 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.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+import os
+import ConfigParser
+import glob
+import cStringIO
+from xml.dom import minidom
+
+def extensions_ini_parser(extensions_ini_file):
+    '''parses profile's extensions.ini file and returns a tuple:
+    ((global extensions, local extensions), (global theme, local theme))'''
+    parser = ConfigParser.ConfigParser()
+    parser.read(extensions_ini_file) 
+    ext_ini_d = {}
+    for section in parser.sections():
+        section_global, section_local, my_ext = [], [], ''
+        for extension in parser.options(section):
+            my_ext = parser.get(section, extension)
+            if '/usr/lib/firefox/extensions' in my_ext:
+                section_global.append((my_ext))
+            else:
+                section_local.append((my_ext))
+        ext_ini_d[section] = (section_global, section_local)
+    return (ext_ini_d['ExtensionDirs'], ext_ini_d['ThemeDirs'])
+
+def install_ini_parser(extension_path):
+    '''parses each extension's install.rdf and returns string:
+    extension name, its version and the id.'''
+    rdf_file = os.path.join(extension_path, 'install.rdf')
+    refs_dict = {'em:version': '', 'em:id': '', 'em:name': ''}
+    parse_err = '%s (Not Parsed)\n' % extension_path 
+    dom_doc = minidom.parse(rdf_file)
+    for key in refs_dict.keys():
+        this_key = ''
+        try:
+            document_ref = dom_doc.getElementsByTagName('RDF:Description')[0].attributes
+            this_key = document_ref[key].value
+        except:
+            try:
+                document_ref = dom_doc.getElementsByTagName('Description')[0].attributes
+                this_key = document_ref[key].value
+            except: 
+                try:
+                    this_key = dom_doc.getElementsByTagName(key)[0].childNodes[0].data
+                except:
+                    return parse_err
+        try: # avoid problems with encodings.
+            print >> cStringIO.StringIO(), this_key
+            refs_dict[key] = this_key            
+        except UnicodeEncodeError:    
+            refs_dict[key] = repr(this_key)
+    return '''%(em:name)s (version: %(em:version)s) -\tid: %(em:id)s''' % refs_dict
+
+def extension_summary_helper(extension_list, section_name, alt_output = 1):
+    '''does some output proccessing for extensionSummary'''
+    str = ''
+    if len(extension_list) > 0:
+        str += '''  %s:\n''' % section_name
+        for extension in extension_list:
+            str += '''    %s\n''' % install_ini_parser(extension)
+    else:
+        if alt_output == 1: # if 0, don't output anything
+            str += '''  No %s in this Profile.\n''' % section_name 
+    str += '''\n'''
+    return str
+
+def add_info(report):
+    config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox')
+    
+    # append pluginreg.dat file:
+    pluginreg_dat = os.path.join(config_dir,'pluginreg.dat')
+    if os.path.exists(pluginreg_dat):
+        report['pluginreg.dat'] = open(pluginreg_dat).read()
+    
+    # append profiles.ini file & parse it:
+    profiles_ini = os.path.join(config_dir,'profiles.ini') 
+    if os.path.exists(profiles_ini):
+        report['profiles.ini'] = open(profiles_ini).read() 
+        # parse profiles.ini: 
+        profiles_d = {} # { profile_name : [ profile_path, is_default ] }
+        profile_parser = ConfigParser.ConfigParser()
+        profile_parser.read(profiles_ini)
+        for section in profile_parser.sections():
+            if profile_parser.has_option(section, 'Name') and profile_parser.has_option(section, 'Path'):
+                if profile_parser.has_option(section, 'Default'):
+                    is_default = profile_parser.get(section, 'Default')
+                else:
+                    is_default = 0
+                profiles_d[profile_parser.get(section, 'Name')] = (os.path.join(config_dir, profile_parser.get(section, 'Path')), is_default)
+    
+    # summarize the extensions loaded on each profile (either global and local):
+    extensions_dict, themes_dict, extension_summary = {}, {}, ''
+    for profile_name in profiles_d.keys():
+        profile_path, is_default = profiles_d[profile_name]
+        extensions_ini = os.path.join(profile_path, 'extensions.ini')
+        if os.path.exists(extensions_ini):
+            # attach each profile's extensions.ini too (not enabled).
+            #report['extensions.ini (profile: %s)' % profile_name ] = open(extensions_ini).read()
+            (extensions_dict['global_extensions'], extensions_dict['local_extensions']),\
+            (themes_dict['global_theme'], themes_dict['local_theme']) = extensions_ini_parser(extensions_ini)
+    
+            if is_default == '1': is_default_str = ''' (The Default):'''
+            else: is_default_str = ''':'''
+            extension_summary += '''Profile "%s"%s\n\n''' % (profile_name, is_default_str)
+            extension_summary += extension_summary_helper(extensions_dict['global_extensions'], 'Global Extensions')
+            extension_summary += extension_summary_helper(extensions_dict['local_extensions'], 'Local Extensions')
+            extension_summary += extension_summary_helper(themes_dict['global_theme'], 'Global Theme', 0)
+            extension_summary += extension_summary_helper(themes_dict['local_theme'], 'Local Theme', 0)
+        buffer = cStringIO.StringIO() # it's needed for propper apport attachments
+        print >> buffer, extension_summary
+        buffer.seek(0)
+    report['ExtensionSummary'] = buffer.read()
+    # debug (comment on production)
+    # return report
+
+#### debug ####
+# (uncomment the 'return report' at add_report())
+if __name__ == "__main__":
+    D = {}  
+    report = add_info(D)
+    for key in report.keys(): print '''%s:\n''' % key, report[key]
--- iceowl-0.7.orig/debian/copyright
+++ iceowl-0.7/debian/copyright
@@ -0,0 +1,884 @@
+This package was debianized by John Vivirito <gnomefreak@ubuntu.com> and
+Alexander Sack <asac@debian.org> in Jul 2007
+
+It was downloaded from http://ftp.mozilla.org/pub/mozilla.org/sunbird/releases/
+
+and rebranded.
+
+The source tarball is an aggregate of several different works in which the
+main one, developed by the Mozilla Project, is firefox.
+
+Other works include gzip, bzip2, sqlite, libjpeg, libpng, cairo, and others.
+Please see the sections following the copyright statements for firefox for
+these.
+
+=== sunbird/calendar
+
+Overall, the sunbird/calendar project is licensed under the terms of the Mozilla
+Public License version 1.1 or, at your option, under the terms of the GNU
+eneral Public License version 2 or subsequent, or the terms of the GNU
+Lesser General Public License version 2.1 or subsequent.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL' ;
+the complete text of the GNU Lesser General Public License can be
+found in the file `/usr/share/common-licenses/LGPL'.
+
+The complete text of the Mozilla Public License can be found in the MPL file
+in the same directory as this file.
+
+Some files may still contain licensing notices claiming licensing under
+other combinations of NPL, MPL, GPL and LGPL. They are files that were missed
+by the upstream relicensing script, but all the permissions required for
+relicensing were indeed provided.
+
+The file db/mork/src/morkQuickSort.cpp is licensed under the following terms:
+
+  Copyright (c) 1992, 1993
+   The Regents of the University of California.  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the name of the University nor the names of its contributors
+     may be used to endorse or promote products derived from this software
+     without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+
+The embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl file and the files
+under the embedding/tests directory are licensed under the following terms:
+
+  Copyright (c) 2002 Netscape Communications Corporation and
+  other contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this Mozilla sample software and associated documentation files
+  (the "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to permit
+  persons to whom the Software is furnished to do so, subject to the
+  following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+
+The modules/plugin/base/public/npruntime.h file is licensed under the
+following terms:
+
+  Copyright (c) 2004, Apple Computer, Inc. and The Mozilla Foundation.
+  All rights reserved.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+ 
+  1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+  3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla
+  Foundation ("Mozilla") nor the names of their contributors may be used
+  to endorse or promote products derived from this software without
+  specific prior written permission.
+ 
+  THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR
+  THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The toolkit/mozapps/update/src/updater/bspatch.cpp and
+toolkit/mozapps/update/src/updater/bspatch.h files are licensed under the
+following terms:
+
+  Copyright 2003,2004 Colin Percival
+  All rights reserved
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted providing that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+Some but not all the files in netwerk/dns/src/ are licensed under the
+following terms:
+
+  Copyright (c) 2001,2002 Japan Network Information Center.
+  All rights reserved.
+ 
+  By using this file, you agree to the terms and conditions set forth bellow.
+ 
+                       LICENSE TERMS AND CONDITIONS
+ 
+  The following License Terms and Conditions apply, unless a different
+  license is obtained from Japan Network Information Center ("JPNIC"),
+  a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda,
+  Chiyoda-ku, Tokyo 101-0047, Japan.
+ 
+  1. Use, Modification and Redistribution (including distribution of any
+     modified or derived work) in source and/or binary forms is permitted
+     under this License Terms and Conditions.
+ 
+  2. Redistribution of source code must retain the copyright notices as they
+     appear in each source code file, this License Terms and Conditions.
+ 
+  3. Redistribution in binary form must reproduce the Copyright Notice,
+     this License Terms and Conditions, in the documentation and/or other
+     materials provided with the distribution.  For the purposes of binary
+     distribution the "Copyright Notice" refers to the following language:
+     "Copyright (c) 2000-2002 Japan Network Information Center.  All rights reserved."
+ 
+  4. The name of JPNIC may not be used to endorse or promote products
+     derived from this Software without specific prior written approval of
+     JPNIC.
+ 
+  5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC
+     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+     PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL JPNIC BE LIABLE
+     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+     ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+Some files in plugin/oji/JEP/ are licensed under the following terms:
+
+  Copyright (c) 2004, Steven Michaud, All Rights Reserved
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The extensions/auth/gssapi.h file is licensed under the following terms:
+
+  Copyright 1993 by OpenVision Technologies, Inc.
+ 
+  Permission to use, copy, modify, distribute, and sell this software
+  and its documentation for any purpose is hereby granted without fee,
+  provided that the above copyright notice appears in all copies and
+  that both that copyright notice and this permission notice appear in
+  supporting documentation, and that the name of OpenVision not be used
+  in advertising or publicity pertaining to distribution of the software
+  without specific, written prior permission. OpenVision makes no
+  representations about the suitability of this software for any
+  purpose.  It is provided "as is" without express or implied warranty.
+ 
+  OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+The gfx/src/xlib/xregion.h and gfx/src/gtk/xregion.h are licensed under the
+following terms:
+
+  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+  and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                          All Rights Reserved
+
+  Permission to use, copy, modify, and distribute this software and its
+  documentation for any purpose and without fee is hereby granted,
+  provided that the above copyright notice appear in all copies and that
+  both that copyright notice and this permission notice appear in
+  supporting documentation, and that the names of Digital or MIT not be
+  used in advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+  DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+  ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+  SOFTWARE.
+
+=== sqlite
+
+The db/sqlite3 directory contains a copy of sqlite with the following
+licensing terms:
+
+  The author disclaims copyright to this source code.  In place of
+  a legal notice, here is a blessing:
+
+     May you do good and not evil.
+     May you find forgiveness for yourself and forgive others.
+     May you share freely, never taking more than you give.
+
+=== dbm
+
+The dbm directory, except some files added by the mozilla project, is
+licensed under the following terms:
+
+  Copyright (c) 1991, 1993, 1994
+  The Regents of the University of California.  All rights reserved.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. All advertising materials mentioning features or use of this software
+     must display the following acknowledgement:
+  This product includes software developed by the University of
+  California, Berkeley and its contributors.
+  4. Neither the name of the University nor the names of its contributors
+     may be used to endorse or promote products derived from this software
+     without specific prior written permission.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+ 
+=== myspell
+
+The extensions/spellcheck/myspell directory is licensed under the following
+terms:
+
+  Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
+  And Contributors.  All rights reserved.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+ 
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ 
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 
+  3. All modifications to the source code must be clearly marked as
+     such.  Binary redistributions based on modified source code
+     must be clearly marked as modified versions in the documentation
+     and/or other materials provided with the distribution.
+ 
+  THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS 
+  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+  FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL 
+  KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+
+=== boehm
+
+The gc/boehm directory, except the files listed under the xulrunner section,
+is licensed under the following terms:
+
+  Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
+  Copyright (c) 1991-1996 by Xerox Corporation.  All rights reserved.
+  Copyright (c) 1996-1998 by Silicon Graphics.  All rights reserved.
+
+  THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+  OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+
+  Permission is hereby granted to use or copy this program
+  for any purpose,  provided the above notices are retained on all copies.
+  Permission to modify the code and to distribute modified code is granted,
+  provided the above notices are retained, and a notice that the code was
+  modified is included with the above copyright notice.
+
+=== cairo
+
+The gfx/cairo/cairo directory is licensed under the following terms:
+
+  Copyright (c) 2003 University of Southern California
+  Copyright (c) 1999 Tom Tromey
+  Copyright (c) 2002, 2003 University of Southern California
+  Copyright (c) 2004 Calum Robinson
+  Copyright (c) 2004 David Reveman
+  Copyright (c) 2000, 2002, 2004 Keith Packard
+  Copyright (c) 2004, 2005 Red Hat, Inc
+
+  Cairo is free software and is available to be redistributed and/or
+  modified under the terms of either the GNU Lesser General Public
+  License (LGPL) version 2.1 or the Mozilla Public License (MPL) version
+  1.1.
+
+=== libpixman
+
+The gfx/cairo/libpixman directory is licensed under the following terms:
+(from gfx/cairo/libpixman/COPYING)
+
+  libpixregion
+  
+  Copyright 1987, 1998  The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings
+  in this Software without prior written authorization from The Open Group.
+  
+  
+  Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+  
+                          All Rights Reserved
+  
+  Permission to use, copy, modify, and distribute this software and its 
+  documentation for any purpose and without fee is hereby granted, 
+  provided that the above copyright notice appear in all copies and that
+  both that copyright notice and this permission notice appear in 
+  supporting documentation, and that the name of Digital not be
+  used in advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.  
+  
+  DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+  DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+  ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+  SOFTWARE.
+  
+  ----------------------------------------------------------------------
+  libic
+  
+  Copyright © 2001 Keith Packard
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Keith Packard not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Keith Packard makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided "as is" without express or implied warranty.
+  
+  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+  
+  ----------------------------------------------------------------------
+  slim
+  
+  slim is Copyright © 2003 Richard Henderson
+  
+  Permission to use, copy, modify, distribute, and sell this software
+  and its documentation for any purpose is hereby granted without fee,
+  provided that the above copyright notice appear in all copies and that
+  both that copyright notice and this permission notice appear in
+  supporting documentation, and that the name of Richard Henderson not be
+  used in advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.  Richard Henderson
+  makes no representations about the suitability of this software for
+  any purpose.  It is provided "as is" without express or implied
+  warranty.
+  
+  RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+=== libjpeg
+
+The jpeg directory, except the files under the xulrunner section, are licensed
+under the following terms:
+
+  The authors make NO WARRANTY or representation, either express or implied,
+  with respect to this software, its quality, accuracy, merchantability, or
+  fitness for a particular purpose.  This software is provided "AS IS", and you,
+  its user, assume the entire risk as to its quality and accuracy.
+
+  This software is copyright (C) 1991-1998, Thomas G. Lane.
+  All Rights Reserved except as specified below.
+
+  Permission is hereby granted to use, copy, modify, and distribute this
+  software (or portions thereof) for any purpose, without fee, subject to these
+  conditions:
+  (1) If any part of the source code for this software is distributed, then this
+  README file must be included, with this copyright and no-warranty notice
+  unaltered; and any additions, deletions, or changes to the original files
+  must be clearly indicated in accompanying documentation.
+  (2) If only executable code is distributed, then the accompanying
+  documentation must state that "this software is based in part on the work of
+  the Independent JPEG Group".
+  (3) Permission for use of this software is granted only if the user accepts
+  full responsibility for any undesirable consequences; the authors accept
+  NO LIABILITY for damages of any kind.
+
+  These conditions apply to any software derived from or based on the IJG code,
+  not just to the unmodified library.  If you use our work, you ought to
+  acknowledge us.
+
+  Permission is NOT granted for the use of any IJG author's name or company name
+  in advertising or publicity relating to this software or products derived from
+  it.  This software may be referred to only as "the Independent JPEG Group's
+  software".
+
+  We specifically permit and encourage the use of this software as the basis of
+  commercial products, provided that all warranty or liability claims are
+  assumed by the product vendor.
+
+=== bzip2
+
+The modules/libbz2/src directory is licensed under the following terms:
+(from modules/libbz2/src/LICENSE)
+
+  This program, "bzip2", the associated library "libbzip2", and all
+  documentation, are copyright (C) 1996-2005 Julian R Seward.  All
+  rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  
+  2. The origin of this software must not be misrepresented; you must 
+     not claim that you wrote the original software.  If you use this 
+     software in a product, an acknowledgment in the product 
+     documentation would be appreciated but is not required.
+  
+  3. Altered source versions must be plainly marked as such, and must
+     not be misrepresented as being the original software.
+  
+  4. The name of the author may not be used to endorse or promote 
+     products derived from this software without specific prior written 
+     permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  
+  Julian Seward, Cambridge, UK.
+  jseward@acm.org
+  bzip2/libbzip2 version 1.0.3 of 15 February 2005
+
+=== libpng
+
+The directory modules/libimg/png is licensed under the following terms:
+(from modules/libimg/png/LICENSE)
+
+  This copy of the libpng notices is provided for your convenience.  In case of
+  any discrepancy between this copy and the notices in the file png.h that is
+  included in the libpng distribution, the latter shall prevail.
+  
+  COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+  
+  If you modify libpng you may insert additional notices immediately following
+  this sentence.
+  
+  libpng version 1.2.6, September 12, 2004, is
+  Copyright (c) 2004 Glenn Randers-Pehrson, and is
+  distributed according to the same disclaimer and license as libpng-1.2.5
+  with the following individual added to the list of Contributing Authors
+  
+     Cosmin Truta
+  
+  libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
+  Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+  distributed according to the same disclaimer and license as libpng-1.0.6
+  with the following individuals added to the list of Contributing Authors
+  
+     Simon-Pierre Cadieux
+     Eric S. Raymond
+     Gilles Vollant
+  
+  and with the following additions to the disclaimer:
+  
+     There is no warranty against interference with your enjoyment of the
+     library or against infringement.  There is no warranty that our
+     efforts or the library will fulfill any of your particular purposes
+     or needs.  This library is provided with all faults, and the entire
+     risk of satisfactory quality, performance, accuracy, and effort is with
+     the user.
+  
+  libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+  Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
+  distributed according to the same disclaimer and license as libpng-0.96,
+  with the following individuals added to the list of Contributing Authors:
+  
+     Tom Lane
+     Glenn Randers-Pehrson
+     Willem van Schaik
+  
+  libpng versions 0.89, June 1996, through 0.96, May 1997, are
+  Copyright (c) 1996, 1997 Andreas Dilger
+  Distributed according to the same disclaimer and license as libpng-0.88,
+  with the following individuals added to the list of Contributing Authors:
+  
+     John Bowler
+     Kevin Bracey
+     Sam Bushell
+     Magnus Holmgren
+     Greg Roelofs
+     Tom Tanner
+  
+  libpng versions 0.5, May 1995, through 0.88, January 1996, are
+  Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+  
+  For the purposes of this copyright and license, "Contributing Authors"
+  is defined as the following set of individuals:
+  
+     Andreas Dilger
+     Dave Martindale
+     Guy Eric Schalnat
+     Paul Schmidt
+     Tim Wegner
+  
+  The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+  and Group 42, Inc. disclaim all warranties, expressed or implied,
+  including, without limitation, the warranties of merchantability and of
+  fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+  assume no liability for direct, indirect, incidental, special, exemplary,
+  or consequential damages, which may result from the use of the PNG
+  Reference Library, even if advised of the possibility of such damage.
+  
+  Permission is hereby granted to use, copy, modify, and distribute this
+  source code, or portions hereof, for any purpose, without fee, subject
+  to the following restrictions:
+  
+  1. The origin of this source code must not be misrepresented.
+  
+  2. Altered versions must be plainly marked as such and must not
+     be misrepresented as being the original source.
+  
+  3. This Copyright notice may not be removed or altered from any
+     source or altered source distribution.
+  
+  The Contributing Authors and Group 42, Inc. specifically permit, without
+  fee, and encourage the use of this source code as a component to
+  supporting the PNG file format in commercial products.  If you use this
+  source code in a product, acknowledgment is not required but would be
+  appreciated.
+  
+  
+  A "png_get_copyright" function is available, for convenient use in "about"
+  boxes and the like:
+  
+     printf("%s",png_get_copyright(NULL));
+  
+  Also, the PNG logo (in PNG format, of course) is supplied in the
+  files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+  
+  Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
+  certification mark of the Open Source Initiative.
+  
+  Glenn Randers-Pehrson
+  glennrp@users.sourceforge.net
+  September 12, 2004
+
+=== zlib
+
+The directories modules/zlib/src and security/nss/cmd/zlib are licensed under
+the following terms:
+
+ (C) 1995-2004 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+  If you use the zlib library in a product, we would appreciate *not*
+  receiving lengthy legal documents to sign. The sources are provided
+  for free but without warranty of any kind.  The library has been
+  entirely written by Jean-loup Gailly and Mark Adler; it does not
+  include third-party code.
+  
+  If you redistribute modified sources, we would appreciate that you include
+  in the file ChangeLog history information documenting your changes. Please
+  read the FAQ for more information on the distribution of modified source
+  versions.
+  
+=== expat
+
+The directory parser/expat is licensed under the following terms:
+(from parser/expat/COPYING)
+
+  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+                                 and Clark Cooper
+  Copyright (c) 2001, 2002 Expat maintainers.
+  
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+=== other-licenses/branding
+
+You are not granted rights or licenses to the trademarks of the
+Mozilla Foundation or any party, including without limitation the
+Sunbird name or logo.
+
+For more information, see: http://www.mozilla.org/foundation/licensing.html
+
+Note: if you modify this package you have to get permissions from mozilla
+to distribute the modified version. If you don't want to get permissions,
+just strip other-licenses/branding directory and drop the --enable-official-branding
+configure switch from debian/rules before building/redistributing.
+
+
+=== other-licenses/7zstub/ + other-licenses/libart_lgpl/
+
+LGPL: /usr/share/common-licenses/LGPL
+
+
+=== other-licenses/bsdiff
+
+BSD Protection License
+February 2002
+
+Preamble
+--------
+
+The Berkeley Software Distribution ("BSD") license has proven very effective
+over the years at allowing for a wide spread of work throughout both
+commercial and non-commercial products.  For programmers whose primary
+intention is to improve the general quality of available software, it is
+arguable that there is no better license than the BSD license, as it
+permits improvements to be used wherever they will help, without idealogical
+or metallic constraint.
+
+This is of particular value to those who produce reference implementations
+of proposed standards: The case of TCP/IP clearly illustrates that freely
+and universally available implementations leads the rapid acceptance of
+standards -- often even being used instead of a de jure standard (eg, OSI
+network models).
+
+With the rapid proliferation of software licensed under the GNU General
+Public License, however, the continued success of this role is called into
+question.  Given that the inclusion of a few lines of "GPL-tainted" work
+into a larger body of work will result in restricted distribution -- and
+given that further work will likely build upon the "tainted" portions,
+making them difficult to remove at a future date -- there are inevitable
+circumstances where authors would, in order to protect their goal of
+providing for the widespread usage of their work, wish to guard against
+such "GPL-taint".
+
+In addition, one can imagine that companies which operate by producing and
+selling (possibly closed-source) code would wish to protect themselves
+against the rise of a GPL-licensed competitor.  While under existing
+licenses this would mean not releasing their code under any form of open
+license, if a license existed under which they could incorporate any
+improvements back into their own (commercial) products then they might be
+far more willing to provide for non-closed distribution.
+
+For the above reasons, we put forth this "BSD Protection License": A
+license designed to retain the freedom granted by the BSD license to use
+licensed works in a wide variety of settings, both non-commercial and
+commercial, while protecting the work from having future contributors
+restrict that freedom.
+
+The precise terms and conditions for copying, distribution, and
+modification follow.
+
+BSD PROTECTION LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION, AND MODIFICATION
+----------------------------------------------------------------
+
+0. Definitions.
+   a) "Program", below, refers to any program or work distributed under
+      the terms of this license.
+   b) A "work based on the Program", below, refers to either the Program
+      or any derivative work under copyright law.
+   c) "Modification", below, refers to the act of creating derivative works.
+   d) "You", below, refers to each licensee.
+
+1. Scope.
+   This license governs the copying, distribution, and modification of the
+   Program.  Other activities are outside the scope of this license; The
+   act of running the Program is not restricted, and the output from the
+   Program is covered only if its contents constitute a work based on the
+   Program.
+
+2. Verbatim copies.
+   You may copy and distribute verbatim copies of the Program as you
+   receive it, in any medium, provided that you conspicuously and
+   appropriately publish on each copy an appropriate copyright notice; keep
+   intact all the notices that refer to this License and to the absence of
+   any warranty; and give any other recipients of the Program a copy of this
+   License along with the Program.
+
+3. Modification and redistribution under closed license.
+   You may modify your copy or copies of the Program, and distribute
+   the resulting derivative works, provided that you meet the
+   following conditions:
+   a) The copyright notice and disclaimer on the Program must be reproduced
+      and included in the source code, documentation, and/or other materials
+      provided in a manner in which such notices are normally distributed.
+   b) The derivative work must be clearly identified as such, in order that
+      it may not be confused with the original work.
+   c) The license under which the derivative work is distributed must
+      expressly prohibit the distribution of further derivative works.
+
+4. Modification and redistribution under open license.
+   You may modify your copy or copies of the Program, and distribute
+   the resulting derivative works, provided that you meet the
+   following conditions:
+   a) The copyright notice and disclaimer on the Program must be reproduced
+      and included in the source code, documentation, and/or other materials
+      provided in a manner in which such notices are normally distributed.
+   b) You must clearly indicate the nature and date of any changes made
+      to the Program.  The full details need not necessarily be included in
+      the individual modified files, provided that each modified file is
+      clearly marked as such and instructions are included on where the
+      full details of the modifications may be found.
+   c) You must cause any work that you distribute or publish, that in whole
+      or in part contains or is derived from the Program or any part
+      thereof, to be licensed as a whole at no charge to all third
+      parties under the terms of this License.
+
+5. Implied acceptance.
+   You may not copy or distribute the Program or any derivative works except
+   as expressly provided under this license.  Consequently, any such action
+   will be taken as implied acceptance of the terms of this license.
+
+6. NO WARRANTY.
+   THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+   THE COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+   REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE FOR ANY DIRECT,
+   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING, BUT
+   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+   TORT, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGES.
--- iceowl-0.7.orig/iceowl-0.7-source.tar.bz2.cdbs-config_list
+++ iceowl-0.7/iceowl-0.7-source.tar.bz2.cdbs-config_list
@@ -0,0 +1,76 @@
+mozilla/db/sqlite3/src/config.h
+mozilla/js/src/config.mk
+mozilla/mail/installer/windows/config.it
+mozilla/xpfe/global/resources/content/config.js
+mozilla/xpfe/global/resources/content/config.xul
+mozilla/xpfe/global/resources/locale/en-US/config.properties
+mozilla/xpfe/global/resources/locale/en-US/config.dtd
+mozilla/build/autoconf/config.guess
+mozilla/build/autoconf/config.sub
+mozilla/tools/leaky/config.h
+mozilla/xpinstall/packager/os2/config.it
+mozilla/xpinstall/packager/unix/config.it
+mozilla/xpinstall/packager/build/win/gre/config.it
+mozilla/xpinstall/packager/build/win/mozilla/config.it
+mozilla/xpinstall/packager/build/win/mfcembed/config.it
+mozilla/xpinstall/packager/win_mfcembed/config.it
+mozilla/xpinstall/packager/win_gre/config.it
+mozilla/xpinstall/packager/windows/config.it
+mozilla/xpinstall/wizard/unix/src2/config.ini
+mozilla/config.cache
+mozilla/calendar/libical/config.h
+mozilla/config.log
+mozilla/config/config.mk
+mozilla/toolkit/locales/en-US/chrome/global/config.properties
+mozilla/toolkit/locales/en-US/chrome/global/config.dtd
+mozilla/toolkit/components/viewconfig/content/config.js
+mozilla/toolkit/components/viewconfig/content/config.xul
+mozilla/toolkit/themes/winstripe/global/config.css
+mozilla/toolkit/themes/pinstripe/global/config.css
+mozilla/security/nss/cmd/lib/config.mk
+mozilla/security/nss/cmd/zlib/config.mk
+mozilla/security/nss/cmd/crmf-cgi/config.mk
+mozilla/security/nss/cmd/crmftest/config.mk
+mozilla/security/nss/lib/dev/config.mk
+mozilla/security/nss/lib/jar/config.mk
+mozilla/security/nss/lib/nss/config.mk
+mozilla/security/nss/lib/pki/config.mk
+mozilla/security/nss/lib/ssl/config.mk
+mozilla/security/nss/lib/base/config.mk
+mozilla/security/nss/lib/asn1/config.mk
+mozilla/security/nss/lib/ckfw/dbm/config.mk
+mozilla/security/nss/lib/ckfw/capi/config.mk
+mozilla/security/nss/lib/ckfw/config.mk
+mozilla/security/nss/lib/ckfw/builtins/config.mk
+mozilla/security/nss/lib/crmf/config.mk
+mozilla/security/nss/lib/pki1/config.mk
+mozilla/security/nss/lib/util/config.mk
+mozilla/security/nss/lib/softoken/config.mk
+mozilla/security/nss/lib/cryptohi/config.mk
+mozilla/security/nss/lib/certhigh/config.mk
+mozilla/security/nss/lib/pkcs7/config.mk
+mozilla/security/nss/lib/smime/config.mk
+mozilla/security/nss/lib/certdb/config.mk
+mozilla/security/nss/lib/freebl/config.mk
+mozilla/security/nss/lib/pkcs12/config.mk
+mozilla/security/nss/lib/pk11wrap/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/trivial/config.h.in
+mozilla/security/nss/tests/pkcs11/netscape/suites/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/suites/security/ssl/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/suites/security/config.mk
+mozilla/security/nss/tests/pkcs11/netscape/suites/security/pkcs11/config.mk
+mozilla/security/coreconf/config.mk
+mozilla/themes/modern/global/config.css
+mozilla/themes/classic/global/config.css
+mozilla/nsprpub/build/autoconf/config.guess
+mozilla/nsprpub/build/autoconf/config.sub
+mozilla/nsprpub/config/config.mk
+mozilla/extensions/cck/browser/resources/content/cckwizard/config.xul
+mozilla/extensions/irc/xul/content/config.js
+mozilla/extensions/irc/xul/content/config.css
+mozilla/extensions/irc/xul/content/config.xul
+mozilla/extensions/irc/xul/locale/en-US/config.dtd
+mozilla/extensions/xmlterm/config/config.mk
+mozilla/directory/c-sdk/config/config.mk
+mozilla/directory/c-sdk/config/autoconf/config.guess
+mozilla/directory/c-sdk/config/autoconf/config.sub
