--- firefox-1.5.dfsg.orig/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
+++ firefox-1.5.dfsg/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
@@ -39,6 +39,15 @@
     <em:contributor>Mozilla Contributors</em:contributor>
 
     <em:internalName>classic/1.0</em:internalName>
+
+    <em:file>
+      <Description about="urn:mozilla:extension:file:classic.jar">
+        <em:skin>skin/classic/browser/</em:skin>
+	<em:skin>skin/classic/global/</em:skin>
+	<em:skin>skin/classic/communicator/</em:skin>
+	<em:skin>skin/classic/mozapps/</em:skin>
+      </Description>
+    </em:file>
   </Description>      
 
 </RDF>
--- firefox-1.5.dfsg.orig/browser/app/profile/firefox.js
+++ firefox-1.5.dfsg/browser/app/profile/firefox.js
@@ -49,6 +49,7 @@
 #endif
 
 pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties");
+pref("startup.homepage_override.mstone","ignore");
 pref("general.startup.browser", true);
 
 pref("browser.chromeURL","chrome://browser/content/");
@@ -72,12 +73,12 @@
 // App-specific update preferences
 
 // Whether or not app updates are enabled
-pref("app.update.enabled", true);
+pref("app.update.enabled", false);
 
 // This preference turns on app.update.mode and allows automatic download and
 // install to take place. We use a separate boolean toggle for this to make
 // the UI easier to construct.
-pref("app.update.auto", true);
+pref("app.update.auto", false);
 
 // Defines how the Application Update Service notifies the user about updates:
 //
@@ -156,7 +157,6 @@
 pref("keyword.enabled", true);
 pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");
 
-pref("general.useragent.locale", "@AB_CD@");
 pref("general.skins.selectedSkin", "classic/1.0");
 pref("general.useragent.extra.firefox", "Firefox/@APP_VERSION@");
 
@@ -169,12 +169,12 @@
 
 // Whether or not the application should check at startup each time if it 
 // is the default browser.
-pref("browser.shell.checkDefaultBrowser", true);
+pref("browser.shell.checkDefaultBrowser", false);
 
 // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
 // XXXBlake Remove this stupid pref
 pref("browser.startup.page",                1);
-pref("browser.startup.homepage",	          "resource:/browserconfig.properties");
+pref("browser.startup.homepage",	          "chrome://browser-region/locale/region.properties");
 
 pref("browser.cache.disk.capacity",         50000);
 pref("browser.enable_automatic_image_resizing", true);
@@ -314,6 +314,9 @@
 pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
 pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
 
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
 // 0=lines, 1=pages, 2=history , 3=text size
 #ifdef XP_MACOSX
 // On OS X, if the wheel has one axis only, shift+wheel comes through as a
@@ -332,6 +335,8 @@
 pref("mousewheel.withaltkey.action",0);
 pref("mousewheel.withaltkey.sysnumlines",false);
 
+pref("middlemouse.contentLoadURL", false); // setting to false disables pasting urls on to the page
+
 pref("profile.allow_automigration", false);   // setting to false bypasses automigration in the profile code
 
 // Customizable toolbar stuff
@@ -378,6 +383,10 @@
 pref("security.warn_viewing_mixed.show_once", true);
 pref("security.warn_submit_insecure.show_once", true);
 
+// enable negotiate extension
+pref("network.negotiate-auth.trusted-uris", "https://");
+
+
 #ifdef XP_UNIX
 pref("browser.urlbar.clickSelectsAll", false);
 #else
@@ -415,3 +424,13 @@
 // Setting this pref to |true| forces BiDi UI menu items and keyboard shortcuts
 // to be exposed. By default, only expose it for bidi-associated system locales.
 pref("bidi.browser.ui", false);
+
+pref("mozilla.widget.raise-on-setfocus", false);
+
+// disable insecure ciphers
+pref("security.enable_ssl2", false);
+
+pref("security.ssl2.rc2_40", false);
+pref("security.ssl2.rc4_40", false);
+pref("security.ssl3.rsa_rc4_40_md5", false);
+pref("security.ssl3.rsa_rc2_40_md5", false);
--- firefox-1.5.dfsg.orig/browser/base/content/aboutDialog.xul
+++ firefox-1.5.dfsg/browser/base/content/aboutDialog.xul
@@ -79,7 +79,7 @@
       <description id="copyright">&copyrightText;</description>
       <vbox id="detailsBox" align="center" flex="1">
         <spacer flex="1"/>
-        <textbox id="userAgent" multiline="true" readonly="true" cols="60"/>
+        <textbox id="userAgent" multiline="true" readonly="true" cols="60" rows="5"/>
       </vbox>
     </vbox>
     <vbox flex="1" id="creditsBox">
--- firefox-1.5.dfsg.orig/browser/base/content/browser-menubar.inc
+++ firefox-1.5.dfsg/browser/base/content/browser-menubar.inc
@@ -60,8 +60,10 @@
                 <menuitem label="&printPreviewCmd.label;" accesskey="&printPreviewCmd.accesskey;" oncommand="PrintUtils.printPreview(onEnterPrintPreview, onExitPrintPreview);"/>
 #endif
                 <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="printKb" command="cmd_print"/>
+#if 0
                 <menuseparator/>
                 <menuitem label="&import.label;" accesskey="&import.accesskey;" oncommand="BrowserImport();"/>
+#endif
 #ifndef XP_MACOSX
                 <menuseparator/>
 #endif
--- firefox-1.5.dfsg.orig/browser/base/content/search.xml
+++ firefox-1.5.dfsg/browser/base/content/search.xml
@@ -141,15 +141,18 @@
           this._initializeEngine();
 
           var element;
-          element = document.createElementNS(XUL_NS, "menuseparator");
-          this.mContextMenu.appendChild(element);
-          element = document.createElementNS(XUL_NS, "menuitem");
-          element.setAttribute("label", this.mStringBundle
-                               .getString("cmd_clearHistory"));
-          element.setAttribute("accesskey", this.mStringBundle
-                               .getString("cmd_clearHistory_accesskey"));
-          element.setAttribute("cmd", "cmd_clearhistory");
-          this.mContextMenu.appendChild(element);
+# clearHistory doesn't work properly because it misses clearing the
+# corresponding URL history items.  So we disable it for now to avoid
+# unfortunate accidents.
+#          element = document.createElementNS(XUL_NS, "menuseparator");
+#          this.mContextMenu.appendChild(element);
+#          element = document.createElementNS(XUL_NS, "menuitem");
+#          element.setAttribute("label", this.mStringBundle
+#                               .getString("cmd_clearHistory"));
+#          element.setAttribute("accesskey", this.mStringBundle
+#                               .getString("cmd_clearHistory_accesskey"));
+#          element.setAttribute("cmd", "cmd_clearhistory");
+#          this.mContextMenu.appendChild(element);
           this.controllers.appendController(this.searchbarController);
 
         ]]></body>
--- firefox-1.5.dfsg.orig/browser/components/preferences/downloads.js
+++ firefox-1.5.dfsg/browser/components/preferences/downloads.js
@@ -104,6 +104,9 @@
 #ifdef XP_BEOS
     return aFolderType == "Desktop" ? "Desk" : "Home";
 #endif
+#ifdef XP_UNIX
+     return aFolderType == "Desktop" ? "Desk" : "Home";
+#endif
     return "Home";
   },
 
--- firefox-1.5.dfsg.orig/browser/locales/en-US/chrome/branding/brand.dtd
+++ firefox-1.5.dfsg/browser/locales/en-US/chrome/branding/brand.dtd
@@ -1,5 +1,5 @@
-<!ENTITY  brandShortName        "Deer Park">
-<!ENTITY  brandFullName         "Deer Park">            
+<!ENTITY  brandShortName        "Firefox">
+<!ENTITY  brandFullName         "Firefox">            
 <!ENTITY  vendorShortName       "Mozilla">
 
 <!ENTITY  releaseURL            "http://www.mozilla.org/">
--- firefox-1.5.dfsg.orig/browser/locales/en-US/chrome/branding/brand.properties
+++ firefox-1.5.dfsg/browser/locales/en-US/chrome/branding/brand.properties
@@ -1,3 +1,3 @@
-brandShortName=Deer Park
-brandFullName=Deer Park
+brandShortName=Firefox
+brandFullName=Firefox
 vendorShortName=Mozilla
--- firefox-1.5.dfsg.orig/browser/locales/en-US/chrome/browser-region/region.properties
+++ firefox-1.5.dfsg/browser/locales/en-US/chrome/browser-region/region.properties
@@ -1,20 +1,20 @@
 general.useragent.contentlocale=US
 
-homePageDefault=http://start.mozilla.org/firefox
+homePageDefault=file:///usr/share/ubuntu-artwork/home/index.html
 fallbackDefaultSearchURL=http://www.google.com/search?&q=
 
-releaseNotesURL=http://www.mozilla.org/products/firefox/releases/%S.html
+releaseNotesURL=http://www.ubuntu.com/support/releasenotes604
 
 # firefox.js
-browser.startup.homepage=http://start.mozilla.org/firefox
-browser.throbber.url=http://www.mozilla.org/products/firefox/central.html
+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?lr=&ie=UTF-8&oe=UTF-8&q=
 
 browser.search.order.1=Google
 browser.search.order.2=Yahoo
 
 #config.js
-startup.homepage_override_url=http://www.mozilla.org/products/firefox/releases/whatsnew/
+startup.homepage_override_url=file:///usr/share/ubuntu-artwork/home/index.html
 
 # search-panel.properties
 defaultSearchURL=http://www.google.com/search?hl=en&lr=&ie=UTF-8&oe=UTF-8&q=
@@ -28,4 +28,4 @@
 
 # This is the fallback URL for release notes. Do not change this 
 # unless you are providing localized release notes!
-app.update.url.details=http://www.mozilla.org/products/firefox/releases/
+app.update.url.details=file:///usr/share/ubuntu-artwork/home/index.html
--- firefox-1.5.dfsg.orig/browser/locales/en-US/searchplugins/amazondotcom.src
+++ firefox-1.5.dfsg/browser/locales/en-US/searchplugins/amazondotcom.src
@@ -21,6 +21,6 @@
 <BROWSER
         update="https://addons.mozilla.org/searchplugins/updates/amazondotcom.src"
         updateIcon="https://addons.mozilla.org/searchplugins/updates/amazondotcom.png"
-        updateCheckDays="3"
+        updateCheckDays="0"
 	>
 
--- firefox-1.5.dfsg.orig/browser/locales/en-US/searchplugins/answers.src
+++ firefox-1.5.dfsg/browser/locales/en-US/searchplugins/answers.src
@@ -14,4 +14,4 @@
 
 <BROWSER update="https://addons.mozilla.org/searchplugins/updates/answers.src" 
          updateIcon="https://addons.mozilla.org/searchplugins/updates/answers.png" 
-         updateCheckDays="3">
+         updateCheckDays="0">
--- firefox-1.5.dfsg.orig/browser/locales/en-US/searchplugins/creativecommons.src
+++ firefox-1.5.dfsg/browser/locales/en-US/searchplugins/creativecommons.src
@@ -32,7 +32,7 @@
 <browser
 	update="https://addons.mozilla.org/searchplugins/updates/creativecommons.src"
 	updateIcon="https://addons.mozilla.org/searchplugins/updates/creativecommons.png"
-	updateCheckDays="3"
+	updateCheckDays="0"
 >
 </search>
 
--- firefox-1.5.dfsg.orig/browser/locales/en-US/searchplugins/dictionary.src
+++ firefox-1.5.dfsg/browser/locales/en-US/searchplugins/dictionary.src
@@ -24,6 +24,6 @@
 <BROWSER
    update="http://www.mozilla.org/products/firefox/plugins/dictionary.src" 
    updateIcon="http://www.mozilla.org/products/firefox/plugins/dictionary.png" 
-   updateCheckDays="3"
+   updateCheckDays="0"
 >
 
--- firefox-1.5.dfsg.orig/browser/locales/en-US/searchplugins/eBay.src
+++ firefox-1.5.dfsg/browser/locales/en-US/searchplugins/eBay.src
@@ -33,5 +33,5 @@
 <BROWSER
    update="https://addons.mozilla.org/searchplugins/updates/eBay.src" 
    updateIcon="https://addons.mozilla.org/searchplugins/updates/eBay.gif" 
-   updateCheckDays="3"
+   updateCheckDays="0"
 >
--- firefox-1.5.dfsg.orig/browser/locales/en-US/searchplugins/google.src
+++ firefox-1.5.dfsg/browser/locales/en-US/searchplugins/google.src
@@ -27,5 +27,5 @@
 <browser
     update="https://addons.mozilla.org/searchplugins/updates/google.src"
     updateIcon="https://addons.mozilla.org/searchplugins/updates/google.gif"
-    updateCheckDays="1"
+    updateCheckDays="0"
 >
--- firefox-1.5.dfsg.orig/browser/locales/en-US/searchplugins/yahoo.src
+++ firefox-1.5.dfsg/browser/locales/en-US/searchplugins/yahoo.src
@@ -39,7 +39,7 @@
     alsomatch="http://search.yahoo.com/bin/search"
     update="https://addons.mozilla.org/searchplugins/updates/yahoo.src"
     updateIcon="https://addons.mozilla.org/searchplugins/updates/yahoo.gif"
-    updateCheckDays="3"
+    updateCheckDays="0"
 >
 
 </search>
--- firefox-1.5.dfsg.orig/build/unix/run-mozilla.sh
+++ firefox-1.5.dfsg/build/unix/run-mozilla.sh
@@ -221,7 +221,7 @@
 	fi
     if [ -x "$debugger" ] 
     then
-    	tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
+    	tmpfile=`mktemp -t mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
 	trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
         echo "set args ${1+"$@"}" > $tmpfile
 # If you are not using ddd, gdb and know of a way to convey the arguments 
--- firefox-1.5.dfsg.orig/nsprpub/admin/repackage.sh
+++ firefox-1.5.dfsg/nsprpub/admin/repackage.sh
@@ -165,15 +165,18 @@
     #
     headers=`ls $FROMTOP/$OBJDIR/include/*.h`
     for header in $headers; do
-        sed -e 's/$/
/g' $header > $NSPRDIR/include/`basename $header`
+        sed -e 's/$/
+/g' $header > $NSPRDIR/include/`basename $header`
     done
     headers=`ls $FROMTOP/$OBJDIR/include/obsolete/*.h`
     for header in $headers; do
-        sed -e 's/$/
/g' $header > $NSPRDIR/include/obsolete/`basename $header`
+        sed -e 's/$/
+/g' $header > $NSPRDIR/include/obsolete/`basename $header`
     done
     headers=`ls $FROMTOP/$OBJDIR/include/private/*.h`
     for header in $headers; do
-        sed -e 's/$/
/g' $header > $NSPRDIR/include/private/`basename $header`
+        sed -e 's/$/
+/g' $header > $NSPRDIR/include/private/`basename $header`
     done
 
     echo "copying $FROMTOP/$OBJDIR/lib"
--- firefox-1.5.dfsg.orig/security/nss/lib/freebl/unix_rand.c
+++ firefox-1.5.dfsg/security/nss/lib/freebl/unix_rand.c
@@ -880,12 +880,14 @@
 	safe_pclose(fp);
     }
 #endif
+#ifndef LINUX 
     fp = safe_popen(netstat_ni_cmd);
     if (fp != NULL) {
 	while ((bytes = fread(buf, 1, sizeof(buf), fp)) > 0)
 	    RNG_RandomUpdate(buf, bytes);
 	safe_pclose(fp);
     }
+#endif
 
 }
 #else
--- firefox-1.5.dfsg.orig/security/coreconf/Linux.mk
+++ firefox-1.5.dfsg/security/coreconf/Linux.mk
@@ -56,6 +56,10 @@
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= m68k
 else		
+ifeq ($(OS_TEST),ppc64)
+	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
+	CPU_ARCH	= ppc64
+else
 ifeq ($(OS_TEST),ppc)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= ppc
@@ -119,6 +123,7 @@
 endif
 endif
 endif
+endif
 
 
 LIBC_TAG		= _glibc
--- firefox-1.5.dfsg.orig/security/coreconf/UNIX.mk
+++ firefox-1.5.dfsg/security/coreconf/UNIX.mk
@@ -49,13 +49,14 @@
 	DEFINES    += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami)
 endif
 
-ifdef BUILD_TREE
-NSINSTALL_DIR  = $(BUILD_TREE)/nss
-NSINSTALL      = $(BUILD_TREE)/nss/nsinstall
-else
-NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
-NSINSTALL      = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall
-endif
+#ifdef BUILD_TREE
+#NSINSTALL_DIR  = $(BUILD_TREE)/nss
+#NSINSTALL      = $(BUILD_TREE)/nss/nsinstall
+#else
+#NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
+#NSINSTALL      = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall
+#endif
+NSINSTALL=	$(CORE_DEPTH)/../nsprpub/config/nsinstall
 
 MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
 MKDEPEND        = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
--- firefox-1.5.dfsg.orig/security/coreconf/ruleset.mk
+++ firefox-1.5.dfsg/security/coreconf/ruleset.mk
@@ -227,7 +227,7 @@
     LOOP_OVER_DIRS	=					\
 	@for directory in $(DIRS); do				\
 	    if test -d $$directory; then			\
-		set $(EXIT_ON_ERROR);				\
+		set $(EXIT_ON_ERROR) -e;			\
 		echo "cd $$directory; $(MAKE) $@";		\
 		$(MAKE) -C $$directory $@;			\
 		set +e;						\
--- firefox-1.5.dfsg.orig/modules/libpref/src/init/all.js
+++ firefox-1.5.dfsg/modules/libpref/src/init/all.js
@@ -49,10 +49,11 @@
 
 pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
 pref("keyword.enabled", false);
-pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties");
-pref("general.useragent.contentlocale", "chrome://navigator-region/locale/region.properties");
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("general.useragent.contentlocale", "chrome://browser-region/locale/region.properties");
 
-pref("general.config.obscure_value", 13); // for MCD .cfg files
+pref("general.config.obscure_value", 0); // for MCD .cfg files
+pref("general.config.filename", "firefox.cfg");
 
 pref("browser.cache.disk.enable",           true);
 pref("browser.cache.disk.capacity",         51200);
@@ -432,7 +433,7 @@
 //   2 = openAbused
 pref("privacy.popups.disable_from_plugins", 2);
 
-pref("dom.event.contextmenu.enabled",       true);
+pref("dom.event.contextmenu.enabled",       false);
 
 pref("javascript.enabled",                  true);
 pref("javascript.allow.mailnews",           false);
@@ -724,32 +725,32 @@
 pref("ime.password.onFocus.dontCare",       false);
 pref("ime.password.onBlur.dontCare",        false);
 
-pref("intl.accept_languages",               "chrome://navigator/locale/navigator.properties");
+pref("intl.accept_languages",               "chrome://global/locale/intl.properties");
 pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
-pref("intl.collationOption",                "chrome://navigator-platform/locale/navigator.properties");
-pref("intl.menuitems.alwaysappendaccesskeys","chrome://navigator/locale/navigator.properties");
-pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.static",     "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more1",      "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more2",      "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more3",      "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more4",      "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.more5",      "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.browser.unicode",    "chrome://navigator/locale/navigator.properties");
-pref("intl.charsetmenu.mailedit",           "chrome://navigator/locale/navigator.properties");
+pref("intl.collationOption",                "chrome://global-platform/locale/intl.properties");
+pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
+pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.static",     "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more1",      "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more2",      "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more3",      "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more4",      "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.more5",      "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.browser.unicode",    "chrome://global/locale/intl.properties");
+pref("intl.charsetmenu.mailedit",           "chrome://global/locale/intl.properties");
 pref("intl.charsetmenu.browser.cache",      "");
 pref("intl.charsetmenu.mailview.cache",     "");
 pref("intl.charsetmenu.composer.cache",     "");
 pref("intl.charsetmenu.browser.cache.size", 5);
-pref("intl.charset.detector",               "chrome://navigator/locale/navigator.properties");
-pref("intl.charset.default",                "chrome://navigator-platform/locale/navigator.properties");
-pref("intl.content.langcode",               "chrome://communicator-region/locale/region.properties");
+pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
+pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
+pref("intl.content.langcode",               "chrome://browser-region/locale/region.properties");
 pref("intl.locale.matchOS",                 false);
 // fallback charset list for Unicode conversion (converting from Unicode)
 // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
 // for ISO-8859-1
 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
-pref("font.language.group",                 "chrome://navigator/locale/navigator.properties");
+pref("font.language.group",                 "chrome://global/locale/intl.properties");
 
 pref("images.dither", "auto");
 pref("security.directory",              "");
@@ -1157,7 +1158,7 @@
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 13);
 
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
 pref("font.size.variable.el", 16);
 pref("font.size.fixed.el", 13);
 
@@ -1173,11 +1174,11 @@
 pref("font.size.variable.ko", 16);
 pref("font.size.fixed.ko", 16);
 
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
 pref("font.size.variable.th", 16);
 pref("font.size.fixed.th", 13);
 
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
 pref("font.size.variable.tr", 16);
 pref("font.size.fixed.tr", 13);
 
@@ -1416,7 +1417,7 @@
 pref("font.size.variable.ar", 15);
 pref("font.size.fixed.ar", 13);
 
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
 pref("font.size.variable.el", 16);
 pref("font.size.fixed.el", 13);
 
@@ -1432,11 +1433,11 @@
 pref("font.size.variable.ko", 16);
 pref("font.size.fixed.ko", 16);
 
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
 pref("font.size.variable.th", 16);
 pref("font.size.fixed.th", 13);
 
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
 pref("font.size.variable.tr", 16);
 pref("font.size.fixed.tr", 13);
 
@@ -1590,7 +1591,7 @@
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 13);
 
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
 pref("font.size.variable.el", 16);
 pref("font.size.fixed.el", 13);
 
@@ -1606,11 +1607,11 @@
 pref("font.size.variable.ko", 16);
 pref("font.size.fixed.ko", 16);
 
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
 pref("font.size.variable.th", 16);
 pref("font.size.fixed.th", 13);
 
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
 pref("font.size.variable.tr", 16);
 pref("font.size.fixed.tr", 13);
 
@@ -1701,7 +1702,7 @@
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 13);
 
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
 pref("font.size.variable.el", 16);
 pref("font.size.fixed.el", 13);
 
@@ -1717,11 +1718,11 @@
 pref("font.size.variable.ko", 16);
 pref("font.size.fixed.ko", 16);
 
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
 pref("font.size.variable.th", 16);
 pref("font.size.fixed.th", 13);
 
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
 pref("font.size.variable.tr", 16);
 pref("font.size.fixed.tr", 13);
 
@@ -1824,7 +1825,7 @@
 pref("applications.tn3270", "xterm -e tn3270 %h");
 pref("applications.rlogin", "xterm -e rlogin %h");
 pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u");
-pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
+pref("print.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
 pref("print.printer_list", ""); // list of printers, separated by spaces
 pref("print.print_reversed", false);
 pref("print.print_color", true);
@@ -1974,7 +1975,7 @@
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 12);
 
-pref("font.default.el", "serif");
+pref("font.default.el", "sans-serif");
 pref("font.size.variable.el", 16);
 pref("font.size.fixed.el", 12);
 
@@ -1990,11 +1991,11 @@
 pref("font.size.variable.ko", 16);
 pref("font.size.fixed.ko", 16);
 
-pref("font.default.th", "serif");
+pref("font.default.th", "sans-serif");
 pref("font.size.variable.th", 16);
 pref("font.size.fixed.th", 12);
 
-pref("font.default.tr", "serif");
+pref("font.default.tr", "sans-serif");
 pref("font.size.variable.tr", 16);
 pref("font.size.fixed.tr", 12);
 
@@ -2161,7 +2162,7 @@
 // pref("print.postscript.enabled",      true);
 pref("print.postscript.paper_size",    "letter");
 pref("print.postscript.orientation",   "portrait");
-pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
+pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+-P\"$MOZ_PRINTER_NAME\"}");
 
 /* PostScript print module font config
  * this list is used by the postscript font
--- firefox-1.5.dfsg.orig/modules/libpref/src/nsPrefService.cpp
+++ firefox-1.5.dfsg/modules/libpref/src/nsPrefService.cpp
@@ -755,6 +755,21 @@
     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
 
--- firefox-1.5.dfsg.orig/toolkit/components/passwordmgr/base/nsPasswordManager.cpp
+++ firefox-1.5.dfsg/toolkit/components/passwordmgr/base/nsPasswordManager.cpp
@@ -835,8 +835,10 @@
     for (SignonDataEntry* e = hashEnt->head; e; e = e->next) {
       
       nsCOMPtr<nsISupports> foundNode;
-      form->ResolveName(e->userField, getter_AddRefs(foundNode));
-      temp = do_QueryInterface(foundNode);
+      if (!(e->userField).IsEmpty()) {
+        form->ResolveName(e->userField, getter_AddRefs(foundNode));
+        temp = do_QueryInterface(foundNode);
+      }
 
       nsAutoString oldUserValue;
 
@@ -847,16 +849,15 @@
 
         temp->GetValue(oldUserValue);
         userField = temp;
-      } else {
-        continue;
       }
 
       if (!(e->passField).IsEmpty()) {
         form->ResolveName(e->passField, getter_AddRefs(foundNode));
         temp = do_QueryInterface(foundNode);
       }
-      else {
-        // No password field name was supplied, try to locate one in the form.
+      else if (userField) {
+        // No password field name was supplied, try to locate one in the form,
+        // but only if we have a username field.
         nsCOMPtr<nsIFormControl> fc(do_QueryInterface(foundNode));
         PRInt32 index = -1;
         form->IndexOfControl(fc, &index);
@@ -925,7 +926,7 @@
         }
       }
 
-      if (firstMatch && !attachedToInput) {
+      if (firstMatch && userField && !attachedToInput) {
         // We've found more than one possible signon for this form.
 
         // Listen for blur and autocomplete events on the username field so
@@ -942,16 +943,18 @@
     if (firstMatch && !attachedToInput) {
       nsAutoString buffer;
 
-      if (NS_FAILED(DecryptData(firstMatch->userValue, buffer)))
-        goto done;
+      if (userField) {
+        if (NS_FAILED(DecryptData(firstMatch->userValue, buffer)))
+          goto done;
 
-      userField->SetValue(buffer);
+        userField->SetValue(buffer);
+        AttachToInput(userField);
+      }
 
       if (NS_FAILED(DecryptData(firstMatch->passValue, buffer)))
         goto done;
 
       passField->SetValue(buffer);
-      AttachToInput(userField);
     }
   }
 
--- firefox-1.5.dfsg.orig/toolkit/components/printing/content/printdialog.js
+++ firefox-1.5.dfsg/toolkit/components/printing/content/printdialog.js
@@ -160,7 +160,12 @@
             if (strDefaultPrinterName == "")
                strDefaultPrinterName = printerNameStr;
 
-            list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
+	    // We strip CUPS/ 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("^CUPS/"), "");
+
+            list.appendItem(printerLabelStr, printerNameStr, getPrinterDescription(printerNameStr));
           }
           if (strDefaultPrinterName != "") {
             this.listElement.removeAttribute("disabled");
--- firefox-1.5.dfsg.orig/toolkit/components/remote/nsGTKRemoteService.cpp
+++ firefox-1.5.dfsg/toolkit/components/remote/nsGTKRemoteService.cpp
@@ -81,6 +81,14 @@
 #define MOZILLA_PROGRAM_PROP   "_MOZILLA_PROGRAM"
 #define MOZILLA_COMMANDLINE_PROP "_MOZILLA_COMMANDLINE"
 
+#ifdef IS_BIG_ENDIAN
+#define TO_LITTLE_ENDIAN32(x) \
+    ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
+    (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#else
+#define TO_LITTLE_ENDIAN32(x) (x)
+#endif
+
 #ifdef MOZ_XUL_APP
 const unsigned char kRemoteVersion[] = "5.1";
 #else
@@ -340,7 +348,7 @@
   // [argc][offsetargv0][offsetargv1...]<workingdir>\0<argv[0]>\0argv[1]...\0
   // (offset is from the beginning of the buffer)
 
-  PRInt32 argc = *NS_REINTERPRET_CAST(PRInt32*, aBuffer);
+  PRInt32 argc = TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, aBuffer));
   char *wd   = aBuffer + ((argc + 1) * sizeof(PRInt32));
 
 #ifdef DEBUG_bsmedberg
@@ -362,7 +370,7 @@
   PRInt32  *offset = NS_REINTERPRET_CAST(PRInt32*, aBuffer) + 1;
 
   for (int i = 0; i < argc; ++i) {
-    argv[i] = aBuffer + offset[i];
+    argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]);
 
 #ifdef DEBUG_bsmedberg
     printf("  argv[%i]:\t%s\n", i, argv[i]);
@@ -474,7 +482,7 @@
       return FALSE;
 
     // Failed to get the data off the window or it was the wrong type?
-    if (!data || !*data)
+    if (!data || !TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, data)))
       return FALSE;
 
     // cool, we got the property data.
@@ -519,7 +527,7 @@
       return FALSE;
 
     // Failed to get the data off the window or it was the wrong type?
-    if (!data || !*data)
+    if (!data || !TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, data)))
       return FALSE;
 
     // cool, we got the property data.
--- firefox-1.5.dfsg.orig/toolkit/mozapps/downloads/content/downloads.js
+++ firefox-1.5.dfsg/toolkit/mozapps/downloads/content/downloads.js
@@ -800,6 +800,9 @@
 #ifdef XP_BEOS
       return aFolderType == "Desktop" ? "Desk" : "Home";
 #endif
+#ifdef XP_UNIX
+      return aFolderType == "Desktop" ? "Desk" : "Home";
+#endif
       return "Home";
     }
     
--- firefox-1.5.dfsg.orig/extensions/transformiix/source/base/Double.cpp
+++ firefox-1.5.dfsg/extensions/transformiix/source/base/Double.cpp
@@ -75,14 +75,7 @@
 #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;
@@ -90,8 +83,14 @@
         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; }))
 
@@ -117,20 +116,20 @@
 
 //-- 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
--- firefox-1.5.dfsg.orig/config/autoconf.mk.in
+++ firefox-1.5.dfsg/config/autoconf.mk.in
@@ -54,13 +54,13 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir	= @includedir@/mozilla-firefox
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir		= @datadir@/idl/mozilla-firefox
 
-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+mozappdir	= $(libdir)/firefox
 mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
 mrelibdir	= $(mredir)/lib
 
@@ -459,6 +459,7 @@
 MOZ_ENABLE_PANGO        = @MOZ_ENABLE_PANGO@
 MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
 MOZ_PANGO_LIBS          = @MOZ_PANGO_LIBS@
+MOZ_PANGOCAIRO          = @MOZ_PANGOCAIRO@
 
 MOZ_EXTRA_X11CONVERTERS	= @MOZ_EXTRA_X11CONVERTERS@
 
--- firefox-1.5.dfsg.orig/config/rules.mk
+++ firefox-1.5.dfsg/config/rules.mk
@@ -458,7 +458,7 @@
 
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(filter mips mipsel,$(OS_TEST)))
-ifeq ($(MODULE),layout)
+ifneq (,$(filter layout content xul xuldoc xultmpl svg_doc view dom jsurl,$(MODULE)))
 OS_CFLAGS += -Wa,-xgot
 OS_CXXFLAGS += -Wa,-xgot
 endif
--- firefox-1.5.dfsg.orig/js/src/fdlibm/fdlibm.h
+++ firefox-1.5.dfsg/js/src/fdlibm/fdlibm.h
@@ -61,7 +61,7 @@
 #define __LITTLE_ENDIAN
 #endif
 
-#if defined(linux) && (defined(__i386__) || defined(__x86_64__) || defined(__ia64))
+#if defined(linux) && (defined(__i386__) || defined(__x86_64__) || defined(__ia64) || defined(__MIPSEL))
 #define __LITTLE_ENDIAN
 #endif
 
--- firefox-1.5.dfsg.orig/uriloader/exthandler/unix/nsGNOMERegistry.cpp
+++ firefox-1.5.dfsg/uriloader/exthandler/unix/nsGNOMERegistry.cpp
@@ -42,7 +42,7 @@
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsILocalFile.h"
-#include "nsMIMEInfoImpl.h"
+#include "nsMIMEInfoUnix.h"
 #include "nsAutoPtr.h"
 
 #include <glib.h>
@@ -56,12 +56,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 +264,7 @@
 }
 
 
-/* static */ already_AddRefed<nsMIMEInfoBase>
+/* static */ already_AddRefed<nsMIMEInfoUnix>
 nsGNOMERegistry::GetFromExtension(const char *aFileExt)
 {
   if (!gconfLib)
@@ -286,7 +286,7 @@
   return GetFromType(mimeType);
 }
 
-/* static */ already_AddRefed<nsMIMEInfoBase>
+/* static */ already_AddRefed<nsMIMEInfoUnix>
 nsGNOMERegistry::GetFromType(const char *aMIMEType)
 {
   if (!gconfLib)
@@ -296,8 +296,9 @@
   if (!handlerApp)
     return nsnull;
 
-  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
+  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
   NS_ENSURE_TRUE(mimeInfo, nsnull);
+  mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp);
 
   // Get the list of extensions and append then to the mimeInfo.
   GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType);
@@ -320,11 +321,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 +353,7 @@
 
   _gnome_vfs_mime_application_free(handlerApp);
 
-  nsMIMEInfoBase* retval;
+  nsMIMEInfoUnix* retval;
   NS_ADDREF((retval = mimeInfo));
   return retval;
 }
--- firefox-1.5.dfsg.orig/uriloader/exthandler/unix/nsGNOMERegistry.h
+++ firefox-1.5.dfsg/uriloader/exthandler/unix/nsGNOMERegistry.h
@@ -35,10 +35,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifndef nsGNOMERegistry_h__
+#define nsGNOMERegistry_h__
+
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 
-class nsMIMEInfoBase;
+class nsMIMEInfoUnix;
 
 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__
--- firefox-1.5.dfsg.orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+++ firefox-1.5.dfsg/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -44,6 +44,7 @@
 #include "nsOSHelperAppService.h"
 #ifdef MOZ_WIDGET_GTK2
 #include "nsGNOMERegistry.h"
+#include "nsMIMEInfoUnix.h"
 #endif
 #include "nsISupports.h"
 #include "nsString.h"
@@ -1486,6 +1487,17 @@
   
   LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get()));
 
+#ifdef MOZ_WIDGET_GTK2
+  // Look in GNOME registry first since it is the preferred method in GNOME,
+  // should trump the mailcap entry
+  LOG(("Looking in GNOME registry\n"));
+  nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
+  if (gnomeInfo) {
+    LOG(("Got MIMEInfo from GNOME registry\n"));
+    return gnomeInfo;
+  }
+#endif
+
   // extract the major and minor types
   NS_ConvertASCIItoUTF16 mimeType(aMIMEType);
   nsAString::const_iterator start_iter, end_iter,
--- firefox-1.5.dfsg.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ firefox-1.5.dfsg/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -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 "nsMIMEInfoUnix.h"
+#include "prlink.h"
+#include "prmem.h"
+#include <glib.h>
+#include <glib-object.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);
+}
--- firefox-1.5.dfsg.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.h
+++ firefox-1.5.dfsg/uriloader/exthandler/unix/nsMIMEInfoUnix.h
@@ -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__
--- firefox-1.5.dfsg.orig/uriloader/exthandler/Makefile.in
+++ firefox-1.5.dfsg/uriloader/exthandler/Makefile.in
@@ -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)
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
@@ -24,6 +24,7 @@
  * 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"),
@@ -52,10 +53,8 @@
     // 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;
 
@@ -68,6 +67,9 @@
 		result++;
 	    result++;
 	    break;
+
+        default:
+            break;
         }
     }
     return (result + 1) & ~(PRUint32)1;
@@ -88,8 +90,6 @@
             continue;
         }
 
-        *((void**)d) = s->val.p;
-
         switch(s->type)
         {
         case nsXPTType::T_I64    :
@@ -104,6 +104,9 @@
             if ((PRWord)d & 4) d++;
             *((double*)   d) = s->val.d;      d++;
             break;
+        default:
+            *((void**)d) = s->val.p;
+            break;
         }
     }
 }
@@ -118,5 +121,4 @@
                    PRUint32 paramCount, nsXPTCVariant* params)
 {
     return _XPTC_InvokeByIndex(that, methodIndex, paramCount, params);
-}    
-
+}
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
@@ -45,7 +45,8 @@
 #endif
 
 /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol.  */
-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
+static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch")
+__attribute__((used));
 
 static nsresult
 PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp
@@ -45,6 +45,7 @@
 invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
 __asm__("invoke_copy_to_stack") __attribute__((used));
 
+
 static void
 invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
 {
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
+++ firefox-1.5.dfsg/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)
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp
@@ -129,9 +129,9 @@
     "movl  %1, %/sp@-\n\t"          /* this */ \
     "jbsr  PrepareAndDispatch\n\t" \
     "addw  #12, %/sp" \
-    : "=d" (result)     /* %0 */ \
+    : "=&d" (result)     /* %0 */ \
     : "a" (this), "a" (frame) \
-    : "a0", "a1", "d0", "d1", "memory" ); \
+    : "memory" ); \
     return result; \
 }
 
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -184,6 +184,20 @@
 endif
 endif
 
+#
+# Linux/HPPA/GCC
+#
+ifeq ($(OS_ARCH),Linux)
+ifneq (,$(filter parisc parisc64,$(OS_TEST)))
+ifeq ($(CC),gcc)
+CPPSRCS		:= xptcinvoke_pa32.cpp xptcstubs_pa32.cpp
+ASFILES		:= xptcstubs_asm_parisc_linux.s xptcinvoke_asm_parisc_linux.s
+CXXFLAGS	+= -O0
+endif
+endif
+endif
+
+
 ######################################################################
 # M68k
 ######################################################################
@@ -227,11 +241,7 @@
 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
 
@@ -378,10 +388,8 @@
 
 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
 
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
@@ -212,7 +212,7 @@
     "add	sp, sp, r4	\n\t"	/* restore stack pointer		*/
     "mov	%0, r0		\n\t"	/* the result...			*/
     : "=r" (result)
-    : "r" (&my_params)
+    : "r" (&my_params), "m" (my_params)
     : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp"
     );
     
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
@@ -21,6 +21,7 @@
  * 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. */
@@ -28,139 +29,123 @@
 #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)
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s
@@ -0,0 +1,128 @@
+
+	.LEVEL 1.1
+	.text
+	.align 4
+
+framesz:
+	.equ 128
+
+; XPTC_InvokeByIndex(nsISuppots* that, PRUint32 methodIndex,
+;   PRUint32 paramCount, nsXPTCVariant* params);
+
+.globl XPTC_InvokeByIndex
+	.type XPTC_InvokeByIndex, @function
+
+
+XPTC_InvokeByIndex:
+  	.PROC
+	.CALLINFO FRAME=72, CALLER,SAVE_RP, SAVE_SP, ENTRY_GR=3
+	.ENTRY
+
+ ; frame marker takes 48 bytes,
+ ; register spill area takes 8 bytes,
+ ; local stack area takes 72 bytes result in 128 bytes total
+
+        STW          %rp,-20(%sp)
+        STW,MA       %r3,128(%sp)
+
+        LDO     -framesz(%r30),%r28
+        STW     %r28,-4(%r30)       ; save previous sp
+        STW     %r19,-32(%r30)
+
+        STW     %r26,-36-framesz(%r30)  ; save argument registers in
+        STW     %r25,-40-framesz(%r30)  ; in PREVIOUS frame
+        STW     %r24,-44-framesz(%r30)  ;
+        STW     %r23,-48-framesz(%r30)  ;
+
+;	B,L     .+8,%r2
+;	ADDIL   L'invoke_count_bytes-$PIC_pcrel$1+4,%r2,%r1
+;    ;    LDO     R'invoke_count_bytes-$PIC_pcrel$2+8(%r1),%r1
+;$PIC_pcrel$1
+;        LDSID   (%r1),%r31
+;$PIC_pcrel$2
+;        MTSP    %r31,%sr0
+
+	.CALL   ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26;out=28
+        BL    invoke_count_bytes,%r31
+        COPY    %r31,%r2
+
+        CMPIB,>=        0,%r28, .+76
+        COPY    %r30,%r3            ; copy stack ptr to saved stack ptr
+        ADD     %r30,%r28,%r30      ; extend stack frame
+        LDW     -4(%r3),%r28        ; move frame
+        STW     %r28,-4(%r30)
+        LDW     -8(%r3),%r28
+        STW     %r28,-8(%r30)
+        LDW     -12(%r3),%r28
+        STW     %r28,-12(%r30)
+        LDW     -16(%r3),%r28
+        STW     %r28,-16(%r30)
+        LDW     -20(%r3),%r28
+        STW     %r28,-20(%r30)
+        LDW     -24(%r3),%r28
+        STW     %r28,-24(%r30)
+        LDW     -28(%r3),%r28
+        STW     %r28,-28(%r30)
+        LDW     -32(%r3),%r28
+        STW     %r28,-32(%r30)
+
+        LDO     -40(%r30),%r26         ; load copy address
+        LDW     -44-framesz(%r3),%r25  ; load rest of 2 arguments
+        LDW     -48-framesz(%r3),%r24  ;
+
+        LDW     -32(%r30),%r19 ; shared lib call destroys r19; reload
+;        B,L     .+8,%r2
+;        ADDIL   L'invoke_copy_to_stack-$PIC_pcrel$3+4,%r2,%r1
+;        LDO     R'invoke_copy_to_stack-$PIC_pcrel$4+8(%r1),%r1
+;$PIC_pcrel$3
+;        LDSID   (%r1),%r31
+;$PIC_pcrel$4
+;        MTSP    %r31,%sr0
+        .CALL   ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26
+        BL    invoke_copy_to_stack,%r31
+        COPY    %r31,%r2
+
+        LDO     -48(%r30),%r20
+        EXTRW,U,= %r28,31,1,%r22
+        FLDD    0(%r20),%fr7  ; load double arg 1
+        EXTRW,U,= %r28,30,1,%r22
+        FLDW    8(%r20),%fr5L ; load float arg 1
+        EXTRW,U,= %r28,29,1,%r22
+        FLDW    4(%r20),%fr6L ; load float arg 2
+        EXTRW,U,= %r28,28,1,%r22
+        FLDW    0(%r20),%fr7L ; load float arg 3
+
+        LDW     -36-framesz(%r3),%r26  ; load ptr to 'that'
+        LDW     -40(%r30),%r25  ; load the rest of dispatch argument registers
+        LDW     -44(%r30),%r24
+        LDW     -48(%r30),%r23
+
+        LDW     -36-framesz(%r3),%r20  ; load vtable addr
+        LDW     -40-framesz(%r3),%r28  ; load index
+        LDW     0(%r20),%r20    ; follow vtable
+;        LDO     0(%r20),%r20   ; offset vtable by 16 bytes (g++: 8, aCC: 16)
+        SH2ADDL %r28,%r20,%r28  ; add 4*index to vtable entry
+        LDW     0(%r28),%r22    ; load vtable entry
+
+;        B,L     .+8,%r2
+;        ADDIL   L'$$dyncall_external-$PIC_pcrel$5+4,%r2,%r1
+;        LDO     R'$$dyncall_external-$PIC_pcrel$6+8(%r1),%r1
+;$PIC_pcrel$5
+;        LDSID   (%r1),%r31
+;$PIC_pcrel$6
+;        MTSP    %r31,%sr0
+        .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=22-26;out=28;
+        BL    $$dyncall,%r31
+        COPY    %r31,%r2
+
+        LDW     -32(%r30),%r19
+        COPY    %r3,%r30              ; restore saved stack ptr
+
+        LDW          -148(%sp),%rp
+        LDWM       -128(%sp),%r3
+	BV,N             (%rp)
+	NOP
+   .EXIT
+  .PROCEND  ;in=23,24,25,26;
+  .SIZE XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
+
--- firefox-1.5.dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s
+++ firefox-1.5.dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s
@@ -0,0 +1,73 @@
+        .LEVEL  1.1
+	.TEXT
+	.ALIGN 4
+
+curframesz:
+	.EQU 128
+
+
+; SharedStub has stack size of 128 bytes
+
+lastframesz:
+	.EQU 64
+
+; the StubN C++ function has a small stack size of 64 bytes
+
+
+.globl SharedStub
+	.type SharedStub, @function
+
+SharedStub:
+        .PROC
+        .CALLINFO CALLER,FRAME=80,SAVE_RP
+
+  .ENTRY
+        STW     %rp,-20(%sp)
+        LDO     128(%sp),%sp
+
+        STW     %r19,-32(%r30)
+        STW     %r26,-36-curframesz(%r30) ; save arg0 in previous frame
+
+        LDO     -80(%r30),%r28
+        FSTD,MA %fr5,8(%r28)   ; save darg0
+        FSTD,MA %fr7,8(%r28)   ; save darg1
+        FSTW,MA %fr4L,4(%r28)  ; save farg0
+        FSTW,MA %fr5L,4(%r28)  ; save farg1
+        FSTW,MA %fr6L,4(%r28)  ; save farg2
+        FSTW,MA %fr7L,4(%r28)  ; save farg3
+
+        ; Former value of register 26 is already properly saved by StubN,
+        ; but register 25-23 are not because of the arguments mismatch
+        STW     %r25,-40-curframesz-lastframesz(%r30) ; save r25
+        STW     %r24,-44-curframesz-lastframesz(%r30) ; save r24
+        STW     %r23,-48-curframesz-lastframesz(%r30) ; save r23
+        COPY    %r26,%r25                             ; method index is arg1
+        LDW     -36-curframesz-lastframesz(%r30),%r26 ; self is arg0
+        LDO     -40-curframesz-lastframesz(%r30),%r24 ; normal args is arg2
+        LDO     -80(%r30),%r23                        ; floating args is arg3
+
+;       BL      .+8,%r2
+;       ADDIL   L'PrepareAndDispatch-$PIC_pcrel$0+4,%r2
+;        LDO     R'PrepareAndDispatch-$PIC_pcrel$1+8(%r1),%r1
+;$PIC_pcrel$0
+;        LDSID   (%r1),%r31
+;$PIC_pcrel$1
+;        MTSP    %r31,%sr0
+        .CALL   ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=23-26;out=28;
+        BL     PrepareAndDispatch, %r31
+        COPY    %r31,%r2
+
+        LDW     -32(%r30),%r19
+
+        LDW     -148(%sp),%rp
+        LDO     -128(%sp),%sp
+
+
+	BV,N     (%rp)
+	NOP
+	NOP
+
+	.EXIT
+        .PROCEND        ;in=26;out=28;
+
+	.SIZE SharedStub, .-SharedStub
--- firefox-1.5.dfsg.orig/xpcom/typelib/xpidl/xpidl.c
+++ firefox-1.5.dfsg/xpcom/typelib/xpidl/xpidl.c
@@ -260,7 +260,7 @@
         xpidl_usage(argc, argv);
         return 1;
     }
-    if (argc != i + 1) {
+    if (argc > i + 1) {
         fprintf(stderr, "ERROR: extra arguments after input file\n");
     }
 
@@ -268,7 +268,7 @@
      * 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;
--- firefox-1.5.dfsg.orig/gfx/src/gtk/fontEncoding.properties
+++ firefox-1.5.dfsg/gfx/src/gtk/fontEncoding.properties
@@ -70,8 +70,8 @@
 # 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)
 
--- firefox-1.5.dfsg.orig/gfx/src/gtk/mozilla-decoder.cpp
+++ firefox-1.5.dfsg/gfx/src/gtk/mozilla-decoder.cpp
@@ -40,7 +40,11 @@
 #define PANGO_ENABLE_ENGINE
 
 #include "mozilla-decoder.h"
+#ifdef MOZ_PANGOCAIRO
+#include <pango/pangocairo.h>
+#else
 #include <pango/pangoxft.h>
+#endif
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangofc-font.h>
 #include <gdk/gdkx.h>
@@ -208,7 +212,11 @@
         }
     }
 
+#ifdef MOZ_PANGOCAIRO
+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
+#else
     pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+#endif
                                             mozilla_find_decoder,
                                             NULL,
                                             NULL);
--- firefox-1.5.dfsg.orig/gfx/src/gtk/nsFontMetricsXft.cpp
+++ firefox-1.5.dfsg/gfx/src/gtk/nsFontMetricsXft.cpp
@@ -2188,19 +2188,27 @@
 nsAutoDrawSpecBuffer::Flush()
 {
     if (mSpecPos) {
-        // Some Xft libraries will crash if none of the glyphs have any
-        // area.  So before we draw, we scan through the glyphs.  If we
-        // find any that have area, we can draw.
-        for (PRUint32 i = 0; i < mSpecPos; i++) {
-            XftGlyphFontSpec *sp = &mSpecBuffer[i];
-            XGlyphInfo info;
-            XftGlyphExtents(GDK_DISPLAY(), sp->font, &sp->glyph, 1, &info);
-            if (info.width && info.height) {
-                // If we get here it means we found a drawable glyph.  We will
-                // Draw all the remaining glyphs and then break out of the loop
-                XftDrawGlyphFontSpec(mDraw, mColor, mSpecBuffer+i, mSpecPos-i);
-                break;
+        // There are two Xft problems to work around here:
+        // 1.  Some Xft libraries reportedly crash if none of the
+        //     glyphs have any area.
+        // 2.  Because of an apparent X server bug (see bug 252033),
+        //     a glyph with no area may cause all following glyphs to be
+        //     dropped under some circumstances.
+        // For this reason, we manually ship out blocks of glyphs with
+        // area and skip blocks of glyphs with no area.
+        PRUint32 start = 0;
+        while (start < mSpecPos) {
+            PRUint32 i;
+            for (i = start; i < mSpecPos; i++) {
+                XftGlyphFontSpec *sp = &mSpecBuffer[i];
+                XGlyphInfo info;
+                XftGlyphExtents(GDK_DISPLAY(), sp->font, &sp->glyph, 1, &info);
+                if (!info.width || !info.height)
+                    break;
             }
+            if (i > start)
+                XftDrawGlyphFontSpec(mDraw, mColor, mSpecBuffer+start, i-start);
+            start = i + 1;
         }
         mSpecPos = 0;
     }
--- firefox-1.5.dfsg.orig/layout/html/tests/block/base/jlbtest1.html
+++ firefox-1.5.dfsg/layout/html/tests/block/base/jlbtest1.html
@@ -1,34 +1,34 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=Shift_JIS">
-   <META NAME="Author" CONTENT="Frank Tang">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.03 [en] (WinNT; I) [Netscape]">
-   <TITLE>Japanese Line Break Test 1</TITLE>
-</HEAD>
-<BODY>
-Japanese Line Breaking Test:
-<BR>&nbsp;
-
-<P>ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>--ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>---ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>----ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-----ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>--------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>---------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>----------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-----------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>--------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>---------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>----------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-
-<P>The valide break point should be : [Need to spec out]
-
-<P>ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B&nbsp;
-</BODY>
-</HTML>
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=Shift_JIS">
+   <META NAME="Author" CONTENT="Frank Tang">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.03 [en] (WinNT; I) [Netscape]">
+   <TITLE>Japanese Line Break Test 1</TITLE>
+</HEAD>
+<BODY>
+Japanese Line Breaking Test:
+<BR>&nbsp;
+
+<P>ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>-ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>--ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>---ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>----ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>-----ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>-------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>--------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>---------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>----------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>-----------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>-------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>--------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>---------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+<BR>----------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
+
+<P>The valide break point should be : [Need to spec out]
+
+<P>ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B&nbsp;
+</BODY>
+</HTML>
--- firefox-1.5.dfsg.orig/layout/html/tests/formctls/bugs/bug8665.html
+++ firefox-1.5.dfsg/layout/html/tests/formctls/bugs/bug8665.html
@@ -1 +1,10 @@
-<HTML>
<p>First instance - SkyMiles¨ - does not use character entity<br>
Second instance - SkyMiles&reg; - uses character entity<br>
<FORM METHOD="POST" ACTION="/cgi-bin/quiknav.pl" TARGET="_top" ONSUBMIT="foo">
<SELECT NAME="section" SIZE="1">
<OPTION VALUE="/skymile/index.html">SkyMiles¨
<OPTION VALUE="/skymile/index.html">SkyMiles&reg;
</SELECT>
</FORM>
</HTML>
\ No newline at end of file
+<HTML>
+<p>First instance - SkyMiles¨ - does not use character entity<br>
+Second instance - SkyMiles&reg; - uses character entity<br>
+<FORM METHOD="POST" ACTION="/cgi-bin/quiknav.pl" TARGET="_top" ONSUBMIT="foo">
+<SELECT NAME="section" SIZE="1">
+<OPTION VALUE="/skymile/index.html">SkyMiles¨
+<OPTION VALUE="/skymile/index.html">SkyMiles&reg;
+</SELECT>
+</FORM>
+</HTML>
--- firefox-1.5.dfsg.orig/layout/style/html.css
+++ firefox-1.5.dfsg/layout/style/html.css
@@ -461,6 +461,13 @@
 /* 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
--- firefox-1.5.dfsg.orig/widget/src/gtk2/nsWindow.cpp
+++ firefox-1.5.dfsg/widget/src/gtk2/nsWindow.cpp
@@ -148,9 +148,9 @@
                                            GdkEventVisibility *event);
 static gboolean window_state_event_cb     (GtkWidget *widget,
                                            GdkEventWindowState *event);
-static void     style_set_cb              (GtkWidget *widget,
-                                           GtkStyle *previous_style,
-                                           gpointer data);
+static void     theme_changed_cb          (GtkSettings *settings,
+                                           GParamSpec *pspec,
+                                           nsWindow *data);
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -372,6 +372,10 @@
     mIsDestroyed = PR_TRUE;
     mCreated = PR_FALSE;
 
+    g_signal_handlers_disconnect_by_func(gtk_settings_get_default(),
+                                         (gpointer)G_CALLBACK(theme_changed_cb),
+                                         this);
+
     // ungrab if required
     nsCOMPtr<nsIWidget> rollupWidget = do_QueryReferent(gRollupWindow);
     if (NS_STATIC_CAST(nsIWidget *, this) == rollupWidget.get()) {
@@ -1437,6 +1441,7 @@
 void
 nsWindow::OnLeaveNotifyEvent(GtkWidget *aWidget, GdkEventCrossing *aEvent)
 {
+    // XXXldb Is this the right test for embedding cases?
     if (aEvent->subwindow != NULL)
         return;
 
@@ -1537,6 +1542,9 @@
         return;
 
     switch (aEvent->button) {
+    case 1:
+        eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
+        break;
     case 2:
         eventType = NS_MOUSE_MIDDLE_BUTTON_DOWN;
         break;
@@ -1544,7 +1552,6 @@
         eventType = NS_MOUSE_RIGHT_BUTTON_DOWN;
         break;
     default:
-        eventType = NS_MOUSE_LEFT_BUTTON_DOWN;
         break;
     }
 
@@ -2434,8 +2441,16 @@
                          G_CALLBACK(delete_event_cb), NULL);
         g_signal_connect(G_OBJECT(mShell), "window_state_event",
                          G_CALLBACK(window_state_event_cb), NULL);
-        g_signal_connect(G_OBJECT(mShell), "style_set",
-                         G_CALLBACK(style_set_cb), NULL);
+
+        g_signal_connect_after(gtk_settings_get_default(),
+                               "notify::gtk-theme-name",
+                               G_CALLBACK(theme_changed_cb), this);
+        g_signal_connect_after(gtk_settings_get_default(),
+                               "notify::gtk-key-theme-name",
+                               G_CALLBACK(theme_changed_cb), this);
+        g_signal_connect_after(gtk_settings_get_default(),
+                               "notify::gtk-font-name",
+                               G_CALLBACK(theme_changed_cb), this);
     }
 
     if (mContainer) {
@@ -3916,11 +3931,9 @@
 
 /* static */
 void
-style_set_cb (GtkWidget *widget, GtkStyle *previous_style, gpointer data)
+theme_changed_cb (GtkSettings *settings, GParamSpec *pspec, nsWindow *data)
 {
-    nsWindow *window = get_window_for_gtk_widget(widget);
-    if (window)
-        window->ThemeChanged();
+    data->ThemeChanged();
 }
 
 //////////////////////////////////////////////////////////////////////
--- firefox-1.5.dfsg.orig/widget/src/xremoteclient/XRemoteClient.cpp
+++ firefox-1.5.dfsg/widget/src/xremoteclient/XRemoteClient.cpp
@@ -67,6 +67,14 @@
 #define MOZILLA_PROFILE_PROP   "_MOZILLA_PROFILE"
 #define MOZILLA_PROGRAM_PROP   "_MOZILLA_PROGRAM"
 
+#ifdef IS_BIG_ENDIAN
+#define TO_LITTLE_ENDIAN32(x) \
+    ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
+    (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#else
+#define TO_LITTLE_ENDIAN32(x) (x)
+#endif
+    
 #ifndef MAX_PATH
 #define MAX_PATH 1024
 #endif
@@ -691,19 +699,19 @@
   if (!buffer)
     return NS_ERROR_OUT_OF_MEMORY;
 
-  buffer[0] = argc;
+  buffer[0] = TO_LITTLE_ENDIAN32(argc);
 
   char *bufend = (char*) (buffer + argc + 1);
 
   bufend = estrcpy(cwdbuf, bufend);
 
   for (int i = 0; i < argc; ++i) {
-    buffer[i + 1] = bufend - ((char*) buffer);
+    buffer[i + 1] = TO_LITTLE_ENDIAN32(bufend - ((char*) buffer));
     bufend = estrcpy(argv[i], bufend);
   }
 
 #ifdef DEBUG_bsmedberg
-  PRInt32   debug_argc   = *buffer;
+  PRInt32   debug_argc   = TO_LITTLE_ENDIAN32(*buffer);
   char *debug_workingdir = (char*) (buffer + argc + 1);
 
   printf("Sending command line:\n"
@@ -715,7 +723,7 @@
   PRInt32  *debug_offset = buffer + 1;
   for (int debug_i = 0; debug_i < debug_argc; ++debug_i)
     printf("  argv[%i]:\t%s\n", debug_i,
-           ((char*) buffer) + debug_offset[debug_i]);
+           ((char*) buffer) + TO_LITTLE_ENDIAN32(debug_offset[debug_i]));
 #endif
 
   XChangeProperty (mDisplay, aWindow, mMozCommandLineAtom, XA_STRING, 8,
--- firefox-1.5.dfsg.orig/xpfe/global/resources/content/printdialog.js
+++ firefox-1.5.dfsg/xpfe/global/resources/content/printdialog.js
@@ -160,7 +160,12 @@
             if (strDefaultPrinterName == "")
                strDefaultPrinterName = printerNameStr;
 
-            list.appendItem(printerNameStr, printerNameStr, getPrinterDescription(printerNameStr));
+	    // We strip CUPS/ 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("^CUPS/"), "");
+
+            list.appendItem(printerLabelStr, printerNameStr, getPrinterDescription(printerNameStr));
           }
           if (strDefaultPrinterName != "") {
             this.listElement.removeAttribute("disabled");
--- firefox-1.5.dfsg.orig/configure
+++ firefox-1.5.dfsg/configure
@@ -1039,7 +1039,7 @@
 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
@@ -1866,63 +1866,12 @@
   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 1880 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-int main() {
-exit (42);
-; return 0; }
-EOF
-if { (eval echo configure:1888: \"$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 1898 "configure"
-#include "confdefs.h"
-$ac_declaration
-int main() {
-exit (42);
-; return 0; }
-EOF
-if { (eval echo configure:1905: \"$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
-
-
     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:1926: checking for $ac_word" >&5
+echo "configure:1875: 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
@@ -1957,7 +1906,7 @@
 # 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:1961: checking for $ac_word" >&5
+echo "configure:1910: 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
@@ -1992,7 +1941,7 @@
 # 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:1996: checking for $ac_word" >&5
+echo "configure:1945: 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
@@ -2033,7 +1982,7 @@
 # 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:2037: checking for $ac_word" >&5
+echo "configure:1986: 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
@@ -2068,7 +2017,7 @@
 # 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:2072: checking for $ac_word" >&5
+echo "configure:2021: 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
@@ -2103,7 +2052,7 @@
 # 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:2107: checking for $ac_word" >&5
+echo "configure:2056: 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
@@ -2141,7 +2090,7 @@
     # 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:2145: checking for $ac_word" >&5
+echo "configure:2094: 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
@@ -2171,7 +2120,7 @@
   # 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:2175: checking for $ac_word" >&5
+echo "configure:2124: 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
@@ -2222,7 +2171,7 @@
       # 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:2226: checking for $ac_word" >&5
+echo "configure:2175: 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
@@ -2254,7 +2203,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2258: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2207: 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.
@@ -2265,12 +2214,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 2269 "configure"
+#line 2218 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2223: \"$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
@@ -2296,12 +2245,12 @@
   { 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:2300: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2249: 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:2305: checking whether we are using GNU C" >&5
+echo "configure:2254: 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
@@ -2310,7 +2259,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2314: \"$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:2263: \"$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
@@ -2329,7 +2278,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2333: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2282: 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
@@ -2365,7 +2314,7 @@
 # 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:2369: checking for $ac_word" >&5
+echo "configure:2318: 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
@@ -2397,7 +2346,7 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2401: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:2350: 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.
@@ -2408,12 +2357,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 2412 "configure"
+#line 2361 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2366: \"$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
@@ -2439,12 +2388,12 @@
   { 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:2443: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2392: 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:2448: checking whether we are using GNU C++" >&5
+echo "configure:2397: 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
@@ -2453,7 +2402,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2457: \"$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:2406: \"$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
@@ -2472,7 +2421,7 @@
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:2476: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:2425: 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
@@ -2503,61 +2452,10 @@
   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 2517 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-$ac_declaration
-int main() {
-exit (42);
-; return 0; }
-EOF
-if { (eval echo configure:2525: \"$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 2535 "configure"
-#include "confdefs.h"
-$ac_declaration
-int main() {
-exit (42);
-; return 0; }
-EOF
-if { (eval echo configure:2542: \"$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:2561: checking for $ac_word" >&5
+echo "configure:2459: 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
@@ -2589,7 +2487,7 @@
 # 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:2593: checking for $ac_word" >&5
+echo "configure:2491: 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
@@ -2630,7 +2528,7 @@
 # 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:2634: checking for $ac_word" >&5
+echo "configure:2532: 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
@@ -2665,7 +2563,7 @@
 # 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:2669: checking for $ac_word" >&5
+echo "configure:2567: 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
@@ -2700,7 +2598,7 @@
 # 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:2704: checking for $ac_word" >&5
+echo "configure:2602: 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
@@ -2735,7 +2633,7 @@
 # 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:2739: checking for $ac_word" >&5
+echo "configure:2637: 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
@@ -2824,7 +2722,7 @@
 # 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:2828: checking for $ac_word" >&5
+echo "configure:2726: 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
@@ -2866,14 +2764,14 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
         cat > conftest.$ac_ext <<EOF
-#line 2870 "configure"
+#line 2768 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
  printf("Hello World\n"); 
 ; return 0; }
 EOF
-if { (eval echo configure:2877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -2891,14 +2789,14 @@
 cross_compiling=$ac_cv_prog_cxx_cross
 
         cat > conftest.$ac_ext <<EOF
-#line 2895 "configure"
+#line 2793 "configure"
 #include "confdefs.h"
 #include <new.h>
 int main() {
  unsigned *test = new unsigned(42); 
 ; return 0; }
 EOF
-if { (eval echo configure:2902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -2954,7 +2852,7 @@
         _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:2958: checking for midl flags" >&5
+echo "configure:2856: 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
@@ -2976,9 +2874,9 @@
         _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:2980: checking for w32api version >= $W32API_VERSION" >&5
+echo "configure:2878: checking for w32api version >= $W32API_VERSION" >&5
         cat > conftest.$ac_ext <<EOF
-#line 2982 "configure"
+#line 2880 "configure"
 #include "confdefs.h"
 #include <w32api.h>
 int main() {
@@ -2990,7 +2888,7 @@
             
 ; return 0; }
 EOF
-if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    res=yes 
 else
@@ -3006,7 +2904,7 @@
         fi
         # Check windres version
         echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6
-echo "configure:3010: checking for windres version >= $WINDRES_VERSION" >&5
+echo "configure:2908: 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 }'`
@@ -3033,7 +2931,7 @@
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
     echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3037: checking how to run the C preprocessor" >&5
+echo "configure:2935: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -3048,13 +2946,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 3052 "configure"
+#line 2950 "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:3058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2956: \"$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
   :
@@ -3065,13 +2963,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 3069 "configure"
+#line 2967 "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:3075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2973: \"$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
   :
@@ -3082,13 +2980,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 3086 "configure"
+#line 2984 "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:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2990: \"$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
   :
@@ -3116,17 +3014,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3120: checking for $ac_hdr" >&5
+echo "configure:3018: 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 3125 "configure"
+#line 3023 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3028: \"$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*
@@ -3157,10 +3055,10 @@
 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:3161: checking whether $CC and cc understand -c and -o together" >&5
+echo "configure:3059: 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:3164: checking whether cc understands -c and -o together" >&5
+echo "configure:3062: 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]/_/'`"
@@ -3172,16 +3070,16 @@
 # 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:3176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-   test -f conftest.o && { (eval echo configure:3177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+if { (eval echo configure:3074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+   test -f conftest.o && { (eval echo configure:3075: \"$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:3182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3080: \"$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:3184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-	 test -f conftest.o && { (eval echo configure:3185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+      if { (eval echo configure:3082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+	 test -f conftest.o && { (eval echo configure:3083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
       then
         # cc works too.
         :
@@ -3217,7 +3115,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:3221: checking how to run the C preprocessor" >&5
+echo "configure:3119: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -3232,13 +3130,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 3236 "configure"
+#line 3134 "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:3242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3140: \"$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
   :
@@ -3249,13 +3147,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 3253 "configure"
+#line 3151 "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:3259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3157: \"$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
   :
@@ -3266,13 +3164,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 3270 "configure"
+#line 3168 "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:3276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3174: \"$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
   :
@@ -3297,7 +3195,7 @@
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:3301: checking how to run the C++ preprocessor" >&5
+echo "configure:3199: 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
@@ -3310,12 +3208,12 @@
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 3314 "configure"
+#line 3212 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3217: \"$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
   :
@@ -3362,7 +3260,7 @@
 # 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:3366: checking for a BSD compatible install" >&5
+echo "configure:3264: 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
@@ -3415,7 +3313,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:3419: checking whether ln -s works" >&5
+echo "configure:3317: 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
@@ -3440,7 +3338,7 @@
 # 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:3444: checking for $ac_word" >&5
+echo "configure:3342: 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
@@ -3480,7 +3378,7 @@
 fi
 
 echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6
-echo "configure:3484: checking for minimum required perl version >= $PERL_VERSION" >&5
+echo "configure:3382: 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
@@ -3490,7 +3388,7 @@
 fi
 
 echo $ac_n "checking for full perl installation""... $ac_c" 1>&6
-echo "configure:3494: checking for full perl installation" >&5
+echo "configure:3392: 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
@@ -3503,7 +3401,7 @@
 # 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:3507: checking for $ac_word" >&5
+echo "configure:3405: 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
@@ -3539,7 +3437,7 @@
 # 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:3543: checking for $ac_word" >&5
+echo "configure:3441: 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
@@ -3575,7 +3473,7 @@
 # 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:3579: checking for $ac_word" >&5
+echo "configure:3477: 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
@@ -3611,7 +3509,7 @@
 # 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:3615: checking for $ac_word" >&5
+echo "configure:3513: 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
@@ -3649,7 +3547,7 @@
 # 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:3653: checking for $ac_word" >&5
+echo "configure:3551: 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
@@ -3690,7 +3588,7 @@
 # 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:3694: checking for $ac_word" >&5
+echo "configure:3592: 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
@@ -3725,7 +3623,7 @@
 # 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:3729: checking for $ac_word" >&5
+echo "configure:3627: 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
@@ -3788,7 +3686,7 @@
 # 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:3792: checking for $ac_word" >&5
+echo "configure:3690: 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
@@ -3838,7 +3736,7 @@
             # 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:3842: checking for $ac_word" >&5
+echo "configure:3740: 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
@@ -3944,7 +3842,7 @@
 # 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:3948: checking for $ac_word" >&5
+echo "configure:3846: 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
@@ -3987,7 +3885,7 @@
 # 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:3991: checking for $ac_word" >&5
+echo "configure:3889: 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
@@ -4055,7 +3953,7 @@
 # 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:4059: checking for X" >&5
+echo "configure:3957: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -4117,12 +4015,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 4121 "configure"
+#line 4019 "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:4126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4024: \"$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*
@@ -4191,14 +4089,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4195 "configure"
+#line 4093 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4100: \"$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.
@@ -4304,17 +4202,17 @@
     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:4308: checking whether -R must be followed by a space" >&5
+echo "configure:4206: 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 4311 "configure"
+#line 4209 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -4330,14 +4228,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 4334 "configure"
+#line 4232 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -4369,7 +4267,7 @@
     # 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:4373: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4271: 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
@@ -4377,7 +4275,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4381 "configure"
+#line 4279 "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
@@ -4388,7 +4286,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4290: \"$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
@@ -4410,7 +4308,7 @@
 
     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:4414: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4312: 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
@@ -4418,7 +4316,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4422 "configure"
+#line 4320 "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
@@ -4429,7 +4327,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4331: \"$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
@@ -4458,12 +4356,12 @@
     # 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:4462: checking for gethostbyname" >&5
+echo "configure:4360: 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 4467 "configure"
+#line 4365 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4486,7 +4384,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4388: \"$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
@@ -4507,7 +4405,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4511: checking for gethostbyname in -lnsl" >&5
+echo "configure:4409: 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
@@ -4515,7 +4413,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4519 "configure"
+#line 4417 "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
@@ -4526,7 +4424,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4428: \"$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
@@ -4556,12 +4454,12 @@
     # -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:4560: checking for connect" >&5
+echo "configure:4458: 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 4565 "configure"
+#line 4463 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4584,7 +4482,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4486: \"$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
@@ -4605,7 +4503,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4609: checking for connect in -lsocket" >&5
+echo "configure:4507: 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
@@ -4613,7 +4511,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4617 "configure"
+#line 4515 "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
@@ -4624,7 +4522,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4526: \"$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
@@ -4648,12 +4546,12 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4652: checking for remove" >&5
+echo "configure:4550: 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 4657 "configure"
+#line 4555 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -4676,7 +4574,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4578: \"$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
@@ -4697,7 +4595,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4701: checking for remove in -lposix" >&5
+echo "configure:4599: 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
@@ -4705,7 +4603,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4709 "configure"
+#line 4607 "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
@@ -4716,7 +4614,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4618: \"$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
@@ -4740,12 +4638,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4744: checking for shmat" >&5
+echo "configure:4642: 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 4749 "configure"
+#line 4647 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -4768,7 +4666,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4670: \"$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
@@ -4789,7 +4687,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4793: checking for shmat in -lipc" >&5
+echo "configure:4691: 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
@@ -4797,7 +4695,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4801 "configure"
+#line 4699 "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
@@ -4808,7 +4706,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:4812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4710: \"$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
@@ -4841,7 +4739,7 @@
   # 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:4845: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4743: 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
@@ -4849,7 +4747,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4853 "configure"
+#line 4751 "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
@@ -4860,7 +4758,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:4864: \"$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
@@ -5270,7 +5168,7 @@
 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:5274: checking whether ld has archive extraction flags" >&5
+echo "configure:5172: 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
@@ -5287,14 +5185,14 @@
       LDFLAGS=$force
       LIBS=$unforce
       cat > conftest.$ac_ext <<EOF
-#line 5291 "configure"
+#line 5189 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5196: \"$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
@@ -5329,17 +5227,17 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
-echo "configure:5333: checking for 64-bit OS" >&5
+echo "configure:5231: checking for 64-bit OS" >&5
 if test "$cross_compiling" = yes; then
   result="maybe" 
 else
   cat > conftest.$ac_ext <<EOF
-#line 5338 "configure"
+#line 5236 "configure"
 #include "confdefs.h"
  int main () {
     if (sizeof(long) == 8) { return 0; } return 1; } 
 EOF
-if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   result="yes"
 else
@@ -5498,9 +5396,9 @@
 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:5502: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
+echo "configure:5400: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
             cat > conftest.$ac_ext <<EOF
-#line 5504 "configure"
+#line 5402 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -5509,7 +5407,7 @@
                  #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   _BAD_COMPILER=
 else
@@ -5546,17 +5444,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5550: checking for $ac_hdr" >&5
+echo "configure:5448: 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 5555 "configure"
+#line 5453 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5458: \"$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*
@@ -5598,7 +5496,7 @@
     LIBS="$LIBS -lbe"
     if test "$COMPILE_ENVIRONMENT"; then
         echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
-echo "configure:5602: checking for main in -lbind" >&5
+echo "configure:5500: 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
@@ -5606,14 +5504,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5610 "configure"
+#line 5508 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5515: \"$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
@@ -5634,7 +5532,7 @@
 fi
 
         echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
-echo "configure:5638: checking for main in -lzeta" >&5
+echo "configure:5536: 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
@@ -5642,14 +5540,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lzeta  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5646 "configure"
+#line 5544 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5551: \"$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
@@ -5842,8 +5740,7 @@
         MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
     ;;
     mips*)
-        CFLAGS="$CFLAGS -Wa,-xgot"
-        CXXFLAGS="$CXXFLAGS -Wa,-xgot"
+        MOZ_DEBUG_FLAGS="-g"   # We want inlining
     ;;
     esac
     ;;
@@ -6546,9 +6443,9 @@
         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:6550: checking for Forte compiler version >= WS6U2" >&5
+echo "configure:6447: checking for Forte compiler version >= WS6U2" >&5
        cat > conftest.$ac_ext <<EOF
-#line 6552 "configure"
+#line 6449 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -6557,7 +6454,7 @@
            #endif
 ; return 0; }
 EOF
-if { (eval echo configure:6561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   _BAD_COMPILER=
 else
@@ -6679,7 +6576,7 @@
         ;;
     *-darwin*)
         echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6
-echo "configure:6683: checking for -exported_symbols_list option to ld" >&5
+echo "configure:6580: 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
@@ -6719,12 +6616,12 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:6723: checking for ANSI C header files" >&5
+echo "configure:6620: 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 6728 "configure"
+#line 6625 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6732,7 +6629,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6633: \"$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*
@@ -6749,7 +6646,7 @@
 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 6753 "configure"
+#line 6650 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -6767,7 +6664,7 @@
 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 6771 "configure"
+#line 6668 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -6788,7 +6685,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 6792 "configure"
+#line 6689 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -6799,7 +6696,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:6803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6823,12 +6720,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6827: checking for working const" >&5
+echo "configure:6724: 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 6832 "configure"
+#line 6729 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -6877,7 +6774,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -6898,12 +6795,12 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:6902: checking for mode_t" >&5
+echo "configure:6799: 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 6907 "configure"
+#line 6804 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6931,12 +6828,12 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6935: checking for off_t" >&5
+echo "configure:6832: 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 6940 "configure"
+#line 6837 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6964,12 +6861,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6968: checking for pid_t" >&5
+echo "configure:6865: 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 6973 "configure"
+#line 6870 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6997,12 +6894,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:7001: checking for size_t" >&5
+echo "configure:6898: 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 7006 "configure"
+#line 6903 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -7030,12 +6927,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:7034: checking for uid_t in sys/types.h" >&5
+echo "configure:6931: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7039 "configure"
+#line 6936 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -7064,12 +6961,12 @@
 fi
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:7068: checking for st_blksize in struct stat" >&5
+echo "configure:6965: 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 7073 "configure"
+#line 6970 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -7077,7 +6974,7 @@
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:7081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -7098,12 +6995,12 @@
 fi
 
 echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
-echo "configure:7102: checking for siginfo_t" >&5
+echo "configure:6999: 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 7107 "configure"
+#line 7004 "configure"
 #include "confdefs.h"
 #define _POSIX_C_SOURCE 199506L
                   #include <signal.h>
@@ -7111,7 +7008,7 @@
 siginfo_t* info;
 ; return 0; }
 EOF
-if { (eval echo configure:7115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_siginfo_t=true
 else
@@ -7145,12 +7042,12 @@
 fi
 
 echo $ac_n "checking for int16_t""... $ac_c" 1>&6
-echo "configure:7149: checking for int16_t" >&5
+echo "configure:7046: 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 7154 "configure"
+#line 7051 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                   #include <sys/types.h>
@@ -7158,7 +7055,7 @@
 int16_t foo = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:7162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_int16_t=true
 else
@@ -7180,12 +7077,12 @@
   echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:7184: checking for int32_t" >&5
+echo "configure:7081: 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 7189 "configure"
+#line 7086 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                   #include <sys/types.h>
@@ -7193,7 +7090,7 @@
 int32_t foo = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:7197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_int32_t=true
 else
@@ -7215,12 +7112,12 @@
   echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for int64_t""... $ac_c" 1>&6
-echo "configure:7219: checking for int64_t" >&5
+echo "configure:7116: 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 7224 "configure"
+#line 7121 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                   #include <sys/types.h>
@@ -7228,7 +7125,7 @@
 int64_t foo = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:7232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_int64_t=true
 else
@@ -7250,12 +7147,12 @@
   echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for int64""... $ac_c" 1>&6
-echo "configure:7254: checking for int64" >&5
+echo "configure:7151: 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 7259 "configure"
+#line 7156 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                   #include <sys/types.h>
@@ -7263,7 +7160,7 @@
 int64 foo = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:7267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_int64=true
 else
@@ -7285,12 +7182,12 @@
   echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for uint""... $ac_c" 1>&6
-echo "configure:7289: checking for uint" >&5
+echo "configure:7186: 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 7294 "configure"
+#line 7191 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                   #include <sys/types.h>
@@ -7298,7 +7195,7 @@
 uint foo = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:7302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_uint=true
 else
@@ -7320,12 +7217,12 @@
   echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for uint_t""... $ac_c" 1>&6
-echo "configure:7324: checking for uint_t" >&5
+echo "configure:7221: 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 7329 "configure"
+#line 7226 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                   #include <sys/types.h>
@@ -7333,7 +7230,7 @@
 uint_t foo = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:7337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_uint_t=true
 else
@@ -7355,12 +7252,12 @@
   echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
-echo "configure:7359: checking for uint16_t" >&5
+echo "configure:7256: 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 7364 "configure"
+#line 7261 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                   #include <sys/types.h>
@@ -7368,7 +7265,7 @@
 uint16_t foo = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:7372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_uint16_t=true
 else
@@ -7399,12 +7296,12 @@
 
 
 echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
-echo "configure:7403: checking for uname.domainname" >&5
+echo "configure:7300: 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 7408 "configure"
+#line 7305 "configure"
 #include "confdefs.h"
 #include <sys/utsname.h>
 int main() {
@@ -7412,7 +7309,7 @@
             (void)uname(res);  if (res != 0) { domain = res->domainname; } 
 ; return 0; }
 EOF
-if { (eval echo configure:7416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_have_uname_domainname_field=true
 else
@@ -7436,12 +7333,12 @@
 fi
 
 echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
-echo "configure:7440: checking for uname.__domainname" >&5
+echo "configure:7337: 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 7445 "configure"
+#line 7342 "configure"
 #include "confdefs.h"
 #include <sys/utsname.h>
 int main() {
@@ -7449,7 +7346,7 @@
             (void)uname(res);  if (res != 0) { domain = res->__domainname; } 
 ; return 0; }
 EOF
-if { (eval echo configure:7453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_have_uname_us_domainname_field=true
 else
@@ -7482,7 +7379,7 @@
 
 
 echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
-echo "configure:7486: checking for usable wchar_t (2 bytes, unsigned)" >&5
+echo "configure:7383: checking for usable wchar_t (2 bytes, unsigned)" >&5
 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7490,14 +7387,14 @@
   ac_cv_have_usable_wchar="maybe"
 else
   cat > conftest.$ac_ext <<EOF
-#line 7494 "configure"
+#line 7391 "configure"
 #include "confdefs.h"
 #include <stddef.h>
                  int main () {
                    return (sizeof(wchar_t) != 2) ||
                           (wchar_t)-1 < (wchar_t) 0 ; } 
 EOF
-if { (eval echo configure:7501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_usable_wchar="yes"
 else
@@ -7532,7 +7429,7 @@
     CXXFLAGS="$CXXFLAGS -fshort-wchar"
 
     echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
-echo "configure:7536: checking for compiler -fshort-wchar option" >&5
+echo "configure:7433: checking for compiler -fshort-wchar option" >&5
 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7540,14 +7437,17 @@
   ac_cv_have_usable_wchar_option="maybe"
 else
   cat > conftest.$ac_ext <<EOF
-#line 7544 "configure"
+#line 7441 "configure"
 #include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
 #include <stddef.h>
                      int main () {
                        return (sizeof(wchar_t) != 2) ||
                               (wchar_t)-1 < (wchar_t) 0 ; } 
 EOF
-if { (eval echo configure:7551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_usable_wchar_option="yes"
 else
@@ -7583,7 +7483,7 @@
 
 if test "$GNU_CC"; then
   echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
-echo "configure:7587: checking for visibility(hidden) attribute" >&5
+echo "configure:7487: 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
@@ -7607,7 +7507,7 @@
 EOF
 
       echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
-echo "configure:7611: checking for visibility pragma support" >&5
+echo "configure:7511: 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
@@ -7635,8 +7535,8 @@
 #define HAVE_VISIBILITY_PRAGMA 1
 EOF
 
-        VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-        WRAP_SYSTEM_INCLUDES=1
+        VISIBILITY_FLAGS='-fvisibility=hidden'
+        WRAP_SYSTEM_INCLUDES=
       fi
    fi
 fi     # GNU_CC
@@ -7649,12 +7549,12 @@
 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:7653: checking for $ac_hdr that defines DIR" >&5
+echo "configure:7553: 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 7658 "configure"
+#line 7558 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -7662,7 +7562,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:7666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -7687,7 +7587,7 @@
 # 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:7691: checking for opendir in -ldir" >&5
+echo "configure:7591: 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
@@ -7695,7 +7595,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7699 "configure"
+#line 7599 "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
@@ -7706,7 +7606,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:7710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7610: \"$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
@@ -7728,7 +7628,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:7732: checking for opendir in -lx" >&5
+echo "configure:7632: 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
@@ -7736,7 +7636,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7740 "configure"
+#line 7640 "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
@@ -7747,7 +7647,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7651: \"$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
@@ -7779,17 +7679,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7783: checking for $ac_hdr" >&5
+echo "configure:7683: 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 7788 "configure"
+#line 7688 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7693: \"$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*
@@ -7819,17 +7719,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7823: checking for $ac_hdr" >&5
+echo "configure:7723: 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 7828 "configure"
+#line 7728 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7733: \"$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*
@@ -7859,17 +7759,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7863: checking for $ac_hdr" >&5
+echo "configure:7763: 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 7868 "configure"
+#line 7768 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7773: \"$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*
@@ -7899,17 +7799,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7903: checking for $ac_hdr" >&5
+echo "configure:7803: 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 7908 "configure"
+#line 7808 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7813: \"$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*
@@ -7939,17 +7839,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7943: checking for $ac_hdr" >&5
+echo "configure:7843: 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 7948 "configure"
+#line 7848 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7853: \"$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*
@@ -7980,17 +7880,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7984: checking for $ac_hdr" >&5
+echo "configure:7884: 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 7989 "configure"
+#line 7889 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7894: \"$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*
@@ -8021,17 +7921,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8025: checking for $ac_hdr" >&5
+echo "configure:7925: 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 8030 "configure"
+#line 7930 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7935: \"$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*
@@ -8068,17 +7968,17 @@
 NEW_H=new.h
 ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for new""... $ac_c" 1>&6
-echo "configure:8072: checking for new" >&5
+echo "configure:7972: 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 8077 "configure"
+#line 7977 "configure"
 #include "confdefs.h"
 #include <new>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7982: \"$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*
@@ -8119,17 +8019,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8123: checking for $ac_hdr" >&5
+echo "configure:8023: 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 8128 "configure"
+#line 8028 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8033: \"$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*
@@ -8163,7 +8063,7 @@
 	;;
 *)
 	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
-echo "configure:8167: checking for gethostbyname_r in -lc_r" >&5
+echo "configure:8067: 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
@@ -8171,7 +8071,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8175 "configure"
+#line 8075 "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
@@ -8182,7 +8082,7 @@
 gethostbyname_r()
 ; return 0; }
 EOF
-if { (eval echo configure:8186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8086: \"$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
@@ -8212,7 +8112,7 @@
 	;;
 esac
 echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:8216: checking for atan in -lm" >&5
+echo "configure:8116: 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
@@ -8220,7 +8120,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8224 "configure"
+#line 8124 "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
@@ -8231,7 +8131,7 @@
 atan()
 ; return 0; }
 EOF
-if { (eval echo configure:8235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8135: \"$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
@@ -8265,7 +8165,7 @@
 	;;
 *)
 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:8269: checking for dlopen in -ldl" >&5
+echo "configure:8169: 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
@@ -8273,7 +8173,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8277 "configure"
+#line 8177 "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
@@ -8284,7 +8184,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:8288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8188: \"$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
@@ -8301,17 +8201,17 @@
   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:8305: checking for dlfcn.h" >&5
+echo "configure:8205: 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 8310 "configure"
+#line 8210 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8215: \"$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*
@@ -8347,7 +8247,7 @@
     case $target in
     *-aix*)
 	echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
-echo "configure:8351: checking for demangle in -lC_r" >&5
+echo "configure:8251: 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
@@ -8355,7 +8255,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lC_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8359 "configure"
+#line 8259 "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
@@ -8366,7 +8266,7 @@
 demangle()
 ; return 0; }
 EOF
-if { (eval echo configure:8370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8270: \"$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
@@ -8396,7 +8296,7 @@
 	;;
      *)
 	echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
-echo "configure:8400: checking for demangle in -lC" >&5
+echo "configure:8300: 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
@@ -8404,7 +8304,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lC  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8408 "configure"
+#line 8308 "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
@@ -8415,7 +8315,7 @@
 demangle()
 ; return 0; }
 EOF
-if { (eval echo configure:8419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8319: \"$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
@@ -8446,7 +8346,7 @@
      esac
 fi
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:8450: checking for socket in -lsocket" >&5
+echo "configure:8350: 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
@@ -8454,7 +8354,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8458 "configure"
+#line 8358 "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
@@ -8465,7 +8365,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8369: \"$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
@@ -8510,7 +8410,7 @@
 	_SAVE_LDFLAGS="$LDFLAGS"
 	LDFLAGS="$XLDFLAGS $LDFLAGS"
 	echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
-echo "configure:8514: checking for XDrawLines in -lX11" >&5
+echo "configure:8414: 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
@@ -8518,7 +8418,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $XLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8522 "configure"
+#line 8422 "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
@@ -8529,7 +8429,7 @@
 XDrawLines()
 ; return 0; }
 EOF
-if { (eval echo configure:8533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8433: \"$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
@@ -8551,7 +8451,7 @@
 fi
 
 	echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
-echo "configure:8555: checking for XextAddDisplay in -lXext" >&5
+echo "configure:8455: 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
@@ -8559,7 +8459,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext $XLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8563 "configure"
+#line 8463 "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
@@ -8570,7 +8470,7 @@
 XextAddDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:8574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8474: \"$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
@@ -8594,7 +8494,7 @@
    
      
 	echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
-echo "configure:8598: checking for XtFree in -lXt" >&5
+echo "configure:8498: 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
@@ -8602,7 +8502,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8606 "configure"
+#line 8506 "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
@@ -8613,7 +8513,7 @@
 XtFree()
 ; 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:8517: \"$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
@@ -8634,7 +8534,7 @@
 
         unset ac_cv_lib_Xt_XtFree
 	    echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
-echo "configure:8638: checking for IceFlush in -lICE" >&5
+echo "configure:8538: 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
@@ -8642,7 +8542,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8646 "configure"
+#line 8546 "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
@@ -8653,7 +8553,7 @@
 IceFlush()
 ; return 0; }
 EOF
-if { (eval echo configure:8657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8557: \"$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
@@ -8674,7 +8574,7 @@
 fi
 
 	    echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
-echo "configure:8678: checking for SmcCloseConnection in -lSM" >&5
+echo "configure:8578: 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
@@ -8682,7 +8582,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8686 "configure"
+#line 8586 "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
@@ -8693,7 +8593,7 @@
 SmcCloseConnection()
 ; return 0; }
 EOF
-if { (eval echo configure:8697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8597: \"$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
@@ -8714,7 +8614,7 @@
 fi
  
         echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
-echo "configure:8718: checking for XtFree in -lXt" >&5
+echo "configure:8618: 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
@@ -8722,7 +8622,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8726 "configure"
+#line 8626 "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
@@ -8733,7 +8633,7 @@
 XtFree()
 ; return 0; }
 EOF
-if { (eval echo configure:8737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8637: \"$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
@@ -8767,7 +8667,7 @@
     esac
 
                 echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
-echo "configure:8771: checking for XineramaIsActive in -lXinerama" >&5
+echo "configure:8671: 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
@@ -8775,7 +8675,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8779 "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
@@ -8786,7 +8686,7 @@
 XineramaIsActive()
 ; return 0; }
 EOF
-if { (eval echo configure:8790: \"$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
@@ -8808,17 +8708,17 @@
 
     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:8812: checking for X11/extensions/Xinerama.h" >&5
+echo "configure:8712: 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 8817 "configure"
+#line 8717 "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:8822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8722: \"$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*
@@ -8841,7 +8741,7 @@
 
 
                 echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
-echo "configure:8845: checking for XShmCreateImage in -lXext" >&5
+echo "configure:8745: 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
@@ -8849,7 +8749,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8853 "configure"
+#line 8753 "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
@@ -8860,7 +8760,7 @@
 XShmCreateImage()
 ; return 0; }
 EOF
-if { (eval echo configure:8864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8764: \"$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
@@ -8882,17 +8782,17 @@
 
     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:8886: checking for X11/extensions/XShm.h" >&5
+echo "configure:8786: 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 8891 "configure"
+#line 8791 "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:8896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8796: \"$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*
@@ -8922,7 +8822,7 @@
     fi
 
                 echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
-echo "configure:8926: checking for XieFloGeometry in -lXIE" >&5
+echo "configure:8826: 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
@@ -8930,7 +8830,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8934 "configure"
+#line 8834 "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
@@ -8941,7 +8841,7 @@
 XieFloGeometry()
 ; return 0; }
 EOF
-if { (eval echo configure:8945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8845: \"$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
@@ -8963,17 +8863,17 @@
 
     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:8967: checking for X11/extensions/XIElib.h" >&5
+echo "configure:8867: 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 8972 "configure"
+#line 8872 "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:8977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8877: \"$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*
@@ -9047,7 +8947,7 @@
 # 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:9051: checking for $ac_word" >&5
+echo "configure:8951: 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
@@ -9083,7 +8983,7 @@
 
 min_ft_version=6.1.0
 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
-echo "configure:9087: checking for FreeType - version >= $min_ft_version" >&5
+echo "configure:8987: checking for FreeType - version >= $min_ft_version" >&5
 no_ft=""
 if test "$FT2_CONFIG" = "no" ; then
   no_ft=yes
@@ -9131,7 +9031,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 9135 "configure"
+#line 9035 "configure"
 #include "confdefs.h"
 
 #include <ft2build.h>
@@ -9157,7 +9057,7 @@
 }
 
 EOF
-if { (eval echo configure:9161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -9209,7 +9109,7 @@
 
 
 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:9213: checking for pthread_create in -lpthreads" >&5
+echo "configure:9113: checking for pthread_create in -lpthreads" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { int a = 1;  } 
@@ -9231,7 +9131,7 @@
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:9235: checking for pthread_create in -lpthread" >&5
+echo "configure:9135: checking for pthread_create in -lpthread" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { int a = 1;  } 
@@ -9253,7 +9153,7 @@
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:9257: checking for pthread_create in -lc_r" >&5
+echo "configure:9157: checking for pthread_create in -lc_r" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { int a = 1;  } 
@@ -9275,7 +9175,7 @@
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:9279: checking for pthread_create in -lc" >&5
+echo "configure:9179: checking for pthread_create in -lc" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { int a = 1;  } 
@@ -9331,7 +9231,7 @@
 				rm -f conftest*
 	ac_cv_have_dash_pthread=no
 	echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:9335: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:9235: 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
@@ -9354,7 +9254,7 @@
 			    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:9358: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:9258: 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
@@ -9476,7 +9376,7 @@
 
 
 echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
-echo "configure:9480: checking whether mmap() sees write()s" >&5
+echo "configure:9380: checking whether mmap() sees write()s" >&5
 
 
 mmap_test_prog='
@@ -9515,11 +9415,11 @@
   result="yes"
 else
   cat > conftest.$ac_ext <<EOF
-#line 9519 "configure"
+#line 9419 "configure"
 #include "confdefs.h"
 $mmap_test_prog 
 EOF
-if { (eval echo configure:9523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   result="yes"
 else
@@ -9544,13 +9444,13 @@
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:9548: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:9448: 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 9554 "configure"
+#line 9454 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -9568,7 +9468,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 9572 "configure"
+#line 9472 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -9590,7 +9490,7 @@
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:9594: checking for 8-bit clean memcmp" >&5
+echo "configure:9494: 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
@@ -9598,7 +9498,7 @@
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 9602 "configure"
+#line 9502 "configure"
 #include "confdefs.h"
 
 main()
@@ -9608,7 +9508,7 @@
 }
 
 EOF
-if { (eval echo configure:9612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9512: \"$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
@@ -9628,12 +9528,12 @@
 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:9632: checking for $ac_func" >&5
+echo "configure:9532: 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 9637 "configure"
+#line 9537 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9656,7 +9556,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9560: \"$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
@@ -9683,12 +9583,12 @@
 for ac_func in flockfile getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9687: checking for $ac_func" >&5
+echo "configure:9587: 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 9692 "configure"
+#line 9592 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9711,7 +9611,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9615: \"$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
@@ -9740,12 +9640,12 @@
   for ac_func in localtime_r strtok_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9744: checking for $ac_func" >&5
+echo "configure:9644: 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 9749 "configure"
+#line 9649 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9768,7 +9668,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9672: \"$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
@@ -9804,19 +9704,19 @@
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
-echo "configure:9808: checking for wcrtomb" >&5
+echo "configure:9708: 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 9813 "configure"
+#line 9713 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 int main() {
 mbstate_t ps={0};wcrtomb(0,'f',&ps);
 ; return 0; }
 EOF
-if { (eval echo configure:9820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_wcrtomb="yes"
 else
@@ -9836,19 +9736,19 @@
 
 fi
 echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
-echo "configure:9840: checking for mbrtowc" >&5
+echo "configure:9740: 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 9845 "configure"
+#line 9745 "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:9852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_have_mbrtowc="yes"
 else
@@ -9877,12 +9777,12 @@
 fi
 
 echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
-echo "configure:9881: checking for res_ninit()" >&5
+echo "configure:9781: 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 9886 "configure"
+#line 9786 "configure"
 #include "confdefs.h"
 
         #ifdef linux
@@ -9894,7 +9794,7 @@
 int foo = res_ninit(&_res);
 ; return 0; }
 EOF
-if { (eval echo configure:9898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9798: \"$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
@@ -9924,12 +9824,12 @@
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
-echo "configure:9928: checking for gnu_get_libc_version()" >&5
+echo "configure:9828: 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 9933 "configure"
+#line 9833 "configure"
 #include "confdefs.h"
 
         #ifdef HAVE_GNU_LIBC_VERSION_H
@@ -9940,7 +9840,7 @@
 const char *glibc_version = gnu_get_libc_version();
 ; return 0; }
 EOF
-if { (eval echo configure:9944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9844: \"$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
@@ -9969,7 +9869,7 @@
     *)
     
 echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
-echo "configure:9973: checking for iconv in -lc" >&5
+echo "configure:9873: 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
@@ -9977,7 +9877,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9981 "configure"
+#line 9881 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -9991,7 +9891,7 @@
 iconv()
 ; return 0; }
 EOF
-if { (eval echo configure:9995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9895: \"$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
@@ -10010,7 +9910,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:10014: checking for iconv in -liconv" >&5
+echo "configure:9914: 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
@@ -10018,7 +9918,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-liconv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10022 "configure"
+#line 9922 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -10032,7 +9932,7 @@
 iconv()
 ; return 0; }
 EOF
-if { (eval echo configure:10036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9936: \"$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
@@ -10051,7 +9951,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:10055: checking for libiconv in -liconv" >&5
+echo "configure:9955: 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
@@ -10059,7 +9959,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-liconv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10063 "configure"
+#line 9963 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -10073,7 +9973,7 @@
 libiconv()
 ; return 0; }
 EOF
-if { (eval echo configure:10077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9977: \"$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
@@ -10100,12 +10000,12 @@
 _SAVE_LIBS=$LIBS
 LIBS="$LIBS $_ICONV_LIBS"
 echo $ac_n "checking for iconv()""... $ac_c" 1>&6
-echo "configure:10104: checking for iconv()" >&5
+echo "configure:10004: 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 10109 "configure"
+#line 10009 "configure"
 #include "confdefs.h"
 
         #include <stdlib.h>
@@ -10119,7 +10019,7 @@
         
 ; return 0; }
 EOF
-if { (eval echo configure:10123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_iconv=yes
 else
@@ -10143,12 +10043,12 @@
     LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
     LIBICONV="$_ICONV_LIBS"
     echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
-echo "configure:10147: checking for iconv() with const input" >&5
+echo "configure:10047: 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 10152 "configure"
+#line 10052 "configure"
 #include "confdefs.h"
 
             #include <stdlib.h>
@@ -10163,7 +10063,7 @@
             
 ; return 0; }
 EOF
-if { (eval echo configure:10167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_func_const_iconv=yes
 else
@@ -10192,19 +10092,19 @@
 
 
   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:10196: checking for nl_langinfo and CODESET" >&5
+echo "configure:10096: 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 10201 "configure"
+#line 10101 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int main() {
 char* cs = nl_langinfo(CODESET);
 ; return 0; }
 EOF
-if { (eval echo configure:10208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_langinfo_codeset=yes
 else
@@ -10236,7 +10136,7 @@
 
 
 echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
-echo "configure:10240: checking for an implementation of va_copy()" >&5
+echo "configure:10140: 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
@@ -10246,7 +10146,7 @@
     
 else
   cat > conftest.$ac_ext <<EOF
-#line 10250 "configure"
+#line 10150 "configure"
 #include "confdefs.h"
 
         #include <stdarg.h>
@@ -10260,7 +10160,7 @@
         }
         int main() { f (0, 42); return 0; }
 EOF
-if { (eval echo configure:10264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10164: \"$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
@@ -10277,7 +10177,7 @@
 
 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:10281: checking for an implementation of __va_copy()" >&5
+echo "configure:10181: 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
@@ -10287,7 +10187,7 @@
     
 else
   cat > conftest.$ac_ext <<EOF
-#line 10291 "configure"
+#line 10191 "configure"
 #include "confdefs.h"
 
         #include <stdarg.h>
@@ -10301,7 +10201,7 @@
         }
         int main() { f (0, 42); return 0; }
 EOF
-if { (eval echo configure:10305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10205: \"$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
@@ -10318,7 +10218,7 @@
 
 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:10322: checking whether va_lists can be copied by value" >&5
+echo "configure:10222: 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
@@ -10328,7 +10228,7 @@
     
 else
   cat > conftest.$ac_ext <<EOF
-#line 10332 "configure"
+#line 10232 "configure"
 #include "confdefs.h"
 
         #include <stdarg.h>
@@ -10342,7 +10242,7 @@
         }
         int main() { f (0, 42); return 0; }
 EOF
-if { (eval echo configure:10346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10246: \"$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
@@ -10441,7 +10341,7 @@
 if test "$GNU_CXX"; then
 
   echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
-echo "configure:10445: checking for C++ exceptions flag" >&5
+echo "configure:10345: 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
@@ -10476,12 +10376,12 @@
 HAVE_GCC3_ABI=
 if test "$GNU_CC"; then
   echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
-echo "configure:10480: checking for gcc 3.0 ABI" >&5
+echo "configure:10380: 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 10485 "configure"
+#line 10385 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -10494,7 +10394,7 @@
                       
 ; return 0; }
 EOF
-if { (eval echo configure:10498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_gcc_three_abi="yes"
 else
@@ -10518,12 +10418,12 @@
 
 
 echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
-echo "configure:10522: checking for C++ \"explicit\" keyword" >&5
+echo "configure:10422: 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 10527 "configure"
+#line 10427 "configure"
 #include "confdefs.h"
 class X {
                                public: explicit X(int i) : i_(i) {}
@@ -10533,7 +10433,7 @@
 X x(3);
 ; return 0; }
 EOF
-if { (eval echo configure:10537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_explicit=yes
 else
@@ -10554,12 +10454,12 @@
 fi
 
 echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
-echo "configure:10558: checking for C++ \"typename\" keyword" >&5
+echo "configure:10458: 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 10563 "configure"
+#line 10463 "configure"
 #include "confdefs.h"
 class param {
                                public:
@@ -10578,7 +10478,7 @@
                                A.foo(0);
 ; return 0; }
 EOF
-if { (eval echo configure:10582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_typename=yes
 else
@@ -10599,12 +10499,12 @@
 fi
 
 echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
-echo "configure:10603: checking for modern C++ template specialization syntax support" >&5
+echo "configure:10503: 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 10608 "configure"
+#line 10508 "configure"
 #include "confdefs.h"
 template <class T> struct X { int a; };
                                class Y {};
@@ -10614,7 +10514,7 @@
                                X<Y> y_x;
 ; return 0; }
 EOF
-if { (eval echo configure:10618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_modern_specialize_template_syntax=yes
 else
@@ -10636,12 +10536,12 @@
 
 
 echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
-echo "configure:10640: checking whether partial template specialization works" >&5
+echo "configure:10540: 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 10645 "configure"
+#line 10545 "configure"
 #include "confdefs.h"
 template <class T> class Foo {};
                                template <class T> class Foo<T*> {};
@@ -10649,7 +10549,7 @@
 return 0;
 ; return 0; }
 EOF
-if { (eval echo configure:10653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_partial_specialization=yes
 else
@@ -10670,12 +10570,12 @@
 fi
 
 echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
-echo "configure:10674: checking whether operators must be re-defined for templates derived from templates" >&5
+echo "configure:10574: 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 10679 "configure"
+#line 10579 "configure"
 #include "confdefs.h"
 template <class T> class Base { };
                                 template <class T>
@@ -10687,7 +10587,7 @@
                                 return 0;
 ; return 0; }
 EOF
-if { (eval echo configure:10691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_need_derived_template_operators=no
 else
@@ -10709,12 +10609,12 @@
 
 
 echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
-echo "configure:10713: checking whether we need to cast a derived template to pass as its base class" >&5
+echo "configure:10613: 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 10718 "configure"
+#line 10618 "configure"
 #include "confdefs.h"
 template <class T> class Base { };
                                 template <class T> class Derived : public Base<T> { };
@@ -10723,7 +10623,7 @@
 Derived<char> bar; return foo(bar);
 ; return 0; }
 EOF
-if { (eval echo configure:10727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_need_cpp_template_cast_to_base=no
 else
@@ -10744,12 +10644,12 @@
 fi
 
 echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
-echo "configure:10748: checking whether the compiler can resolve const ambiguities for templates" >&5
+echo "configure:10648: 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 10753 "configure"
+#line 10653 "configure"
 #include "confdefs.h"
 
                                 template <class T> class ptrClass {
@@ -10770,7 +10670,7 @@
                                  a(&i); 
 ; return 0; }
 EOF
-if { (eval echo configure:10774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_can_resolve_const_ambiguity=yes
 else
@@ -10792,12 +10692,12 @@
 
 
 echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
-echo "configure:10796: checking whether the C++ \"using\" keyword can change access" >&5
+echo "configure:10696: 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 10801 "configure"
+#line 10701 "configure"
 #include "confdefs.h"
 class A { protected: int foo() { return 0; } };
                    class B : public A { public: using A::foo; };
@@ -10805,10 +10705,10 @@
 B b; return b.foo();
 ; return 0; }
 EOF
-if { (eval echo configure:10809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 10812 "configure"
+#line 10712 "configure"
 #include "confdefs.h"
 class A { public: int foo() { return 1; } };
                        class B : public A { private: using A::foo; };
@@ -10816,7 +10716,7 @@
 B b; return b.foo();
 ; return 0; }
 EOF
-if { (eval echo configure:10820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_access_changing_using2=no
 else
@@ -10844,12 +10744,12 @@
 fi
 
 echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
-echo "configure:10848: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
+echo "configure:10748: 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 10853 "configure"
+#line 10753 "configure"
 #include "confdefs.h"
 class X { 
                                  public: int go(const X&) {return 3;}
@@ -10865,7 +10765,7 @@
 X x; Y y; y.jo(x);
 ; return 0; }
 EOF
-if { (eval echo configure:10869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_ambiguity_resolving_using=yes
 else
@@ -10886,19 +10786,19 @@
 fi
 
 echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
-echo "configure:10890: checking for \"std::\" namespace" >&5
+echo "configure:10790: 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 10895 "configure"
+#line 10795 "configure"
 #include "confdefs.h"
 #include <algorithm>
 int main() {
 return std::min(0, 1);
 ; return 0; }
 EOF
-if { (eval echo configure:10902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_namespace_std=yes
 else
@@ -10919,12 +10819,12 @@
 fi
 
 echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
-echo "configure:10923: checking whether standard template operator!=() is ambiguous" >&5
+echo "configure:10823: 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 10928 "configure"
+#line 10828 "configure"
 #include "confdefs.h"
 #include <algorithm>
                                 struct T1 {};
@@ -10934,7 +10834,7 @@
 T1 a,b; return a != b;
 ; return 0; }
 EOF
-if { (eval echo configure:10938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_unambiguous_std_notequal=unambiguous
 else
@@ -10956,12 +10856,12 @@
 
 
 echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
-echo "configure:10960: checking for C++ reinterpret_cast" >&5
+echo "configure:10860: 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 10965 "configure"
+#line 10865 "configure"
 #include "confdefs.h"
 struct X { int i; };
                                struct Y { int i; };
@@ -10969,7 +10869,7 @@
 X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
 ; return 0; }
 EOF
-if { (eval echo configure:10973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cpp_reinterpret_cast=yes
 else
@@ -10990,7 +10890,7 @@
 fi
 
 echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
-echo "configure:10994: checking for C++ dynamic_cast to void*" >&5
+echo "configure:10894: 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
@@ -10998,8 +10898,11 @@
   ac_cv_cpp_dynamic_cast_void_ptr=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 11002 "configure"
+#line 10902 "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; };
@@ -11014,7 +10917,7 @@
                                            ((void*)&mdo == dynamic_cast<void*>(suby))));
                             }
 EOF
-if { (eval echo configure:11018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10921: \"$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
@@ -11038,19 +10941,19 @@
 
 
 echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
-echo "configure:11042: checking whether C++ requires implementation of unused virtual methods" >&5
+echo "configure:10945: 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 11047 "configure"
+#line 10950 "configure"
 #include "confdefs.h"
 class X {private: virtual void never_called();};
 int main() {
 X x;
 ; return 0; }
 EOF
-if { (eval echo configure:11054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10957: \"$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
@@ -11073,12 +10976,12 @@
 
 
 echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
-echo "configure:11077: checking for trouble comparing to zero near std::operator!=()" >&5
+echo "configure:10980: 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 11082 "configure"
+#line 10985 "configure"
 #include "confdefs.h"
 #include <algorithm>
                                 template <class T> class Foo {};
@@ -11089,7 +10992,7 @@
 Foo<int> f; return (0 != f);
 ; return 0; }
 EOF
-if { (eval echo configure:11093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_trouble_comparing_to_zero=no
 else
@@ -11121,19 +11024,19 @@
 
 
 echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:11125: checking for LC_MESSAGES" >&5
+echo "configure:11028: 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 11130 "configure"
+#line 11033 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 int category = LC_MESSAGES;
 ; return 0; }
 EOF
-if { (eval echo configure:11137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_i18n_lc_messages=yes
 else
@@ -11214,7 +11117,7 @@
 	# 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:11218: checking for $ac_word" >&5
+echo "configure:11121: 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
@@ -11249,7 +11152,7 @@
 
 	min_nspr_version=4.0.0
 	echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
-echo "configure:11253: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
+echo "configure:11156: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
 
 	no_nspr=""
 	if test "$NSPR_CONFIG" = "no"; then
@@ -11319,7 +11222,7 @@
     SYSTEM_JPEG=
 else
     echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:11323: checking for jpeg_destroy_compress in -ljpeg" >&5
+echo "configure:11226: 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
@@ -11327,7 +11230,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg $JPEG_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11331 "configure"
+#line 11234 "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
@@ -11338,7 +11241,7 @@
 jpeg_destroy_compress()
 ; return 0; }
 EOF
-if { (eval echo configure:11342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11245: \"$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
@@ -11367,7 +11270,7 @@
   SYSTEM_JPEG= 
 else
   cat > conftest.$ac_ext <<EOF
-#line 11371 "configure"
+#line 11274 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	#include <sys/types.h>
@@ -11381,7 +11284,7 @@
 	}
 	
 EOF
-if { (eval echo configure:11385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SYSTEM_JPEG=1
 else
@@ -11422,7 +11325,7 @@
     SYSTEM_ZLIB=
 else
     echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
-echo "configure:11426: checking for gzread in -lz" >&5
+echo "configure:11329: 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
@@ -11430,7 +11333,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz $ZLIB_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11434 "configure"
+#line 11337 "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
@@ -11441,7 +11344,7 @@
 gzread()
 ; return 0; }
 EOF
-if { (eval echo configure:11445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11348: \"$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
@@ -11469,7 +11372,7 @@
   SYSTEM_ZLIB= 
 else
   cat > conftest.$ac_ext <<EOF
-#line 11473 "configure"
+#line 11376 "configure"
 #include "confdefs.h"
 
     #include <stdio.h>
@@ -11490,7 +11393,7 @@
     }
     
 EOF
-if { (eval echo configure:11494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SYSTEM_ZLIB=1
 else
@@ -11533,7 +11436,7 @@
     SYSTEM_PNG=
 else
     echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
-echo "configure:11537: checking for png_get_valid in -lpng" >&5
+echo "configure:11440: 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
@@ -11541,7 +11444,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng $PNG_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11545 "configure"
+#line 11448 "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
@@ -11552,7 +11455,7 @@
 png_get_valid()
 ; return 0; }
 EOF
-if { (eval echo configure:11556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11459: \"$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
@@ -11580,7 +11483,7 @@
   SYSTEM_PNG= 
 else
   cat > conftest.$ac_ext <<EOF
-#line 11584 "configure"
+#line 11487 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	#include <sys/types.h>
@@ -11594,7 +11497,7 @@
 	}
 	
 EOF
-if { (eval echo configure:11598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SYSTEM_PNG=1
 else
@@ -11713,8 +11616,8 @@
     MOZ_ENABLE_GTK2=1
     MOZ_ENABLE_XREMOTE=1
     MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
-    TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
-    TK_LIBS='$(MOZ_GTK2_LIBS)'
+    TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)'
+    TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)'
     cat >> confdefs.h <<\EOF
 #define MOZ_WIDGET_GTK2 1
 EOF
@@ -11863,7 +11766,7 @@
   # 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:11867: checking for $ac_word" >&5
+echo "configure:11770: 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
@@ -11898,7 +11801,7 @@
 
   min_gtk_version=$GTK_VERSION
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:11902: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:11805: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -11921,7 +11824,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 11925 "configure"
+#line 11828 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -11999,7 +11902,7 @@
 }
 
 EOF
-if { (eval echo configure:12003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -12034,7 +11937,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 12038 "configure"
+#line 11941 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12044,7 +11947,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:12048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11951: \"$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"
@@ -12096,7 +11999,7 @@
     # 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:12100: checking for $ac_word" >&5
+echo "configure:12003: 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
@@ -12140,19 +12043,19 @@
      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:12144: checking for gtk+-2.0 >= 1.3.7" >&5
+echo "configure:12047: 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:12151: checking MOZ_GTK2_CFLAGS" >&5
+echo "configure:12054: 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:12156: checking MOZ_GTK2_LIBS" >&5
+echo "configure:12059: 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\"`"
@@ -12217,7 +12120,7 @@
 # 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:12221: checking for $ac_word" >&5
+echo "configure:12124: 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
@@ -12269,7 +12172,7 @@
 cross_compiling=$ac_cv_prog_cxx_cross
 
     echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
-echo "configure:12273: checking for main in -lqt" >&5
+echo "configure:12176: 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
@@ -12277,14 +12180,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lqt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12281 "configure"
+#line 12184 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:12288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12191: \"$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
@@ -12303,7 +12206,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
-echo "configure:12307: checking for main in -lqt-mt" >&5
+echo "configure:12210: 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
@@ -12311,14 +12214,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lqt-mt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12315 "configure"
+#line 12218 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:12322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12225: \"$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
@@ -12354,9 +12257,9 @@
     LIBS="$LIBS $QT_LIBS"
     
     echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
-echo "configure:12358: checking Qt - version >= $QT_VERSION" >&5
+echo "configure:12261: checking Qt - version >= $QT_VERSION" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12360 "configure"
+#line 12263 "configure"
 #include "confdefs.h"
 #include <qglobal.h>
 int main() {
@@ -12367,7 +12270,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:12371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   result="yes"
 else
@@ -12527,7 +12430,7 @@
 
 browser)
   MOZ_APP_NAME=firefox
-  MOZ_APP_DISPLAYNAME=DeerPark
+  MOZ_APP_DISPLAYNAME=Firefox
   MOZ_XUL_APP=1
   MOZ_PHOENIX=1
   MOZ_APP_VERSION=$FIREFOX_VERSION
@@ -12881,7 +12784,7 @@
     # 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:12885: checking for $ac_word" >&5
+echo "configure:12788: 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
@@ -12925,19 +12828,19 @@
      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:12929: checking for xft" >&5
+echo "configure:12832: 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:12936: checking MOZ_XFT_CFLAGS" >&5
+echo "configure:12839: 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:12941: checking MOZ_XFT_LIBS" >&5
+echo "configure:12844: 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\"`"
@@ -12972,7 +12875,7 @@
     # 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:12976: checking for $ac_word" >&5
+echo "configure:12879: 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
@@ -13015,31 +12918,31 @@
   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:13020: checking for pango >= 1.1.0" >&5
+        echo $ac_n "checking for pangoxft >= 1.1.0 pangox""... $ac_c" 1>&6
+echo "configure:12923: checking for pangoxft >= 1.1.0 pangox" >&5
 
-        if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
+        if $PKG_CONFIG --exists "pangoxft >= 1.1.0 pangox" ; then
             echo "$ac_t""yes" 1>&6
             succeeded=yes
 
-            echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
-echo "configure:13027: checking _PANGOCHK_CFLAGS" >&5
-            _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
-            echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
+            echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
+echo "configure:12930: checking MOZ_PANGO_CFLAGS" >&5
+            MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.1.0 pangox"`
+            echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
 
-            echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
-echo "configure:13032: checking _PANGOCHK_LIBS" >&5
+            echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
+echo "configure:12935: checking MOZ_PANGO_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
+            MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.1.0 pangox\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.1.0 pangox\"`"
+            echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6
         else
-            _PANGOCHK_CFLAGS=""
-            _PANGOCHK_LIBS=""
+            MOZ_PANGO_CFLAGS=""
+            MOZ_PANGO_LIBS=""
             ## If we have a custom action on failure, don't print errors, but 
             ## do set a variable so people can do so.
-            _PANGOCHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.1.0"`
-            echo $_PANGOCHK_PKG_ERRORS
+            MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft >= 1.1.0 pangox"`
+            echo $MOZ_PANGO_PKG_ERRORS
         fi
 
         
@@ -13053,7 +12956,7 @@
   if test $succeeded = yes; then
      :
   else
-     { echo "configure: error: Library requirements (pango >= 1.1.0) 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; }
+     { echo "configure: error: Library requirements (pangoxft >= 1.1.0 pangox) 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
 
 fi
@@ -13062,6 +12965,8 @@
 
 
 
+
+
 # Check whether --enable-pango or --disable-pango was given.
 if test "${enable_pango+set}" = set; then
   enableval="$enable_pango"
@@ -13088,7 +12993,7 @@
     # 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:13092: checking for $ac_word" >&5
+echo "configure:12997: 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
@@ -13131,30 +13036,30 @@
   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.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
-echo "configure:13136: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
+        echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6
+echo "configure:13041: checking for pangoxft >= 1.6.0" >&5
 
-        if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then
+        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:13143: checking MOZ_PANGO_CFLAGS" >&5
-            MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`
+echo "configure:13048: 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:13148: checking MOZ_PANGO_LIBS" >&5
+echo "configure:13053: 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 \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`"
+            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 
             ## do set a variable so people can do so.
-            MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.6.0 pangoft2 >= 1.6.0"`
+            MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft >= 1.6.0"`
             echo $MOZ_PANGO_PKG_ERRORS
         fi
 
@@ -13169,13 +13074,113 @@
   if test $succeeded = yes; then
      :
   else
-     { echo "configure: error: Library requirements (pango >= 1.6.0 pangoft2 >= 1.6.0) 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; }
+     { echo "configure: error: Library requirements (pangoxft >= 1.6.0) 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
+
+    
+  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:13088: 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 pangocairo >= 1.10.0""... $ac_c" 1>&6
+echo "configure:13132: checking for pangocairo >= 1.10.0" >&5
+
+        if $PKG_CONFIG --exists "pangocairo >= 1.10.0" ; then
+            echo "$ac_t""yes" 1>&6
+            succeeded=yes
+
+            echo $ac_n "checking PANGOCAIRO_CHK_CFLAGS""... $ac_c" 1>&6
+echo "configure:13139: checking PANGOCAIRO_CHK_CFLAGS" >&5
+            PANGOCAIRO_CHK_CFLAGS=`$PKG_CONFIG --cflags "pangocairo >= 1.10.0"`
+            echo "$ac_t""$PANGOCAIRO_CHK_CFLAGS" 1>&6
+
+            echo $ac_n "checking PANGOCAIRO_CHK_LIBS""... $ac_c" 1>&6
+echo "configure:13144: checking PANGOCAIRO_CHK_LIBS" >&5
+            ## don't use --libs since that can do evil things like add
+            ## -Wl,--export-dynamic
+            PANGOCAIRO_CHK_LIBS="`$PKG_CONFIG --libs-only-L \"pangocairo >= 1.10.0\"` `$PKG_CONFIG --libs-only-l \"pangocairo >= 1.10.0\"`"
+            echo "$ac_t""$PANGOCAIRO_CHK_LIBS" 1>&6
+        else
+            PANGOCAIRO_CHK_CFLAGS=""
+            PANGOCAIRO_CHK_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            PANGOCAIRO_CHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangocairo >= 1.10.0"`
+            
+        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_PANGOCAIRO=1
+      cat >> confdefs.h <<\EOF
+#define MOZ_PANGOCAIRO 1
+EOF
+
+      MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS"
+      MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS"
+    
+  else
+     :
   fi
 
 
     
     
     
+    
 fi
 
 if test "$MOZ_X11"
@@ -13212,7 +13217,7 @@
     _SAVE_LDFLAGS="$LDFLAGS"
     LDFLAGS="$XLDFLAGS $LDFLAGS"
     echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
-echo "configure:13216: checking for XpGetPrinterList in -lXp" >&5
+echo "configure:13221: 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
@@ -13220,7 +13225,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13224 "configure"
+#line 13229 "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
@@ -13231,7 +13236,7 @@
 XpGetPrinterList()
 ; return 0; }
 EOF
-if { (eval echo configure:13235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13240: \"$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
@@ -13304,7 +13309,7 @@
     # 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:13308: checking for $ac_word" >&5
+echo "configure:13313: 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
@@ -13348,19 +13353,19 @@
      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:13352: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
+echo "configure:13357: 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:13359: checking MOZ_GNOMEVFS_CFLAGS" >&5
+echo "configure:13364: 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:13364: checking MOZ_GNOMEVFS_LIBS" >&5
+echo "configure:13369: 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\"`"
@@ -13410,7 +13415,7 @@
     # 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:13414: checking for $ac_word" >&5
+echo "configure:13419: 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
@@ -13454,19 +13459,19 @@
      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:13458: checking for gconf-2.0 >= $GCONF_VERSION" >&5
+echo "configure:13463: 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:13465: checking MOZ_GCONF_CFLAGS" >&5
+echo "configure:13470: 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:13470: checking MOZ_GCONF_LIBS" >&5
+echo "configure:13475: 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\"`"
@@ -13512,7 +13517,7 @@
     # 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:13516: checking for $ac_word" >&5
+echo "configure:13521: 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
@@ -13556,19 +13561,19 @@
      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:13560: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
+echo "configure:13565: 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:13567: checking MOZ_LIBGNOME_CFLAGS" >&5
+echo "configure:13572: 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:13572: checking MOZ_LIBGNOME_LIBS" >&5
+echo "configure:13577: 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\"`"
@@ -13645,7 +13650,7 @@
     # 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:13649: checking for $ac_word" >&5
+echo "configure:13654: 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
@@ -13689,19 +13694,19 @@
      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:13693: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
+echo "configure:13698: 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:13700: checking MOZ_GNOMEUI_CFLAGS" >&5
+echo "configure:13705: 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:13705: checking MOZ_GNOMEUI_LIBS" >&5
+echo "configure:13710: 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\"`"
@@ -14181,7 +14186,7 @@
   # 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:14185: checking for $ac_word" >&5
+echo "configure:14190: 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
@@ -14217,7 +14222,7 @@
   # 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:14221: checking for $ac_word" >&5
+echo "configure:14226: 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
@@ -14363,7 +14368,7 @@
   gdiplus)
     MOZ_SVG_RENDERER_GDIPLUS=1
                         echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
-echo "configure:14367: checking for Gdiplus.h" >&5
+echo "configure:14372: checking for Gdiplus.h" >&5
     
     ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -14373,7 +14378,7 @@
 cross_compiling=$ac_cv_prog_cxx_cross
 
     cat > conftest.$ac_ext <<EOF
-#line 14377 "configure"
+#line 14382 "configure"
 #include "confdefs.h"
 #include <windows.h>
                     #include <unknwn.h>
@@ -14382,7 +14387,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -14482,13 +14487,13 @@
     msvc*|mks*|cygwin*|mingw*|wince*)
         if test -n "$MOZ_UPDATER"; then
             echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:14486: checking for iconv" >&5
+echo "configure:14491: 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:14492: checking for $ac_word" >&5
+echo "configure:14497: 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
@@ -14754,18 +14759,18 @@
 
 if test -n "$MOZ_DEBUG"; then
     echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
-echo "configure:14758: checking for valid debug flags" >&5
+echo "configure:14763: checking for valid debug flags" >&5
     _SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
     cat > conftest.$ac_ext <<EOF
-#line 14762 "configure"
+#line 14767 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello World\n");
 ; return 0; }
 EOF
-if { (eval echo configure:14769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   _results=yes
 else
@@ -14792,7 +14797,7 @@
    if test "$enableval" != "no"; then
     MOZ_OPTIMIZE=1
     if test -n "$enableval" && test "$enableval" != "yes"; then
-        MOZ_OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
+        MOZ_OPTIMIZE_FLAGS=`echo "$enableval" | sed -e 's|\\\ | |g'`
         MOZ_OPTIMIZE=2
     fi
 else
@@ -14806,18 +14811,18 @@
 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:14810: checking for valid optimization flags" >&5
+echo "configure:14815: checking for valid optimization flags" >&5
     _SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
     cat > conftest.$ac_ext <<EOF
-#line 14814 "configure"
+#line 14819 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 printf("Hello World\n");
 ; return 0; }
 EOF
-if { (eval echo configure:14821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   _results=yes
 else
@@ -15034,7 +15039,7 @@
 
 if test -n "$_ENABLE_EFENCE"; then
     echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
-echo "configure:15038: checking for malloc in -lefence" >&5
+echo "configure:15043: 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
@@ -15042,7 +15047,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lefence  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15046 "configure"
+#line 15051 "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
@@ -15053,7 +15058,7 @@
 malloc()
 ; return 0; }
 EOF
-if { (eval echo configure:15057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15062: \"$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
@@ -15154,12 +15159,12 @@
     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:15158: checking for $ac_func" >&5
+echo "configure:15163: 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 15163 "configure"
+#line 15168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15185,7 +15190,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15194: \"$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
@@ -15428,12 +15433,12 @@
     for ac_func in __cxa_demangle
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15432: checking for $ac_func" >&5
+echo "configure:15437: 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 15437 "configure"
+#line 15442 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15459,7 +15464,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15468: \"$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
@@ -15597,7 +15602,7 @@
 # Compiler Options
 
 echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
-echo "configure:15601: checking for gcc -pipe support" >&5
+echo "configure:15606: 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
@@ -15612,14 +15617,14 @@
         _SAVE_CFLAGS=$CFLAGS
         CFLAGS="$CFLAGS -pipe"
         cat > conftest.$ac_ext <<EOF
-#line 15616 "configure"
+#line 15621 "configure"
 #include "confdefs.h"
  #include <stdio.h> 
 int main() {
 printf("Hello World\n");
 ; return 0; }
 EOF
-if { (eval echo configure:15623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   _res_gcc_pipe="yes"
 else
@@ -15661,16 +15666,16 @@
      _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:15665: checking whether compiler supports -Wno-long-long" >&5
+echo "configure:15670: checking whether compiler supports -Wno-long-long" >&5
      cat > conftest.$ac_ext <<EOF
-#line 15667 "configure"
+#line 15672 "configure"
 #include "confdefs.h"
 
 int main() {
 return(0);
 ; return 0; }
 EOF
-if { (eval echo configure:15674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15679: \"$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"
@@ -15691,16 +15696,16 @@
 CFLAGS="$CFLAGS -fprofile-generate"
 
 echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
-echo "configure:15695: checking whether C compiler supports -fprofile-generate" >&5
+echo "configure:15700: checking whether C compiler supports -fprofile-generate" >&5
 cat > conftest.$ac_ext <<EOF
-#line 15697 "configure"
+#line 15702 "configure"
 #include "confdefs.h"
 
 int main() {
 return 0;
 ; return 0; }
 EOF
-if { (eval echo configure:15704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    PROFILE_GEN_CFLAGS="-fprofile-generate"
                  result="yes" 
@@ -15718,16 +15723,16 @@
 else
   CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
   echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
-echo "configure:15722: checking whether C compiler supports -fprofile-arcs" >&5
+echo "configure:15727: checking whether C compiler supports -fprofile-arcs" >&5
   cat > conftest.$ac_ext <<EOF
-#line 15724 "configure"
+#line 15729 "configure"
 #include "confdefs.h"
 
 int main() {
 return 0;
 ; return 0; }
 EOF
-if { (eval echo configure:15731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    PROFILE_GEN_CFLAGS="-fprofile-arcs"
                    result="yes" 
@@ -15773,18 +15778,21 @@
     _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:15777: checking whether C++ compiler has -pedantic long long bug" >&5
+echo "configure:15782: checking whether C++ compiler has -pedantic long long bug" >&5
     if test "$cross_compiling" = yes; then
   result="maybe" 
 else
   cat > conftest.$ac_ext <<EOF
-#line 15782 "configure"
+#line 15787 "configure"
 #include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
  int main () {
                 if (sizeof(long long) != 8) { return 1; } 
                     return 0; } 
 EOF
-if { (eval echo configure:15788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   result="no"
 else
@@ -15814,13 +15822,16 @@
 fi
 
 echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
-echo "configure:15818: checking for correct temporary object destruction order" >&5
+echo "configure:15826: checking for correct temporary object destruction order" >&5
 if test "$cross_compiling" = yes; then
   result="maybe"
 else
   cat > conftest.$ac_ext <<EOF
-#line 15823 "configure"
+#line 15831 "configure"
 #include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
  class A {
              public:  A(int& x) : mValue(x) {}
                       ~A() { mValue--; }
@@ -15839,7 +15850,7 @@
              }
              
 EOF
-if { (eval echo configure:15843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:15854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   result="yes"
 else
@@ -15860,12 +15871,12 @@
 _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:15864: checking for correct overload resolution with const and templates" >&5
+echo "configure:15875: 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 15869 "configure"
+#line 15880 "configure"
 #include "confdefs.h"
 
                       template <class T>
@@ -15895,7 +15906,7 @@
                     
 ; return 0; }
 EOF
-if { (eval echo configure:15899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_nscap_nonconst_opeq_bug="no"
 else
@@ -16158,7 +16169,7 @@
     # 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:16162: checking for $ac_word" >&5
+echo "configure:16173: 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
@@ -16202,19 +16213,19 @@
      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:16206: checking for libIDL-2.0 >= 0.8.0" >&5
+echo "configure:16217: 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:16213: checking LIBIDL_CFLAGS" >&5
+echo "configure:16224: 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:16218: checking LIBIDL_LIBS" >&5
+echo "configure:16229: 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\"`"
@@ -16337,7 +16348,7 @@
   # 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:16341: checking for $ac_word" >&5
+echo "configure:16352: 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
@@ -16372,7 +16383,7 @@
 
   min_glib_version=1.2.0
   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:16376: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:16387: checking for GLIB - version >= $min_glib_version" >&5
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -16395,7 +16406,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 16399 "configure"
+#line 16410 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -16471,7 +16482,7 @@
 }
 
 EOF
-if { (eval echo configure:16475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -16505,7 +16516,7 @@
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 16509 "configure"
+#line 16520 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -16515,7 +16526,7 @@
  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:16519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16530: \"$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"
@@ -16559,7 +16570,7 @@
   # 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:16563: checking for $ac_word" >&5
+echo "configure:16574: 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
@@ -16594,7 +16605,7 @@
 
   min_libIDL_version=$LIBIDL_VERSION
   echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
-echo "configure:16598: checking for libIDL - version >= $min_libIDL_version" >&5
+echo "configure:16609: checking for libIDL - version >= $min_libIDL_version" >&5
   no_libIDL=""
   if test "$LIBIDL_CONFIG" = "no" ; then
     no_libIDL=yes
@@ -16621,7 +16632,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 16625 "configure"
+#line 16636 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16707,7 +16718,7 @@
 }
 
 EOF
-if { (eval echo configure:16711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -16741,7 +16752,7 @@
           CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
           LIBS="$LIBS $LIBIDL_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 16745 "configure"
+#line 16756 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16752,7 +16763,7 @@
  return IDL_get_libver_string ? 1 : 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:16756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16767: \"$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"
@@ -16880,7 +16891,7 @@
   # 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:16884: checking for $ac_word" >&5
+echo "configure:16895: 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
@@ -16915,7 +16926,7 @@
 
   min_glib_version=1.2.0
   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:16919: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:16930: checking for GLIB - version >= $min_glib_version" >&5
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -16938,7 +16949,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 16942 "configure"
+#line 16953 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -17014,7 +17025,7 @@
 }
 
 EOF
-if { (eval echo configure:17018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -17048,7 +17059,7 @@
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 17052 "configure"
+#line 17063 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -17058,7 +17069,7 @@
  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:17062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17073: \"$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"
@@ -17102,7 +17113,7 @@
   # 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:17106: checking for $ac_word" >&5
+echo "configure:17117: 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
@@ -17137,7 +17148,7 @@
 
   min_libIDL_version=$LIBIDL_VERSION
   echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
-echo "configure:17141: checking for libIDL - version >= $min_libIDL_version" >&5
+echo "configure:17152: checking for libIDL - version >= $min_libIDL_version" >&5
   no_libIDL=""
   if test "$LIBIDL_CONFIG" = "no" ; then
     no_libIDL=yes
@@ -17164,7 +17175,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 17168 "configure"
+#line 17179 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17250,7 +17261,7 @@
 }
 
 EOF
-if { (eval echo configure:17254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -17284,7 +17295,7 @@
           CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
           LIBS="$LIBS $LIBIDL_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 17288 "configure"
+#line 17299 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17295,7 +17306,7 @@
  return IDL_get_libver_string ? 1 : 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:17299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17310: \"$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"
@@ -17336,7 +17347,7 @@
     # 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:17340: checking for $ac_word" >&5
+echo "configure:17351: 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
@@ -17380,19 +17391,19 @@
      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:17384: checking for libIDL-2.0 >= 0.8.0" >&5
+echo "configure:17395: 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:17391: checking LIBIDL_CFLAGS" >&5
+echo "configure:17402: 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:17396: checking LIBIDL_LIBS" >&5
+echo "configure:17407: 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\"`"
@@ -17428,7 +17439,7 @@
 # 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:17432: checking for $ac_word" >&5
+echo "configure:17443: 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
@@ -17465,7 +17476,7 @@
 
         if test -n "$ORBIT_CONFIG"; then
             echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
-echo "configure:17469: checking for ORBit libIDL usability" >&5
+echo "configure:17480: 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}`
@@ -17482,7 +17493,7 @@
                 result="maybe" 
 else
   cat > conftest.$ac_ext <<EOF
-#line 17486 "configure"
+#line 17497 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17497,7 +17508,7 @@
 }
             
 EOF
-if { (eval echo configure:17501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17512: \"$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"
@@ -17551,7 +17562,7 @@
     # 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:17555: checking for $ac_word" >&5
+echo "configure:17566: 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
@@ -17595,19 +17606,19 @@
      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:17599: checking for glib-2.0 >= 1.3.7" >&5
+echo "configure:17610: 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:17606: checking GLIB_CFLAGS" >&5
+echo "configure:17617: 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:17611: checking GLIB_LIBS" >&5
+echo "configure:17622: 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\"`"
@@ -17691,7 +17702,7 @@
   # 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:17695: checking for $ac_word" >&5
+echo "configure:17706: 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
@@ -17726,7 +17737,7 @@
 
   min_glib_version=${GLIB_VERSION}
   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:17730: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:17741: checking for GLIB - version >= $min_glib_version" >&5
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -17749,7 +17760,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 17753 "configure"
+#line 17764 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -17825,7 +17836,7 @@
 }
 
 EOF
-if { (eval echo configure:17829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:17840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -17859,7 +17870,7 @@
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 17863 "configure"
+#line 17874 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -17869,7 +17880,7 @@
  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:17873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17884: \"$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"
@@ -17948,19 +17959,19 @@
   # 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:17952: checking for working alloca.h" >&5
+echo "configure:17963: 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 17957 "configure"
+#line 17968 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:17964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17975: \"$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
@@ -17981,12 +17992,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:17985: checking for alloca" >&5
+echo "configure:17996: 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 17990 "configure"
+#line 18001 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -18014,7 +18025,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:18018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18029: \"$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
@@ -18046,12 +18057,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:18050: checking whether alloca needs Cray hooks" >&5
+echo "configure:18061: 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 18055 "configure"
+#line 18066 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -18076,12 +18087,12 @@
 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:18080: checking for $ac_func" >&5
+echo "configure:18091: 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 18085 "configure"
+#line 18096 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18104,7 +18115,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:18108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18119: \"$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
@@ -18131,7 +18142,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:18135: checking stack direction for C alloca" >&5
+echo "configure:18146: 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
@@ -18139,7 +18150,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 18143 "configure"
+#line 18154 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -18158,7 +18169,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:18162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18173: \"$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
@@ -18207,17 +18218,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:18211: checking for $ac_hdr" >&5
+echo "configure:18222: 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 18216 "configure"
+#line 18227 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:18221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18232: \"$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*
@@ -18297,7 +18308,7 @@
     # 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:18301: checking for $ac_word" >&5
+echo "configure:18312: 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
@@ -18341,19 +18352,19 @@
      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:18345: checking for cairo >= $CAIRO_VERSION" >&5
+echo "configure:18356: 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:18352: checking CAIRO_CFLAGS" >&5
+echo "configure:18363: 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:18357: checking CAIRO_LIBS" >&5
+echo "configure:18368: 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\"`"
@@ -18418,7 +18429,7 @@
         # 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:18422: checking for $ac_word" >&5
+echo "configure:18433: 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
@@ -18679,14 +18690,14 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
     cat > conftest.$ac_ext <<EOF
-#line 18683 "configure"
+#line 18694 "configure"
 #include "confdefs.h"
 #include <gmodule.h>
 int main() {
  int x = 1; x++; 
 ; return 0; }
 EOF
-if { (eval echo configure:18690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:18701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -18979,7 +18990,7 @@
                 _SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $XCFLAGS"
     cat > conftest.$ac_ext <<EOF
-#line 18983 "configure"
+#line 18994 "configure"
 #include "confdefs.h"
 
         #include <stdio.h>
@@ -18995,7 +19006,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:18999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -19212,34 +19223,15 @@
 # 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
 
@@ -19517,12 +19509,13 @@
 s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
 s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
 s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g
-s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g
-s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g
-s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g
 s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g
 s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g
+s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g
+s%@PANGOCAIRO_CHK_CFLAGS@%$PANGOCAIRO_CHK_CFLAGS%g
+s%@PANGOCAIRO_CHK_LIBS@%$PANGOCAIRO_CHK_LIBS%g
 s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g
+s%@MOZ_PANGOCAIRO@%$MOZ_PANGOCAIRO%g
 s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g
 s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g
 s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g
@@ -20152,7 +20145,7 @@
       fi
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -20295,7 +20288,7 @@
       fi
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
--- firefox-1.5.dfsg.orig/configure.in
+++ firefox-1.5.dfsg/configure.in
@@ -1465,8 +1465,7 @@
         MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
     ;;
     mips*)
-        CFLAGS="$CFLAGS -Wa,-xgot"
-        CXXFLAGS="$CXXFLAGS -Wa,-xgot"
+        MOZ_DEBUG_FLAGS="-g"   # We want inlining
     ;;
     esac
     ;;
@@ -2400,8 +2399,8 @@
                     ])
       if test "$ac_cv_visibility_pragma" = "yes"; then
         AC_DEFINE(HAVE_VISIBILITY_PRAGMA)
-        VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
-        WRAP_SYSTEM_INCLUDES=1
+        VISIBILITY_FLAGS='-fvisibility=hidden'
+        WRAP_SYSTEM_INCLUDES=
       fi
    fi
 fi     # GNU_CC
@@ -3711,8 +3710,8 @@
     MOZ_ENABLE_GTK2=1
     MOZ_ENABLE_XREMOTE=1
     MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
-    TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
-    TK_LIBS='$(MOZ_GTK2_LIBS)'
+    TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)'
+    TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)'
     AC_DEFINE(MOZ_WIDGET_GTK2)
     ;;
 
@@ -4013,7 +4012,7 @@
 
 browser)
   MOZ_APP_NAME=firefox
-  MOZ_APP_DISPLAYNAME=DeerPark
+  MOZ_APP_DISPLAYNAME=Firefox
   MOZ_XUL_APP=1
   MOZ_PHOENIX=1
   MOZ_APP_VERSION=$FIREFOX_VERSION
@@ -4295,12 +4294,14 @@
 then
     AC_DEFINE(MOZ_ENABLE_XFT)
     PKG_CHECK_MODULES(MOZ_XFT, xft)
-    PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0)
+    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox)
 fi
 
 AC_SUBST(MOZ_ENABLE_XFT)
 AC_SUBST(MOZ_XFT_CFLAGS)
 AC_SUBST(MOZ_XFT_LIBS)
+AC_SUBST(MOZ_PANGO_CFLAGS)
+AC_SUBST(MOZ_PANGO_LIBS)
 
 dnl ========================================================
 dnl = pango font rendering
@@ -4313,9 +4314,18 @@
 if test "$MOZ_ENABLE_PANGO"
 then
     AC_DEFINE(MOZ_ENABLE_PANGO)
-    PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0)
+    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
+    PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0,
+    [ 
+      MOZ_PANGOCAIRO=1
+      AC_DEFINE(MOZ_PANGOCAIRO)
+      MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS"
+      MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS"
+    ],
+    [:])
 
     AC_SUBST(MOZ_ENABLE_PANGO)
+    AC_SUBST(MOZ_PANGOCAIRO)
     AC_SUBST(MOZ_PANGO_CFLAGS)
     AC_SUBST(MOZ_PANGO_LIBS)
 fi
@@ -5214,7 +5224,7 @@
 [ if test "$enableval" != "no"; then
     MOZ_OPTIMIZE=1
     if test -n "$enableval" && test "$enableval" != "yes"; then
-        MOZ_OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
+        MOZ_OPTIMIZE_FLAGS=`echo "$enableval" | sed -e 's|\\\ | |g'`
         MOZ_OPTIMIZE=2
     fi
 else
--- firefox-1.5.dfsg.orig/Makefile.in
+++ firefox-1.5.dfsg/Makefile.in
@@ -473,6 +473,7 @@
 	$(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
 	$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
 endif
+	$(MAKE) -C security/nss export DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nss
 ifdef MOZ_LDAP_XPCOM
 	$(MAKE) -C directory/c-sdk real_install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/ldap
 endif
--- firefox-1.5.dfsg.orig/debian/firefox.mime
+++ firefox-1.5.dfsg/debian/firefox.mime
@@ -0,0 +1,5 @@
+text/html; /usr/bin/firefox %s; description=HTML Text; test=test -n "$DISPLAY";  nametemplate=%s.html; priority=5
+text/xml; /usr/bin/firefox %s; description=XML Text; test=test -n "$DISPLAY";  nametemplate=%s.xml; priority=5
+image/png;  /usr/bin/firefox %s; description=PNG Image; test=test -n "$DISPLAY";  nametemplate=%s.png; priority=2
+image/jpeg;  /usr/bin/firefox %s; description=JPEG Image; test=test -n "$DISPLAY";  nametemplate=%s.jpeg; priority=2
+image/gif;  /usr/bin/firefox %s; description=GIF Image; test=test -n "$DISPLAY";  nametemplate=%s.gif; priority=2
--- firefox-1.5.dfsg.orig/debian/control
+++ firefox-1.5.dfsg/debian/control
@@ -0,0 +1,138 @@
+Source: firefox
+Section: web
+Priority: optional
+Maintainer: Eric Dorland <eric@debian.org>
+Uploaders: Mike Hommey <glandium@debian.org>
+Build-Depends: debhelper (>= 4.0), libx11-dev, libxp-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, patch, sharutils, m4
+Standards-Version: 3.6.2.1
+
+Package: firefox
+Architecture: any
+Depends: fontconfig, psmisc, debianutils (>= 1.16), ${shlibs:Depends}, libnspr4 (>= 2:1.firefox${Source-Version}), libnss3 (>= 2:1.firefox${Source-Version})
+Suggests: firefox-gnome-support (= ${Source-Version}), latex-xft-fonts
+Provides: www-browser, mozilla-firefox
+Conflicts: mozilla-firefox (<< ${Source-Version})
+Replaces: mozilla-firefox (<< ${Source-Version})
+Description: lightweight web browser based on Mozilla
+ Firefox is a redesign of the Mozilla browser component, similar to
+ Galeon, K-Meleon and Camino, but written using the XUL user interface
+ language and designed to be lightweight and cross-platform.
+ .
+ This browser was previously known as Firebird and Phoenix.
+
+Package: firefox-dom-inspector
+Architecture: any
+Depends: ${shlibs:Depends}, firefox (= ${Source-Version})
+Provides: mozilla-firefox-dom-inspector
+Replaces: mozilla-firefox-dom-inspector 
+Conflicts: mozilla-firefox-dom-inspector
+Description: tool for inspecting the DOM of pages in Mozilla Firefox
+ This is a tool that allows you to inspect the DOM for web pages in
+ Firefox.  This is of great use to people who are doing Mozilla chrome
+ development or web page development.
+
+Package: firefox-gnome-support
+Architecture: any
+Depends: ${shlibs:Depends}, firefox (= ${Source-Version})
+Provides: mozilla-firefox-gnome-support
+Replaces: mozilla-firefox-gnome-support, firefox (<< 1.0.7-0ubuntu15)
+Conflicts: mozilla-firefox-gnome-support
+Description: Support for Gnome in Mozilla Firefox
+ This is an extension to Firefox that allows it to use protocol
+ handlers from Gnome-VFS, such as smb or sftp, and other Gnome
+ integration features.
+
+Package: mozilla-firefox
+Architecture: all
+Depends: firefox
+Description: Transition package for firefox rename
+ Package to ease upgrading from older mozilla-firefox packages to the
+ new firefox package.
+ .
+ This package can be purged at anytime once the firefox package has
+ been installed.
+
+Package: firefox-dev
+Architecture: any
+Section: devel
+Depends: firefox (= ${Source-Version}), libnss-dev (= 2:1.firefox${Source-Version}), libnspr-dev (= 2:1.firefox${Source-Version})
+Provides: mozilla-firefox-dev
+Replaces: mozilla-firefox-dev
+Conflicts: mozilla-firefox-dev
+Description: Development files for Mozilla Firefox
+ This package contains the development headers, idl files and static libraries 
+ needed to develop applications using Mozilla Firefox.
+
+Package: mozilla-firefox-dev
+Architecture: all
+Section: devel
+Depends: firefox-dev
+Description: dummy transitional package
+ This package is to aid the transition to firefox-dev
+
+Package: libnspr4
+Priority: optional
+Section: libs
+Architecture: any
+Replaces: libnspr3
+Conflicts: libnspr3
+Depends: ${shlibs:Depends}
+Description: Netscape Portable Runtime Library
+ This library provides platform independent non-GUI operating system
+ facilities including:
+   * threads,
+   * thread synchronisation,
+   * normal file I/O and network I/O,
+   * interval timing and calendar time,
+   * basic memory management (malloc and free),
+   * shared library linking.
+ This Ubuntu-specific version is built using the the Firefox NSPR.
+ .
+ See http://www.mozilla.org/docs/refList/refNSPR/ for more
+ information about NSPR.
+
+Package: libnspr-dev
+Priority: optional
+Section: libdevel
+Architecture: any
+Replaces: mozilla-dev (<< 1.2-2)
+Depends: libnspr4 (= 2:1.firefox${Source-Version})
+Description: Netscape Portable Runtime library - development files
+ NSPR provides platform independence for non-GUI operating system
+ facilities including:
+  * threads,
+  * thread synchronisation,
+  * normal file I/O and network I/O,
+  * interval timing and calendar time,
+  * basic memory management (malloc and free),
+  * shared library linking.
+ .
+ This Ubuntu-specific version is built using the the Firefox NSPR.
+ You need this package to get includes and static libraries for building
+ programs linked to NSPR.
+ .
+ See http://www.mozilla.org/docs/refList/refNSPR/ for more
+ information about NSPR.
+
+Package: libnss3
+Priority: optional
+Section: libs
+Architecture: any
+Replaces: mozilla-psm (<< 2:0.9.9), firefox (<< 2:1.firefox1.5.dfsg-4ubuntu4)
+Depends: ${shlibs:Depends}
+Description: Network Security Service Libraries - runtime
+ This package provides the runtime libraries needed to use the Netscape
+ SSL/TLS layer, including S/MIME and key management.
+ .
+ This Ubuntu-specific version is built using the the Firefox libnss.
+
+Package: libnss-dev
+Priority: optional
+Section: libdevel
+Architecture: any
+Depends: libnss3 (= 2:1.firefox${Source-Version}), libnspr-dev (= 2:1.firefox${Source-Version})
+Description: Network Security Service Libraries - development
+ This package provides the development files needed to compile programs that
+ use the Netscape SSL/TLS layer.
+ .
+ This Ubuntu-specific version is built using the the Firefox libnss.
--- firefox-1.5.dfsg.orig/debian/README.Debian
+++ firefox-1.5.dfsg/debian/README.Debian
@@ -0,0 +1,97 @@
+README for Debian
+=================
+
+*** Please submit non packaging issue (e.g. feature requests) bugs to
+the Debian BTS and the upstream bugzilla
+(http://bugzilla.mozilla.org/buglist.cgi?product=Firefox) and put a
+reference to the bugzilla bug in the Debian bug report, to ease bug
+triage for the maintainer. Thank you. ***
+
+Firefox is still in heavy development, and it does not fully support
+upgrading from one release to another. Moving your .mozilla/firefox
+directory out of the way should be your first course of action before
+filing a bug report. Please see #202130 for an excellent analysis. You
+may also want to try removing ~/.mozilla/firefox/default/*/XUL.mfasl.
+
+Firefox 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.
+
+Application Update
+------------------
+
+From version 1.5beta1 onwards, the automatic application update has been
+disabled through the app.update.enabled preference, which is locked to
+'false' by /usr/lib/firefox/greprefs/firefox.cfg.
+
+Automatic extensions update, which used to be disabled; has been re-enabled,
+since the Extensions Manager has a correct behaviour with system-wide
+installed extensions now.
+
+Extensions
+----------
+
+From Firefox 0.9, "old" extensions are disabled at first run (i.e.
+when no profile was found). By old extensions, Firefox means extensions
+not following the new extensions guidelines described at:
+http://www.bengoodger.com/software/mb/extensions/packaging/extensions.html
+But even the ones following these guidelines can be considered old if the
+contents.rdf file in their chrome gives the attribute chrome:extension = 
+"true" in the package information.
+
+Some extensions can also get disabled by a new release of Firefox, because
+the install.rdf file provided by the extension says it's targetted for a
+maximum version older than the current one.
+
+Packaged Extensions
+-------------------
+
+With older versions of Firefox, an update-mozilla-firefox-chrome script was
+provided so that extensions are correctly enabled in Firefox. This has been
+obsoleted by the new Extensions Manager, and the update-mozilla-firefox-chrome
+script removed. Packages that use this script to support older versions of
+Firefox are advised to check for its presence before using it.
+
+Sound
+-----
+
+By default, firefox detects and runs the correct dsp wrapper for esd
+or arts. If this is not the desired behaviour, edit
+/etc/firefox/mozilla-firefoxrc or ~/.mozilla/firefox/rc and set
+the FIREFOX_DSP variable to:
+
+"auto": The default, auto-detection.
+
+"esddsp": Use esd.
+
+"artsdsp": Use arts.
+
+"none": Don't use any sound wrapper.
+
+
+using Java. (You should use plugin which compiled with gcc-3.2)
+----------
+ 
+Grab a binary Java distribution from http://java.sun.com/. Install the
+java-package package and do a make-jpkg on the file.
+
+Buttons
+-------
+
+Some people have complained that the button order in dialogs is
+non-intuitive (ie, they don't like it). To reverse the order, add the
+following to your chrome/userChrome.css file, under the
+~/.mozilla/firefox directory:
+
+.dialog-button-box { -moz-box-direction: reverse; -moz-box-pack: right; }
+.dialog-button-box spacer { display: none ! important; }
+
+Emacs keybindings
+-----------------
+
+Versions of Firefox before 1.0 supported Emacs style keybindings in
+text entry boxes. Version 1.0 now merely follows the GTK keybindings
+settings. To enable Emacs keybindings in GTK, follow the instructions
+at http://kb.mozillazine.org/Emacs_Keybindings_(Firefox).
+
+ -- Eric Dorland <eric@debian.org>, Sun Nov 27 13:34:23 2005
--- firefox-1.5.dfsg.orig/debian/changelog
+++ firefox-1.5.dfsg/debian/changelog
@@ -0,0 +1,2368 @@
+firefox (1.5.dfsg-4ubuntu4) dapper; urgency=low
+
+  * libnssckbi.so must not be installed in /usr/lib/mozilla, move it to
+    /usr/lib/firefox; /usr/lib/mozilla is the namespace of the mozilla/
+    mozilla-browser package; we cannot conflict runtime packages like
+    libnss3 and mozilla-browser as we do for the -dev packages.
+  * Current libnss3 replaces older firefox package.
+  * Set vendor name to Ubuntu.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 21 Jan 2006 15:27:01 +0100
+
+firefox (1.5.dfsg-4ubuntu3) dapper; urgency=low
+
+  * Invoke dh_shlibdeps with -Xlibssl3.so; this avoids a fakeroot bug
+    which causes ldd to segfault on amd64.  (Thanks to Adam Conrad for
+    the hint.)
+  * Ship nspr-config in libnspr-dev's /usr/bin.
+  * firefox package Depends on libnss3 as it should.
+  * Work around bug in esddsp, which makes firefox crash on startup
+    on amd64, by setting default FIREFOX_DSP to none on amd64.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 19 Jan 2006 19:23:09 +0000
+
+firefox (1.5.dfsg-4ubuntu2) dapper; urgency=low
+
+  * Remove obsolete patches for extended mouse buttons.
+    (Closes Malone #27783; related to Debian 348375.)
+  * Cope with incompatible make syntax in debian/rules
+    for multi-line sedder.
+  * Build package with .orig.tar.gz in correct way.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Wed, 18 Jan 2006 19:02:19 +0000
+
+firefox (1.5.dfsg-4ubuntu1) dapper; urgency=low
+
+  * New Debian version imported into Ubuntu.  Changes included in this
+    Ubuntu version, compared to Debian:
+    - Build libnss and libnspr from the firefox package, and provide
+      firefox-dev for embedders.  This approach allows mozilla to be
+      relegated to Ubuntu universe.  It also means we can build a
+      dynamically linked firefox.
+    - Disable xprint support.  Ubuntu does not use xprint.
+    - Disable import wizard (as it is broken).
+    - Disable Clear Search History since it does not clear the URL
+      history, ie it leaves information about searches in the profile.
+    - Download to `Desktop' folder by default.
+    - Use `mktemp -t' not `mktemp /tmp....' in wrapper script.
+    - Configure to use Pango and Cairo.
+    - Minor changes to the transitional arrangements in debian/control.
+    - Replace Debian search by Ubuntu search.
+    - Adjustments to the icons supplied and used.
+    - .desktop file has more translations and refers to the browswer as
+      `Firefox Web Browser' (for better UI in the menus - this change is
+      also in firefox.menu).
+    - Fixed dh_install exclusion strings -X*inspector* to -Xinspector
+      in debian/rules.
+    - In debian/rules clean, delete a whole lot of cruft that the build
+      leaves behind but which make distclean doesn't delete.
+    - List __MIPSEL as a little-endian arch in fdlibm.h.
+    - Whening printing prefer Times and Courier.
+    - Default postscript print command copes with printer names with
+      spaces.
+    - Make password manager work with sites with only one
+      form field, the password (eg, mailman!)
+    - Strip CUPS/ from the front of displayed printer names since
+      all Ubuntu printers are CUPS.
+    - Patch imported from RH to make firefox use Gnome mime database.
+    - Various other minor changes to default preferences.
+  
+  * Changes compared to 1.4.99+1.5rc3.dfsg-1ubuntu12, the previous Ubuntu
+    package for Dapper:
+    - New Debian version, including Debian changes since
+      1.4.99+1.5rc3.dfsg-1 - see below.  Major change: package renamed.
+    - /usr/lib/mozilla-firefox -> /usr/lib/firefox
+    - Slightly changed arrangements for enabling pangocairo (now
+      Ubuntu is aligned with Debian).
+    - Minor changes to debian/control (and hence to binary packages'
+      control files) to reduce size of the diff from Debian.
+    - Extensive adjustments to debian/rules to fit new names in Debian
+      so we have to do less work.
+    - Revert workaround for presumed make bug with multi-line seddery
+      (hope this works!)
+    - Remove obsolete files debian/inspector/* relating to previous
+      arrangements for the dom inspector.
+    - Remove junk files debian/{nspr4,nss3}/DEBIAN.
+    - Discard change to debian/presubj regarding bug reporting.
+    - Icons in firefox package moved from /usr/lib to /usr/share
+      and other fiddling with icon locations.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Tue, 17 Jan 2006 19:09:25 +0000
+
+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
--- firefox-1.5.dfsg.orig/debian/firefox.postinst
+++ firefox-1.5.dfsg/debian/firefox.postinst
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" -o "$1" = "abort-upgrade" ] ; then
+    update-alternatives --install /usr/bin/x-www-browser \
+        x-www-browser /usr/bin/firefox 70 \
+        --slave /usr/share/man/man1/x-www-browser.1.gz \
+        x-www-browser.1.gz /usr/share/man/man1/firefox.1.gz
+    update-alternatives --install /usr/bin/mozilla mozilla \
+        /usr/bin/firefox 0 \
+        --slave /usr/share/man/man1/mozilla.1.gz mozilla.1.gz \
+        /usr/share/man/man1/firefox.1.gz
+fi
+
+if [ -x /usr/sbin/update-desktop-database ]; then
+    /usr/sbin/update-desktop-database
+fi
+
+#DEBHELPER#
+
+echo "Please restart any running Firefoxes, or you will experience problems."
--- firefox-1.5.dfsg.orig/debian/README.Ubuntu
+++ firefox-1.5.dfsg/debian/README.Ubuntu
@@ -0,0 +1,66 @@
+**** NOTES regarding this version of firefox ****
+
+This package is a preliminary release for early in the release cycle
+for Ubuntu Dapper.  It currently contains both unredacted notes about
+the actual package, and work list items.
+
+ -iwj 17.01.2005
+
+
+fixmes
+ check for -DMOZ_PANGOCAIRO
+  if so then Pango para in README.Debian is wrong
+ check for TK_LIBS having MOZ_XFT_LIBS or whatever it is that's needed
+ sort out this README
+
+
+
+REVERTED NEED TO BE REIMPLEMENTED
+
+* Preferences / Advanced / Update
+remove Firefox update bits
+in browser/components/preferences/advanced.xul
+
+
+
+TO BE SORTED OUT STILL
+
+* Disable installation of themes and extensions from websites
+  see for example toolkit/mozapps/extensions/content/extensions.xul.~diff-left~
+
+    - Startup homepage changed (browser/app/profile/firefox.js)
+      (
+
+* Choose default set of live bookmarks
+* Choose and set up default bookmarks
+
+
+REVERTED SHOULD BE OK
+
+(stuff known to be ok removed)
+
+* Some stuff about plugins
+in debian/README.Debian
+
+* In toolkit/components/cookie/content/cookieAcceptDialog.js
++  document.getElementById("Button2").setAttribute("icon","accept");
+near
+ hook up button icons where implemented
+but since we already have
+ document.getElementById("ok").setAttribute("icon","accept");
+that seems wrong
+
+* debian/patches/xpinstall.diff: remove unneeded chrome registrations
+  from xpinstall/packager/unix/browser.jst.
+
+* Most of debian/rules changes
+
+
+
+REVERTED NOT UNDERSTOOD, NOT FOUND IN debian/changelog
+
+* Strip spaces from nativeCommand
+in uriloader/exthandler/unix/nsGNOMERegistry.cpp
+
+* Some colour changes
+in widget/src/gtk2/nsLookAndFeel.cpp
--- firefox-1.5.dfsg.orig/debian/firefox.preinst
+++ firefox-1.5.dfsg/debian/firefox.preinst
@@ -0,0 +1,38 @@
+#!/bin/sh -e
+
+if [ "$1" = 'install' ]; then
+    if [ -d /etc/mozilla-firefox ] && [ ! -d /etc/firefox ]; then
+        mkdir /etc/firefox > /dev/null 2>&1 || true
+        
+        if [ -f /etc/mozilla-firefox/mozilla-firefoxrc ] \
+            && [ ! -f /etc/firefox/firefoxrc ]; then
+            cp -fa /etc/mozilla-firefox/mozilla-firefoxrc \
+                /etc/firefox/firefoxrc
+        fi
+        
+        if [ -d /etc/mozilla-firefox/profile ] \
+            && [ ! -d /etc/firefox/profile ]; then
+            cp -fa /etc/mozilla-firefox/profile /etc/firefox/profile
+        fi
+
+        if [ -d /etc/mozilla-firefox/pref ] \
+            && [ ! -d /etc/firefox/pref ]; then
+            cp -fa /etc/mozilla-firefox/pref /etc/firefox/pref
+        fi
+    fi
+fi
+
+# Remove some directories that are now symlinks
+if [ -d /usr/lib/firefox/icons ]; then
+    rm -rf /usr/lib/firefox/icons
+fi
+
+if [ -d /usr/lib/firefox/searchplugins ]; then
+    rm -rf /usr/lib/firefox/searchplugins
+fi
+
+if [ -d /usr/lib/firefox/res ]; then
+    rm -rf /usr/lib/firefox/res
+fi
+
+#DEBHELPER#
--- firefox-1.5.dfsg.orig/debian/firefox.dirs
+++ firefox-1.5.dfsg/debian/firefox.dirs
@@ -0,0 +1,3 @@
+usr/sbin
+etc/firefox
+usr/lib/firefox/chrome/icons/default
--- firefox-1.5.dfsg.orig/debian/firefox-gnome-support.install
+++ firefox-1.5.dfsg/debian/firefox-gnome-support.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/firefox/components/*gnome* usr/lib/firefox/components
+debian/tmp/usr/lib/firefox/components/*imgicon* usr/lib/firefox/components
--- firefox-1.5.dfsg.orig/debian/firefox.manpages
+++ firefox-1.5.dfsg/debian/firefox.manpages
@@ -0,0 +1 @@
+debian/firefox.1
--- firefox-1.5.dfsg.orig/debian/watch
+++ firefox-1.5.dfsg/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/([\d\.]+)/source/firefox-([\d\.]+)-source.tar.bz2
--- firefox-1.5.dfsg.orig/debian/debsearch.gif.uu
+++ firefox-1.5.dfsg/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
--- firefox-1.5.dfsg.orig/debian/debsearch.src
+++ firefox-1.5.dfsg/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="dapper">
+<input name="release" value="all">
+<input name="keywords" user="">
+<input name="sourceid" value="mozilla-search">
+
+</search>
--- firefox-1.5.dfsg.orig/debian/firefox-dom-inspector.install
+++ firefox-1.5.dfsg/debian/firefox-dom-inspector.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/firefox/extensions/inspector@mozilla.org usr/lib/firefox/extensions/
--- firefox-1.5.dfsg.orig/debian/firefox-dev.dirs
+++ firefox-1.5.dfsg/debian/firefox-dev.dirs
@@ -0,0 +1,4 @@
+usr/lib/pkgconfig
+usr/share/idl
+usr/include
+usr/bin
--- firefox-1.5.dfsg.orig/debian/firefox.xpm
+++ firefox-1.5.dfsg/debian/firefox.xpm
@@ -0,0 +1,1144 @@
+/* XPM */
+static char * mozicon50_xpm[] = {
+"48 48 1093 2",
+"  	c None",
+". 	c #2099CF",
+"+ 	c #2CA7D9",
+"@ 	c #33AEDD",
+"# 	c #34B2E1",
+"$ 	c #35B8E5",
+"% 	c #2FBAE8",
+"& 	c #26B5E4",
+"* 	c #199FD6",
+"= 	c #177DB8",
+"- 	c #2C8FC4",
+"; 	c #43A0CE",
+"> 	c #55ADD6",
+", 	c #5CB5DD",
+"' 	c #61C4E8",
+") 	c #63CBED",
+"! 	c #64CFF1",
+"~ 	c #63D1F2",
+"{ 	c #5ECCEF",
+"] 	c #57C3E9",
+"^ 	c #4EB8E1",
+"/ 	c #3CABD9",
+"( 	c #2A9ED1",
+"_ 	c #1991C9",
+": 	c #0F7CBA",
+"< 	c #166EAC",
+"[ 	c #3387BC",
+"} 	c #4797C6",
+"| 	c #51A0CC",
+"1 	c #56A7D2",
+"2 	c #5BAED7",
+"3 	c #60B6DD",
+"4 	c #67CDEE",
+"5 	c #69D3F2",
+"6 	c #6BD4F4",
+"7 	c #69D3F4",
+"8 	c #63CDEF",
+"9 	c #5AC0E6",
+"0 	c #51B6DF",
+"a 	c #49ACD8",
+"b 	c #42A2D1",
+"c 	c #3898CA",
+"d 	c #298CC2",
+"e 	c #167EB9",
+"f 	c #0B5A9C",
+"g 	c #2674AE",
+"h 	c #3D87BA",
+"i 	c #4590C0",
+"j 	c #4B97C6",
+"k 	c #519FCB",
+"l 	c #58A6D1",
+"m 	c #5DADD5",
+"n 	c #62B3DA",
+"o 	c #69C3E6",
+"p 	c #6ED4F2",
+"q 	c #6FD6F4",
+"r 	c #6ED5F4",
+"s 	c #6AD3F2",
+"t 	c #5FC3E7",
+"u 	c #53B2DC",
+"v 	c #4BA8D5",
+"w 	c #439FCE",
+"x 	c #3B95C7",
+"y 	c #338BC0",
+"z 	c #2B82B9",
+"A 	c #1D76B1",
+"B 	c #0C69A9",
+"C 	c #10599A",
+"D 	c #2D71AA",
+"E 	c #377CB2",
+"F 	c #3D84B8",
+"G 	c #458DBE",
+"H 	c #4B95C4",
+"I 	c #529CC9",
+"J 	c #59A4CF",
+"K 	c #5FABD4",
+"L 	c #65B1D8",
+"M 	c #6BC2E4",
+"N 	c #71D5F3",
+"O 	c #73D6F3",
+"P 	c #72D5F3",
+"Q 	c #6DD1F0",
+"R 	c #5FBBE2",
+"S 	c #54ADD8",
+"T 	c #4CA4D2",
+"U 	c #439ACB",
+"V 	c #3B91C4",
+"W 	c #3487BD",
+"X 	c #2D7EB7",
+"Y 	c #2675AF",
+"Z 	c #1E6CA9",
+"` 	c #0F5FA0",
+" .	c #055296",
+"..	c #115394",
+"+.	c #2767A2",
+"@.	c #2F70A9",
+"#.	c #3679AF",
+"$.	c #3C81B5",
+"%.	c #448ABC",
+"&.	c #4A92C2",
+"*.	c #519AC7",
+"=.	c #58A2CD",
+"-.	c #5FA9D2",
+";.	c #65B0D7",
+">.	c #6EC8E9",
+",.	c #74D4F2",
+"'.	c #76D6F3",
+").	c #75D6F3",
+"!.	c #71D3F1",
+"~.	c #62BCE1",
+"{.	c #54A9D5",
+"].	c #4C9FCE",
+"^.	c #4396C8",
+"/.	c #3B8CC1",
+"(.	c #3483BA",
+"_.	c #2C7AB3",
+":.	c #2670AC",
+"<.	c #1F68A6",
+"[.	c #195F9F",
+"}.	c #0D5497",
+"|.	c #04488D",
+"1.	c #0F4A8D",
+"2.	c #1F5A98",
+"3.	c #2663A0",
+"4.	c #2D6DA6",
+"5.	c #3475AD",
+"6.	c #3B7EB3",
+"7.	c #4287B9",
+"8.	c #4990C1",
+"9.	c #51A4CF",
+"0.	c #569FCA",
+"a.	c #5DA6CF",
+"b.	c #66B5DB",
+"c.	c #6FD1F0",
+"d.	c #75D4F1",
+"e.	c #79D5F2",
+"f.	c #75D3F1",
+"g.	c #63BBE0",
+"h.	c #54A4D1",
+"i.	c #4B9BCB",
+"j.	c #4391C4",
+"k.	c #3B88BD",
+"l.	c #337FB6",
+"m.	c #2C76B0",
+"n.	c #266CA9",
+"o.	c #1F64A3",
+"p.	c #1A5B9C",
+"q.	c #145396",
+"r.	c #0A498E",
+"s.	c #034C8F",
+"t.	c #085293",
+"u.	c #164D8E",
+"v.	c #1D5695",
+"w.	c #24609C",
+"x.	c #2A69A3",
+"y.	c #3271AA",
+"z.	c #387AAF",
+"A.	c #429FCC",
+"B.	c #4CBFE4",
+"C.	c #52C4E8",
+"D.	c #57AFD7",
+"E.	c #5DB3DA",
+"F.	c #65C5E7",
+"G.	c #6DD0EE",
+"H.	c #72D2EF",
+"I.	c #78D4F0",
+"J.	c #7BD5F1",
+"K.	c #76D2EF",
+"L.	c #6AC5E6",
+"M.	c #55A5D1",
+"N.	c #4A95C6",
+"O.	c #428CC0",
+"P.	c #3A83B9",
+"Q.	c #337AB3",
+"R.	c #2C71AD",
+"S.	c #2568A6",
+"T.	c #1F5F9F",
+"U.	c #1D65A3",
+"V.	c #269ACA",
+"W.	c #1C84BA",
+"X.	c #0D7DB5",
+"Y.	c #0298CC",
+"Z.	c #0296CA",
+"`.	c #0C5998",
+" +	c #14498A",
+".+	c #1B609C",
+"++	c #2498C8",
+"@+	c #2977AF",
+"#+	c #2F75AC",
+"$+	c #3575AC",
+"%+	c #40ABD5",
+"&+	c #49BFE4",
+"*+	c #50C3E7",
+"=+	c #56C5E8",
+"-+	c #5DC8EA",
+";+	c #63CBEB",
+">+	c #69CEED",
+",+	c #6ED0EE",
+"'+	c #73D2EF",
+")+	c #77D3EF",
+"!+	c #72CEEC",
+"~+	c #5AA7D1",
+"{+	c #4F99C9",
+"]+	c #4891C3",
+"^+	c #4087BC",
+"/+	c #387EB5",
+"(+	c #3277B1",
+"_+	c #2B70AB",
+":+	c #2463A2",
+"<+	c #1E5B9C",
+"[+	c #185395",
+"}+	c #165496",
+"|+	c #10498D",
+"1+	c #105F9E",
+"2+	c #0A9ECF",
+"3+	c #0088C0",
+"4+	c #038DC3",
+"5+	c #0A4A8C",
+"6+	c #114E8E",
+"7+	c #1989BD",
+"8+	c #22AAD7",
+"9+	c #28A2D0",
+"0+	c #2C71A9",
+"a+	c #3380B5",
+"b+	c #3EB9E1",
+"c+	c #45BDE3",
+"d+	c #4CC0E5",
+"e+	c #53C3E7",
+"f+	c #59C6E8",
+"g+	c #5EC9EA",
+"h+	c #64CBEB",
+"i+	c #69CDEC",
+"j+	c #6ECFED",
+"k+	c #70D0ED",
+"l+	c #64BDE1",
+"m+	c #55A6D1",
+"n+	c #3D82B8",
+"o+	c #3D8BBE",
+"p+	c #49AFD8",
+"q+	c #378DBF",
+"r+	c #225F9E",
+"s+	c #1D5698",
+"t+	c #174E92",
+"u+	c #12468B",
+"v+	c #0E3F85",
+"w+	c #115F9D",
+"x+	c #15A2D1",
+"y+	c #0395C9",
+"z+	c #0088C1",
+"A+	c #0190C6",
+"B+	c #079ACC",
+"C+	c #0FA0D0",
+"D+	c #169ECF",
+"E+	c #1D99CC",
+"F+	c #25AAD7",
+"G+	c #2BA0CE",
+"H+	c #32AED8",
+"I+	c #3AB7DF",
+"J+	c #41BBE1",
+"K+	c #47BEE3",
+"L+	c #4EC1E5",
+"M+	c #53C4E7",
+"N+	c #5FC8E9",
+"O+	c #63CAEA",
+"P+	c #67CBEB",
+"Q+	c #69CBEA",
+"R+	c #62BCE0",
+"S+	c #5AAFD7",
+"T+	c #478DBF",
+"U+	c #4084B9",
+"V+	c #3A7CB4",
+"W+	c #3E8CBF",
+"X+	c #4DBADF",
+"Y+	c #3383B8",
+"Z+	c #215B9B",
+"`+	c #1B5295",
+" @	c #164A8E",
+".@	c #114288",
+"+@	c #0D3A82",
+"@@	c #0E4C8E",
+"#@	c #1380B7",
+"$@	c #0D96C9",
+"%@	c #0089C1",
+"&@	c #007BB8",
+"*@	c #0085BE",
+"=@	c #008CC4",
+"-@	c #0496C9",
+";@	c #0B9DCF",
+">@	c #1168AB",
+",@	c #174F99",
+"'@	c #21AAD7",
+")@	c #28AED9",
+"!@	c #2FB1DB",
+"~@	c #36B5DE",
+"{@	c #3CB8E0",
+"]@	c #42BBE2",
+"^@	c #49BEE4",
+"/@	c #54C3E6",
+"(@	c #59C5E7",
+"_@	c #5DC7E8",
+":@	c #5FC5E7",
+"<@	c #53A9D3",
+"[@	c #4B96C6",
+"}@	c #478FC2",
+"|@	c #4186BB",
+"1@	c #3C7FB5",
+"2@	c #3676AF",
+"3@	c #306EA9",
+"4@	c #3889BD",
+"5@	c #44AFD8",
+"6@	c #2F84B9",
+"7@	c #194D91",
+"8@	c #15458A",
+"9@	c #144D90",
+"0@	c #0C367E",
+"a@	c #0C4086",
+"b@	c #1797C8",
+"c@	c #1295C8",
+"d@	c #0487C0",
+"e@	c #0079B6",
+"f@	c #0081BC",
+"g@	c #0E9ACC",
+"h@	c #1597CA",
+"i@	c #1CA7D5",
+"j@	c #23ABD8",
+"k@	c #2AAFDA",
+"l@	c #31B2DC",
+"m@	c #37B5DE",
+"n@	c #3DB8E0",
+"o@	c #43BBE2",
+"p@	c #49BEE3",
+"q@	c #4EC0E4",
+"r@	c #53C2E5",
+"s@	c #57C4E6",
+"t@	c #4EAAD4",
+"u@	c #4696C5",
+"v@	c #438FC0",
+"w@	c #4088BC",
+"x@	c #3C80B6",
+"y@	c #3778B1",
+"z@	c #3270AB",
+"A@	c #2C68A5",
+"B@	c #3D9AC8",
+"C@	c #46BADF",
+"D@	c #3DB0D8",
+"E@	c #287CB2",
+"F@	c #164D90",
+"G@	c #299ECC",
+"H@	c #1B79B0",
+"I@	c #1A8CBF",
+"J@	c #199BCC",
+"K@	c #1392C6",
+"L@	c #0A86BE",
+"M@	c #0079B7",
+"N@	c #006AAC",
+"O@	c #0074B3",
+"P@	c #007CB9",
+"Q@	c #0083BE",
+"R@	c #008BC2",
+"S@	c #0393C8",
+"T@	c #099CCD",
+"U@	c #10A1D1",
+"V@	c #17A4D3",
+"W@	c #1EA8D6",
+"X@	c #25ABD8",
+"Y@	c #2BAFDA",
+"Z@	c #37B5DD",
+"`@	c #3DB8DF",
+" #	c #42BAE1",
+".#	c #48BCE2",
+"+#	c #4CBEE3",
+"@#	c #50C0E4",
+"##	c #48A8D3",
+"$#	c #3F8EC0",
+"%#	c #3C87BC",
+"&#	c #3A81B7",
+"*#	c #3679B1",
+"=#	c #3171AC",
+"-#	c #2D6AA6",
+";#	c #2862A0",
+">#	c #40A5D1",
+",#	c #43B8DE",
+"'#	c #3DB5DC",
+")#	c #38B1DA",
+"!#	c #2D9ECC",
+"~#	c #2B9FCE",
+"{#	c #246AAA",
+"]#	c #1F96C7",
+"^#	c #1996C9",
+"/#	c #138DC3",
+"(#	c #0E84BC",
+"_#	c #0175B4",
+":#	c #0068AC",
+"<#	c #0070B1",
+"[#	c #0077B5",
+"}#	c #007FBA",
+"|#	c #0086BF",
+"1#	c #018DC4",
+"2#	c #0596C9",
+"3#	c #0B9DCE",
+"4#	c #12A1D1",
+"5#	c #1897C8",
+"6#	c #1E96C7",
+"7#	c #25A0CE",
+"8#	c #2B90C2",
+"9#	c #31A4D0",
+"0#	c #37B4DD",
+"a#	c #3CB7DF",
+"b#	c #41B9E0",
+"c#	c #45BBE0",
+"d#	c #49BCE1",
+"e#	c #4BBBE0",
+"f#	c #419FCC",
+"g#	c #3C91C2",
+"h#	c #337AB1",
+"i#	c #3072AC",
+"j#	c #2C6BA7",
+"k#	c #2864A1",
+"l#	c #255F9E",
+"m#	c #3FAAD4",
+"n#	c #40B6DC",
+"o#	c #3AB3DB",
+"p#	c #35B0D8",
+"q#	c #2F86BD",
+"r#	c #29599F",
+"s#	c #237DB7",
+"t#	c #1E99CA",
+"u#	c #1892C5",
+"v#	c #1389C0",
+"w#	c #0E7FBA",
+"x#	c #0473B2",
+"y#	c #0065AA",
+"z#	c #0064A9",
+"A#	c #006BAD",
+"B#	c #0072B2",
+"C#	c #0080BC",
+"D#	c #0082BC",
+"E#	c #028DC4",
+"F#	c #0796C9",
+"G#	c #0D88BD",
+"H#	c #1372AB",
+"I#	c #1982B8",
+"J#	c #1F79B0",
+"K#	c #247BB1",
+"L#	c #2A86B9",
+"M#	c #31B1DA",
+"N#	c #36B3DC",
+"O#	c #3AB5DD",
+"P#	c #3FB7DE",
+"Q#	c #42B9DF",
+"R#	c #45BAE0",
+"S#	c #48BBE0",
+"T#	c #47B6DD",
+"U#	c #3689BC",
+"V#	c #2D72AB",
+"W#	c #2C73AC",
+"X#	c #2F7DB3",
+"Y#	c #399BC9",
+"Z#	c #3FB4DB",
+"`#	c #3CB3DA",
+" $	c #37B0D9",
+".$	c #32AED7",
+"+$	c #2CA8D3",
+"@$	c #277EB8",
+"#$	c #229CCC",
+"$$	c #1D95C8",
+"%$	c #188DC2",
+"&$	c #1384BD",
+"*$	c #0D7AB6",
+"=$	c #066FB0",
+"-$	c #0057A0",
+";$	c #005FA5",
+">$	c #0066AA",
+",$	c #006DAF",
+"'$	c #006EAC",
+")$	c #004C8E",
+"!$	c #005595",
+"~$	c #025999",
+"{$	c #085D9B",
+"]$	c #0D64A0",
+"^$	c #1369A4",
+"/$	c #196EA7",
+"($	c #1E73AA",
+"_$	c #2376AD",
+":$	c #2AA0CE",
+"<$	c #2FAFD9",
+"[$	c #34B1DB",
+"}$	c #38B3DC",
+"|$	c #3BB5DC",
+"1$	c #3EB6DD",
+"2$	c #40B7DD",
+"3$	c #42B7DD",
+"4$	c #43B7DE",
+"5$	c #43B7DD",
+"6$	c #40B5DC",
+"7$	c #3DB4DB",
+"8$	c #3AB2DA",
+"9$	c #33AED6",
+"0$	c #2EABD5",
+"a$	c #29A5D2",
+"b$	c #259ECD",
+"c$	c #2094C6",
+"d$	c #1C8DC2",
+"e$	c #1787BE",
+"f$	c #127EB9",
+"g$	c #0D75B3",
+"h$	c #076AAC",
+"i$	c #005FA6",
+"j$	c #00539D",
+"k$	c #005AA2",
+"l$	c #0060A6",
+"m$	c #0068AB",
+"n$	c #0063A5",
+"o$	c #004487",
+"p$	c #004386",
+"q$	c #004789",
+"r$	c #004B8D",
+"s$	c #045192",
+"t$	c #095997",
+"u$	c #0E5F9C",
+"v$	c #1365A0",
+"w$	c #1869A4",
+"x$	c #1D6EA7",
+"y$	c #2274AB",
+"z$	c #28A6D2",
+"A$	c #2DAED8",
+"B$	c #31AFD9",
+"C$	c #34B1DA",
+"D$	c #37B2DB",
+"E$	c #39B3DB",
+"F$	c #3BB4DB",
+"G$	c #3CB4DB",
+"H$	c #3BB3DA",
+"I$	c #38B1D9",
+"J$	c #35AFD8",
+"K$	c #32ADD6",
+"L$	c #2EAAD4",
+"M$	c #2BA5D1",
+"N$	c #2795C5",
+"O$	c #2374AA",
+"P$	c #1E5691",
+"Q$	c #1A4C89",
+"R$	c #156AA5",
+"S$	c #1078B5",
+"T$	c #0B6FAF",
+"U$	c #0665A9",
+"V$	c #004A97",
+"W$	c #004D9A",
+"X$	c #00509A",
+"Y$	c #00579F",
+"Z$	c #0062A7",
+"`$	c #00468A",
+" %	c #00387C",
+".%	c #003C7F",
+"+%	c #004083",
+"@%	c #044D8E",
+"#%	c #095493",
+"$%	c #0E5A98",
+"%%	c #13609C",
+"&%	c #18659F",
+"*%	c #1C6BA4",
+"=%	c #219FCD",
+"-%	c #25AAD5",
+";%	c #29ABD6",
+">%	c #2DADD7",
+",%	c #30AED8",
+"'%	c #32AFD8",
+")%	c #34B0D8",
+"!%	c #34AED7",
+"~%	c #30ABD4",
+"{%	c #2DA8D2",
+"]%	c #2BA3CF",
+"^%	c #289DCC",
+"/%	c #2494C5",
+"(%	c #20659E",
+"_%	c #1C4684",
+":%	c #183D7C",
+"<%	c #133B7A",
+"[%	c #0F5695",
+"}%	c #0A5FA1",
+"|%	c #055FA5",
+"1%	c #00559F",
+"2%	c #004D99",
+"3%	c #004896",
+"4%	c #002E74",
+"5%	c #003C82",
+"6%	c #004E94",
+"7%	c #003377",
+"8%	c #003175",
+"9%	c #003578",
+"0%	c #003B7F",
+"a%	c #003F82",
+"b%	c #014285",
+"c%	c #044889",
+"d%	c #094E8E",
+"e%	c #0D5493",
+"f%	c #125997",
+"g%	c #167FB4",
+"h%	c #1A96C7",
+"i%	c #1EA5D2",
+"j%	c #22A7D3",
+"k%	c #25A9D4",
+"l%	c #28AAD5",
+"m%	c #2AAAD5",
+"n%	c #2CABD6",
+"o%	c #2DACD6",
+"p%	c #2EACD5",
+"q%	c #2DA9D3",
+"r%	c #2CA6D1",
+"s%	c #299FCD",
+"t%	c #279ACA",
+"u%	c #2495C7",
+"v%	c #218FC3",
+"w%	c #1D86BC",
+"x%	c #1A4683",
+"y%	c #163574",
+"z%	c #112C6C",
+"A%	c #0D2464",
+"B%	c #082D6F",
+"C%	c #044E94",
+"D%	c #004F9A",
+"E%	c #004292",
+"F%	c #00347D",
+"G%	c #002266",
+"H%	c #002669",
+"I%	c #00286C",
+"J%	c #002B6F",
+"K%	c #002E72",
+"L%	c #003478",
+"M%	c #00377B",
+"N%	c #003A7E",
+"O%	c #013D80",
+"P%	c #044285",
+"Q%	c #084889",
+"R%	c #0D4D8D",
+"S%	c #115492",
+"T%	c #15609B",
+"U%	c #189ACB",
+"V%	c #1CA0CF",
+"W%	c #1FA2CF",
+"X%	c #21A3D1",
+"Y%	c #24A4D1",
+"Z%	c #25A5D1",
+"`%	c #27A4D1",
+" &	c #28A4D1",
+".&	c #28A0CE",
+"+&	c #289ECC",
+"@&	c #2596C8",
+"#&	c #2392C5",
+"$&	c #208DC2",
+"%&	c #1D87BD",
+"&&	c #1A75AE",
+"*&	c #173978",
+"=&	c #132E6D",
+"-&	c #0F2565",
+";&	c #0B1D5D",
+">&	c #071555",
+",&	c #021151",
+"'&	c #001F61",
+")&	c #00276D",
+"!&	c #003D8E",
+"~&	c #003B89",
+"{&	c #001E62",
+"]&	c #002063",
+"^&	c #002569",
+"/&	c #002D72",
+"(&	c #003074",
+"_&	c #003579",
+":&	c #033C7F",
+"<&	c #074183",
+"[&	c #0B4787",
+"}&	c #0F5392",
+"|&	c #1391C5",
+"1&	c #1695C8",
+"2&	c #1998CA",
+"3&	c #1C99CA",
+"4&	c #1E9ACB",
+"5&	c #209BCB",
+"6&	c #219BCB",
+"7&	c #229ACA",
+"8&	c #2399C9",
+"9&	c #2397C8",
+"0&	c #2394C6",
+"a&	c #2291C4",
+"b&	c #1E89C0",
+"c&	c #1C84BC",
+"d&	c #1A5B97",
+"e&	c #174C89",
+"f&	c #142D6C",
+"g&	c #102665",
+"h&	c #0C1E5D",
+"i&	c #081756",
+"j&	c #040F4F",
+"k&	c #000847",
+"l&	c #000541",
+"m&	c #00033D",
+"n&	c #00368A",
+"o&	c #00256E",
+"p&	c #00185A",
+"q&	c #001A5D",
+"r&	c #001D60",
+"s&	c #001F63",
+"t&	c #002568",
+"u&	c #00276B",
+"v&	c #00296D",
+"w&	c #002B70",
+"x&	c #003276",
+"y&	c #023579",
+"z&	c #063A7D",
+"A&	c #0A5997",
+"B&	c #0D87BF",
+"C&	c #108AC1",
+"D&	c #138CC3",
+"E&	c #168EC4",
+"F&	c #188FC4",
+"G&	c #1A90C4",
+"H&	c #1C90C4",
+"I&	c #1D8FC4",
+"J&	c #1D8EC3",
+"K&	c #1D8CC2",
+"L&	c #1D8AC0",
+"M&	c #1C87BE",
+"N&	c #1B83BC",
+"O&	c #1A7FB9",
+"P&	c #1864A0",
+"Q&	c #164987",
+"R&	c #132C6A",
+"S&	c #102564",
+"T&	c #0D1E5D",
+"U&	c #091756",
+"V&	c #06104E",
+"W&	c #020947",
+"X&	c #000441",
+"Y&	c #00023C",
+"Z&	c #000038",
+"`&	c #003086",
+" *	c #001A5E",
+".*	c #001354",
+"+*	c #001658",
+"@*	c #001D5F",
+"#*	c #001F62",
+"$*	c #002164",
+"%*	c #002367",
+"&*	c #002D71",
+"**	c #014C8E",
+"=*	c #0474B2",
+"-*	c #077CB9",
+";*	c #0B80BA",
+">*	c #0E82BB",
+",*	c #1083BC",
+"'*	c #1285BD",
+")*	c #1485BE",
+"!*	c #1686BD",
+"~*	c #1785BD",
+"{*	c #1884BC",
+"]*	c #1882BB",
+"^*	c #1880B9",
+"/*	c #187DB7",
+"(*	c #177AB6",
+"_*	c #1571AF",
+":*	c #143676",
+"<*	c #122968",
+"[*	c #0F2362",
+"}*	c #0D1D5C",
+"|*	c #0A1755",
+"1*	c #030A47",
+"2*	c #000239",
+"3*	c #002A82",
+"4*	c #00175D",
+"5*	c #00104F",
+"6*	c #001252",
+"7*	c #001454",
+"8*	c #001657",
+"9*	c #00195C",
+"0*	c #001C5E",
+"a*	c #001D61",
+"b*	c #002165",
+"c*	c #002366",
+"d*	c #002468",
+"e*	c #006CAE",
+"f*	c #006FB0",
+"g*	c #0271B1",
+"h*	c #0574B3",
+"i*	c #0877B4",
+"j*	c #0B78B5",
+"k*	c #0F7AB6",
+"l*	c #107AB7",
+"m*	c #127AB6",
+"n*	c #1279B5",
+"o*	c #1377B4",
+"p*	c #1375B3",
+"q*	c #1372B1",
+"r*	c #126FAF",
+"s*	c #115797",
+"t*	c #0F2766",
+"u*	c #0D2160",
+"v*	c #0B1B5A",
+"w*	c #091554",
+"x*	c #06104D",
+"y*	c #030A46",
+"z*	c #000540",
+"A*	c #000036",
+"B*	c #00237E",
+"C*	c #002980",
+"D*	c #002372",
+"E*	c #001A60",
+"F*	c #001659",
+"G*	c #001358",
+"H*	c #001A5F",
+"I*	c #002064",
+"J*	c #001B5E",
+"K*	c #005397",
+"L*	c #0065A9",
+"M*	c #0067AB",
+"N*	c #0069AC",
+"O*	c #026AAD",
+"P*	c #046CAE",
+"Q*	c #0768AB",
+"R*	c #0965A9",
+"S*	c #0A6EAF",
+"T*	c #0C6EAE",
+"U*	c #0D6DAE",
+"V*	c #0D6CAD",
+"W*	c #0D6AAB",
+"X*	c #0D67AA",
+"Y*	c #0D64A7",
+"Z*	c #0C498C",
+"`*	c #0A1E5E",
+" =	c #091856",
+".=	c #071350",
+"+=	c #050D4B",
+"@=	c #020844",
+"#=	c #00043F",
+"$=	c #00023B",
+"%=	c #000037",
+"&=	c #000035",
+"*=	c #000034",
+"==	c #001A77",
+"-=	c #00237D",
+";=	c #002881",
+">=	c #002D84",
+",=	c #00287F",
+"'=	c #000B6C",
+")=	c #00388A",
+"!=	c #003785",
+"~=	c #001556",
+"{=	c #001759",
+"]=	c #00195B",
+"^=	c #001C5F",
+"/=	c #001C60",
+"(=	c #004B91",
+"_=	c #004287",
+":=	c #00569C",
+"<=	c #0061A7",
+"[=	c #023187",
+"}=	c #033388",
+"|=	c #0563A7",
+"1=	c #0662A7",
+"2=	c #0762A7",
+"3=	c #0860A6",
+"4=	c #085EA4",
+"5=	c #085CA3",
+"6=	c #084388",
+"7=	c #071B5B",
+"8=	c #061453",
+"9=	c #04104D",
+"0=	c #030B48",
+"a=	c #010742",
+"b=	c #00033E",
+"c=	c #00013A",
+"d=	c #000033",
+"e=	c #000032",
+"f=	c #001C79",
+"g=	c #00217C",
+"h=	c #002780",
+"i=	c #002B83",
+"j=	c #003589",
+"k=	c #001D63",
+"l=	c #000F4F",
+"m=	c #000F4E",
+"n=	c #001050",
+"o=	c #001152",
+"p=	c #001353",
+"q=	c #001455",
+"r=	c #002F74",
+"s=	c #00529A",
+"t=	c #0058A1",
+"u=	c #00529D",
+"v=	c #0156A0",
+"w=	c #02569F",
+"x=	c #02549E",
+"y=	c #03529D",
+"z=	c #034F9A",
+"A=	c #032062",
+"B=	c #020F4E",
+"C=	c #010C49",
+"D=	c #000845",
+"E=	c #00033C",
+"F=	c #000138",
+"G=	c #000135",
+"H=	c #001474",
+"I=	c #001F7B",
+"J=	c #00247E",
+"K=	c #002D83",
+"L=	c #001051",
+"M=	c #000A46",
+"N=	c #000B48",
+"O=	c #000C4A",
+"P=	c #000D4B",
+"Q=	c #000E4D",
+"R=	c #001151",
+"S=	c #001253",
+"T=	c #00377E",
+"U=	c #004E9A",
+"V=	c #004C98",
+"W=	c #00408C",
+"X=	c #000946",
+"Y=	c #00053F",
+"Z=	c #000137",
+"`=	c #000031",
+" -	c #000030",
+".-	c #001373",
+"+-	c #001876",
+"@-	c #001D79",
+"#-	c #00267F",
+"$-	c #000D4D",
+"%-	c #000741",
+"&-	c #000843",
+"*-	c #000945",
+"=-	c #000A47",
+"--	c #000B49",
+";-	c #000D4C",
+">-	c #002F77",
+",-	c #00327A",
+"'-	c #002267",
+")-	c #002166",
+"!-	c #00256A",
+"~-	c #003D89",
+"{-	c #004393",
+"]-	c #003F90",
+"^-	c #003C8D",
+"/-	c #003382",
+"(-	c #003587",
+"_-	c #002069",
+":-	c #00033A",
+"<-	c #000136",
+"[-	c #00002F",
+"}-	c #000C6E",
+"|-	c #001171",
+"1-	c #001574",
+"2-	c #001E7A",
+"3-	c #00196A",
+"4-	c #00053E",
+"5-	c #000640",
+"6-	c #000742",
+"7-	c #00185B",
+"8-	c #003787",
+"9-	c #00398C",
+"0-	c #00378B",
+"a-	c #003388",
+"b-	c #002779",
+"c-	c #00063F",
+"d-	c #00002D",
+"e-	c #00096C",
+"f-	c #000D6F",
+"g-	c #001271",
+"h-	c #001675",
+"i-	c #001872",
+"j-	c #000338",
+"k-	c #00043A",
+"l-	c #00043B",
+"m-	c #00053D",
+"n-	c #000844",
+"o-	c #000944",
+"p-	c #002573",
+"q-	c #002E85",
+"r-	c #002C83",
+"s-	c #001E71",
+"t-	c #00002E",
+"u-	c #00002C",
+"v-	c #000266",
+"w-	c #00066A",
+"x-	c #000A6D",
+"y-	c #000E70",
+"z-	c #000C58",
+"A-	c #000643",
+"B-	c #000337",
+"C-	c #000236",
+"D-	c #000339",
+"E-	c #00053C",
+"F-	c #00063E",
+"G-	c #00073F",
+"H-	c #00145A",
+"I-	c #001C78",
+"J-	c #000743",
+"K-	c #00002A",
+"L-	c #00005F",
+"M-	c #000267",
+"N-	c #000A6C",
+"O-	c #000952",
+"P-	c #000131",
+"Q-	c #000132",
+"R-	c #000133",
+"S-	c #000134",
+"T-	c #000235",
+"U-	c #00196E",
+"V-	c #001D7A",
+"W-	c #001B78",
+"X-	c #001977",
+"Y-	c #001775",
+"Z-	c #001473",
+"`-	c #000E66",
+" ;	c #00002B",
+".;	c #000029",
+"+;	c #000053",
+"@;	c #00005E",
+"#;	c #000265",
+"$;	c #000464",
+"%;	c #000130",
+"&;	c #001160",
+"*;	c #001164",
+"=;	c #001674",
+"-;	c #001272",
+";;	c #001071",
+">;	c #000E6F",
+",;	c #000B6E",
+"';	c #00086C",
+");	c #00045F",
+"!;	c #000152",
+"~;	c #000046",
+"{;	c #000051",
+"];	c #00005A",
+"^;	c #00012F",
+"/;	c #000542",
+"(;	c #00106E",
+"_;	c #001070",
+":;	c #000F70",
+"<;	c #00086B",
+"[;	c #000367",
+"};	c #000163",
+"|;	c #00005B",
+"1;	c #000052",
+"2;	c #000047",
+"3;	c #000041",
+"4;	c #000028",
+"5;	c #000021",
+"6;	c #000025",
+"7;	c #00003E",
+"8;	c #00003A",
+"9;	c #00075A",
+"0;	c #00076B",
+"a;	c #000569",
+"b;	c #000368",
+"c;	c #000162",
+"d;	c #00005C",
+"e;	c #000054",
+"f;	c #00004C",
+"g;	c #000042",
+"h;	c #000039",
+"i;	c #000026",
+"j;	c #000023",
+"k;	c #000017",
+"l;	c #00001C",
+"m;	c #00004D",
+"n;	c #000055",
+"o;	c #000027",
+"p;	c #00003D",
+"q;	c #000058",
+"r;	c #00004E",
+"s;	c #000048",
+"t;	c #000019",
+"u;	c #000012",
+"v;	c #00001D",
+"w;	c #00001F",
+"x;	c #000044",
+"y;	c #000008",
+"z;	c #000018",
+"A;	c #000024",
+"B;	c #000015",
+"C;	c #000022",
+"D;	c #00000F",
+"E;	c #000004",
+"F;	c #000007",
+"G;	c #000009",
+"H;	c #00000C",
+"I;	c #00000D",
+"J;	c #00000E",
+"K;	c #00000A",
+"L;	c #000003",
+"M;	c #000000",
+"N;	c #000001",
+"O;	c #000005",
+"P;	c #00000B",
+"                                                                                                ",
+"                                                                                                ",
+"                                        . + @ # $ % & *                                         ",
+"                                = - ; > , ' ) ! ~ { ] ^ / ( _ :                                 ",
+"                            < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e                               ",
+"                        f g h i j k l m n o p q r s t u v w x y z A B                           ",
+"                      C D E F G H I J K L M N O P Q R S T U V W X Y Z `  .                      ",
+"                    ..+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.                    ",
+"                  1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.                  ",
+"                t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.                ",
+"              Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+                ",
+"            3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+k+l+m+]+n+o+p+q+r+s+t+u+v+w+x+y+              ",
+"            z+A+B+C+D+E+F+G+H+I+J+K+L+M+f+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@            ",
+"          &@*@=@-@;@>@,@'@)@!@~@{@]@^@L+/@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@c@d@            ",
+"          e@f@z+A+B+g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@          ",
+"        N@O@P@Q@R@S@T@U@V@W@X@Y@l@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#          ",
+"        :#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#        ",
+"        z#A#B#M@C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$z#        ",
+"      -$;$>$,$O@'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$3$6$7$8$ $9$0$a$b$c$d$e$f$g$h$i$        ",
+"      j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$G$H$8$I$J$K$L$M$N$O$P$Q$R$S$T$U$k$V$      ",
+"      W$X$Y$Z$`$ %.%+%p$q$@%#%$%%%&%*%=%-%;%>%,%'%)%p#p#J$!%K$~%{%]%^%/%(%_%:%<%[%}%|%1%2%      ",
+"      3%4%5%6%7%8%9% %0%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%0$q%r%]%s%t%u%v%w%x%y%z%A%B%C%D%3%      ",
+"      E%F%G%H%I%J%K%8%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &9+.&+&V.@&#&$&%&&&*&=&-&;&>&,&'&)&      ",
+"      !&~&{&]&G%^&I%J%/&(&7%_& %:&<&[&}&|&1&2&3&4&5&6&7&8&9&0&a&$&b&c&d&e&f&g&h&i&j&k&l&m&      ",
+"      n&o&p&q&r&s&G%t&u&v&w&K%(&x&y&z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&W&X&Y&Z&      ",
+"      `& *.*+*p&q&@*#*$*%*^&u&v&J%&***=*-*;*>*,*'*)*!*~*{*]*^*/*(*_*:*<*[*}*|*V&1*l&Y&Z&2*      ",
+"      3*4*5*6*7*8*p&9*0*a*s&b*c*d*v&e*f*g*h*i*j**$k*l*m*n*o*p*q*r*s*t*u*v*w*x*y*z*Y&Z&A*z*      ",
+"      B*C*D*E*F*G*H*I*+*p&9*J*r&{&x&K*L*M*N*O*P*Q*R*S*T*U*V*W*X*Y*Z*`* =.=+=@=#=$=%=&=*=        ",
+"      ==-=;=>=,='=)=!=J*.*~=+*{=]=^=/=(=_=:=l$<=[=}=|=1=2=3=4=5=6=7=8=9=0=a=b=c=%=&=d=e=        ",
+"        f=g=h=i=3*j=k=l=m=n=o=p=q=~=8*r=^=b*s=t=j$u=-$v=w=x=y=z=A=B=C=D=z*E=F=A*&=d=e=G=        ",
+"        H===I=J=;=K=L=M=N=O=P=Q=l=n=R=6*S=.*T=D%D%D%U=2%V=V$3%W=J*L=X=Y=$=Z=&=*=e=`= -          ",
+"          .-+-@-g=#-$-%-&-*-M==---O=P=;-Q=m=>-,-'-)-!-~-{-E%]-^-/-(-_-:-<-*=d=e=`=[-[-          ",
+"          }-|-1-==2-3-4-4-5-%-6-&-*-X==-=-N=q&;-O=O=O=7-8-9-0-j=a-`&b-c-d=e=`= -[-d-$=          ",
+"            e-f-g-h-i-4-j-k-l-m-4-c-5-%-6-6-&-&-n-o-o-*-M=p-q-r-3*h=s-X=`= -[-t-u-u-            ",
+"            v-w-x-y-g-z-A-B-C-j-D-:-l-l-E-m-4-F-F-c-c-c-G-H-#-J=g=I=I-J-t-t-d-u-K-              ",
+"              L-M-w-N-f-O-P-Q-R-S-T-C-C-B-j-D-D-:-k-l-k-D=U-V-W-X-Y-Z-`-[- ; ;.;u-              ",
+"                +;@;#;$; ;u-d-t-[- -%;P-Q-R-R-S-B-z*&;*;Y-=;H=-;;;>;,;';);!;%=d-                ",
+"                  ~;{;];u-.;K- ; ;u-d-d-d-t-t-^;/;(;_;;;:;f-}-x-<;w-[;};|;1;2;                  ",
+"                  A*%=3;4;5;6;u-7;8;u-K- ; ; ; ;^;9;<;0;w-a;b;v-c;d;e;f;g;h;                    ",
+"                      i;j;k;l;d=m;1;n;d= ;i;o;o;o;o;p;@;d;q;+;r;s;3;h;`=K-                      ",
+"                        t;u;k;o;e=Z&%=5;*=l;v;v;v;w; ;x;3;p;Z&d=d-i;w;                          ",
+"                            y;u;z;v;5;A;A;B;u;u;u;j; ;.;i;C;v;z;u;D;                            ",
+"                                E;E;F;G;H;I;I;I;H;D;J;H;K;F;E;K;                                ",
+"                                      y;L;M;M;N;N;M;N;O;P;                                      ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                ",
+"                                                                                                "};
--- firefox-1.5.dfsg.orig/debian/mozilla-firefox.preinst
+++ firefox-1.5.dfsg/debian/mozilla-firefox.preinst
@@ -0,0 +1,86 @@
+#!/bin/sh -e
+
+LIBDIR=/usr/lib/mozilla-firefox
+VARDIR=/var/lib/mozilla-firefox
+
+if [ "$1" = "upgrade" ]; then
+    if [ -d "/usr/lib/mozilla-firebird/defaults/pref" ]; then
+        rm -rf /usr/lib/mozilla-firebird/defaults/pref
+    fi
+
+    # Remove old alternative to www-browser that version < 0.6.1-1 installed
+    if dpkg --compare-versions "$2" lt 0.6.1-1; then
+      update-alternatives --remove www-browser /usr/bin/MozillaFirebird || true
+    fi
+    
+    # Remove obsolete alteratives
+    if dpkg --compare-versions "$2" lt 1.5.dfsg-1; then
+        update-alternatives --remove x-www-browser /usr/bin/mozilla-firefox
+        update-alternatives --remove mozilla /usr/bin/mozilla-firefox
+    fi
+
+    # Remove old conf files 
+    if dpkg --compare-versions "$2" lt 0.9.1-3; then
+      rm -f /etc/mozilla-firefox/pref/all.js
+      rm -f /etc/mozilla-firefox/pref/security-prefs.js
+      rm -f /etc/mozilla-firefox/pref/unix.js
+      rm -f /etc/mozilla-firefox/pref/xpinstall.js
+      rm -f /etc/mozilla-firefox/pref/non-shared.txt
+    fi
+
+    # Remove old inspector conffile
+    if dpkg --compare-versions "$2" lt 1.0-2; then
+        rm -f /etc/mozilla-firefox/pref/inspector.js
+    fi
+
+
+    if dpkg --compare-versions "$2" lt 0.10.1+1.0PR-5; then
+      if [ -f /etc/mozilla-firefox/profile/US/bookmarks.html ]; then
+        mv /etc/mozilla-firefox/profile/US/bookmarks.html /etc/mozilla-firefox/profile/bookmarks.html
+      fi
+      [ -d /etc/mozilla-firefox/profile/US ] && rmdir --ignore-fail-on-non-empty /etc/mozilla-firefox/profile/US
+    fi
+
+    if dpkg --compare-versions "$2" lt 1.0-1; then
+      rm -f /etc/mozilla-firefox/pref/firefox-l10n.js
+      rm -f /etc/mozilla-firefox/pref/vendor.js
+
+      # Remove old link
+      rm -f ${LIBDIR}/defaults/pref
+
+      # Remove old installed-chrome.txt
+      rm -f ${VARDIR}/chrome/installed-chrome.txt
+    fi
+
+    if dpkg --compare-versions "$2" lt 1.0-3; then
+      for f in `find ${LIBDIR}/extensions/ -maxdepth 1 -name '{*}' -type l`; do
+        if [ "`readlink -f $f`" = "${LIBDIR}/defaults/profile/extensions/`basename $f`" ]; then
+            rm -f $f
+        fi
+      done
+      if [ -e ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt ] || [ -L ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt ]; then
+        rm -f ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt
+      fi
+    fi
+
+    # Move of default profile into /etc
+    if dpkg --compare-versions "$2" lt 1.0+dfsg.1-1; then
+        rm -rf /usr/lib/mozilla-firefox/defaults/profile
+    fi
+
+    # Remove all files generated by update-mozilla-firefox-chrome
+    if dpkg --compare-versions "$2" lt 1.0.99; then
+        rm -rf /var/lib/mozilla-firefox/chrome
+        rm -rf /var/lib/mozilla-firefox/components
+        rm -rf /var/lib/mozilla-firefox/extensions
+        rm -f /var/lib/mozilla-firefox/components.ini
+        rm -f /var/lib/mozilla-firefox/defaults.ini
+        rmdir --ignore-fail-on-non-empty /var/lib/mozilla-firefox
+        for uninstall in /usr/lib/mozilla-firefox/extensions/*/uninstall; do
+            rm -f ${uninstall}/Uninstall
+            rmdir --ignore-fail-on-non-empty ${uninstall}
+        done
+    fi
+fi
+
+#DEBHELPER#
--- firefox-1.5.dfsg.orig/debian/firefox-dev.install
+++ firefox-1.5.dfsg/debian/firefox-dev.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/pkgconfig/*.pc usr/lib/pkgconfig
+debian/tmp/usr/share/idl/mozilla-firefox usr/share/idl
+debian/tmp/usr/include/mozilla-firefox usr/include
+debian/tmp/usr/bin/firefox-config usr/bin
--- firefox-1.5.dfsg.orig/debian/mozilla-firefox.postrm
+++ firefox-1.5.dfsg/debian/mozilla-firefox.postrm
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+if [ "$1" = 'purge' ]; then
+    rm -rf /etc/mozilla-firefox
+fi
+
+#DEBHELPER#
\ No newline at end of file
--- firefox-1.5.dfsg.orig/debian/firefox-dev.preinst
+++ firefox-1.5.dfsg/debian/firefox-dev.preinst
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+case "$1!$2" in
+upgrade!?*|install!?*)
+	ui=/usr/include
+	for f in nspr nss; do
+		old=$ui/mozilla-firefox/$f
+		new=$ui/mozilla/$f
+		if ! test -h $old && test -d $old; then
+			if test -d $new; then
+				rm -rf $old
+			elif test -e $new; then
+				echo >&2 \
+ "$0: $old -> $new symlink shuffling: did not expect to find nondirectory $new"
+				exit 1
+			else
+				mv $old $new
+			fi
+		fi
+	done
+	;;
+esac
--- firefox-1.5.dfsg.orig/debian/presubj
+++ firefox-1.5.dfsg/debian/presubj
@@ -0,0 +1,17 @@
+*** Please submit non packaging issue (e.g. feature requests) bugs to
+the Debian BTS and the upstream bugzilla
+(https://bugzilla.mozilla.org/enter_bug.cgi?product=Firefox) and put a
+reference to the bugzilla bug in the Debian bug report, to ease bug
+triage for the maintainers. Thank you. ***
+
+If your Firefox installation pre-dates 1.0, you might have had problems
+Firefox not really cleanly supporting upgrade from one release to another.
+Please try moving around your ~/.mozilla/firefox directory to see if it
+helps with your issue.
+
+Firefox 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 are seeing XML parsing errors, please make sure you kill all
+running Firefoxes and reload before filing any bugs. 
--- firefox-1.5.dfsg.orig/debian/firefox-runner
+++ firefox-1.5.dfsg/debian/firefox-runner
@@ -0,0 +1,263 @@
+#!/bin/sh
+#
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+##
+## For silly people running firefox through sudo
+##
+if [ "${SUDO_USER}" ] && [ "${SUDO_USER}" != "${USER}" ]; then
+    SUDO_HOME=`getent passwd ${SUDO_USER} | cut -f6 -d:`
+    if [ "${SUDO_HOME}" = "${HOME}" ]; then
+        echo "You should really not run firefox through sudo WITHOUT the -H option." >&2
+        echo "Anyway, I'll do as if you did use the -H option." >&2
+        HOME=`getent passwd ${USER} | cut -f6 -d:`
+        if [ -z "${HOME}" ]; then
+            echo "Could not find the correct home directory. Please use the -H option of sudo." >&2
+        fi
+    fi
+fi
+
+##
+## Variables
+##
+MOZ_DIST_BIN="/usr/lib/firefox"
+MOZ_PROGRAM="${MOZ_DIST_BIN}/firefox-bin"
+
+##
+## Load system and user properties
+##
+
+RUNTIME_FIREFOX_DSP="${FIREFOX_DSP}"
+
+if [ -f /etc/firefox/firefoxrc ]; then
+    . /etc/firefox/firefoxrc
+fi
+
+if [ -f "${HOME}/.mozilla/firefox/rc" ]; then
+    . "${HOME}/.mozilla/firefox/rc"
+elif [ -f "${HOME}/.mozilla-firefoxrc" ]; then
+    . "${HOME}/.mozilla-firefoxrc"
+    echo "Warning: a .mozilla-firefoxrc file has been found in your home directory" >&2
+    echo "While it is still supported, it is recommended to move it to" >&2
+    echo "\${HOME}/.mozilla/firefox/rc" >&2
+fi
+
+if [ "${RUNTIME_FIREFOX_DSP}" ]; then
+    FIREFOX_DSP="${RUNTIME_FIREFOX_DSP}"
+fi
+
+if [ -z "${FIREFOX_DSP}" ]; then
+    FIREFOX_DSP="auto"
+fi
+
+if [ -z "${MOZ_ENABLE_PANGO}" ]; then
+    MOZ_DISABLE_PANGO=1
+    export MOZ_DISABLE_PANGO
+fi
+
+##
+## find /dev/dsp handler
+##
+
+if [ "${FIREFOX_DSP}" = "auto" ]; then
+    FIREFOX_DSP=
+    if pgrep -u `id -u` esd >/dev/null 2>&1; then 
+        FIREFOX_DSP=esddsp 
+    elif pgrep -u `id -u` arts >/dev/null 2>&1; then 
+        FIREFOX_DSP=artsdsp 
+    fi
+elif [ "${FIREFOX_DSP}" = "none" ]; then
+    FIREFOX_DSP=
+fi
+
+##
+## Set LD_LIBRARY_PATH
+##
+EXTENT_LD_LIB_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:/usr/lib/mozilla-firefox/plugins
+if [ "${LD_LIBRARY_PATH}" ]; then
+    LD_LIBRARY_PATH=${EXTENT_LD_LIB_PATH}:${LD_LIBRARY_PATH}
+else
+    LD_LIBRARY_PATH=${EXTENT_LD_LIB_PATH}
+fi
+
+export LD_LIBRARY_PATH
+
+MOZ_PLUGIN_PATH=/usr/lib/mozilla-firefox/plugins
+export MOZ_PLUGIN_PATH
+
+# Set XPSERVERLIST if not set yet for XPrint support, or complain.
+
+#if [ -z "${XPSERVERLIST}" ]; then
+#    if [ -x /etc/init.d/xprint ]; then
+#        XPSERVERLIST=`/etc/init.d/xprint get_xpserverlist`
+#        export XPSERVERLIST
+#    else
+#        echo -e "Warning: \${XPSERVERLIST} not set and /etc/init.d/xprint not found;\nprinting will not work.\nPlease install the xprt-xprintorg package" >&2
+#    fi  
+#fi
+
+verbose () {
+    if [ "${VERBOSE}" ]; then
+        echo $@
+    fi
+}
+
+echo_vars () {
+    if [ "${VERBOSE}" ]; then
+      for var in "$@"; do
+          echo "$var=`eval echo \\${$var}`"
+      done
+    fi
+}
+    
+# exec wrapper for verbosity
+exec_verbose () {
+    verbose Running: $@
+    exec "$@"
+}
+
+# exec wrapper for verbosity
+run_verbose () {
+    verbose Running: $@
+    "$@"
+}
+
+# OK, here's where all the real work gets done
+
+# parse command line
+APPLICATION_ID=firefox
+VERBOSE=
+DEBUG=0
+DEBUGGER=
+first=1
+opt=
+for arg in "$@"; do
+    if [ ${first} -eq 1 ]; then
+        set dummy
+        first=0
+    fi
+
+    case "${arg}" in
+        -a | --display | -contentLocale | -UILocale | -remote | --debugger | -height | -width | -chrome | -P)
+            prev=${arg}
+            continue
+        ;;
+    esac
+    
+    if [ "${prev}" ]; then
+        case "${prev}" in
+            -a)
+                APPLICATION_ID="${arg}"
+                ;;
+            --display)
+                CMDLINE_DISPLAY="${arg}"
+                set "$@" --display "${arg}"
+                ;;
+            -remote)
+                set "$@" -remote "${arg}"
+                ;;
+            --debugger)
+                DEBUGGER="${arg}"
+                DEBUG=1
+                ;;
+            *)
+                set "$@" "${prev}" "${arg}"
+                ;;
+        esac
+        prev=
+    elif [ "${arg}" ]; then
+        case "$arg" in
+            --verbose | -V)
+                VERBOSE=1
+                ;;
+            --display=*)
+                CMDLINE_DISPLAY=`echo ${arg} | sed 's/^--display=//'`
+                set "$@" "${arg}"
+                ;;
+            -g | -debug)
+                DEBUG=1
+                ;;
+            -*)
+                set "$@" "${arg}"
+                ;;
+            *)
+                if [ -z "${opt}" ]; then
+                    opt="${arg}"
+                    # check to make sure that the url contains at least a :/ in it.
+                    echo ${opt} | grep -e ':/' 2>/dev/null > /dev/null
+                    RETURN_VAL=$?
+                    if [ "${RETURN_VAL}" -eq 1 ]; then
+                    # if it doesn't begin with a '/' and it exists when the pwd is
+                    # prepended to it then append the full path
+                        echo ${opt} | grep -e '^/' 2>/dev/null > /dev/null
+                        if [ "$?" -ne "0" ] && [ -e "`pwd`/${opt}" ]; then
+                            opt="`pwd`/${opt}"
+                        fi
+		        # Replace all spaces by %20 and prepend file:// if it is a valid file
+			if [ -e "${opt}" ]; then
+		          opt="file://`echo ${opt} | sed 's/ /%20/g'`"
+			fi
+                    fi
+                    set "$@" "${opt}"
+                else
+                    set "$@" "${arg}"
+                fi
+                ;;
+        esac
+    fi
+done
+
+if [ $# -ne 0 ]; then
+    shift
+fi
+OPTIONS="$@"
+
+if [ ${DEBUG} -eq 1 ]; then
+    if [ "${DEBUGGER}" = "" ]; then
+        DEBUGGER=gdb
+    fi
+    TMPFILE=`mktemp -t firefox_argsXXXXXX`
+    echo set args -a ${APPLICATION_ID} "$@" > ${TMPFILE}
+    case "${DEBUGGER}" in
+        gdb)
+            run_verbose gdb "${MOZ_PROGRAM}" -x ${TMPFILE}
+            ;;
+        ddd)
+            run_verbose ddd --debugger "gdb -x ${TMPFILE}" "${MOZ_PROGRAM}"
+            ;;
+        *)
+            run_verbose ${DEBUGGER} "${MOZ_PROGRAM}" "$@"
+            ;;
+    esac
+    rm ${TMPFILE}
+    exit
+fi
+
+MOZ_PROGRAM="${MOZ_PROGRAM} -a ${APPLICATION_ID}"
+
+echo_vars FIREFOX_DSP APPLICATION_ID CMDLINE_DISPLAY DISPLAY \
+          OPTIONS DEBUG DEBUGGER
+
+if type "${FIREFOX_DSP}" > /dev/null 2>&1; then
+    MOZ_PROGRAM="${FIREFOX_DSP} ${MOZ_PROGRAM}"
+fi
+
+exec_verbose ${MOZ_PROGRAM} "$@"
--- firefox-1.5.dfsg.orig/debian/firefox-small.xpm
+++ firefox-1.5.dfsg/debian/firefox-small.xpm
@@ -0,0 +1,156 @@
+/* XPM */
+static char * mozicon16_xpm[] = {
+"16 16 137 2",
+"  	c None",
+". 	c #388BBF",
+"+ 	c #59ADD6",
+"@ 	c #68CEEF",
+"# 	c #62CCEE",
+"$ 	c #45AAD7",
+"% 	c #3578AF",
+"& 	c #4A93C3",
+"* 	c #5EA9D2",
+"= 	c #72D1EF",
+"- 	c #6DCCEC",
+"; 	c #4B9FCE",
+"> 	c #3483BA",
+", 	c #1E67A5",
+"' 	c #1B6BA5",
+") 	c #2F7AB0",
+"! 	c #48B9E0",
+"~ 	c #5CC2E5",
+"{ 	c #6ED0EE",
+"] 	c #6FC9E9",
+"^ 	c #4994C5",
+"/ 	c #3783B9",
+"( 	c #1E5D9D",
+"_ 	c #1463A1",
+": 	c #028DC4",
+"< 	c #128DC3",
+"[ 	c #27ABD7",
+"} 	c #3CB8E0",
+"| 	c #4EC0E5",
+"1 	c #5BC3E6",
+"2 	c #50A2CE",
+"3 	c #3B7EB5",
+"4 	c #3C93C4",
+"5 	c #2164A1",
+"6 	c #145A9A",
+"7 	c #0E8FC4",
+"8 	c #007EBA",
+"9 	c #0694C8",
+"0 	c #1896C7",
+"a 	c #2B99C9",
+"b 	c #3CB7DE",
+"c 	c #48B9DF",
+"d 	c #3E95C5",
+"e 	c #2E71AB",
+"f 	c #399DCA",
+"g 	c #34A9D4",
+"h 	c #2387BE",
+"i 	c #1388C0",
+"j 	c #0059A1",
+"k 	c #005C9E",
+"l 	c #00498B",
+"m 	c #095897",
+"n 	c #1869A3",
+"o 	c #289CCA",
+"p 	c #34B1DA",
+"q 	c #3BB3DB",
+"r 	c #3BB3DA",
+"s 	c #35AFD7",
+"t 	c #2BA2CF",
+"u 	c #1E6AA2",
+"v 	c #106AA7",
+"w 	c #0258A0",
+"x 	c #00357F",
+"y 	c #002D71",
+"z 	c #003175",
+"A 	c #013A7E",
+"B 	c #084889",
+"C 	c #1577AF",
+"D 	c #1FA1CF",
+"E 	c #26A3D1",
+"F 	c #28A2CF",
+"G 	c #269ACA",
+"H 	c #2088BE",
+"I 	c #174784",
+"J 	c #0B1F5F",
+"K 	c #012568",
+"L 	c #00206A",
+"M 	c #00185A",
+"N 	c #001F62",
+"O 	c #002569",
+"P 	c #002C70",
+"Q 	c #0567A7",
+"R 	c #0D81BB",
+"S 	c #1485BD",
+"T 	c #1883BC",
+"U 	c #177DB7",
+"V 	c #144A88",
+"W 	c #0C1D5C",
+"X 	c #030B47",
+"Y 	c #00023B",
+"Z 	c #00207A",
+"` 	c #002072",
+" .	c #00236B",
+"..	c #001556",
+"+.	c #001B5E",
+"@.	c #003D81",
+"#.	c #01599E",
+"$.	c #04559E",
+"%.	c #0761A6",
+"&.	c #085499",
+"*.	c #061958",
+"=.	c #020843",
+"-.	c #000137",
+";.	c #001C79",
+">.	c #00155D",
+",.	c #000945",
+"'.	c #000B49",
+").	c #000E4C",
+"!.	c #002367",
+"~.	c #002A6F",
+"{.	c #003E8B",
+"].	c #003787",
+"^.	c #00175C",
+"/.	c #000035",
+"(.	c #000030",
+"_.	c #000E67",
+":.	c #00043B",
+"<.	c #000339",
+"[.	c #00043C",
+"}.	c #00053E",
+"|.	c #00063F",
+"1.	c #000E4F",
+"2.	c #00247E",
+"3.	c #00166A",
+"4.	c #00002E",
+"5.	c #00014F",
+"6.	c #000029",
+"7.	c #00012F",
+"8.	c #000953",
+"9.	c #000E6E",
+"0.	c #000A6C",
+"a.	c #000563",
+"b.	c #00002F",
+"c.	c #00001D",
+"d.	c #000025",
+"e.	c #000040",
+"f.	c #000033",
+"                                ",
+"          . + @ # $             ",
+"        % & * = - ; > ,         ",
+"      ' ) ! ~ { ] ^ / ( _       ",
+"    : < [ } | 1 2 3 4 5 6 7     ",
+"    8 9 0 a b c d e f g h i     ",
+"  j k l m n o p q r s t u v w   ",
+"  x y z A B C D E F G H I J K   ",
+"  L M N O P Q R S T U V W X Y   ",
+"  Z `  ...+.@.#.$.%.&.*.=.-.    ",
+"    ;.>.,.'.).!.~.{.].^./.(.    ",
+"      _.:.<.[.}.|.1.2.3.4.      ",
+"      5.6.(.4.7.8.9.0.a.        ",
+"          b.b.c.d.e.f.          ",
+"                                ",
+"                                "};
--- firefox-1.5.dfsg.orig/debian/firefox.desktop
+++ firefox-1.5.dfsg/debian/firefox.desktop
@@ -0,0 +1,59 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Firefox Web Browser
+Name[ca]=Navegador web Firefox
+Name[cs]=Firefox Webový prohlíže�
+Name[fa]=مرورگر اینترنتی Firefox
+Name[fi]=Firefox-webselain
+Name[fr]=Navigateur Web Firefox
+Name[hu]=Firefox webböngésző
+Name[it]=Firefox Browser Web
+Name[nb]=Firefox Nettleser
+Name[nl]=Firefox webbrowser
+Name[nn]=Firefox Nettlesar
+Name[no]=Firefox Nettleser
+Name[pt]=Firefox Navegador Web
+Name[pt_BR]=Navegador Web Firefox
+Name[pt_BR]=Navegador Web Firefox
+Name[sk]=Internetový prehliada� Firefox
+Comment=Browse the World Wide Web
+Comment[ca]=Navegueu per el web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[de]=Im Internet surfen
+Comment[fa]=ص�حات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin www-sivuja
+Comment[fr]=Navigue sur Internet
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[sk]=Prehliadanie internetu
+GenericName=Web Browser
+GenericName[ca]=Navegador web
+GenericName[cs]=Webový prohlíže�
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=Webselain
+GenericName[fr]=Navigateur Web
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[sk]=Internetový prehliada�
+Exec=firefox %u
+Terminal=false
+MultipleArgs=false
+Type=Application
+Icon=mozilla-firefox.png
+Categories=Application;Network
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;x-directory/webdav;x-directory/webdav-prefer-directory;image/gif;image/jpeg;image/png
+StartupWMClass=Firefox-bin
--- firefox-1.5.dfsg.orig/debian/firefox.links
+++ firefox-1.5.dfsg/debian/firefox.links
@@ -0,0 +1,10 @@
+/usr/lib/firefox/firefox /usr/bin/mozilla-firefox
+/usr/lib/firefox/firefox /usr/bin/firefox
+/usr/share/man/man1/firefox.1.gz /usr/share/man/man1/mozilla-firefox.1.gz
+/usr/share/pixmaps/firefox.png /usr/share/pixmaps/mozilla-firefox.png 
+/etc/firefox/pref /usr/lib/firefox/defaults/syspref
+/etc/firefox/profile /usr/lib/firefox/defaults/profile
+
+/usr/share/firefox/searchplugins /usr/lib/firefox/searchplugins
+/usr/share/firefox/icons /usr/lib/firefox/icons
+/usr/share/firefox/res /usr/lib/firefox/res
\ No newline at end of file
--- firefox-1.5.dfsg.orig/debian/firefox.install
+++ firefox-1.5.dfsg/debian/firefox.install
@@ -0,0 +1,38 @@
+debian/tmp/usr/bin/firefox usr/bin
+debian/tmp/usr/lib/firefox/*.so usr/lib/firefox
+debian/tmp/usr/lib/firefox/*.chk usr/lib/firefox
+debian/tmp/usr/lib/firefox/components usr/lib/firefox
+debian/tmp/usr/lib/firefox/defaults/autoconfig usr/lib/firefox/defaults
+debian/tmp/usr/lib/firefox/defaults/pref usr/lib/firefox/defaults
+debian/tmp/usr/lib/firefox/defaults/profile usr/lib/firefox/defaults
+debian/tmp/usr/lib/firefox/greprefs usr/lib/firefox
+debian/tmp/usr/lib/firefox/res usr/share/firefox
+debian/tmp/usr/lib/firefox/searchplugins usr/share/firefox
+debian/tmp/usr/lib/firefox/icons usr/share/firefox
+debian/tmp/usr/lib/firefox/firefox-bin usr/lib/firefox
+debian/firefox-xremote-client usr/lib/firefox
+debian/tmp/usr/lib/firefox/regxpcom usr/lib/firefox
+debian/tmp/usr/lib/firefox/xp* usr/lib/firefox
+debian/tmp/usr/lib/firefox/run-mozilla.sh usr/lib/firefox
+
+debian/tmp/usr/lib/firefox/chrome/browser.* usr/lib/firefox/chrome
+debian/tmp/usr/lib/firefox/chrome/comm.* usr/lib/firefox/chrome
+debian/tmp/usr/lib/firefox/chrome/en-US.* usr/lib/firefox/chrome
+debian/tmp/usr/lib/firefox/chrome/toolkit.* usr/lib/firefox/chrome
+debian/tmp/usr/lib/firefox/chrome/pippki.* usr/lib/firefox/chrome
+
+debian/firefox.desktop usr/share/applications
+debian/firefoxrc etc/firefox
+debian/firefox.png usr/share/pixmaps
+debian/presubj usr/share/bug/firefox
+
+debian/firefox.js etc/firefox/pref
+debian/firefox.cfg usr/lib/firefox
+
+debian/debsearch.gif usr/share/firefox/searchplugins
+debian/debsearch.src usr/share/firefox/searchplugins
+
+debian/tmp/usr/lib/firefox/chrome/classic.* usr/lib/firefox/chrome
+debian/tmp/usr/lib/firefox/extensions/\{972ce4c6-7e08-4474-a285-3208198ce6fd\} usr/lib/firefox/extensions
+
+debian/tmp/usr/lib/firefox/plugins/libunixprintplugin.so usr/lib/firefox/plugins
--- firefox-1.5.dfsg.orig/debian/compat
+++ firefox-1.5.dfsg/debian/compat
@@ -0,0 +1 @@
+4
--- firefox-1.5.dfsg.orig/debian/libnspr-dev.install
+++ firefox-1.5.dfsg/debian/libnspr-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/mozilla-firefox/nspr usr/include/mozilla
+debian/mozilla-nspr.pc usr/lib/pkgconfig
+debian/tmp/usr/share/aclocal/nspr.m4
--- firefox-1.5.dfsg.orig/debian/about.png.uu
+++ firefox-1.5.dfsg/debian/about.png.uu
@@ -0,0 +1,453 @@
+begin 644 about.png
+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
+K`````````````````````````$!R?@%;<0*PD_3YQ@````!)14Y$KD)@@@``
+`
+end
--- firefox-1.5.dfsg.orig/debian/libnss-dev.install
+++ firefox-1.5.dfsg/debian/libnss-dev.install
@@ -0,0 +1 @@
+debian/mozilla-nss.pc usr/lib/pkgconfig
--- firefox-1.5.dfsg.orig/debian/firefox.prerm
+++ firefox-1.5.dfsg/debian/firefox.prerm
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" -o "$1" = "deconfigure" ] ; then
+    update-alternatives --remove x-www-browser /usr/bin/firefox
+    update-alternatives --remove mozilla /usr/bin/firefox
+fi
+
+if [ "$1" = "remove" ]; then
+    rm -rf /var/lib/firefox/chrome/overlayinfo
+    rm -f /var/lib/firefox/chrome/chrome.rdf
+    rm -f /var/lib/firefox/defaults.ini
+    rm -f /var/lib/firefox/components.ini
+    rm -f /var/lib/firefox/components/xpti.dat
+    rm -f /var/lib/firefox/components/compreg.dat
+    rm -f /var/lib/firefox/extensions/installed-extensions.txt
+    rm -f /var/lib/firefox/extensions/Extensions.rdf
+    rm -f /usr/lib/firefox/defaults/profile/extensions/Extensions.rdf
+    if [ -d /var/lib/firefox/ ]; then
+        find /var/lib/firefox/ -depth -type d -empty -exec rmdir {} \;
+    fi
+fi
+
+#DEBHELPER#
--- firefox-1.5.dfsg.orig/debian/libpackage.postinst
+++ firefox-1.5.dfsg/debian/libpackage.postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
--- firefox-1.5.dfsg.orig/debian/firefoxrc
+++ firefox-1.5.dfsg/debian/firefoxrc
@@ -0,0 +1,2 @@
+# which /dev/dsp wrapper to use
+FIREFOX_DSP="auto"
--- firefox-1.5.dfsg.orig/debian/firefox.cfg
+++ firefox-1.5.dfsg/debian/firefox.cfg
@@ -0,0 +1,2 @@
+//
+lockPref("app.update.enabled", false);
--- firefox-1.5.dfsg.orig/debian/firefox.menu
+++ firefox-1.5.dfsg/debian/firefox.menu
@@ -0,0 +1,4 @@
+?package(firefox):needs="x11" section="Apps/Net" \
+        title="Firefox Web Browser" \
+	icon="/usr/share/pixmaps/firefox.xpm" \
+	command="firefox" hints="Web Browsers"
--- firefox-1.5.dfsg.orig/debian/firefox-xremote-client
+++ firefox-1.5.dfsg/debian/firefox-xremote-client
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+##
+## Set MOZILLA_FIVE_HOME
+##
+MOZILLA_FIVE_HOME="/usr/lib/firefox"
+
+export MOZILLA_FIVE_HOME
+
+##
+## Set LD_LIBRARY_PATH
+##
+if [ "$LD_LIBRARY_PATH" ]
+then
+  LD_LIBRARY_PATH=/usr/lib/firefox:/usr/lib/firefox/plugins:/usr/lib/mozilla/plugins:/usr/lib:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=/usr/lib/firefox:/usr/lib/firefox/plugins:/usr/lib/mozilla/plugins:/usr/lib
+fi
+ export LD_LIBRARY_PATH
+
+/usr/lib/firefox/firefox-bin -a firefox -remote "$1"
--- firefox-1.5.dfsg.orig/debian/firefox.1
+++ firefox-1.5.dfsg/debian/firefox.1
@@ -0,0 +1,142 @@
+.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.
+
+.SH OPTIONS
+A summary of the options supported by \ffirefox\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
+\fB\-CreateProfile\fR \fIprofile\fR
+Create \fIprofile\fR.
+.TP
+\fB\-P\fR \fIprofile\fR
+Start with \fIprofile\fR.
+.TP
+.B \-ProfileManager
+Start with profile manager.
+.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\-remote\fR \fIcommand\fR
+Execute \fIcommand\fR in an already running Firefox process.
+For more info, see: \fIhttp://www.mozilla.org/unix/remote.html\fR
+.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" (default), "arts", "esd" or "none".
+
+.SH FILES
+\fI/usr/bin/mozilla\-firefox\fR - shell script wrapping
+\fBfirefox\-bin\fR
+.br
+
+\fI/usr/lib/mozilla/firefox\-bin\fR - \fBfirefox\fR
+executable
+.br
+
+\fI/etc/firefox/firefoxrc\fR - file containing environment
+variables to be passed to Mozilla Firefox.
+.br
+
+\fI${HOME}/.mozilla/firefox/rc\fR - file containing environment variables to
+be passed to Mozilla 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
--- firefox-1.5.dfsg.orig/debian/copyright
+++ firefox-1.5.dfsg/debian/copyright
@@ -0,0 +1,576 @@
+This package was debianized by Eric Dorland <eric@debian.org> on
+Thu, 05 Jun 2003 01:01:22 -0400
+
+It was downloaded from http://www.mozilla.org/projects/firebird
+
+Upstream Authors: Mozilla Project
+
+Copyright:
+
+                          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."
--- firefox-1.5.dfsg.orig/debian/firefox.NEWS
+++ firefox-1.5.dfsg/debian/firefox.NEWS
@@ -0,0 +1,34 @@
+mozilla-firefox (1.0.3-2) unstable; urgency=high
+
+    SSLv2 and all 40-bit ciphers are disabled by default in this
+    release. The insecurities of SSLv2 are outlined in
+    http://www.eucybervote.org/Reports/MSI-WP2-D7V1-V1.0-02.htm. 40-bit
+    ciphers do not provide a realistic amount of security in this day
+    and age. SSLv2 can be reenabled from the Preferences dialog, and
+    the 40-bit ciphers from about:config (look under the
+    security.ssl.* keys).
+
+ -- Eric Dorland <eric@debian.org>  Mon, 18 Apr 2005 00:27:21 -0400
+
+mozilla-firefox (1.0-1) unstable; urgency=medium
+
+    A heavily patched extension manager has been introduced this
+    release by Mike Hommey. It is designed to work around the
+    deficiencies in the upstream's current offering. Unfortunately, the
+    registration process for extension and locale packages has now
+    changed in an incompatible way. The packages will install
+    correctly but won't actually be registered with
+    Firefox. Maintainers are aware of the issue and are working on new
+    packages that will work with this new mechanism. Please do not
+    file bugs on this issue.
+    
+ -- Eric Dorland <eric@debian.org>, Wed, 10 Nov 2004 00:16:15 -0500
+
+mozilla-firefox (0.8-1) unstable; urgency=low
+
+    The mozilla-firefox package no longer uses the ~/.phoenix
+    directory for it's configuration, but the ~/.firefox directory. To
+    migrate your config, just execute "mv ~/.phoenix ~/.firefox" which
+    should work in most cases.
+
+ -- Eric Dorland <eric@debian.org>, Fri Feb 20 00:01:54 2004
--- firefox-1.5.dfsg.orig/debian/firefox.png.uu
+++ firefox-1.5.dfsg/debian/firefox.png.uu
@@ -0,0 +1,146 @@
+begin 644 firefox.png
+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
+KQSEW52FU$X8A412U#A\^;/B[S^O[^;\Z\7.<>GK+0@````!)14Y$KD)@@@``
+`
+end
--- firefox-1.5.dfsg.orig/debian/firefox.js
+++ firefox-1.5.dfsg/debian/firefox.js
@@ -0,0 +1,16 @@
+// This is the Debian specific preferences file for Mozilla Firefox
+// 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/firefox/pref directory, override any preference that is
+// present in /usr/lib/firefox/defaults/pref directory.
+// While your changes will be kept on upgrade if you modify files in
+// /etc/firefox/pref, please note that they won't be kept if you
+// do them in /usr/lib/firefox/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);
--- firefox-1.5.dfsg.orig/debian/rules
+++ firefox-1.5.dfsg/debian/rules
@@ -0,0 +1,360 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+SHELL=/bin/bash # I use bashisms
+
+# build phoenix
+export MOZ_PHOENIX=1
+export MOZ_FIREBIRD=1
+export MOZ_FIREFOX=1
+export BUILD_OFFICIAL=1 
+export MOZILLA_OFFICIAL=1
+#export MOZ_INTERNAL_LIBART_LGPL=1
+
+PHOENIX := firefox
+PHOENIX_CVS := mozilla
+# things to remove from upstream tarball cause we don't need them
+UPSTREAM_REMOVE := debian mailnews themes/modern editor/ui \
+	editor/composer/src lib/mac
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/Version: *\(.*\)/\1/ p')
+UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/-.*$$//')
+LIB_DIR := /usr/lib/firefox
+SHARE_DIR := /usr/share/firefox
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	OPTFLAGS = -O0
+else
+	OPTFLAGS = -O2
+
+# Commented out OPTFLAGS set for some architectures.
+# We will see if gcc 4.0 is doing any better.
+#ifeq ($(DEB_BUILD_ARCH),ia64)
+#	OPTFLAGS=-O
+#endif
+
+#ifeq ($(DEB_BUILD_ARCH),powerpc)
+#	OPTFLAGS=-O
+#endif
+
+#ifeq ($(DEB_BUILD_ARCH),arm)
+#	OPTFLAGS=-O
+#endif
+
+endif
+
+DEBUG_FLAG=
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	DEBUG_FLAG = --enable-debug
+endif
+
+CONFIGURE_OPTIONS = \
+	--enable-default-toolkit=gtk2 \
+	--with-default-mozilla-five-home=$(LIB_DIR) \
+	--enable-pango \
+	--with-user-appdir=.mozilla \
+	--with-system-png=/usr \
+	--with-system-jpeg=/usr \
+	--disable-mailnews \
+	--disable-composer \
+	--disable-ldap \
+	--enable-postscript \
+	--disable-installer \
+	--disable-xprint \
+	--enable-crypto \
+	--enable-strip-libs \
+	--enable-canvas \
+	--enable-svg \
+	--enable-svg-renderer=cairo \
+	--enable-system-cairo \
+	--enable-mathml \
+	--disable-tests \
+	--disable-gtktest \
+	--disable-debug \
+	--enable-xft \
+	--enable-optimize="-pipe -w $(OPTFLAGS)" \
+	--with-system-zlib=/usr \
+	--without-system-nspr \
+	--enable-xinerama \
+	--enable-extensions=default \
+	--disable-pedantic \
+	--disable-long-long-warning \
+	--enable-single-profile \
+	--disable-profilesharing \
+	--enable-gnomevfs \
+	--enable-application=browser \
+	--disable-installer \
+	--disable-updater \
+	$(DEBUG_FLAG)
+
+ifneq ($(DEB_BUILD_ARCH),mips)
+ifneq ($(DEB_BUILD_ARCH),mipsel)
+#	CONFIGURE_OPTIONS += --enable-static --disable-shared
+#	 we need not to build statically because our embedding
+#	 programs use firefox, unlike in Debian, where they
+#	 use mozilla
+endif
+endif
+
+configure: config.status
+config.status:
+	dh_testdir
+
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(CONFIGURE_OPTIONS)
+
+build: build-stamp
+build-stamp: config.status
+	dh_testdir
+
+	(cd debian && uudecode firefox.png.uu \
+		&& uudecode debsearch.gif.uu && uudecode about.png.uu)
+	if [ ! -f browser/base/branding/about.png.orig ]; then \
+		mv -f browser/base/branding/about.png \
+			browser/base/branding/about.png.orig; fi
+	cp -f debian/about.png browser/base/branding/about.png
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp \
+		debian/firefox.png debian/debsearch.gif debian/about.png
+	mv -f browser/base/branding/about.png.orig \
+		browser/base/branding/about.png || true
+	rm -f debian/mozilla-*.pc
+
+	-$(MAKE) distclean
+
+	dh_clean
+
+	rm -f	browser/app/nsStaticComponents.cpp			\
+		embedding/browser/gtk/src/nsStaticComponents.cpp	\
+		extensions/xmlextras/base/src/nsRect.cpp		\
+		gfx/gfx-config.h					\
+		xpcom/xpcom-config.h					\
+		xpcom/xpcom-private.h					\
+		netwerk/necko-config.h					\
+		browser/app/profile/extensions/*/install.rdf		\
+		build/unix/firefox-config				\
+		modules/libpr0n/build/_img_list
+
+	find	xpcom/build 						\
+		xpcom/glue/standalone					\
+		profile/dirserviceprovider/standalone			\
+		toolkit/xre						\
+		extensions/pref/system-pref/src/gconf			\
+	    -type l -print0 | xargs -0r rm --
+
+	find -name '*.OBJ' -print0 | xargs -0r rm -r --
+
+	find	toolkit/mozapps/*/src					\
+		xpfe/components/filepicker/src				\
+	    -name '*.in' -print | sed -e 's/\.in$$//' | xargs -r rm -f --
+
+	find	nsprpub							\
+	    -name Makefile -print0 | xargs -0r rm --
+
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	chmod 755 debian/firefox-xremote-client
+# Remove execute on javascript files
+	find debian/tmp -name '*.so' | xargs chmod -x 
+	chmod -x debian/tmp/$(LIB_DIR)/components/*.js
+
+	set -e; for f in nss nspr; do echo $$f; sed 			\
+		-e 's,mozilla-firefox,mozilla,'				\
+		-e 's,firefox-,mozilla-,'				\
+		-e 's,^libdir=.*,libdir=/usr/lib/mozilla,'		\
+		-e '/^Libs:.*nspr/ s,$$, -lc -lpthread,'		\
+		<build/unix/firefox-$$f.pc >debian/mozilla-$$f.pc; done
+
+	dh_install -plibnspr-dev
+	dh_install -plibnss-dev
+	dh_install -plibnspr4
+	dh_install -plibnss3
+	dh_installdirs -plibnss-dev usr/include/mozilla/nss
+	cp dist/public/nss/* debian/libnss-dev/usr/include/mozilla/nss
+
+# Exclude inspector for firefox
+	dh_install -pfirefox '-Xinspector' '-Xgnome' '-Ximgicon'
+	dh_install -pfirefox-dom-inspector
+	dh_install -pfirefox-gnome-support
+
+	dh_install -pfirefox-dev '-Xnspr'
+	cp debian/tmp/usr/lib/pkgconfig/firefox-nspr.pc debian/firefox-dev/usr/lib/pkgconfig/firefox-nspr.pc
+
+	set -e; for f in nspr4 nss3; do					\
+		dh_installdirs -A -plib$$f usr/lib DEBIAN;		\
+		install -m 755	debian/libpackage.postinst		\
+				debian/lib$$f/DEBIAN/postinst;		\
+	done
+	dh_installdirs -A -plibnss3 usr/lib/mozilla
+
+	dh_installdirs -pfirefox-dev DEBIAN
+	install -m 755 debian/firefox-dev.preinst \
+		debian/firefox-dev/DEBIAN/preinst
+
+	set -ex; for f in nspr4 plc4 plds4; do 				\
+		g=lib$$f.so;						\
+		mv	debian/firefox/usr/lib/firefox/$$g 		\
+			debian/libnspr4/usr/lib/$$g;			\
+	done
+
+	set -ex; for f in nss3 smime3 softokn3 ssl3; do 		\
+		g=lib$$f.so;						\
+		mv	debian/firefox/usr/lib/firefox/$$g		\
+			debian/libnss3/usr/lib/$$g;			\
+	done
+
+# libnssckbi.so must not be installed in /usr/lib/mozilla; this is the
+# namespace of the mozilla/mozilla-browser package; we cannot conflict
+# libnss3 and mozilla-browser.
+#	mv	debian/firefox/usr/lib/firefox/libnssckbi.so		\
+#		debian/libnss3/usr/lib/mozilla/.
+#
+#	# But the firefox we build still looks for it here :-/
+#	ln -s	../mozilla/libnssckbi.so				\
+#		debian/firefox/usr/lib/firefox/libnssckbi.so
+	mkdir -p debian/libnss3/usr/lib/firefox
+	mv	debian/firefox/usr/lib/firefox/libnssckbi.so		\
+		debian/libnss3/usr/lib/firefox/.
+	-rmdir	debian/libnss3/usr/lib/mozilla
+
+	# Old mozilla-based packages provided nspr and nss in
+	# a different directory; these symlinks are provided for
+	# the convenience of embedding applications.
+	# (originally from dholbach/doko):
+	for f in nspr nss; do						\
+		ln -s ../mozilla/$$f					\
+			debian/firefox-dev/usr/include/mozilla-firefox/$$f; \
+	done
+
+	# Include pointer to Gecko Runtime
+	# http://developer.mozilla.org/en/docs/GRE_Registration
+	# http://bugzilla.ubuntu.com/show_bug.cgi?id=13750
+	mkdir debian/firefox/etc/gre.d
+	exec >>debian/firefox/etc/gre.d/firefox.conf	&& \
+		echo "[$(UPSTREAM_VERSION)]"		&& \
+		echo GRE_PATH=/usr/lib/firefox
+
+	# Include nspr-config (needs sedding, unfortunately)
+	dh_installdirs -plibnspr-dev usr/bin
+	sed -e 's,/include/nspr,/include/mozilla/nspr,' \
+		<nsprpub/config/nspr-config \
+		>debian/libnspr-dev/usr/bin/nspr-config
+	chmod 755 debian/libnspr-dev/usr/bin/nspr-config
+
+	# Work around bug in esddsp, which makes firefox crash
+	# during startup.  So we disable it on amd64:
+
+#Install helpers
+	install -m 755 debian/firefox-runner \
+		debian/firefox/usr/lib/firefox/firefox
+
+	set -e; if [ x"`dpkg-architecture -qDEB_BUILD_ARCH`"		\
+			= xamd64 ]; then				\
+		f=debian/firefox/usr/lib/firefox/firefox;		\
+		sed -e s/=esddsp/=/ <$$f >$$f.new;			\
+		chmod 755 $$f.new;					\
+		mv $$f.new $$f;						\
+		fi
+
+# Remove unneeded configs
+	rm -f debian/firefox/$(LIB_DIR)/defaults/pref/firefox-l10n.js
+
+# Add Debian package version to preferences
+	echo // Debian package version \
+		> debian/firefox/$(LIB_DIR)/defaults/pref/vendor.js
+	echo "pref(\"general.useragent.vendor\",\"Ubuntu\");" \
+		>> debian/firefox/$(LIB_DIR)/defaults/pref/vendor.js
+	echo "pref(\"general.useragent.vendorSub\",\"$(DEBIAN_VERSION)\");" \
+		>> debian/firefox/$(LIB_DIR)/defaults/pref/vendor.js
+
+# Move profiles into /etc
+	mv \
+	 debian/firefox/$(LIB_DIR)/defaults/profile \
+	 debian/firefox/etc/firefox/
+
+#Move icons into place
+	dh_installdirs -pfirefox $(LIB_DIR)/chrome/icons
+
+	cp -a debian/firefox.xpm \
+		debian/firefox/usr/share/pixmaps/mozilla-firefox.xpm
+	cp -f debian/firefox.xpm \
+		debian/firefox/usr/share/firefox/icons/default.xpm
+	cp -f debian/firefox.xpm \
+		debian/firefox/usr/share/firefox/icons/mozicon50.xpm
+	cp -f debian/firefox-small.xpm \
+		debian/firefox/usr/share/firefox/icons/mozicon16.xpm
+	cp -a debian/firefox.xpm \
+		debian/firefox/$(LIB_DIR)/chrome/icons/default/default.xpm
+
+# Use system colours
+	echo "pref(\"browser.display.use_system_colors\",   true);"\
+		>> debian/firefox/${LIB_DIR}/defaults/pref/vendor.js
+       
+	echo "$(UPSTREAM_VERSION)" > debian/firefox/${LIB_DIR}/pkg-ver
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+
+# Build architecture-dependent files here.
+binary-arch: build install
+#	dh_testversion
+	dh_testdir
+	dh_testroot
+	dh_installdebconf	
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installinit
+#	dh_installcron
+	dh_installman
+	dh_installinfo
+	dh_installmime
+#	dh_undocumented
+	dh_installchangelogs
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps -Xlibssl3.so
+	dh_gencontrol
+	dh_gencontrol -plibnspr4 -plibnspr-dev -plibnss3 -plibnss-dev \
+		-- -v'2:1.firefox$${Source-Version}'
+	dh_md5sums
+	dh_builddeb
+
+source-tarball-from-cvs: clean
+	cp -af ../$(PHOENIX_CVS) ../$(PHOENIX)-$(UPSTREAM_VERSION).orig
+	cd ../$(PHOENIX)-$(UPSTREAM_VERSION).orig ; rm -rf mailnews debian
+	cd ../$(PHOENIX)-$(UPSTREAM_VERSION).orig ; find . -depth \( -name CVS \
+		 -or -name .cvsignore \) -exec rm -rf '{}' \;
+	cd .. ; tar --remove-files -cf $(PHOENIX)_$(UPSTREAM_VERSION).orig.tar \
+		$(PHOENIX)-$(UPSTREAM_VERSION).orig 
+	rm -rf ../$(PHOENIX)-$(UPSTREAM_VERSION).orig
+	gzip -9 ../$(PHOENIX)_$(UPSTREAM_VERSION).orig.tar
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure source-tarball-from-cvs