--- mozilla-thunderbird-1.5.orig/debian/po/templates.pot
+++ mozilla-thunderbird-1.5/debian/po/templates.pot
@@ -0,0 +1,69 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr ""
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr ""
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr ""
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
--- mozilla-thunderbird-1.5.orig/debian/po/ar.po
+++ mozilla-thunderbird-1.5/debian/po/ar.po
@@ -0,0 +1,77 @@
+# translation of ar.po to Arabic
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Ossama M. Khayat <okhayat@yahoo.com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-07-19 22:46+0300\n"
+"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
+"Language-Team: Arabic <debian-l10n-arabic@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "ديبيان, جنوم, سأقوم به بنفسي"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "الرجاء اختيار طريقتك المفضلة لدمج المتصفح"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "الرجاء اختيار نوع دمج المتصفح الذي تريده."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"إن كنت تستخدم جنوم، قم باختياره. سيختار هذا المتصفح المهيأ في مركز تحكم جنوم."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"إن كنت تستخدم كيدي أو أي مدير نافذة بسيط آخر قم باختيار ديبيان. سيقوم هذا "
+"بدمج x-www-browser البديل المفضل لديك. استخدم update-alternatives(8) لتغيير "
+"ذلك البديل."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"إن قمت بإضافة تهيئة المتصفح مسبقاً في /etc/mozilla-thunderbird/global-config."
+"js فسيكون الناتج مجهولاً. اختر يدوي أو قم بتشغيل dpkg-reconfigure later."
--- mozilla-thunderbird-1.5.orig/debian/po/ca.po
+++ mozilla-thunderbird-1.5/debian/po/ca.po
@@ -0,0 +1,70 @@
+# Catalan translation of Debian thunderbird templates.
+# Copyright © 2005 Software in the Public Interest, Inc.
+# This file is distributed under the terms of the GNU GPL licence.
+# Jordi Mallach <jordi@debian.org>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-01-27 18:29+0100\n"
+"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
+"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, Ho faré jo mateix"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Seleccioneu la integració amb el navegador que preferiu"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Seleccioneu el tipus d'integració amb el navegador que voleu."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Si esteu executant el GNOME, seleccioneu-ho. Això seleccionari el navegador "
+"configurat al Centre de Control del GNOME."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Si esteu executant KDE o qualsevol gestor de finestres simple, seleccionau "
+"Debian. Això integrarà la vostra alternativa de x-www-browser preferida. "
+"l'opció adequada. Useu update-alternatives(8) per a canviar l'alternativa."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Si ja heu afegir una configuració del navegador en /etc/mozilla-thunderbird/"
+"global-config.js, el resultat no és predecible. Seleccioneu «Manual» ara i "
+"potser executeu dpkg-reconfigure després."
--- mozilla-thunderbird-1.5.orig/debian/po/de.po
+++ mozilla-thunderbird-1.5/debian/po/de.po
@@ -0,0 +1,80 @@
+# translation of mozilla-thunderbird_1.0.2-3_templates.po to German
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+#    Developers do not need to manually edit POT or PO files.
+# Alwin Meschede <ameschede@gmx.de>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird_1.0.2-3_templates\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-07-17 14:34+0200\n"
+"Last-Translator: Alwin Meschede <ameschede@gmx.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, Manuell"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Bitte wählen Sie Ihre bevorzugte Browser-Integration"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Bitte wählen Sie die gewünschte Browser-Integration."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Wenn Sie GNOME ausführen, wählen Sie es aus. Dies wird den im GNOME-"
+"Kontrollzentrum eingestellten Browser auswählen."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Wenn Sie KDE oder einen anderen Windowmanager verweden, wählen Sie \"Debian"
+"\". Dies wird Ihre bevorzugte x-www-browser-Alternative einbinden. Benutzen "
+"Sie update-alternatives(8), um diese Alternative zu ändern."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Wenn Sie bereits eine Browser-Konfiguration in /etc/mozilla-thunderbird/"
+"global-config.js hinzugefügt haben, ist das Ergebnis undefiniert.  Wählen "
+"Sie \"Manuell\" und führen Sie dpkg-reconfigure vielleicht später aus."
--- mozilla-thunderbird-1.5.orig/debian/po/cs.po
+++ mozilla-thunderbird-1.5/debian/po/cs.po
@@ -0,0 +1,78 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-05-13 19:17+0200\n"
+"Last-Translator: Jan Outrata <outrataj@upcase.inf.upol.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, ud�l�m to s�m"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Vyberte v� zp�sob integrace prohl��e�e"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Vyberte po�adovan� typ integrace prohl��e�e."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Pokud pou��v�te GNOME, vyberte ho. To vybere prohl��e� nastaven� v ovl�dac�m "
+"centru gnome."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Pokud pou��v�te KDE nebo jen jin� spr�vce oken, vyberte Debian. To nastav� x-"
+"www-browser v syst�mu alternativ. Pro jeho zm�nu pou�ijte update-alternatives"
+"(8)."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Pokud jste ji� p�idali nastaven� prohl��e�e do /etc/mozilla-thunderbird/"
+"global-config.js, v�sledek m��e b�t jak�koliv. Vyberte Manu�ln� a mo�n� "
+"je�t� pozd�ji spus�te dpkg-reconfigure."
--- mozilla-thunderbird-1.5.orig/debian/po/fi.po
+++ mozilla-thunderbird-1.5/debian/po/fi.po
@@ -0,0 +1,79 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-04-09 00:07+0300\n"
+"Last-Translator: Matti Pöllä <mpo@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, Muokkaan itse"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Valitse haluamasi liityntätapa selainohjelmaan"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Valitse haluamasi liitäntätapa selainohjelmaan."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Jos käytät GNOME:a, valitse se. Tämä vaikuttaa Gnomen asetuksissa\n"
+"tehtyyn valintaan selaimesta."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Jos käytät KDE:tä tai muuta ikkunointimanageria, valitse Debian. Tämä\n"
+"vaihtoehto käyttää haluamaasi x-www-browser  valintaa. Käytä komentoa\n"
+"\"update-alternatives\"(8) muuttaaksesi tämän."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Mikäli lisäsit jo asetustiedoston\n"
+"/etc/mozilla-thunderbird/global-config.js, lopputulos on\n"
+"arvaamaton. Valitse Manuaalinen ja halutessasi aja komento\n"
+"\"dpkg-reconfigure\" myöhemmin."
--- mozilla-thunderbird-1.5.orig/debian/po/fr.po
+++ mozilla-thunderbird-1.5/debian/po/fr.po
@@ -0,0 +1,89 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thundirbird 1.0-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-01-19 16:22+0200\n"
+"Last-Translator: Mohammed Adn�ne Trojette <adn+deb@diwi.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, Aucune"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "M�thode d'int�gration du navigateur�:"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "M�thode d'int�gration du navigateur�:"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Choisissez �| GNOME| � si vous utilisez cet environnement, afin que les "
+"param�tres du panneau de contr�le de GNOME s'appliquent correctement."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Si vous utilisez KDE ou tout autre gestionnaire de fen�tres, il est "
+"conseill� de choisir �| Debian| �. Sinon, choisissez �| Aucune| �."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Note�: si vous avez d�j� configur� le navigateur dans le fichier de "
+"configuration /etc/mozilla-thunderbird/global-config.js, des probl�mes "
+"peuvent survenir. Vous devriez choisir ��Aucune�� maintenant et lancer "
+"��dpkg-reconfigure mozilla-thunderbird�� apr�s avoir retir� vos "
+"modifications de global-config.js."
+
+#~ msgid ""
+#~ "If you are running GNOME, select gnome, so that your settings in gnome "
+#~ "control center apply. If you are running kde or any other plain window "
+#~ "manager selecting Debian is a wise decision. Otherwise select none."
+#~ msgstr ""
+#~ "Choisissez ��GNOME�� si vous utilisez cet environnement, afin que les "
+#~ "param�tres du panneau de contr�le de GNOME s'appliquent correctement. Si "
+#~ "vous utilisez KDE ou tout autre gestionnaire de fen�tres, il est "
+#~ "conseill� de choisir ��Debian��. Sinon, choisissez ��Aucune��."
--- mozilla-thunderbird-1.5.orig/debian/po/ja.po
+++ mozilla-thunderbird-1.5/debian/po/ja.po
@@ -0,0 +1,79 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thuderbird\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-04-30 11:46+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, ��ư"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "�Ȥ������֥饦����������ˡ������Ǥ�������"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "�Ȥ������֥饦������Υ����פ�����Ǥ���������"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"GNOME ��¹Ԥ��Ƥ���ΤǤ���С���GNOME�פ����Ӥޤ�������ϡ�GNOME ����ȥ���"
+"�륻�󥿡������ꤵ��Ƥ���֥饦�������򤹤뤳�Ȥˤʤ�ޤ���"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"KDE �䤽��¾�Υץ쥤�󥦥���ɥ��ޥ͡������¹Ԥ��Ƥ���ΤǤ���С�"
+"��Debian�פ�����Ǥ�������������ϡ����ʤ������򤷤Ƥ��� x-www-browser "
+"alternative �����礹�뤳�Ȥˤʤ�ޤ���alternative ���ѹ�����ˤ� update-"
+"alternatives(8) ��ȤäƤ���������"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"���Ǥ� /etc/mozilla-thunderbird/global-config.js �˥֥饦��������ɲä��Ƥ���"
+"�ΤǤ���С���̤�����Ǥ����ּ�ư�פ����򤷤ơ������餯���Ȥ� dpkg-"
+"reconfigure ��¹Ԥ��뤳�Ȥˤʤ�Ǥ��礦��"
--- mozilla-thunderbird-1.5.orig/debian/po/it.po
+++ mozilla-thunderbird-1.5/debian/po/it.po
@@ -0,0 +1,86 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird 1.0-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-01-31 23:21+0100\n"
+"Last-Translator: Vittorio Palmisano <redclay@email.it>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, nessuno"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Scegliere l'integrazione con il browser preferita"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Scegliere l'integrazione con il browser preferita"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Se si sta usando GNOME, selezionare gnome, in modo da applicare levostre "
+"modifiche nel centro di controllo di gnome."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Se si sta usando KDEo un altro gestore delle finestre selezionare Debian� "
+"una buona scelta. Altrimenti selezionare nessuno."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Nota: se si � gi� aggiunto una configurazione del browser nel file /etc/"
+"mozilla-thunderbird/global-config.js il risultato � indefinito selezionare "
+"nessuno per adesso e lanciare dpkg-reconfigure dopo aver rimosso le "
+"modifiche al file global-config.js"
+
+#~ msgid ""
+#~ "If you are running GNOME, select gnome, so that your settings in gnome "
+#~ "control center apply. If you are running kde or any other plain window "
+#~ "manager selecting Debian is a wise decision. Otherwise select none."
+#~ msgstr ""
+#~ "Se si sta usando GNOME, selezionare gnome, in modo da applicare levostre "
+#~ "modifiche nel centro di controllo di gnome. Se si sta usando KDEo un "
+#~ "altro gestore delle finestre selezionare Debian � una buona scelta."
+#~ "Altrimenti selezionare nessuno."
--- mozilla-thunderbird-1.5.orig/debian/po/ko.po
+++ mozilla-thunderbird-1.5/debian/po/ko.po
@@ -0,0 +1,70 @@
+# Korean translation of Debian thunderbird templates.
+# Copyright �� 2005 Software in the Public Interest, Inc.
+# This file is distributed under the terms of the GNU GPL licence.
+# Yooseong Yang <yooseong@debian.org>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-01-27 10:46+0100\n"
+"Last-Translator: Yooseong Yang <yooseong@debian.org>\n"
+"Language-Team: Korean <debian-kr-devel@lists.debian.or.kr>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-KR\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "�����, �׳�, ���� �� �ý����� �ٷ� ���̴�"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "������ ���տ� �ʿ��� ���ϴ� ����� �����Ͻʽÿ�"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "�������� ���ϴ� ������ ���¸� �����Ͻʽÿ�"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"�׳��� ���ٸ�, �̸� �����ϸ� �ǰ� �׳� ����Ϳ��� �̰��� ������ �������� "
+"�������� ���Դϴ�"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"���� KDE�� �ٸ� ������ �����ڸ� ���ٸ� ������� �����Ͻʽÿ�. �̰��� ������"
+"�� ���ϴ� �������� ���� ���ٰ��̴�. �ٸ� ���� ������ �Ѵٸ� update-"
+"alternatives(8)�� ���� �ȴ�"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"�̹� /etc/mozilla-thunderbird/global-config.js�� �ִ� ������ ������ �߰���"
+"�ٸ�, ����� ���ǵ��� �ʾҴ�. �̷� �� �Ŵ����� �����ϰ� dpkg-reconfigure�� ��"
+"�߿� �����ϸ� �ȴ�."
--- mozilla-thunderbird-1.5.orig/debian/po/nl.po
+++ mozilla-thunderbird-1.5/debian/po/nl.po
@@ -0,0 +1,88 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird 1.0-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-02-07 16:49+0100\n"
+"Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, geen"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Kies de browser-integratiemethode van uw voorkeur"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Kies de browser-integratiemethode van uw voorkeur"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Als u GNOME draait, kies dan GNOME zodat uw instellingen in het gnome "
+"control center van toepassing zijn."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Als u kde of een andere window-beheerder draait, dan is Debian kiezen "
+"eenwijs besluit. Kies anders 'geen'."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Opmerking: als u reeds een browserconfiguratie heeft toegevoegd in /etc/"
+"mozilla-thunderbird/global-config.js, dan is het resultaat niet "
+"gedefinieerd. Kies dan nu 'geen' en voer daarna misschien, na het "
+"verwijderen van uw wijzigingen aan global-config.js, dpkg-reconfigure uit."
+
+#~ msgid ""
+#~ "If you are running GNOME, select gnome, so that your settings in gnome "
+#~ "control center apply. If you are running kde or any other plain window "
+#~ "manager selecting Debian is a wise decision. Otherwise select none."
+#~ msgstr ""
+#~ "Als u GNOME draait, kies dan GNOME zodat uw instellingen in het gnome "
+#~ "control center van toepassing zijn. Als u kde of een andere window-"
+#~ "beheerder draait, dan is Debian kiezen een wijs besluit. Kies anders "
+#~ "'geen'."
--- mozilla-thunderbird-1.5.orig/debian/po/pl.po
+++ mozilla-thunderbird-1.5/debian/po/pl.po
@@ -0,0 +1,78 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird 1.0-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-01-28 19:50+0100\n"
+"Last-Translator: Robert Luberda <robert@debian.org>\n"
+"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, Zrobię to po swojemu"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Proszę wybrać preferowany sposób intergracji z przeglądarką www"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Proszę wybrać preferowany sposób intergracji z przeglądarką www"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Jeżeli używasz GNOME, to wybierz opcję GNOME. Wybierze to przeglądarkę "
+"skonfigurowaną w Centrum sterowania GNOME."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Jeżeli używasz KDE lub jakiegokolwiek innego menadżera okien, to wybierz "
+"opcję Debian. Oznacza ona integrację z Twoim preferowanym x-www-browserem. "
+"Użyj programu update-alternatives(8), aby go zmienić."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Jeżeli już dodałeś konfigurację przeglądarki w pliku /etc/mozilla-"
+"thunderbird/global-config.js, to rezultat może być nieokreślony. Wybierz "
+"tryb ręczny i być może uruchom dpkg-reconfigure później."
--- mozilla-thunderbird-1.5.orig/debian/po/sv.po
+++ mozilla-thunderbird-1.5/debian/po/sv.po
@@ -0,0 +1,75 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird 1.0.7-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-10-05 08:08+0200\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, Jag g�r det p� egen hand"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "V�lj den metod f�r integrering av webl�saren som passar dig b�st"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "V�lj den integrationstyp av webl�saren som du �nskar."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Om du k�r GNOME, v�lj den. Detta kommer att v�lja webl�saren som �r "
+"konfigurerad i Gnome's Kontrollcenter."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Om du k�r KDE eller n�gon annan f�nsterhanterare, v�lj Debian. Detta kommer "
+"att integrera ditt �nskade x-www-browser alternativ. Anv�nd update-"
+"alternatives(8) f�r att �ndra det alternativet."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Om du redan lagt till en webl�sarekonfiguration i /etc/mozilla-thunderbird/"
+"global-config.js �r resultatet ok�nt. V�lj att manuellt konfigurera detta "
+"och k�r dpkg-reconfigure senare om det beh�vs."
--- mozilla-thunderbird-1.5.orig/debian/po/vi.po
+++ mozilla-thunderbird-1.5/debian/po/vi.po
@@ -0,0 +1,69 @@
+# Vietnamese Translation for mozilla-thunderbird.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird 1.0.6-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-08-21 15:29+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.2.2\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, tự làm"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Hãy chọn cách ưa thích hợp nhất trình duyệt."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Hãy chọn cách hợp nhất trình duyệt mà bạn muốn."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Nếu bạn đang chạy GNOME thì hãy chọn nó. Làm như thế sẽ chọn trình duyệt "
+"được cấu hình trong trung tâm điều khiển Gnome (trình gnome-control-center)."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Nếu bạn đang chạy KDE hay bất cứ trình quản lý cửa sổ chuẩn nào thì hãy chọn "
+"Debian. Làm như thế sẽ hợp nhất trình duyệt « x-www-browser » thay thế đã "
+"chọn của bạn. Có thể sử dụng « update-alternatives(8) » để sửa đổi tùy chọn "
+"điều thay thế ấy."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Nếu bạn đã thêm cấu hình trình duyệt trong </etc/mozilla-thunderbird/global-"
+"config.js> thì chưa định nghĩa kết quả. Hãy chọn « Tự làm » và có lẽ chạy lại lệnh cấu hình lại « dpkg-reconfigure » lần sau."
--- mozilla-thunderbird-1.5.orig/debian/po/POTFILES.in
+++ mozilla-thunderbird-1.5/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] mozilla-thunderbird.templates
--- mozilla-thunderbird-1.5.orig/debian/po/pt_BR.po
+++ mozilla-thunderbird-1.5/debian/po/pt_BR.po
@@ -0,0 +1,79 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mozilla-thunderbird\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-07-21 10:06+0000\n"
+"PO-Revision-Date: 2005-05-26 13:44-0300\n"
+"Last-Translator: Andr� Lu�s Lopes <andrelop@debian.org>\n"
+"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. choices
+#: ../mozilla-thunderbird.templates:3
+msgid "Debian, GNOME, I will do it on my own"
+msgstr "Debian, GNOME, farei isso manualmente"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose your preferred way of browser integration"
+msgstr "Por favor, selecione a maneira preferida de integra��o com o navegador"
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid "Please choose the type of browser integration you want."
+msgstr "Por favor, selecione o tipo de integra��o com o navegador desejado."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+msgid ""
+"If you are running GNOME, select it. This will select the browser configured "
+"in gnome control center."
+msgstr ""
+"Caso voc� esteja utilizando GNOME, selecione a op��o GNOME. Isso ir� "
+"selecionar o navegador configurado no Centro de Controle do GNOME."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you are running KDE or any other plain window manager select Debian. This "
+"will integrate your preferred x-www-browser alternative. Use update-"
+"alternatives(8) to change that alternative."
+msgstr ""
+"Caso voc� esteja utilizando KDE ou qualquer outro gerenciador de janelas, "
+"selecione a op��o Debian. Isso integrar� sua alternativa x-www-browser "
+"preferida. Utilize update-alternatives(8) para modificar essa alternativa."
+
+#. Type: select
+#. description
+#: ../mozilla-thunderbird.templates:4
+#, fuzzy
+msgid ""
+"If you already added a browser configuration in /etc/mozilla-thunderbird/"
+"global-config.js the outcome is undefined. Select Manual and maybe run dpkg-"
+"reconfigure later."
+msgstr ""
+"Caso voc� j� tenha adicionado uma configura��o de navegador em /etc/mozilla-"
+"thunderbird/global-config.js o resultado ser� indefinido. Selecione a op��o "
+"'farei isso manualmente' e possivelmente execute 'dpkg-reconfigure' "
+"posteriormente."
--- mozilla-thunderbird-1.5.orig/debian/CVS/Tag
+++ mozilla-thunderbird-1.5/debian/CVS/Tag
@@ -0,0 +1 @@
+TDEV_0_6
--- mozilla-thunderbird-1.5.orig/debian/CVS/Root
+++ mozilla-thunderbird-1.5/debian/CVS/Root
@@ -0,0 +1 @@
+:ext:alex@personalfree.com:/var/lib/cvs
--- mozilla-thunderbird-1.5.orig/debian/CVS/Repository
+++ mozilla-thunderbird-1.5/debian/CVS/Repository
@@ -0,0 +1 @@
+tbird-debian
--- mozilla-thunderbird-1.5.orig/debian/CVS/Entries
+++ mozilla-thunderbird-1.5/debian/CVS/Entries
@@ -0,0 +1,68 @@
+D/overrides////
+D/patches////
+/00_locale-en-US/1.1/Tue Dec 16 07:58:11 2003//TDEV_0_6
+/README.Debian/1.2/Tue Jun  8 17:53:40 2004//TDEV_0_6
+/build-extensions.sh/1.2/Thu Jan 29 08:14:55 2004//TDEV_0_6
+/changelog/1.37.2.2/Tue Jun 15 09:02:20 2004//TDEV_0_6
+/chrome-typeadheadfind.txt/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/clean-extensions.sh/1.1.1.1/Fri Oct 24 11:22:46 2003//TDEV_0_6
+/control/1.13.2.2/Tue Jun 15 09:02:20 2004//TDEV_0_6
+/copyright/1.1.1.1/Fri Oct 24 11:22:46 2003//TDEV_0_6
+/docs/1.4/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/enigmail-startup-hook/1.2/Sun Oct 26 17:37:32 2003//TDEV_0_6
+/global-config.js/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-calendar.dirs/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-calendar.install/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-calendar.links/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-calendar.postinst/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-calendar.postrm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-dev.dirs/1.1.2.1/Tue Jun  8 17:56:29 2004//TDEV_0_6
+/mozilla-thunderbird-dev.install/1.1.2.1/Tue Jun  8 17:56:29 2004//TDEV_0_6
+/mozilla-thunderbird-dev.postinst/1.1.2.1/Tue Jun  8 17:56:29 2004//TDEV_0_6
+/mozilla-thunderbird-dev.postrm/1.1.2.1/Tue Jun  8 17:56:29 2004//TDEV_0_6
+/mozilla-thunderbird-dev.preinst/1.1.2.1/Tue Jun  8 17:56:29 2004//TDEV_0_6
+/mozilla-thunderbird-dev.prerm/1.1.2.1/Tue Jun  8 17:56:29 2004//TDEV_0_6
+/mozilla-thunderbird-enigmail.dirs/1.3/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-enigmail.install/1.3/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-enigmail.links/1.1/Thu Feb 19 19:23:51 2004//TDEV_0_6
+/mozilla-thunderbird-enigmail.postinst/1.1.1.1/Fri Oct 24 11:22:46 2003//TDEV_0_6
+/mozilla-thunderbird-enigmail.postrm/1.1.1.1/Fri Oct 24 11:22:46 2003//TDEV_0_6
+/mozilla-thunderbird-enigmail.preinst/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-enigmail.prerm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-inspector.dirs/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-inspector.install/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-inspector.links/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-inspector.postinst/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-inspector.postrm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-inspector.preinst/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-inspector.prerm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-menu.xpm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-offline.dirs/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-offline.install/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-offline.links/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-offline.postinst/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-offline.postrm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-offline.preinst/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-typeaheadfind.dirs/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-typeaheadfind.install/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-typeaheadfind.links/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-typeaheadfind.postinst/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird-typeaheadfind.postrm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.conffiles/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.desktop/1.1/Wed Nov  5 19:27:51 2003//TDEV_0_6
+/mozilla-thunderbird.dirs/1.7/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.install/1.4/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.links/1.4/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.manpages/1.2/Wed Feb 18 20:56:02 2004//TDEV_0_6
+/mozilla-thunderbird.menu/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.postinst/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.postrm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.preinst/1.7/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.prerm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/mozilla-thunderbird.sgml/1.3/Wed Feb 18 20:54:24 2004//TDEV_0_6
+/mozilla-thunderbird.xpm/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/rebuild-mozilla-chrome/1.1.1.1/Fri Oct 24 11:22:46 2003//TDEV_0_6
+/rejar-typeaheadfind.sh/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/rules/1.20.2.1/Tue Jun 15 09:02:20 2004//TDEV_0_6
+/update-mozilla-thunderbird-chrome/1.1.1.1/Fri Oct 24 11:22:46 2003//TDEV_0_6
+/update-mozilla-thunderbird-chrome.sgml/1.2/Wed Feb 18 20:53:51 2004//TDEV_0_6
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-offline.postinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-offline.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ] ; then
+ echo .
+fi
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/messengerWindow16.xpm
+++ mozilla-thunderbird-1.5/debian/messengerWindow16.xpm
@@ -0,0 +1,160 @@
+/* XPM */
+static char * messengerWindow16_xpm[] = {
+"16 16 141 2",
+"  	c None",
+". 	c #897D63",
+"+ 	c #A8A090",
+"@ 	c #C7C0B2",
+"# 	c #BBB4A4",
+"$ 	c #A09A90",
+"% 	c #C1BAAC",
+"& 	c #C6BEAD",
+"* 	c #CBC5B6",
+"= 	c #CDC5B5",
+"- 	c #817764",
+"; 	c #DFE4F3",
+"> 	c #DEE2EF",
+", 	c #B2BACD",
+"' 	c #9EA3B2",
+") 	c #9B9DA6",
+"! 	c #A8A6A4",
+"~ 	c #B5B1AA",
+"{ 	c #C4BFB2",
+"] 	c #858995",
+"^ 	c #FCFFFF",
+"/ 	c #FEFFFF",
+"( 	c #F1F6FF",
+"_ 	c #E5EAF5",
+": 	c #CDD4E5",
+"< 	c #B7C0D6",
+"[ 	c #AFB7CC",
+"} 	c #A6A9B8",
+"| 	c #8E8063",
+"1 	c #817A6F",
+"2 	c #ADB7D1",
+"3 	c #FAFFFF",
+"4 	c #EEF4FE",
+"5 	c #EEF4FF",
+"6 	c #EEF5FF",
+"7 	c #F8FDFF",
+"8 	c #F6FBFF",
+"9 	c #F2FAFF",
+"0 	c #CFD8EC",
+"a 	c #ABA8A5",
+"b 	c #B7A787",
+"c 	c #988E7D",
+"d 	c #B2B8CB",
+"e 	c #E7F2FF",
+"f 	c #E5EFFF",
+"g 	c #E7F0FE",
+"h 	c #E1EAFE",
+"i 	c #DFE8FE",
+"j 	c #E3EDFE",
+"k 	c #E6EFFF",
+"l 	c #E2ECFC",
+"m 	c #ADAAA6",
+"n 	c #C4B188",
+"o 	c #B8AA8C",
+"p 	c #DCD0B3",
+"q 	c #B8AD96",
+"r 	c #B1B3BE",
+"s 	c #D2DEFB",
+"t 	c #E1EDFF",
+"u 	c #DCE8FF",
+"v 	c #D7E3FF",
+"w 	c #DBE7FF",
+"x 	c #D4DFFD",
+"y 	c #AAB0BD",
+"z 	c #B4A78A",
+"A 	c #D2C097",
+"B 	c #AFA285",
+"C 	c #E3D9BE",
+"D 	c #E4DAC1",
+"E 	c #C2B79F",
+"F 	c #A1A0A2",
+"G 	c #B8C4E3",
+"H 	c #ACB6CC",
+"I 	c #A7AAB6",
+"J 	c #B1B9CF",
+"K 	c #99A0B8",
+"L 	c #A09682",
+"M 	c #D0C19D",
+"N 	c #CFBE97",
+"O 	c #AA9C81",
+"P 	c #E3D8BE",
+"Q 	c #E4DBC5",
+"R 	c #EFE8D5",
+"S 	c #DAD1BC",
+"T 	c #958D83",
+"U 	c #B6AFA1",
+"V 	c #DFD9C8",
+"W 	c #C3BCAC",
+"X 	c #948974",
+"Y 	c #CFC2A3",
+"Z 	c #D5C7A5",
+"` 	c #CCBC95",
+" .	c #A3967B",
+"..	c #E3D8BD",
+"+.	c #E4DAC3",
+"@.	c #ECE4D0",
+"#.	c #D7CFBB",
+"$.	c #C8BDA6",
+"%.	c #F9F4E4",
+"&.	c #FBF6E8",
+"*.	c #F9F3E2",
+"=.	c #D7CEB9",
+"-.	c #AFA288",
+";.	c #C9BB99",
+">.	c #998B71",
+",.	c #E2D7B9",
+"'.	c #DCD2B8",
+").	c #BCB199",
+"!.	c #CFC4AF",
+"~.	c #EDE6D3",
+"{.	c #EDE4D0",
+"].	c #E8DFC9",
+"^.	c #E7DDC7",
+"/.	c #E9DFC8",
+"(.	c #DACEB5",
+"_.	c #B3A589",
+":.	c #AF9E7A",
+"<.	c #918369",
+"[.	c #DDD0B0",
+"}.	c #AC9E84",
+"|.	c #C8BCA6",
+"1.	c #ECE3CD",
+"2.	c #E6DCC4",
+"3.	c #E5D9BF",
+"4.	c #E5D9BE",
+"5.	c #E4D7BB",
+"6.	c #DED0B3",
+"7.	c #DBCDAE",
+"8.	c #C3B496",
+"9.	c #7E6E53",
+"0.	c #897A5E",
+"a.	c #B2A385",
+"b.	c #C6B9A1",
+"c.	c #EADEC4",
+"d.	c #DFD2B6",
+"e.	c #D7C9AD",
+"f.	c #C4B698",
+"g.	c #A99B80",
+"h.	c #8C7F67",
+"i.	c #988B71",
+"j.	c #A1937B",
+"              . . .             ",
+"            . + @ # .           ",
+"        . . $ % & * = -         ",
+"      . ; > , ' ) ! ~ { .       ",
+"    . ] ^ / ^ ( _ : < [ } .     ",
+"  | 1 2 3 4 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 ` .   ",
+"   ...+.@.#.$.%.&.*.=.-.;.N .   ",
+"  >.,.'.).!.~.{.].^./.(._.:..   ",
+"  <.[.}.|.1.2.3.4.5.6.7.8.9..   ",
+"  0.a.b.c.d.e.f.g.h.h.. . .     ",
+"  . i.j.. . . .                 ",
+"                                "};
--- mozilla-thunderbird-1.5.orig/debian/docs
+++ mozilla-thunderbird-1.5/debian/docs
@@ -0,0 +1,3 @@
+debian/README.Debian
+debian/mozilla-thunderbird-compose
+build-dir/mozilla/README.txt
--- mozilla-thunderbird-1.5.orig/debian/control
+++ mozilla-thunderbird-1.5/debian/control
@@ -0,0 +1,42 @@
+Source: mozilla-thunderbird
+Section: mail
+Priority: optional
+Maintainer: Alexander Sack <asac@debian.org>
+Build-Depends: debhelper (>> 4), libgtk2.0-dev, libidl-dev (>= 0.8.0), libx11-dev, libxp-dev, libxt-dev, zlib1g-dev, docbook-to-man, zip, dpatch, m4, bzip2, unzip, autoconf2.13, libpng12-dev, libjpeg62-dev, libmng-dev, libpango1.0-dev, libxinerama-dev
+Standards-Version: 3.6.1
+
+Package: mozilla-thunderbird
+Architecture: any
+Provides: mail-reader, imap-client
+Depends: ${shlibs:Depends} 
+Recommends: myspell-en-us | myspell-dictionary, xprint
+Suggests: mozilla-thunderbird-typeaheadfind, mozilla-thunderbird-inspector, mozilla-firefox, ttf-bitstream-vera, ttf-freefont, mozilla-thunderbird-enigmail
+Description: Mozilla Thunderbird standalone mail client
+ Mozilla Thunderbird is a redesign of the Mozilla mail component. The 
+ goal is to produce a cross platform stand alone mail application using
+ the XUL user interface language. Mozilla Thunderbird leaves a somewhat 
+ smaller memory footprint than the Mozilla suite.
+
+Package: mozilla-thunderbird-inspector
+Architecture: any
+Depends: mozilla-thunderbird (=${Source-Version}), ${shlibs:Depends}
+Description: mozilla thunderbird dom inspector extension
+ The Mozilla Thunderbird Dom Inspector extension allows inspection of the
+ internal dom tree state in thunderbird. This extension is mainly a 
+ development and debugging feature. Users of mozilla thunderbird usually don't
+ want this feature installed, so don't bother if you don't know what is this.
+
+Package: mozilla-thunderbird-typeaheadfind
+Architecture: any
+Depends: mozilla-thunderbird (=${Source-Version}), ${shlibs:Depends}
+Description: mozilla thunderbird typeaheadfind extension
+ The Mozilla Thunderbird typeaheadfind is an accessibility 
+ extension adding enhanced search as you type capabilities
+ to thunderbird.
+
+Package: mozilla-thunderbird-dev
+Architecture: any
+Depends: mozilla-thunderbird (=${Source-Version}), ${shlibs:Depends}
+Description: mozilla thunderbird development files
+ The Mozilla Thunderbird development files
+
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.conffiles
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.conffiles
@@ -0,0 +1 @@
+/etc/mozilla-thunderbird/global-config.js
--- mozilla-thunderbird-1.5.orig/debian/rebuild-mozilla-chrome
+++ mozilla-thunderbird-1.5/debian/rebuild-mozilla-chrome
@@ -0,0 +1,10 @@
+MOZ_FIVE_HOME=/usr/lib/mozilla-thunderbird/
+export MOZILLA_FIVE_HOME=$MOZ_FIVE_HOME
+export LD_LIBRARY_PATH=$MOZ_FIVE_HOME:$LD_LIBRARY_PATH
+
+#rm -f $MOZILLA_FIVE_HOME/chrome/overlayinfo/global/content/overlays.rdf
+rm -f $MOZILLA_FIVE_HOME/chrome/chrome.rdf
+rm -f $MOZILLA_FIVE_HOME/components/compreg.dat
+
+$MOZILLA_FIVE_HOME/regxpcom 
+$MOZILLA_FIVE_HOME/regchrome
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-dev.dirs
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-dev.dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/lib
--- mozilla-thunderbird-1.5.orig/debian/chrome.manifest.typeaheadfind
+++ mozilla-thunderbird-1.5/debian/chrome.manifest.typeaheadfind
@@ -0,0 +1,2 @@
+content typeaheadfind jar:chrome/typeaheadfind.jar!/content/typeaheadfind/ xpcnativewrappers=no
+locale typeaheadfind en-US jar:typeaheadfind.jar!/locale/en-US/typeaheadfind/
--- mozilla-thunderbird-1.5.orig/debian/chrome-typeadheadfind.txt
+++ mozilla-thunderbird-1.5/debian/chrome-typeadheadfind.txt
@@ -0,0 +1,2 @@
+content,install,url,jar:resource:/chrome/typeaheadfind.jar!/content/messenger-offline/
+locale,install,url,jar:resource:/chrome/typeaheadfind.jar!/locale/en-US/messenger-offline/
--- mozilla-thunderbird-1.5.orig/debian/parts/Extensions.rdf.head
+++ mozilla-thunderbird-1.5/debian/parts/Extensions.rdf.head
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
+         xmlns:NC="http://home.netscape.com/NC-rdf#"
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <RDF:Description RDF:about="rdf:#$FXdPh2"
+         em:id="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+         em:minVersion="0.7"
+         em:maxVersion="0.7" />
--- mozilla-thunderbird-1.5.orig/debian/parts/Extensions.rdf.tail
+++ mozilla-thunderbird-1.5/debian/parts/Extensions.rdf.tail
@@ -0,0 +1 @@
+</RDF:RDF>
--- mozilla-thunderbird-1.5.orig/debian/parts/zerothemes.part
+++ mozilla-thunderbird-1.5/debian/parts/zerothemes.part
@@ -0,0 +1,2 @@
+<RDF:Seq RDF:about="urn:mozilla:theme:root">
+</RDF:Seq>
--- mozilla-thunderbird-1.5.orig/debian/parts/zeroextensions.part
+++ mozilla-thunderbird-1.5/debian/parts/zeroextensions.part
@@ -0,0 +1,2 @@
+<RDF:Seq RDF:about="urn:mozilla:extension:root">
+</RDF:Seq>
--- mozilla-thunderbird-1.5.orig/debian/rules
+++ mozilla-thunderbird-1.5/debian/rules
@@ -0,0 +1,259 @@
+#!/usr/bin/make -f
+#
+# debian/rules by Alexander Sack <asac@jwsdot.com>
+#
+# $Id: rules,v 1.20.2.1 2004/06/08 17:56:16 alex Exp $
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_THUNDERBIRD=1
+export PACKAGE=mozilla-thunderbird
+
+MAKE_OPTS=-C build-dir/mozilla
+
+TBIRD_BZ2_ARCHIVE=thunderbird-1.5-source-dfsg.tar.bz2
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+#CFLAGS = -Wall -g
+
+OPTFLAGS = -O2 -fno-strict-aliasing -fno-unsigned-char
+
+#NULL =
+#CONFIGURE_OPTIONS = \
+#	--program-prefix=mozilla- \
+#        --enable-default-toolkit=gtk2 \
+#        --with-default-mozilla-five-home=/usr/lib/mozilla-thunderbird \
+#        --with-user-appdir=.mozilla-thunderbird \
+#        --with-system-mng=/usr \
+#        --with-system-png=/usr \
+#        --with-system-jpeg=/usr \
+#        --with-system-zlib=/usr \
+#        --without-system-nspr \
+#        --enable-crypto \
+#	--disable-mathml \
+#	--disable-installer \
+#	--disable-activex \
+#	--disable-activex-scripting \
+#	--disable-tests \
+#	--disable-oji \
+#	--disable-necko-disk-cache \
+#	--disable-debug \
+#	--enable-optimize=\"$(OPTFLAGS)\" \
+#	--enable-strip \
+#	--enable-single-profile \
+#	--disable-profilesharing \
+#	--enable-extensions=wallet,spellcheck,xmlextras,typeaheadfind,inspector,webservices,pref \
+#	--enable-necko-protocols=http,file,jar,viewsource,res,data \
+#	--enable-image-decoders=default,-xbm \
+#	--enable-xft \
+#        --enable-xprint \
+#        $(NULL)
+
+NULL =
+CONFIGURE_OPTIONS = \
+	--program-prefix=mozilla- \
+	--enable-default-toolkit=gtk2 \
+	--enable-application=mail \
+	--with-default-mozilla-five-home=/usr/lib/mozilla-thunderbird \
+	--with-user-appdir=.mozilla-thunderbird \
+	--with-system-mng=/usr \
+	--with-system-png=/usr \
+	--with-system-jpeg=/usr \
+	--with-system-zlib=/usr \
+	--without-system-nspr \
+	--enable-system-cairo \
+	--enable-optimize=\"$(OPTFLAGS)\" \
+	--enable-extensions=default,typeaheadfind,inspector \
+	--enable-necko-protocols=http,file,jar,viewsource,res,data \
+	--enable-xft \
+	--disable-xprint \
+	--enable-xinerama \
+	--enable-strip \
+	--disable-pedantic \
+	--disable-debug \
+	$(NULL)
+
+build-dir/mozilla/config.status: build-dir/mozilla/configure
+	dh_testdir
+	rm -f build-dir/mozilla/.mozconfig
+	# Add here commands to configure the package.
+	sh -c "cd build-dir/mozilla; ./configure --host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--srcdir=. \
+		$(CONFIGURE_OPTIONS)"
+
+build-dir:
+	mkdir $(CURDIR)/build-dir
+
+extract: extract-stamp
+
+extract-stamp: build-dir
+	tar xjf archives/$(TBIRD_BZ2_ARCHIVE) -C build-dir/
+	cp build-dir/mozilla/nsprpub/config/nspr.m4 build-dir/mozilla/nsprpub/config/mozilla-thunderbird-nspr.m4
+	touch extract-stamp
+
+dopatch: extract patch-stamp
+
+dounpatch: unpatch
+
+build: extract dopatch build-dir/mozilla/config.status build-stamp
+
+build-stamp: 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE) -C build-dir/mozilla
+
+        # build separate extensions
+#	$(MAKE) -C build-dir/mozilla/mail/extensions/offline
+#	$(MAKE) -C build-dir/mozilla/mail/extensions/inspector
+	$(MAKE) -C build-dir/mozilla/extensions/inspector
+	$(MAKE) -C build-dir/mozilla/extensions/typeaheadfind
+#	$(MAKE) -C build-dir/mozilla/other-licenses/libical 
+#	$(MAKE) -C build-dir/mozilla/calendar
+
+	/usr/bin/docbook-to-man debian/mozilla-thunderbird.sgml > debian/mozilla-thunderbird.1
+	/usr/bin/docbook-to-man debian/update-mozilla-thunderbird-chrome.sgml > debian/update-mozilla-thunderbird-chrome.8
+
+	touch build-stamp
+
+clean: dounpatch clean-real
+
+clean-real:
+	dh_testdir
+	dh_testroot
+	rm -rf build-dir extract-stamp build-stamp
+	dh_clean
+	rm -rf debian/tmp-calendar
+	rm -rf debian/tmp-offline
+	rm -rf debian/tmp-inspector
+	rm -rf debian/tmp-typeaheadfind
+	rm -rf debian/tmpbuild
+	rm -f debian/mozilla-thunderbird.1
+	rm -f debian/update-mozilla-thunderbird-chrome.8
+	rm -f a.out config.* # configure sometimes leaves files
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/mozilla-thunderbird.
+	$(MAKE) -C build-dir/mozilla install DESTDIR=$(CURDIR)/debian/tmpbuild
+
+	# applying patches to /usr/bin/mozilla-thunderbird
+	# applying patch for MFSA_2005-59 ... sorry patching the source would have been
+	# too hard to do right now.
+	#patch -d $(CURDIR)/debian/tmpbuild -p0 < $(CURDIR)/debian/mfsa_2005-59.debian.patch
+
+        # install separate extensions
+#	$(MAKE) -C build-dir/mozilla/mail/extensions/offline install DESTDIR=$(CURDIR)/debian/tmp-offline
+
+	# inspector
+	$(MAKE) -C build-dir/mozilla/extensions/inspector install DESTDIR=$(CURDIR)/debian/tmp-inspector
+#	$(MAKE) -C build-dir/mozilla/mail/extensions/inspector install DESTDIR=$(CURDIR)/debian/tmp-inspector
+
+	# typeaheadfind
+	$(MAKE) -C build-dir/mozilla/extensions/typeaheadfind install DESTDIR=$(CURDIR)/debian/tmp-typeaheadfind
+	cp -v debian/chrome.manifest.typeaheadfind $(CURDIR)/debian/tmp-typeaheadfind/chrome.manifest
+
+	# calendar
+#	$(MAKE) -C build-dir/mozilla/other-licenses/libical install DESTDIR=$(CURDIR)/debian/tmp-calendar
+#	$(MAKE) -C build-dir/mozilla/calendar install DESTDIR=$(CURDIR)/debian/tmp-calendar
+
+	sh $(CURDIR)/debian/rejar-chrome.sh comm
+	sh $(CURDIR)/debian/rejar-chrome.sh global
+	sh $(CURDIR)/debian/rejar-chrome.sh messenger
+	sh $(CURDIR)/debian/rejar-typeaheadfind.sh
+
+
+# Build architecture-independent files here.
+#binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/mozilla-thunderbird/components/myspell
+	# dirty move to var folder for chromes: do it in .install file
+
+	cp -f $(CURDIR)/debian/tmp/usr/share/mozilla-thunderbird/chrome/installed-chrome.txt $(CURDIR)/debian/tmp/var/lib/mozilla-thunderbird/chrome.d/base-chrome.txt
+	cp -f $(CURDIR)/debian/00_locale-en-US $(CURDIR)/debian/tmp/var/lib/mozilla-thunderbird/locales.d/
+	rm -f $(CURDIR)/debian/tmp/usr/share/mozilla-thunderbird/chrome/installed-chrome.txt
+
+	install -m 755 debian/update-mozilla-thunderbird-chrome \
+	                debian/tmp/usr/sbin/update-mozilla-thunderbird-chrome
+
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/usr/lib/mozilla-thunderbird/chrome/chrome.rdf
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/defaults.ini
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/components.ini
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/extensions/Extensions.rdf
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/extensions/installed-extensions.txt
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/components/xpti.dat
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/components/compreg.dat
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/chrome/installed-chrome.txt
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/chrome/overlayinfo/communicator/content/overlays.rdf
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/chrome/overlayinfo/navigator/content/overlays.rdf
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/chrome/overlayinfo/messenger/content/overlays.rdf
+#	install -m 644 debian/dummy-empty-file \
+#			debian/tmp/var/lib/mozilla-thunderbird/chrome/overlayinfo/browser/content/overlays.rdf
+
+
+	dh_installmenu
+	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- mozilla-thunderbird-1.5.orig/debian/branding/start.html
+++ mozilla-thunderbird-1.5/debian/branding/start.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+
+<!--
+** Debian Thunderbird Start Page
+** 
+** Original Contributor:
+**	 David Tenser <david.tenser@telia.com>
+**
+** Contributor:
+** 	 Alexander Sack <asac@debian.org>
+-->
+
+<title>Welcome to Debian Thunderbird!</title>
+
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="content-style-type" content="text/css" />
+<meta content="David Tenser" name="author" />
+
+<style type="text/css" media="screen,projection">
+body {
+	font-family: Tahoma, Verdana, sans, sans-serif;
+	margin: 0px;
+	background: url(back.png) repeat-y top right white;
+}
+
+h1 {
+	color: white;
+	background: url(h1.png) repeat-y #91a0b7;
+	border-bottom: 1px solid #c9d1dd;
+	font-weight: normal;
+	padding: 0.3ex 0.3ex 0.3ex 25px;
+	margin: 0px;
+	font-size: 160%;
+}
+
+h2 {
+	color: black;
+	background: url(h2.png) repeat-y bottom left;
+	width: 30ex;	
+	font-size: 100%;
+	padding: 2px 0px 2px 10px;
+	border-left: 4px solid #dde;
+	border-bottom: 1px solid #dde;
+
+}
+
+.indent {
+	margin-left: 25px;
+	margin-right: 25px;
+	min-height: 320px;
+}
+
+.watermarked {
+	background: url(thunderbird-watermark.png) no-repeat center right;
+}
+
+a:link, a:visited {
+	background: transparent;
+	text-decoration: none;
+	color: #009;
+}
+
+a:active, a:hover {
+	background: #f4f4ff;
+}
+
+#gecko {
+	font-size: 80%;
+	color: #999;
+	background: transparent;
+	bottom: 2px;
+	border-top: 1px solid #ddd;
+	width: 28ex;
+}
+
+#gecko a:link, #gecko a:visited {
+	color: #999;
+	background: inherit;
+} 
+
+</style>
+
+</head>
+
+<body>
+
+<h1>Welcome to Debian Thunderbird!</h1>
+
+<div class="indent watermarked">
+<p>Debian Thunderbird is the debian package derived from Thunderbird, 
+   a next generation open-source email, news and rss client made 
+   by Mozilla Foundation.</p>
+<h2>Features</h2>
+<ul>
+  <li><a href="http://www.mozilla.org/products/thunderbird/junkmail.html">Adaptive Junk Mail Controls</a></li>
+
+  <li><a href="http://www.mozilla.org/products/thunderbird/rss.html">RSS Reader</a></li>
+
+  <li><a href="http://www.mozilla.org/products/thunderbird/global-inbox.html">Global Inbox Support</a></li>
+
+  <li><a href="http://www.mozilla.org/products/thunderbird/search-folders.html">Saved Search Folders</a></li>
+
+  <li><a href="http://www.mozilla.org/products/thunderbird/message-grouping.html">Message Grouping</a></li>
+
+  <li><a href="http://www.mozilla.org/products/thunderbird/privacy-protection.html">Privacy Protection</a></li>
+</ul>
+
+<h2>More Information</h2>
+<p>For frequently asked questions and news related to the Debian Thunderbird package, 
+   please visit the FAQ available on the 	
+   <a href=" http://www.jwsdot.com/debian/faq.html">debian thunderbird homepage</a>
+</p>
+<p>For more information on the debian project, visit the 
+   <a href="http://www.debian.org">Debian Homepage</a>
+</p>
+<p>For frequently asked questions, tips and help on thunderbird in general, 
+   visit <a href="http://www.mozilla.org/support/thunderbird/">Thunderbird Help</a>.
+</p>
+<p>For product information, visit the <a href="http://www.mozilla.org/products/thunderbird/">Thunderbird Product Page</a>.
+</p>
+</div>
+<div class="indent">
+<h2>Bugs</h2>
+<p>Please post bugs initially against the debian bug tracking system. We will 
+   forward it to the upstream authors bugzilla after we verified that this bug 
+   is not only a debian issue. If you encounter a bug, please verify if the bug 
+   is already known. To see a list of open bugs visit the 
+   <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=pkg&data=mozilla-thunderbird&archive=no">mozilla-thunderbird bug list</a>.</p>
+<p>For information on how to post a bug visit the <a href="http://www.debian.org/Bugs/Reporting">How to report a bug page</a>.
+<p><B>Note:</B> For wishlist bugs, please verify if they are somehow related to debian.
+ Otherwise, please report your wishlist bugs to 
+ <a href="http://bugzilla.mozilla.org">mozillas bugzilla</a> by yourself. This will
+ be much more efficient and will certainly lead to faster results than using me
+ as a high latency, lossy proxy.
+</p>  
+
+<h2>Thanks</h2>
+<p>
+  Thank you for using the Debian Thunderbird. We hope that you enjoy your experience.
+</p>
+
+<div id="gecko"><a href="http://www.mozilla.org/">Powered by Gecko.</a></div>
+</div>
+
+</body>
+</html>
--- mozilla-thunderbird-1.5.orig/debian/patches.old/CVS/Tag
+++ mozilla-thunderbird-1.5/debian/patches.old/CVS/Tag
@@ -0,0 +1 @@
+TDEV_0_6
--- mozilla-thunderbird-1.5.orig/debian/patches.old/CVS/Root
+++ mozilla-thunderbird-1.5/debian/patches.old/CVS/Root
@@ -0,0 +1 @@
+:ext:alex@personalfree.com:/var/lib/cvs
--- mozilla-thunderbird-1.5.orig/debian/patches.old/CVS/Repository
+++ mozilla-thunderbird-1.5/debian/patches.old/CVS/Repository
@@ -0,0 +1 @@
+tbird-debian/patches
--- mozilla-thunderbird-1.5.orig/debian/patches.old/CVS/Entries
+++ mozilla-thunderbird-1.5/debian/patches.old/CVS/Entries
@@ -0,0 +1,21 @@
+/00list/1.9.2.1/Tue Jun 15 09:02:20 2004//TDEV_0_6
+/00patch-opts/1.1/Tue Feb  3 21:55:53 2004//TDEV_0_6
+/10_configure-MOZAPP-patch.dpatch/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/10_debian-basemail-unix.dpatch/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/10_debian-branding.dpatch/1.4.2.1/Tue Jun 15 09:02:20 2004//TDEV_0_6
+/10_debian-mail_config_Makefile_in.dpatch/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/10_debian-thunderbird.dpatch/1.3/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/10_debian-widget_src_xremoteclient_Makefile_in.dpatch/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/20_debian-enigmail-patch.dpatch/1.6/Thu Jan 29 08:14:55 2004//TDEV_0_6
+/20_enigmail-remove-seamonkey-skin-patch.dpatch/1.3/Tue Feb  3 22:02:26 2004//TDEV_0_6
+/20_mozilla_in-patch.dpatch/1.4/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/30_nspr_dev_discrim-patch.dpatch/1.1.2.1/Tue Jun  8 17:56:29 2004//TDEV_0_6
+/50_alpha-build-fix.dpatch/1.2/Tue Dec  2 20:35:30 2003//TDEV_0_6
+/50_dtoa-arm-double-wordfix.dpatch/1.1/Tue Dec  2 20:13:45 2003//TDEV_0_6
+/50_hppa-build-fix.dpatch/1.3/Thu Mar  4 20:17:39 2004//TDEV_0_6
+/50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch/1.1/Tue Dec  2 20:13:45 2003//TDEV_0_6
+/70_enigmail-fix.dpatch/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/70_exclude_calendar_autobuild.dpatch/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/70_exclude_sep_extensions_autobuild.dpatch/1.2/Tue Jun  8 17:53:41 2004//TDEV_0_6
+/70_gtk-settings-patch.dpatch/1.2/Thu Feb  5 18:13:36 2004//TDEV_0_6
+D
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_debian-thunderbird.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_debian-thunderbird.dpatch
@@ -0,0 +1,57 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/config/autoconf.mk.in.orig	2004-03-20 00:56:47.000000000 +0000
++++ mozilla/config/autoconf.mk.in	2004-03-20 00:58:15.000000000 +0000
+@@ -31,14 +31,14 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @datadir@/idl/$(MOZ_APP_NAME)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/$(MOZ_APP_NAME)
++mredir		= $(libdir)/mre/mre
+ mrelibdir	= $(mredir)/lib
+ 
+ DIST		= $(DEPTH)/dist
+--- mozilla/mail/app/nsMailApp.cpp.orig	2004-06-15 09:07:30.000000000 +0000
++++ mozilla/mail/app/nsMailApp.cpp	2004-06-15 09:07:49.000000000 +0000
+@@ -47,7 +47,7 @@
+ static const nsXREAppData kAppData = {
+   sizeof(nsXREAppData),
+   nsnull,
+   nsnull,
+-  "Thunderbird",
++  "Mozilla-Thunderbird",
+   NS_STRINGIFY(APP_VERSION),
+   NS_STRINGIFY(BUILD_ID),
--- mozilla-thunderbird-1.5.orig/debian/patches.old/90_xptcinvoke_arm.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/90_xptcinvoke_arm.dpatch
@@ -0,0 +1,32 @@
+#!/bin/sh -e
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp.orig	2005-10-10 15:22:55.621815263 +0000
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp	2005-10-10 15:23:14.669524635 +0000
+@@ -136,7 +136,7 @@
+         PRUint32 fn_count;     
+         PRUint32 fn_copy;      
+     };
+-};
++}
+ 
+ XPTC_PUBLIC_API(nsresult)
+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
--- mozilla-thunderbird-1.5.orig/debian/patches.old/70_extensionManagerBug.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/70_extensionManagerBug.dpatch
@@ -0,0 +1,304 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla-thunderbird-1.0.orig/toolkit/mozapps/extensions/content/extensions.js
++++ mozilla-thunderbird-1.0/toolkit/mozapps/extensions/content/extensions.js
+@@ -678,7 +678,8 @@
+       return !selectedItem ||
+              (selectedItem &&
+               selectedItem.getAttribute("toBeUninstalled") != "true" &&
+-              selectedItem.getAttribute("toBeInstalled") != "true");
++              selectedItem.getAttribute("toBeInstalled") != "true" &&
++	      selectedItem.getAttribute("locked") != "true");
+     case "cmd_reallyEnable":
+     // controls whether to show Enable or Disable in extensions' context menu
+       return selectedItem && 
+--- mozilla-thunderbird-1.0.orig/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
++++ mozilla-thunderbird-1.0/toolkit/mozapps/extensions/src/nsExtensionManager.js.in
+@@ -20,6 +20,7 @@
+  *
+  * Contributor(s):
+  *  Ben Goodger <ben@bengoodger.com>
++ *  Mike Hommey <mh@glandium.org>
+  *
+  * Alternatively, the contents of this file may be used under the terms of
+  * either the GNU General Public License Version 2 or later (the "GPL"), or
+@@ -144,6 +145,19 @@
+ }
+ 
+ // Returns the file at the appropriate point in a directory hierarchy under
++// the specified key. Does NOT create the file NOR the directories along the
++// way.
++function getFileNoCreateDir(aKey, aPathToFile)
++{
++  var subdirs = [];
++  for (var i = 0; i < aPathToFile.length - 1; ++i)
++    subdirs.push(aPathToFile[i]);
++  var file = getDirNoCreate(aKey, subdirs);
++  file.append(aPathToFile[aPathToFile.length - 1]);
++  return file;
++}
++
++// Returns the file at the appropriate point in a directory hierarchy under
+ // the specified key, creating directories along the way if necessary. Does
+ // NOT create the file.
+ function getFile(aKey, aPathToFile)
+@@ -675,7 +689,7 @@
+ function nsInstallLogReader(aExtensionID, aIsProfile, aListener)
+ {
+   this._isProfile = aIsProfile;
+-  this.uninstallLog = getFile(getDirKey(aIsProfile),
++  this.uninstallLog = getFileNoCreateDir(getDirKey(aIsProfile),
+                               [DIR_EXTENSIONS, aExtensionID, 
+                                DIR_UNINSTALL, FILE_UNINSTALL_LOG]);
+   this._listener = aListener
+@@ -829,26 +843,20 @@
+   {
+     // extension,{GUID} or theme,{GUID}
+     var parts = aLine.split(",");
+-    var manifest = getFile(KEY_APPDIR, 
++    var manifest = getFileNoCreateDir(KEY_APPDIR, 
+                            [DIR_EXTENSIONS, parts[1], FILE_INSTALL_MANIFEST]);
+     if (parts.length != 2)
+       return;
+       
+-    if (!manifest.exists()) {
+-      defaultManifest = defaultFile = getFile(KEY_DEFAULTS, 
+-                                              [DIR_DEFAULTS_EXTENSIONS, parts[1], FILE_INSTALL_MANIFEST]);
+-      var extensionDir = getDir(KEY_APPDIR, [DIR_EXTENSIONS, parts[1]]);
+-      defaultManifest.copyTo(extensionDir, FILE_INSTALL_MANIFEST);
+-      manifest = getFile(KEY_APPDIR, 
+-                         [DIR_EXTENSIONS, parts[1], FILE_INSTALL_MANIFEST]);
+-    }
+-    switch (parts[0]) {
+-    case this.TOKEN_EXTENSION:
+-      this._manager.ensurePreConfiguredItem(parts[1], nsIUpdateItem.TYPE_EXTENSION, manifest);
+-      break;
+-    case this.TOKEN_THEME:
+-      this._manager.ensurePreConfiguredItem(parts[1], nsIUpdateItem.TYPE_THEME, manifest);
+-      break;
++    if (manifest.exists()) {
++      switch (parts[0]) {
++      case this.TOKEN_EXTENSION:
++        this._manager.ensurePreConfiguredItem(parts[1], nsIUpdateItem.TYPE_EXTENSION, manifest);
++        break;
++      case this.TOKEN_THEME:
++        this._manager.ensurePreConfiguredItem(parts[1], nsIUpdateItem.TYPE_THEME, manifest);
++        break;
++      }
+     }
+   }
+ };
+@@ -917,21 +925,26 @@
+     this._writer = new nsInstallLogWriter(this._extensionID, this._isProfile);
+     this._writer.open();
+     
+-    // Move files from the staging dir into the extension's final home.
+-    // This function generates uninstall log files and creates backups of
+-    // existing files. 
+-    // XXXben - would like to add exception handling here to test for file
+-    //          I/O failures on uninstall log so that if there's a crash
+-    //          and the uninstall log is incorrectly/incompletely written 
+-    //          we can roll back. It's not critical that we do so right now
+-    //          since if this throws the extension's chrome is never 
+-    //          registered. 
+-    this._installExtensionFiles();
+-    
+     // Load the metadata datasource
+-    var metadataFile = getFile(this._extDirKey, 
++    var metadataFile = getFileNoCreateDir(this._extDirKey, 
+                                [DIR_EXTENSIONS, aExtensionID, FILE_INSTALL_MANIFEST]);
+     
++    // If the metadata file exists, it means we don't have to to extract the xpi.
++    // Useful for pre-configured extensions.
++
++    if (aIsProfile && !metadataFile.exists()) {
++      // Move files from the staging dir into the extension's final home.
++      // This function generates uninstall log files and creates backups of
++      // existing files. 
++      // XXXben - would like to add exception handling here to test for file
++      //          I/O failures on uninstall log so that if there's a crash
++      //          and the uninstall log is incorrectly/incompletely written 
++      //          we can roll back. It's not critical that we do so right now
++      //          since if this throws the extension's chrome is never 
++      //          registered. 
++      this._installExtensionFiles();
++    }
++
+     this._metadataDS = getInstallManifest(metadataFile);
+     if (!this._metadataDS) return;
+     
+@@ -1752,6 +1765,9 @@
+       // Write bin/components.ini
+       var manifest = getFile(KEY_APPDIR, [FILE_COMPONENT_MANIFEST]);
+       this._writeProfileFile(manifest, this._getComponentsDir, false);
++
++      // Update the Defaults Manifest
++      this._writeDefaults(false);
+     }
+   },
+ 
+@@ -1823,7 +1839,7 @@
+         cr.selectSkin(KEY_DEFAULT_THEME, true);
+       }
+       catch (e) {
+-        dump("*** nsExtensionManager::_disableObsoleteExtensions - failure, catching exception so finalize window can close\n");
++//        dump("*** nsExtensionManager::_disableObsoleteExtensions - failure, catching exception so finalize window can close\n");
+       }
+       win.close();
+       
+@@ -2002,6 +2018,34 @@
+     this._ds.insertForthcomingItem(aItemID, aItemType, false);
+     var metadataDS = getInstallManifest(aManifest);
+     this._ds.addItemMetadata(aItemID, aItemType, metadataDS, false);
++
++    // Check whether the extension is installable (thunderbird_version fitting between
++    // em:MaxVersion and em:MinVersion)
++    var extensionID = this.canInstallItem(metadataDS);
++    // |extensionID| must be a GUID string, not a number - a number means failure.
++    if (isNaN(parseInt(extensionID))) {
++      // Do install the extension, meaning we register its chrome and components
++      if (!this._extInstaller)
++          this._extInstaller = new nsExtensionInstaller(this._ds);
++      try {
++          this._extInstaller.install(aItemID, false);
++      }
++      catch (e) {
++          // If the installation failed, we disable the extension in addition
++	  // to _not_ uninstalling it (which would fail anyway because it
++	  // would be done at launch time... as a user).
++	  this._ds.setItemProperty(aItemID, this._ds._emR("toBeUninstalled"),
++	                           null, false, aItemType);
++          this._ds.setItemProperty(aItemID, this._ds._emR("disabled"),
++                                   this._ds._emL("true"), false, aItemType);
++      }
++    } else {
++      // disable extensions that aren't installable
++      this._ds.setItemProperty(aItemID, this._ds._emR("disabled"),
++                              this._ds._emL("true"), false, aItemType);
++    }
++    // Force locking pre-configured items.
++    this._ds.lockUnlockItem(aItemID, true);
+   },
+   
+   checkForMismatches: function nsExtensionManager_checkForMismatches () 
+@@ -2028,22 +2072,31 @@
+       if (items.length > 0) {
+         for (var i = 0; i < items.length; ++i) {
+           // Now disable the extension so it won't hurt anything. 
++	  var alreadyDisabled = this._ds.getItemProperty(items[i].id, "disabled");
+           var itemType = getItemType(this._ds._getResourceForItem(items[i].id).Value);
+           if (itemType != -1 && itemType & nsIUpdateItem.TYPE_EXTENSION)
+-            this.disableExtension(items[i].id);
++            if (!alreadyDisabled) this.disableExtension(items[i].id);
+           else if (itemType & nsIUpdateItem.TYPE_THEME) {
+             if (gPref.prefHasUserValue(PREF_GENERAL_SKINS_SELECTEDSKIN))
+               gPref.clearUserPref(PREF_GENERAL_SKINS_SELECTEDSKIN);
+-            this._ds.disableTheme(items[i].id);
++            if (!alreadyDisabled) this._ds.disableTheme(items[i].id);
+           }
+         }
+-        var updates = Components.classes["@mozilla.org/updates/update-service;1"]
+-                                .getService(Components.interfaces.nsIUpdateService);
+-        updates.checkForUpdates(items, items.length, nsIUpdateItem.TYPE_ADDON, 
+-                                nsIUpdateService.SOURCE_EVENT_MISMATCH,
+-                                null);
++	// We want to eliminate locked extensions
++	newitems = [];
++	for (var i = 0; i < items.length; ++i) {
++	  if (!this._ds.getItemProperty(items[i].id, "locked"))
++	    newitems.push(items[i]);
++	}
++	if (newitems.length > 0) {
++          var updates = Components.classes["@mozilla.org/updates/update-service;1"]
++                                  .getService(Components.interfaces.nsIUpdateService);
++          updates.checkForUpdates(newitems, newitems.length, nsIUpdateItem.TYPE_ADDON, 
++                                  nsIUpdateService.SOURCE_EVENT_MISMATCH,
++                                  null);
+         
+-        needsRestart = true;
++          needsRestart = true;
++	}
+       }
+     }
+     
+@@ -2087,7 +2140,7 @@
+       this._writeDefaults(false);
+     }
+     catch (e) { 
+-      dump("*** ExtensionManager:_updateManifests: no access privileges to application directory, skipping.\n"); 
++//      dump("*** ExtensionManager:_updateManifests: no access privileges to application directory, skipping.\n"); 
+     };
+     this._writeComponentManifest(true);
+     this._writeDefaults(true);
+@@ -2133,6 +2186,11 @@
+         validExtensions.push({ sourceDir: sourceDir, isProfile: isProfile });
+     }
+     
++    // Debian hook to insert defaults/syspref into defaults.ini
++    if ((aFile.leafName == FILE_DEFAULTS) && aIsProfile == false) {
++      validExtensions.push({ sourceDir: getDirNoCreate(getDirKey(false), [DIR_DEFAULTS, "syspref"]), isProfile: false });
++    }
++
+     var lines = ["[Extra Files]\r\n",
+                  "Count=" + validExtensions.length + "\r\n"];
+     for (i = 0; i < lines.length; ++i)
+@@ -3090,8 +3148,10 @@
+   checkForUpdates: function (aItem, aVersionUpdateOnly)
+   {
+     // A preference setting can disable updating for this item
++    // We'll also skip locked items.
+     try {
+-      if (!gPref.getBoolPref(PREF_EM_ITEM_UPDATE_ENABLED.replace(/%UUID%/, aItem.id))) {
++      if (this._updater._emDS.getItemProperty(aItem.id, "locked") ||
++          !gPref.getBoolPref(PREF_EM_ITEM_UPDATE_ENABLED.replace(/%UUID%/, aItem.id))) {
+         gOS.notifyObservers(null, "Update:Extension:Item-Ended", "");
+         this._updater._checkForDone();
+         return;
+@@ -3557,7 +3617,7 @@
+   
+   isProfileItem: function nsExtensionsDataSource_isProfileItem (aItemID)
+   {
+-    return this.getItemProperty(aItemID, "installLocation") != "global";
++    return this.getItemProperty(aItemID, "installLocation") == "profile";
+   },
+   
+   _setProperty: function nsExtensionsDataSource__setProperty (aDS, aSource, aProperty, aNewValue)
+--- mozilla-thunderbird-1.0.orig/toolkit/mozapps/update/src/nsUpdateService.js.in
++++ mozilla-thunderbird-1.0/toolkit/mozapps/update/src/nsUpdateService.js.in
+@@ -178,9 +178,10 @@
+       if (aRequestedTypes & nsIUpdateItem.TYPE_THEME)
+         types |= nsIUpdateItem.TYPE_THEME;
+     }
+-    if (appUpdateEnabled && 
+-        (aRequestedTypes & nsIUpdateItem.TYPE_APP))
+-      types |= nsIUpdateItem.TYPE_APP;
++    // Disable application updates
++    //if (appUpdateEnabled && 
++    //    (aRequestedTypes & nsIUpdateItem.TYPE_APP))
++    //  types |= nsIUpdateItem.TYPE_APP;
+ 
+     return types;
+   },
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_mips_optimization_patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_mips_optimization_patch.dpatch
@@ -0,0 +1,48 @@
+#!/bin/sh -e
+## 10_mips_optimization_patch.dpatch by Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de> 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0; sh -c "cd build-dir/mozilla && autoconf2.13" ;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/configure.in.old	2004-09-09 04:17:48.000000000 +0200
++++ mozilla/configure.in	2004-09-10 11:51:35.000000000 +0200
+@@ -1107,8 +1107,7 @@ case "$target" in
+         MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
+     ;;
+     mips*)
+-        CFLAGS="$CFLAGS -Wa,-xgot"
+-        CXXFLAGS="$CXXFLAGS -Wa,-xgot"
++        MOZ_DEBUG_FLAGS="-g"   # We want inlining
+     ;;
+     esac
+     ;;
+--- mozilla/config/rules.mk.old	2004-09-09 04:18:22.000000000 +0200
++++ mozilla/config/rules.mk	2004-09-12 19:33:49.000000000 +0200
+@@ -455,7 +455,7 @@ endif
+ 
+ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(filter mips mipsel,$(OS_TEST)))
+-ifeq ($(MODULE),layout)
++ifneq (,$(filter layout content xul xuldoc xultmpl view dom jsurl,$(MODULE)))
+ OS_CFLAGS += -Wa,-xgot
+ OS_CXXFLAGS += -Wa,-xgot
+ endif
--- mozilla-thunderbird-1.5.orig/debian/patches.old/20_mozilla_in-patch.dpatch.sav1
+++ mozilla-thunderbird-1.5/debian/patches.old/20_mozilla_in-patch.dpatch.sav1
@@ -0,0 +1,172 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/app/mozilla.arch	2004-08-04 20:30:06.000000000 +0200
++++ mozilla/mail/app/mozilla.in	2004-08-04 20:30:54.000000000 +0200
+@@ -72,6 +72,7 @@
+ #uncomment for debugging
+ #set -x
+ 
++CMDLINE="$@"
+ moz_libdir=%MOZAPPDIR%
+ MRE_HOME=%MREDIR%
+ 
+@@ -146,6 +147,123 @@
+   esac
+ done
+ 
++HOOKS=`find $dist_bin/startup-hooks.d/* 2>/dev/null`
++for i in $HOOKS; do
++  $i
++done
++
++
++LOCALES_DIR=/var/lib/mozilla-thunderbird/locales.d/
++MOZLOCALE=""                                                                               
++LOCALES=$(cat $LOCALES_DIR/* | sed -e "s/#.*$//" | grep -v ^$)
++DEFAULT_LOCALE=$(cat $LOCALES_DIR/* | sed -e "s/#.*$//" | grep -v ^$| 
++head -n 1)
++                                                                                
++# try all locales to match exactly
++for locale in $LOCALES; do
++   # break if already set
++                                                                                
++   lang=$(expr "$locale" : "\(.*\):.*")
++   COUNTRY=$(expr "$locale" : ".*\:\(.*\)")
++   SYSLOCALE="$lang""_$COUNTRY"
++                                                                                
++   MATCHED=$(expr "$LANG" : ".*\($SYSLOCALE\).*")
++                                                                                
++   #echo matched: $MATCHED
++   if test "x$MATCHED" != "x"; then
++        MOZLOCALE="$lang-$COUNTRY"
++        export MOZLOCALE
++   fi
++                                                                                
++   if test "x$MOZLOCALE" != "x"; then
++        break;
++   fi
++done
++                                                                                
++# match locales only with LANGUAGE
++for locale in $LOCALES; do
++   if test "x$MOZLOCALE" != "x"; then
++        break
++   fi
++                                                                                
++   lang=$(expr "$locale" : "\(.*\):.*")
++   COUNTRY=$(expr "$locale" : ".*\:\(.*\)")
++   SYSLOCALE="$lang""_$COUNTRY"
++                                                                                
++   MATCHED=$(expr "$LANG" : "\($lang.*\)")
++                                                                                
++   #echo matched2: $MATCHED
++   if test "x$MATCHED" != "x"; then
++        MOZLOCALE="$lang-$COUNTRY"
++        export MOZLOCALE
++   fi
++done
++                                                                                
++# set absolut default locale
++if test "x$MATCHED" = "x"; then
++   lang=$(expr "$DEFAULT_LOCALE" : "\(.*\):.*")
++   COUNTRY=$(expr "$DEFAULT_LOCALE" : ".*\:\(.*\)")
++   MOZLOCALE="$lang-$COUNTRY"
++   export MOZLOCALE
++fi
++                                                                                
++echo selected locale: $MOZLOCALE
++                                                                               
++LOCALE_ARGS="-contentLocale $MOZLOCALE -UILocale $MOZLOCALE"
++"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" -remote 'ping()' 2> /dev/null
++if [ $? = 0 ]; then LOCK_FILE=lock; else LOCK_FILE=; fi 
++
++MOZ_ARGS=
++donext=
++
++for opt_in in $CMDLINE
++do
++  if [ -z $donext ]
++  then 
++     if [ "$opt_in" = "-contentLocale" ]
++     then
++       # let the command line eat the env determined value
++       LOCALE_ARGS=
++       next=
++       donext=
++     elif [ "$opt_in" = -UILocale ]
++     then
++       # let the command line eat the env determined value
++       LOCALE_ARGS=
++       next=
++       donext=
++     elif [ $opt_in = "-compose" ]
++     then 
++       # if -compose and not remote (aka no lockfile)
++       if [ ! -z $LOCK_FILE ]
++       then 
++         next=compose
++         donext=true
++       else
++          MOZ_ARGS="$MOZ_ARGS $opt_in"
++	  donext=
++       fi
++     else
++       MOZ_ARGS="$MOZ_ARGS $opt_in"
++       donext=
++     fi
++  else 
++     # here come the transforming commands
++     if [ "$next" = "compose" ]
++     then
++        # cut off protocol
++        mail_to=$(expr match "$opt_in" "mailto:\(.*\)")
++        MOZ_ARGS="$MOZ_ARGS -remote mailto($mail_to)"
++     fi
++     donext=
++     next=
++  fi
++done
++
++if test -z "$MOZ_ARGS" -a -n "$LOCK_FILE"; then
++  MOZ_ARGS="-remote xfeDoCommand(openInbox)"
++fi
++
+ export MRE_HOME
+ eval "set -- $moreargs"
+ 
+@@ -154,9 +272,10 @@
+ 
+ if [ $debugging = 1 ]
+ then
+-  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
++  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $LOCALE_ARGS $MOZ_ARGS@
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
++"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $LOCALE_ARGS $MOZ_ARGS
++
+ exitcode=$?
+ 
+ ## Stop addon scripts
--- mozilla-thunderbird-1.5.orig/debian/patches.old/15_pkgconfig_name_patches.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/15_pkgconfig_name_patches.dpatch
@@ -0,0 +1,95 @@
+#!/bin/sh -e
+## debian/patches/10_debian-branding.dpatch by  <alex@personalfree.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -u -w -r1.2 mozilla-gtkmozembed.pc.in
+--- mozilla/build/unix/mozilla-gtkmozembed.pc.in	19 Nov 2002 03:11:13 -0000	1.2
++++ mozilla/build/unix/mozilla-gtkmozembed.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: Mozilla Gtk Embedding Widget
+ Description: Mozilla Embedding Widget for Gtk+
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-xpcom = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-xpcom = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lgtkembedmoz %SUPERWIN_LIBS%
+ Cflags: -I${includedir}/gtkembedmoz
+Index: build/unix/mozilla-js.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-js.pc.in,v
+retrieving revision 1.4
+diff -u -w -r1.4 mozilla-js.pc.in
+--- mozilla/build/unix/mozilla-js.pc.in	25 Oct 2002 02:30:37 -0000	1.4
++++ mozilla/build/unix/mozilla-js.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lmozjs
+ Cflags: -I${includedir}/js -DXP_UNIX
+Index: build/unix/mozilla-nss.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-nss.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-nss.pc.in
+--- mozilla/build/unix/mozilla-nss.pc.in	3 Jun 2002 22:26:01 -0000	1.1
++++ mozilla/build/unix/mozilla-nss.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: NSS
+ Description: Mozilla Network Security Services
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
+ Cflags: -I${includedir}/nss
+Index: build/unix/mozilla-plugin.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-plugin.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-plugin.pc.in
+--- mozilla/build/unix/mozilla-plugin.pc.in	30 Oct 2002 00:40:16 -0000	1.1
++++ mozilla/build/unix/mozilla-plugin.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,5 +6,5 @@
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-xpcom = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-xpcom = %MOZILLA_VERSION%
+ Cflags: -I${includedir}/java -I${includedir}/plugin
+Index: build/unix/mozilla-xpcom.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-xpcom.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-xpcom.pc.in
+--- mozilla/build/unix/mozilla-xpcom.pc.in	28 May 2002 20:20:42 -0000	1.1
++++ mozilla/build/unix/mozilla-xpcom.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: XPCOM
+ Description: The Mozilla Cross Platform Component Library
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lxpcom
+ Cflags: -I${includedir}/xpcom -I${includedir}/string
--- mozilla-thunderbird-1.5.orig/debian/patches.old/70_single_typeaheadfind_package.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/70_single_typeaheadfind_package.dpatch
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	2004-12-07 17:47:26.000000000 +0000
++++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h	2004-12-07 17:47:46.000000000 +0000
+@@ -68,9 +68,9 @@
+ #include "nsISound.h"
+ 
+ #define TYPEAHEADFIND_BUNDLE_URL \
+-        "chrome://global/locale/typeaheadfind.properties"
++        "chrome://typeaheadfind/locale/typeaheadfind.properties"
+ #define TYPEAHEADFIND_NOTFOUND_WAV_URL \
+-        "chrome://global/content/notfound.wav"
++        "chrome://typeaheadfind/content/notfound.wav"
+ 
+ enum {
+   eRepeatingNone,
--- mozilla-thunderbird-1.5.orig/debian/patches.old/50_ftbfs_alpha+arm+ia64_325536_fix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/50_ftbfs_alpha+arm+ia64_325536_fix.dpatch
@@ -0,0 +1,64 @@
+#!/bin/sh -e
+## 50_mozilla-thunderbird-xpcom-xptcall-mips by Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Reimplementation of the xpcom assembly call layer for mips o32 ABI
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ur mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 
+mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	2005-08-28 20:01:29.000000000 -0700
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	2005-08-28 02:36:43.000000000 -0700
+@@ -43,7 +43,8 @@
+ /* Prototype specifies unmangled function name and disables unused warning */
+ static void
+ invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
+-__asm__("invoke_copy_to_stack") __attribute__((unused));
++__asm__("invoke_copy_to_stack") __attribute__((used));
++
+ 
+ static void
+ invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
+diff -ur mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	2002-03-04 22:35:50.000000000 -0800
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp	2005-08-28 02:46:41.000000000 -0700
+@@ -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)
+diff -ur mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	2005-08-28 20:01:29.000000000 -0700
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	2005-08-28 02:37:54.000000000 -0700
+@@ -43,7 +43,7 @@
+ /* Prototype specifies unmangled function name and disables unused warning */
+ static nsresult
+ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
+-__asm__("PrepareAndDispatch") __attribute__((unused));
++__asm__("PrepareAndDispatch") __attribute__((used));
+ 
+ static nsresult
+ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_debian-widget_src_xremoteclient_Makefile_in.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_debian-widget_src_xremoteclient_Makefile_in.dpatch
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+## debian/patches/10_debian-branding.dpatch by  <alex@personalfree.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/widget/src/xremoteclient/Makefile.in.orig	2004-05-03 01:09:55.000000000 +0200
++++ mozilla/widget/src/xremoteclient/Makefile.in	2004-05-03 01:10:19.000000000 +0200
+@@ -60,9 +60,9 @@
+ 		nsXRemoteClientCID.h
+ 
+ ifndef MOZ_ENABLE_PHOTON
+-PROGRAM         = mozilla-xremote-client$(BIN_SUFFIX)
++PROGRAM         = mozilla-thunderbird-xremote-client$(BIN_SUFFIX)
+ 
+-PROGOBJS        = mozilla-xremote-client.$(OBJ_SUFFIX) \
++PROGOBJS        = mozilla-xremote-client.$(OBJ_SUFFIX) \
+ 		XRemoteClient_standalone.$(OBJ_SUFFIX) \
+ 		$(NULL)
+ endif
--- mozilla-thunderbird-1.5.orig/debian/patches.old/70_exclude_calendar_autobuild.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/70_exclude_calendar_autobuild.dpatch
@@ -0,0 +1,37 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+ 
+--- mozilla/Makefile.in.orig	2004-03-31 20:06:26.000000000 +0200
++++ mozilla/Makefile.in	2004-03-23 21:58:19.000000000 +0100
+@@ -309,7 +309,7 @@
+ endif
+ 
+ ifdef MOZ_CALENDAR
+-tier_98_dirs	+= other-licenses/libical calendar
++tier_98_dirs	+= 
+ endif
+ 
+ #
--- mozilla-thunderbird-1.5.orig/debian/patches.old/20_run-mozilla_sh_306893_fix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/20_run-mozilla_sh_306893_fix.dpatch
@@ -0,0 +1,59 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/build/unix/run-mozilla.sh.orig	2005-04-29 09:53:40.000000000 +0200
++++ mozilla/build/unix/run-mozilla.sh	2005-04-29 09:54:25.000000000 +0200
+@@ -249,16 +249,18 @@
+ 	fi
+     if [ -x "$debugger" ] 
+     then
+-        echo "set args ${1+"$@"}" > /tmp/mozargs$$ 
++    	tmpfile=`mktemp -t` || { 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 
+ # over to the prog then add that here- Gagan Saksena 03/15/00
+         case `basename $debugger` in
+-            gdb) echo "$debugger $prog -x /tmp/mozargs$$"
+-                $debugger "$prog" -x /tmp/mozargs$$
++            gdb) echo "$debugger $prog -x $tmpfile"
++                $debugger "$prog" -x $tmpfile
+ 		exitcode=$?
+                 ;;
+-            ddd) echo "$debugger --debugger \"gdb -x /tmp/mozargs$$\" $prog"
+-                $debugger --debugger "gdb -x /tmp/mozargs$$" "$prog"
++            ddd) echo "$debugger --debugger \"gdb -x $tmpfile\" $prog"
++                $debugger --debugger "gdb -x $tmpfile" "$prog"
+ 		exitcode=$?
+                 ;;
+             *) echo "$debugger $prog ${1+"$@"}"
+@@ -266,7 +268,6 @@
+ 		exitcode=$?
+                 ;;
+         esac
+-        /bin/rm /tmp/mozargs$$
+     else
+         echo "Could not find a debugger on your system." 
+     fi
--- mozilla-thunderbird-1.5.orig/debian/patches.old/50_mozilla-thunderbird-xpcom-xptcall-mips.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/50_mozilla-thunderbird-xpcom-xptcall-mips.dpatch
@@ -0,0 +1,611 @@
+#!/bin/sh -e
+## 50_mozilla-thunderbird-xpcom-xptcall-mips by Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Reimplementation of the xpcom assembly call layer for mips o32 ABI
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2004-09-03 08:13:20.000000000 +0200
++++ mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2004-09-03 02:59:33.000000000 +0200
+@@ -210,11 +210,7 @@ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(findstring mips, $(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_mips.cpp xptcstubs_mips.cpp
+ ASFILES		:= xptcinvoke_asm_mips.s xptcstubs_asm_mips.s
+-#xptcstubs_mips.cpp
+-# xptcstubs_asm_mips.s
+-ifdef GNU_CC
+-ASFLAGS		+= $(INCLUDES) -x assembler-with-cpp -D__GNUC__
+-endif
++AS		:= $(CC) $(CFLAGS) $(INCLUDES) -c -x assembler-with-cpp
+ endif
+ endif
+ 
+@@ -359,10 +355,8 @@ INCLUDES	+= -I$(srcdir)/../..
+ 
+ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(findstring mips, $(OS_TEST)))
+-xptcstubs_asm_mips.o: xptcstubs_asm_mips.s.m4 $(PUBLIC)/xptcstubsdef.inc
+-	m4 $(INCLUDES) $< > ./xptcstubs_asm_mips.s && \
+-	$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) ./xptcstubs_asm_mips.s
+-	$(RM) -f ./xptcstubs_asm_mips.s
++xptcstubs_asm_mips.o: xptcstubs_asm_mips.s $(PUBLIC)/xptcstubsdef.inc
++	$(AS) -o $@ $<
+ endif
+ endif
+ 
+--- mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig	2004-09-03 08:14:00.000000000 +0200
++++ mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s	2004-09-03 02:59:33.000000000 +0200
+@@ -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)
+--- mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp.orig	2004-09-03 08:14:39.000000000 +0200
++++ mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp	2004-09-03 02:59:33.000000000 +0200
+@@ -21,7 +21,7 @@
+  * Contributor(s):
+  *   Stuart Parmenter <pavlov@netscape.com>
+  *   Brendan Eich     <brendan@mozilla.org>
+- * 
++ *   Thiemo Seufer    <seufer@csv.ica.uni-stuttgart.de>
+  */
+ 
+ /* This code is for MIPS using the O32 ABI. */
+@@ -37,10 +37,8 @@ invoke_count_words(PRUint32 paramCount, 
+     // 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;
+ 
+@@ -53,6 +51,9 @@ invoke_count_words(PRUint32 paramCount, 
+ 		result++;
+ 	    result++;
+ 	    break;
++
++        default:
++            break;
+         }
+     }
+     return (result + 1) & ~(PRUint32)1;
+@@ -73,8 +74,6 @@ invoke_copy_to_stack(PRUint32* d, PRUint
+             continue;
+         }
+ 
+-        *((void**)d) = s->val.p;
+-
+         switch(s->type)
+         {
+         case nsXPTType::T_I64    :
+@@ -89,6 +88,9 @@ invoke_copy_to_stack(PRUint32* d, PRUint
+             if ((PRWord)d & 4) d++;
+             *((double*)   d) = s->val.d;      d++;
+             break;
++        default:
++            *((void**)d) = s->val.p;
++            break;
+         }
+     }
+ }
+@@ -103,5 +105,4 @@ XPTC_InvokeByIndex(nsISupports* that, PR
+                    PRUint32 paramCount, nsXPTCVariant* params)
+ {
+     return _XPTC_InvokeByIndex(that, methodIndex, paramCount, params);
+-}    
+-
++}
+--- mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4.orig	2004-09-03 08:15:10.000000000 +0200
++++ mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4	1970-01-01 01:00:00.000000000 +0100
+@@ -1,93 +0,0 @@
+-/* -*- 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>
+- */
+-
+-/* This code is for MIPS using the O32 ABI. */
+-
+-#include <sys/regdef.h>
+-#include <sys/asm.h>
+-
+-	.text
+-	.globl PrepareAndDispatch
+-
+-NARGSAVE=4  # extra space for the callee to use.  gccism
+-            # we can put our a0-a3 in our callers space.
+-LOCALSZ=2   # gp, ra
+-FRAMESZ=(((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK
+-
+-define(STUB_NAME, `Stub'$1`__14nsXPTCStubBase')
+-
+-define(STUB_ENTRY,
+-`	.globl		'STUB_NAME($1)`
+-	.align		2
+-	.type		'STUB_NAME($1)`,@function
+-	.ent		'STUB_NAME($1)`, 0
+-'STUB_NAME($1)`:
+-	.frame		sp, FRAMESZ, ra 
+-	.set		noreorder
+-	.cpload		t9
+-	.set		reorder
+-	subu		sp, FRAMESZ
+-	.cprestore	16	
+-	li		t0, '$1`
+-	b		sharedstub
+-.end			'STUB_NAME($1)`
+-
+-')
+-
+-define(SENTINEL_ENTRY, `')
+-
+-include(xptcstubsdef.inc)
+-
+-	.globl	sharedstub
+-	.ent	sharedstub
+-sharedstub:
+-
+-	REG_S	ra, 20(sp)
+-
+-	REG_S	a0, 24(sp)
+-	REG_S	a1, 28(sp)
+-	REG_S	a2, 32(sp)
+-	REG_S	a3, 36(sp)
+-
+-	# t0 is methodIndex
+-	move	a1, t0
+-
+-	# put the start of a1, a2, a3, and stack
+-	move	a2, sp
+-	addi	a2, 24  # have a2 point to sp + 24 (where a0 is)
+-
+-	# PrepareAndDispatch(that, methodIndex, args)
+-	#                     a0       a1        a2
+-	#
+-	jal	PrepareAndDispatch
+-
+-	REG_L	ra, 20(sp)
+-	REG_L	a1, 28(sp)
+-	REG_L	a2, 32(sp)
+-
+-	addu	sp, FRAMESZ
+-	j	ra
+-
+-.end sharedstub
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s	2004-09-03 09:22:27.000000000 +0200
+@@ -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)
--- mozilla-thunderbird-1.5.orig/debian/patches.old/80_mozilla-thunderbird-in-reply-to.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/80_mozilla-thunderbird-in-reply-to.dpatch
@@ -0,0 +1,102 @@
+#!/bin/sh -e
+## 80_mozilla-thunderbird-in-reply-to.dpatch by Kevin B. McCarty <kmccarty@princeton.edu>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow Thunderbird to recognize In-Reply-To argument passed in mailto links.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mailnews/compose/src/nsSmtpUrl.cpp.orig	2004-11-18 10:19:38.000000000 -0500
++++ mozilla/mailnews/compose/src/nsSmtpUrl.cpp	2004-11-18 12:30:17.229410328 -0500
+@@ -70,6 +70,7 @@
+ nsresult nsMailtoUrl::ParseMailtoUrl(char * searchPart)
+ {
+ 	char *rest = searchPart;
++        nsCAutoString inReplyToPart;
+ 	// okay, first, free up all of our old search part state.....
+ 	CleanupMailtoState();
+ 
+@@ -148,6 +149,11 @@
+             mFormat = nsIMsgCompFormat::HTML;
+           }
+           break;
++                                case 'I':
++                                        if (!nsCRT::strcasecmp (token, "in-reply-to"))
++                                                inReplyToPart = value;
++                                        break;
++
+ 				case 'N':
+ 					if (!nsCRT::strcasecmp (token, "newsgroups"))
+ 						m_newsgroupPart = value;
+@@ -194,6 +200,27 @@
+ 		} // while we still have part of the url to parse...
+ 	} // if rest && *rest
+ 
++  // Ensure that References and In-Reply-To are consistent...
++  if (!inReplyToPart.IsEmpty())
++  {
++    if (m_referencePart.IsEmpty())
++      m_referencePart = inReplyToPart;
++    else
++    {
++      const char * lastRef = strrchr(m_referencePart.get(), '<');
++      nsCAutoString lastReference;
++      if (lastRef)
++        lastReference = lastRef;
++      else
++        lastReference = m_referencePart;
++      if (lastReference != inReplyToPart)
++      {
++        m_referencePart += " ";
++        m_referencePart += inReplyToPart;
++      }
++    }
++  }
++
+   nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID);
+   char *decodedString;
+ 
+--- mozilla/mailnews/compose/src/nsMsgComposeService.cpp.orig	2004-08-19 17:41:56.000000000 -0400
++++ mozilla/mailnews/compose/src/nsMsgComposeService.cpp	2004-11-17 18:40:37.023897195 -0500
+@@ -497,6 +497,7 @@
+        nsXPIDLCString aSubjectPart;
+        nsXPIDLCString aBodyPart;
+        nsXPIDLCString aNewsgroup;
++       nsXPIDLCString aRefPart;
+        nsXPIDLCString aHTMLBodyPart;
+ 
+        // we are explictly not allowing attachments to be specified in mailto: urls
+@@ -507,7 +508,7 @@
+                                     nsnull /* follow */, nsnull /* organization */, 
+                                     nsnull /* reply to part */, getter_Copies(aSubjectPart),
+                                     getter_Copies(aBodyPart), getter_Copies(aHTMLBodyPart) /* html part */, 
+-                                    nsnull /* a ref part */, nsnull /* attachment part, must always null, see #99055 */,
++                                    getter_Copies(aRefPart), nsnull /* attachment part, must always null, see #99055 */,
+                                     nsnull /* priority */, getter_Copies(aNewsgroup), nsnull /* host */,
+                                     &requestedComposeFormat);
+ 
+@@ -576,6 +577,7 @@
+           pMsgCompFields->SetCc(NS_ConvertUTF8toUCS2(aCcPart).get());
+           pMsgCompFields->SetBcc(NS_ConvertUTF8toUCS2(aBccPart).get());
+           pMsgCompFields->SetNewsgroups(aNewsgroup);
++          pMsgCompFields->SetReferences(aRefPart);
+           pMsgCompFields->SetSubject(NS_ConvertUTF8toUCS2(aSubjectPart).get());
+           pMsgCompFields->SetBody(composeHTMLFormat ? sanitizedBody.get() : rawBody.get());
+           pMsgComposeParams->SetComposeFields(pMsgCompFields);
--- mozilla-thunderbird-1.5.orig/debian/patches.old/90_new_freetype_fix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/90_new_freetype_fix.dpatch
@@ -0,0 +1,460 @@
+#!/bin/sh -e
+## 90_gcc4_fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla-firefox-1.0.6.orig/gfx/idl/nsIFreeType2.idl
++++ mozilla-firefox-1.0.6/gfx/idl/nsIFreeType2.idl
+@@ -76,11 +76,13 @@
+ native FT_Sfnt_Tag(FT_Sfnt_Tag);
+ native FT_Size(FT_Size);
+ 
+-[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
++native FTC_ImageType(FTC_ImageType);
+ native FTC_Face_Requester(FTC_Face_Requester);
+ native FTC_Font(FTC_Font);
+-native FTC_Image_Cache(FTC_Image_Cache);
++native FTC_ImageCache(FTC_ImageCache);
+ native FTC_Manager(FTC_Manager);
++native FTC_Node(FTC_Node);
++native FTC_Scaler(FTC_Scaler);
+ 
+ // #ifdef MOZ_SVG
+ [ptr] native FT_Matrix_p(FT_Matrix);
+@@ -99,7 +101,7 @@
+ 
+     readonly attribute FT_Library library;
+     readonly attribute FTC_Manager FTCacheManager;
+-    readonly attribute FTC_Image_Cache ImageCache;
++    readonly attribute FTC_ImageCache ImageCache;
+ 
+     void    doneFace(in FT_Face face);
+     void    doneFreeType(in FT_Library lib);
+@@ -115,16 +117,17 @@
+     void    outlineDecompose(in FT_Outline_p outline,
+                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
+     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
+-    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
+-                             in FT_UInt gindex, out FT_Glyph glyph);
+-    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
+-                              out FT_Face face, out FT_Size size);
++    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType type,
++                             in FT_UInt gindex, out FT_Glyph glyph, 
++                             out FTC_Node node);
++    void    managerLookupSize(in FTC_Manager manager, in FTC_Scaler scaler,
++                              out FT_Size size);
+     void    managerDone(in FTC_Manager manager);
+     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
+                        in FT_UInt max_sizes, in FT_ULong max_bytes,
+                        in FTC_Face_Requester requester, in FT_Pointer req_data,
+                        out FTC_Manager manager);
+-    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
++    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
+ /* #ifdef MOZ_SVG */
+     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
+                         in FT_Vector_p delta);
+--- mozilla-firefox-1.0.6.orig/gfx/src/gtk/fontEncoding.properties
++++ mozilla-firefox-1.0.6/gfx/src/gtk/fontEncoding.properties
+@@ -54,8 +54,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)
+ 
+--- mozilla-firefox-1.0.6.orig/gfx/src/freetype/nsFreeType.cpp
++++ mozilla-firefox-1.0.6/gfx/src/freetype/nsFreeType.cpp
+@@ -96,7 +96,7 @@
+ // Define the FreeType2 functions we resolve at run time.
+ // see the comment near nsFreeType2::DoneFace() for more info
+ //
+-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
++#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
+ FtFuncList nsFreeType2::FtFuncs [] = {
+   {"FT_Done_Face",            NS_FT2_OFFSET(nsFT_Done_Face),            PR_TRUE},
+   {"FT_Done_FreeType",        NS_FT2_OFFSET(nsFT_Done_FreeType),        PR_TRUE},
+@@ -110,11 +110,11 @@
+   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
+   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
+   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
+-  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
+-  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
++  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_ImageCache_Lookup),   PR_TRUE},
++  {"FTC_Manager_LookupSize",  NS_FT2_OFFSET(nsFTC_Manager_LookupSize),  PR_TRUE},
+   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
+   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
+-  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
++  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_ImageCache_New),      PR_TRUE},
+ // #ifdef MOZ_SVG
+   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
+   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
+@@ -282,20 +282,21 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
+-                              FT_UInt glyphID, FT_Glyph *glyph)
++nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType type,
++                              FT_UInt glyphID, FT_Glyph *glyph,
++                              FTC_Node *node)
+ { 
+   // call the FreeType2 function via the function pointer
+-  FT_Error error = nsFTC_Image_Cache_Lookup(cache, desc, glyphID, glyph);
++  FT_Error error = nsFTC_ImageCache_Lookup(cache, type, glyphID, glyph, node);
+   return error ? NS_ERROR_FAILURE : NS_OK;
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
+-                               FT_Face *face, FT_Size *size)
++nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Scaler scaler,
++                               FT_Size *size)
+ { 
+   // call the FreeType2 function via the function pointer
+-  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
++  FT_Error error = nsFTC_Manager_LookupSize(manager, scaler, size);
+   return error ? NS_ERROR_FAILURE : NS_OK;
+ } 
+  
+@@ -320,10 +321,10 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
++nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
+ { 
+   // call the FreeType2 function via the function pointer
+-  FT_Error error = nsFTC_Image_Cache_New(manager, cache);
++  FT_Error error = nsFTC_ImageCache_New(manager, cache);
+   return error ? NS_ERROR_FAILURE : NS_OK;
+ } 
+ 
+@@ -389,7 +390,7 @@
+ } 
+  
+ NS_IMETHODIMP
+-nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
++nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
+ {
+   *aCache = mImageCache;
+   return NS_OK;
+--- mozilla-firefox-1.0.6.orig/gfx/src/freetype/nsFreeType.h
++++ mozilla-firefox-1.0.6/gfx/src/freetype/nsFreeType.h
+@@ -103,14 +103,15 @@
+                       (FT_Outline*, const FT_Outline_Funcs*, void*);
+ typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
+ typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
+-typedef FT_Error (*FTC_Image_Cache_Lookup_t)
+-                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
+-typedef FT_Error (*FTC_Manager_Lookup_Size_t)
+-                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
++typedef FT_Error (*FTC_ImageCache_Lookup_t)
++                      (FTC_ImageCache, FTC_ImageType, FT_UInt, FT_Glyph*, 
++                       FTC_Node*);
++typedef FT_Error (*FTC_Manager_LookupSize_t)
++                      (FTC_Manager, FTC_Scaler, FT_Size*);
+ typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
+ typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
+                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
+-typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
++typedef FT_Error (*FTC_ImageCache_New_t)(FTC_Manager, FTC_ImageCache*);
+ // #ifdef MOZ_SVG
+ typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
+ typedef FT_Error (*FT_Get_Kerning_t)
+@@ -164,11 +165,11 @@
+   FT_New_Face_t             nsFT_New_Face;
+   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
+   FT_Set_Charmap_t          nsFT_Set_Charmap;
+-  FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
+-  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
++  FTC_ImageCache_Lookup_t   nsFTC_ImageCache_Lookup;
++  FTC_Manager_LookupSize_t  nsFTC_Manager_LookupSize;
+   FTC_Manager_Done_t        nsFTC_Manager_Done;
+   FTC_Manager_New_t         nsFTC_Manager_New;
+-  FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
++  FTC_ImageCache_New_t      nsFTC_ImageCache_New;
+ // #ifdef MOZ_SVG
+   FT_Glyph_Transform_t      nsFT_Glyph_Transform;
+   FT_Get_Kerning_t          nsFT_Get_Kerning;
+@@ -213,7 +214,7 @@
+   PRLibrary      *mSharedLib;
+   FT_Library      mFreeTypeLibrary;
+   FTC_Manager     mFTCacheManager;
+-  FTC_Image_Cache mImageCache;
++  FTC_ImageCache  mImageCache;
+ 
+   static nsHashtable   *sFontFamilies;
+   static nsHashtable   *sRange1CharSetNames;
+--- mozilla-firefox-1.0.6.orig/gfx/src/ps/nsFontMetricsPS.cpp
++++ mozilla-firefox-1.0.6/gfx/src/ps/nsFontMetricsPS.cpp
+@@ -1141,10 +1141,14 @@
+   
+   mPixelSize = NSToIntRound(app2dev * mFont->size);
+ 
+-  mImageDesc.font.face_id    = (void*)mEntry;
+-  mImageDesc.font.pix_width  = mPixelSize;
+-  mImageDesc.font.pix_height = mPixelSize;
+-  mImageDesc.image_type = 0;
++  mImageTypeRec.face_id    = (FTC_FaceID)(void*)mEntry;
++  mImageTypeRec.width      = mPixelSize;
++  mImageTypeRec.height     = mPixelSize;
++  mImageTypeRec.flags      = FT_LOAD_DEFAULT;
++  mScalerRec.face_id       = (FTC_FaceID)(void*)mEntry;
++  mScalerRec.width         = mPixelSize;
++  mScalerRec.height        = mPixelSize;
++  mScalerRec.pixel         = PR_TRUE;
+ 
+   nsresult rv;
+   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
+@@ -1190,7 +1194,7 @@
+   if (!face)
+     return 0;
+ 
+-  FTC_Image_Cache iCache;
++  FTC_ImageCache iCache;
+   nsresult rv = mFt2->GetImageCache(&iCache);
+   if (NS_FAILED(rv)) {
+     NS_ERROR("Failed to get Image Cache");
+@@ -1199,8 +1203,8 @@
+ 
+   for (PRUint32 i=0; i<aLength; i++) {
+     mFt2->GetCharIndex((FT_Face)face, aString[i], &glyph_index);
+-    nsresult rv = mFt2->ImageCacheLookup(iCache, &mImageDesc,
+-                                         glyph_index, &glyph);
++    nsresult rv = mFt2->ImageCacheLookup(iCache, &mImageTypeRec,
++                                         glyph_index, &glyph, nsnull);
+     if (NS_FAILED(rv)) {
+       origin_x += FT_REG_TO_16_16(face->size->metrics.x_ppem/2 + 2);
+       continue;
+@@ -1224,16 +1228,15 @@
+ FT_Face
+ nsFontPSFreeType::getFTFace()
+ {
+-  FT_Face face = nsnull;
++  FT_Size size = nsnull;
+   
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupSize(cManager, &mScalerRec, &size);
+   NS_ASSERTION(rv==0, "failed to get face/size");
+   if (rv)
+     return nsnull;
+-  return face;
++  return size->face;
+ }
+ 
+ nscoord
+@@ -1622,22 +1625,21 @@
+   mEntry->GetFamilyName(fontName);
+   mEntry->GetStyleName(styleName);
+   
+-  mImageDesc.font.face_id    = (void*)mEntry;
++  mScalerRec.face_id    = (FTC_FaceID)(void*)mEntry;
+   // TT glyph has no relation to size
+-  mImageDesc.font.pix_width  = 16;
+-  mImageDesc.font.pix_height = 16;
+-  mImageDesc.image_type = 0;
+-  FT_Face face = nsnull;
++  mScalerRec.width      = 16;
++  mScalerRec.height     = 16;
++  mScalerRec.pixel      = PR_TRUE;
++  FT_Size size = nsnull;
+   FTC_Manager cManager;
+   mFt2->GetFTCacheManager(&cManager);
+-  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
+-                                        &face, nsnull);
++  nsresult rv = mFt2->ManagerLookupSize(cManager, &mScalerRec, &size);
+   if (NS_FAILED(rv))
+     return;
+  
+   int wmode = 0;
+   if (!mSubset.IsEmpty())
+-    FT2SubsetToType8(face, mSubset.get(), mSubset.Length(), wmode, aFile);
++    FT2SubsetToType8(size->face, mSubset.get(), mSubset.Length(), wmode, aFile);
+ }
+ #endif //MOZ_ENABLE_FREETYPE2
+ 
+--- mozilla-firefox-1.0.6.orig/gfx/src/ps/nsFontMetricsPS.h
++++ mozilla-firefox-1.0.6/gfx/src/ps/nsFontMetricsPS.h
+@@ -319,9 +319,9 @@
+ protected:
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
+   nsCOMPtr<nsIFreeType2> mFt2;
+-  PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
+-
++  PRUint16           mPixelSize;
++  FTC_ImageTypeRec   mImageTypeRec;
++  FTC_ScalerRec      mScalerRec;
+ 
+   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
+                             fontPSInfo *aFpi);
+@@ -363,7 +363,7 @@
+ protected:
+   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
+   nsCOMPtr<nsIFreeType2> mFt2;
+-  FTC_Image_Desc  mImageDesc;
++  FTC_ScalerRec mScalerRec;
+ };
+ #endif
+ 
+--- mozilla-firefox-1.0.6.orig/gfx/src/x11shared/nsFontFreeType.cpp
++++ mozilla-firefox-1.0.6/gfx/src/x11shared/nsFontFreeType.cpp
+@@ -173,15 +173,15 @@
+ FT_Face
+ nsFreeTypeFont::getFTFace()
+ {
+-  FT_Face face = nsnull;
++  FT_Size size = nsnull;
+   FTC_Manager mgr;
+   nsresult rv;
+   mFt2->GetFTCacheManager(&mgr);
+-  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
++  rv = mFt2->ManagerLookupSize(mgr, &mScalerRec, &size);
+   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
+   if (NS_FAILED(rv))
+     return nsnull;
+-  return face;
++  return size->face;
+ }
+ 
+ nsFreeTypeFont::nsFreeTypeFont(nsITrueTypeFontCatalogEntry *aFaceID,
+@@ -191,21 +191,25 @@
+   PRBool embedded_bimap = PR_FALSE;
+   mFaceID = aFaceID;
+   mPixelSize = aPixelSize;
+-  mImageDesc.font.face_id    = (void*)mFaceID;
+-  mImageDesc.font.pix_width  = aPixelSize;
+-  mImageDesc.font.pix_height = aPixelSize;
+-  mImageDesc.image_type = 0;
+-
++  mImageTypeRec.face_id    = (FTC_FaceID)(void*)mFaceID;
++  mImageTypeRec.width      = aPixelSize;
++  mImageTypeRec.height     = aPixelSize;
++  mImageTypeRec.flags      = FT_LOAD_DEFAULT | FT_LOAD_RENDER;
++  mScalerRec.face_id       = (FTC_FaceID)(void*)mFaceID;
++  mScalerRec.width         = aPixelSize;
++  mScalerRec.height        = aPixelSize;
++  mScalerRec.pixel         = PR_TRUE;
++  
+   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
+-    mImageDesc.image_type |= ftc_image_mono;
++    mImageTypeRec.flags |= FT_LOAD_MONOCHROME;
+     anti_alias = PR_FALSE;
+   }
+ 
+   if (nsFreeType2::gFreeType2Autohinted)
+-    mImageDesc.image_type |= ftc_image_flag_autohinted;
++    mImageTypeRec.flags |= FT_LOAD_FORCE_AUTOHINT;
+ 
+   if (nsFreeType2::gFreeType2Unhinted)
+-    mImageDesc.image_type |= ftc_image_flag_unhinted;
++    mImageTypeRec.flags |= FT_LOAD_NO_HINTING;
+ 
+   PRUint32  num_embedded_bitmaps, i;
+   PRInt32*  embedded_bitmapheights;
+@@ -218,7 +222,7 @@
+         if (embedded_bitmapheights[i] == aPixelSize) {
+           embedded_bimap = PR_TRUE;
+           // unhinted must be set for embedded bitmaps to be used
+-          mImageDesc.image_type |= ftc_image_flag_unhinted;
++          mImageTypeRec.flags |= FT_LOAD_NO_HINTING;
+           break;
+         }
+       }
+@@ -312,7 +316,7 @@
+   if (!face)
+     return NS_ERROR_FAILURE;
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return NS_ERROR_FAILURE;
+@@ -339,7 +343,8 @@
+ 
+     //NS_ASSERTION(glyph_index,"failed to get glyph");
+     if (glyph_index) {
+-      rv = mFt2->ImageCacheLookup(icache, &mImageDesc, glyph_index, &glyph);
++      rv = mFt2->ImageCacheLookup(icache, &mImageTypeRec, glyph_index,
++                                 &glyph, nsnull);
+       NS_ASSERTION(NS_SUCCEEDED(rv),"error loading glyph");
+     }
+     if ((glyph_index) && (NS_SUCCEEDED(rv))) {
+@@ -401,7 +406,7 @@
+   if (!face)
+     return 0;
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
+@@ -420,7 +425,8 @@
+     }
+     mFt2->GetCharIndex((FT_Face)face, code_point, &glyph_index);
+     nsresult rv;
+-    rv = mFt2->ImageCacheLookup(icache, &mImageDesc, glyph_index, &glyph);
++    rv = mFt2->ImageCacheLookup(icache, &mImageTypeRec, glyph_index, &glyph,
++                                nsnull);
+     NS_ASSERTION(NS_SUCCEEDED(rv),"error loading glyph");
+     if (NS_FAILED(rv)) {
+       origin_x += face->size->metrics.x_ppem/2 + 2;
+@@ -723,7 +729,7 @@
+     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
+ #endif
+ 
+-  FTC_Image_Cache icache;
++  FTC_ImageCache icache;
+   mFt2->GetImageCache(&icache);
+   if (!icache)
+     return 0;
+@@ -752,7 +758,8 @@
+ 
+     mFt2->GetCharIndex(face, code_point, &glyph_index);
+     if (glyph_index) {
+-      rv = mFt2->ImageCacheLookup(icache, &mImageDesc, glyph_index, &glyph);
++      rv = mFt2->ImageCacheLookup(icache, &mImageTypeRec, glyph_index,
++                                 &glyph, nsnull);
+     }
+     if ((glyph_index) && (NS_SUCCEEDED(rv))) {
+       mFt2->GlyphGetCBox(glyph, ft_glyph_bbox_pixels, &glyph_bbox);
+--- mozilla-firefox-1.0.6.orig/gfx/src/x11shared/nsFontFreeType.h
++++ mozilla-firefox-1.0.6/gfx/src/x11shared/nsFontFreeType.h
+@@ -109,8 +109,9 @@
+ protected:
+   XImage *GetXImage(PRUint32 width, PRUint32 height);
+   nsITrueTypeFontCatalogEntry *mFaceID;
+-  PRUint16        mPixelSize;
+-  FTC_Image_Desc  mImageDesc;
++  PRUint16          mPixelSize;
++  FTC_ImageTypeRec  mImageTypeRec;
++  FTC_ScalerRec     mScalerRec;
+   nsCOMPtr<nsIFreeType2> mFt2;
+ };
+ 
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_debranding.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_debranding.dpatch
@@ -0,0 +1,52 @@
+#!/bin/sh -e
+## debian/patches/10_debian-branding.dpatch by  <alex@personalfree.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/locales/en-US/chrome/global/brand.properties.orig	2005-01-16 12:15:00.000000000 +0000
++++ mozilla/mail/locales/en-US/chrome/global/brand.properties	2005-01-16 12:15:54.000000000 +0000
+@@ -1,10 +1,10 @@
+-brandShortName=Mozilla Thunderbird
++brandShortName=Debian Thunderbird
+ 
+ #We don't have a real property for the REAL short name (Thunderbird), uses this one temporarily
+ #We can't change brandShortName because that's used by non forked thunderbird/seamonkey code
+ #where it really needs to be the full name for thunderbird
+ brandRealShortName=Thunderbird
+ 
+-brandFullName=Mozilla Thunderbird
+-vendorShortName=Mozilla Thunderbird
++brandFullName=Debian Thunderbird
++vendorShortName=Debian Thunderbird
+ sidebarName=Sidebar
+--- mozilla/mail/locales/en-US/chrome/global/brand.dtd.orig	2005-01-16 12:15:07.000000000 +0000
++++ mozilla/mail/locales/en-US/chrome/global/brand.dtd	2005-01-16 12:15:21.000000000 +0000
+@@ -1,5 +1,5 @@
+ #expand <!ENTITY  lang.version          "__MOZILLA_LOCALE_VERSION__">
+ <!ENTITY  brandShortName        "Thunderbird">
+-<!ENTITY  brandFullName         "Mozilla Thunderbird">
+-<!ENTITY  vendorShortName       "Mozilla Thunderbird">
++<!ENTITY  brandFullName         "Debian Thunderbird">
++<!ENTITY  vendorShortName       "Debian Thunderbird">
+ <!ENTITY  sidebarName           "Sidebar">
+\ No newline at end of file
--- mozilla-thunderbird-1.5.orig/debian/patches.old/50_dtoa-arm-double-wordfix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/50_dtoa-arm-double-wordfix.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_dtoa-arm-double-wordfix.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla-thunderbird-0.3.orig/nsprpub/pr/src/misc/prdtoa.c.~3.7.4.3.~	Tue Jan  7 10:30:15 2003
++++ mozilla-thunderbird-0.3/nsprpub/pr/src/misc/prdtoa.c	Thu Oct 23 20:09:19 2003
+@@ -129,7 +129,7 @@
+  *	is not strictly legal and can cause trouble with aggressively
+  *	optimizing compilers (e.g., gcc 2.95.1 under -O2).
+  */
+-#if  defined(IS_LITTLE_ENDIAN)
++#if  defined(IS_LITTLE_ENDIAN) && (!defined(__arm__) || defined(__VFP_FP__))
+ #define IEEE_8087
+ #else
+ #define IEEE_MC68k
--- mozilla-thunderbird-1.5.orig/debian/patches.old/80_mailnews_imap_perm-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/80_mailnews_imap_perm-patch.dpatch
@@ -0,0 +1,78 @@
+#!/bin/sh -e
+## by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -uw mozilla/mailnews/imap/src.org/nsImapMailFolder.cpp mozilla/mailnews/imap/src/nsImapMailFolder.cpp
+--- mozilla/mailnews/imap/src.org/nsImapMailFolder.cpp	2004-11-02 00:13:04.000000000 +0000
++++ mozilla/mailnews/imap/src/nsImapMailFolder.cpp	2004-11-15 19:20:58.000000000 +0000
+@@ -107,6 +107,8 @@
+ #include "nsIMimeHeaders.h"
+ #include "nsIMsgMdnGenerator.h"
+ #include "nsISpamSettings.h"
++#include "nsIFile.h"
++#include "nsIFileSpec.h"
+ #include <time.h>
+ 
+ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+@@ -2996,6 +2998,18 @@
+   tmpFileSpec.MakeUnique();
+   rv = NS_NewFileSpecWithSpec(tmpFileSpec,
+                                 getter_AddRefs(m_copyState->m_tmpFileSpec));
++
++      
++  if(NS_SUCCEEDED(rv)) {
++     nsCOMPtr <nsILocalFile> tmpFile = do_CreateInstance("@mozilla.org/file/local;1", &rv);
++     if(NS_SUCCEEDED(rv)) {
++         nsXPIDLString str;
++	 m_copyState->m_tmpFileSpec->GetUnicodePath(str);
++	 tmpFile->InitWithPath(str);
++         tmpFile->Create(nsIFile::NORMAL_FILE_TYPE, 00700);
++     }
++  }
++
+   if (NS_SUCCEEDED(rv) && m_copyState->m_tmpFileSpec)
+     rv = m_copyState->m_tmpFileSpec->OpenStreamForWriting();
+ 
+diff -uw mozilla/mailnews/imap/src.org/nsImapOfflineSync.cpp mozilla/mailnews/imap/src/nsImapOfflineSync.cpp
+--- mozilla/mailnews/imap/src.org/nsImapOfflineSync.cpp	2004-10-22 23:51:58.000000000 +0000
++++ mozilla/mailnews/imap/src/nsImapOfflineSync.cpp	2004-11-15 19:20:58.000000000 +0000
+@@ -308,7 +308,17 @@
+     tmpFileSpec.MakeUnique();
+     rv = NS_NewFileSpecWithSpec(tmpFileSpec,
+       getter_AddRefs(tempFileSpec));
+-    if (tempFileSpec)
++    
++    nsCOMPtr <nsILocalFile> tmpFile = do_CreateInstance("@mozilla.org/file/local;1", &rv);
++
++    if(NS_SUCCEEDED(rv)) {
++         nsXPIDLString nativePath;
++         tempFileSpec->GetUnicodePath(nativePath);
++         tmpFile->InitWithPath(nativePath); 
++         tmpFile->Create(nsIFile::NORMAL_FILE_TYPE, 00700);
++    }
++
++    if (tempFileSpec && NS_SUCCEEDED(rv))
+     {
+       nsCOMPtr <nsIOutputStream> outputStream;
+       rv = tempFileSpec->GetOutputStream(getter_AddRefs(outputStream));
--- mozilla-thunderbird-1.5.orig/debian/patches.old/70_mail_extension_offline_jar_mn-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/70_mail_extension_offline_jar_mn-patch.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/extensions/offline/jar.mn.orig	2004-09-07 09:14:40.000000000 +0000
++++ mozilla/mail/extensions/offline/jar.mn	2004-09-07 09:14:47.000000000 +0000
+@@ -4,7 +4,7 @@
+ *   content/messenger-offline/contents.rdf                         (content/contents.rdf)
+ *   content/messenger-offline/pref-offline.xul                     (content/pref-offline.xul)
+ 
+-en-US.jar:
++offline-en-US.jar:
+     locale/en-US/messenger-offline/offline.properties              (locale/offline.properties)
+     locale/en-US/messenger-offline/offline.dtd                     (locale/offline.dtd)
+     locale/en-US/messenger-offline/pref-offline.dtd                (locale/pref-offline.dtd)
--- mozilla-thunderbird-1.5.orig/debian/patches.old/90_gcc4_fix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/90_gcc4_fix.dpatch
@@ -0,0 +1,108 @@
+#!/bin/sh -e
+## 90_gcc4_fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla-firefox-1.0.6.orig/security/nss/lib/pki1/oiddata.h
++++ mozilla-firefox-1.0.6/security/nss/lib/pki1/oiddata.h
+@@ -43,9 +43,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+ /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+ /*extern const PRUint32 nss_attribute_type_alias_count;*/
+ 
+--- mozilla-firefox-1.0.6.orig/security/nss/lib/pki1/pki1.h
++++ mozilla-firefox-1.0.6/security/nss/lib/pki1/pki1.h
+@@ -58,6 +58,8 @@
+ /* fgmr 19990505 moved these here from oiddata.h */
+ extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
+ extern const PRUint32 nss_attribute_type_alias_count;
++extern const NSSOID nss_builtin_oids[];
++extern const PRUint32 nss_builtin_oid_count;
+ 
+ /*
+  * NSSOID
+---- mozilla-firefox-1.0.6.orig/widget/src/gtk2/nsDragService.cpp
++++ mozilla-firefox-1.0.6/widget/src/gtk2/nsDragService.cpp
+@@ -838,7 +838,7 @@
+             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+         listTarget->target = g_strdup(gMimeListType);
+         listTarget->flags = 0;
+-        listTarget->info = (guint)listAtom;
++        listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
+         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                ("automatically adding target %s with id %ld\n",
+                listTarget->target, listAtom));
+@@ -877,7 +877,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             listTarget->target = g_strdup(gTextUriListType);
+                             listTarget->flags = 0;
+-                            listTarget->info = (guint)listAtom;
++                            listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", listTarget->target, listAtom));
+@@ -914,7 +914,7 @@
+                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                         target->target = g_strdup(flavorStr);
+                         target->flags = 0;
+-                        target->info = (guint)atom;
++                        target->info = (guint)NS_PTR_TO_INT32(atom);
+                         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                ("adding target %s with id %ld\n",
+                                target->target, atom));
+@@ -931,7 +931,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             plainTarget->target = g_strdup(kTextMime);
+                             plainTarget->flags = 0;
+-                            plainTarget->info = (guint)plainAtom;
++                            plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", plainTarget->target, plainAtom));
+@@ -948,7 +948,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             urlTarget->target = g_strdup(gMozUrlType);
+                             urlTarget->flags = 0;
+-                            urlTarget->info = (guint)urlAtom;
++                            urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", urlTarget->target, urlAtom));
+---- mozilla-firefox-1.0.6.orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
++++ mozilla-firefox-1.0.6/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
+@@ -834,8 +834,8 @@
+ void
+ nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
+ {
+-    PRUint16 name  = (PRUint32(param) & 0xFFFF0000) >> 16;
+-    PRUint16 value =  PRUint32(param) & 0x0000FFFF;
++    PRUint16 name  = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
++    PRUint16 value =  NS_PTR_TO_INT32(param) & 0x0000FFFF;
+ 
+     switch (name) {
+     case MAX_CONNECTIONS:
+-
--- mozilla-thunderbird-1.5.orig/debian/patches.old/70_config_rules_mk.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/70_config_rules_mk.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/config/rules.mk.orig	2004-09-06 15:55:40.000000000 +0000
++++ mozilla/config/rules.mk	2004-09-06 15:56:03.000000000 +0000
+@@ -1535,7 +1535,7 @@
+ ifndef NO_INSTALL
+ 	@$(EXIT_ON_ERROR) \
+ 	if test -f $(JAR_MANIFEST); then \
+-	  if test ! -d $(DESTDIR)$(mozappdir)/chrome; then mkdir $(DESTDIR)$(mozappdir)/chrome; fi; \
++	  if test ! -d $(DESTDIR)$(mozappdir)/chrome; then mkdir -p $(DESTDIR)$(mozappdir)/chrome; fi; \
+ 	  $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
+ 	    $(JAR_MANIFEST) | \
+ 	  $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \
--- mozilla-thunderbird-1.5.orig/debian/patches.old/91_gcc4_imgLoader.fix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/91_gcc4_imgLoader.fix.dpatch
@@ -0,0 +1,90 @@
+#!/bin/sh -e
+## 91_gcc4_imgLoader.fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- a/modules/libpr0n/src/imgLoader.cpp	2004-08-14 01:39:57.000000000 +0400
++++ b/modules/libpr0n/src/imgLoader.cpp	2005-06-19 15:12:41.000000000 +0400
+@@ -896,7 +896,7 @@
+   // the network.
+   aProxy->AddToLoadGroup();
+ 
+-  mProxies.AppendElement(aProxy);
++  mProxies.AppendObject(aProxy);
+ }
+ 
+ /** nsIRequestObserver methods **/
+@@ -909,13 +909,10 @@
+     PRBool isFromCache;
+     if (NS_SUCCEEDED(cacheChan->IsFromCache(&isFromCache)) && isFromCache) {
+ 
+-      PRUint32 count;
+-      mProxies.Count(&count);
++      PRUint32 count = mProxies.Count();
+       for (PRInt32 i = count-1; i>=0; i--) {
+-        imgRequestProxy *proxy;
+-        mProxies.GetElementAt(i, (nsISupports**)&proxy);
++        imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
+         mRequest->NotifyProxyListener(proxy);
+-        NS_RELEASE(proxy);
+       }
+ 
+       mRequest->SetLoadId(mContext);
+@@ -964,14 +961,11 @@
+ 
+   mDestListener = NS_STATIC_CAST(nsIStreamListener*, pl);
+ 
+-  PRUint32 count;
+-  mProxies.Count(&count);
++  PRUint32 count = mProxies.Count();
+   for (PRInt32 i = count-1; i>=0; i--) {
+-    imgRequestProxy *proxy;
+-    mProxies.GetElementAt(i, (nsISupports**)&proxy);
++    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
+     proxy->ChangeOwner(request);
+     request->NotifyProxyListener(proxy);
+-    NS_RELEASE(proxy);
+   }
+ 
+   NS_RELEASE(request);
+diff -urN a/modules/libpr0n/src/imgLoader.h b/modules/libpr0n/src/imgLoader.h
+--- a/modules/libpr0n/src/imgLoader.h	2004-08-14 01:39:57.000000000 +0400
++++ b/modules/libpr0n/src/imgLoader.h	2005-06-19 15:10:11.000000000 +0400
+@@ -90,7 +90,7 @@
+  * validate checker
+  */
+ 
+-#include "nsSupportsArray.h"
++#include "nsCOMArray.h"
+ 
+ class imgCacheValidator : public nsIStreamListener
+ {
+@@ -109,7 +109,7 @@
+   nsCOMPtr<nsIStreamListener> mDestListener;
+ 
+   imgRequest *mRequest;
+-  nsSupportsArray mProxies;
++  nsCOMArray<imgIRequest> mProxies;
+ 
+   void *mContext;
+ };
+-
--- mozilla-thunderbird-1.5.orig/debian/patches.old/50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla-thunderbird-0.3/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4	2003-06-19 16:54:27.000000000 +0930
++++ mozilla-thunderbird-0.3/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4	2003-06-19 23:45:45.000000000 +0930
+@@ -36,7 +36,7 @@
+ LOCALSZ=2   # gp, ra
+ FRAMESZ=(((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK
+ 
+-define(STUB_NAME, `Stub'$1`__14nsXPTCStubBase')
++define(STUB_NAME, ```_ZN14nsXPTCStubBase'len(Stub'$1`)Stub'$1`Ev'')
+ 
+ define(STUB_ENTRY,
+ `	.globl		'STUB_NAME($1)`
--- mozilla-thunderbird-1.5.orig/debian/patches.old/50_alpha-build-fix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/50_alpha-build-fix.dpatch
@@ -0,0 +1,180 @@
+#!/bin/sh -e
+## 50_alpha-build-fix.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+Index: xptcinvoke_linux_alpha.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp,v
+retrieving revision 1.3.38.1
+diff -c -3 -p -r1.3.38.1 xptcinvoke_linux_alpha.cpp
+*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	10 Apr 2002 03:37:38 -0000	1.3.38.1
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp	20 May 2002 22:37:04 -0000
+***************
+*** 20,25 ****
+--- 20,26 ----
+   * the Initial Developer. All Rights Reserved.
+   *
+   * Contributor(s):
++  *   Glen Nakamura <glen@imodulo.com>
+   *
+   * Alternatively, the contents of this file may be used under the terms of
+   * either the GNU General Public License Version 2 or later (the "GPL"), or 
+***************
+*** 37,44 ****
+  
+  /* Platform specific code to invoke XPCOM methods on native objects */
+  
+- /* contributed by Glen Nakamura <glen.nakamura@usa.net> */
+- 
+  #include "xptcprivate.h"
+  
+  /* Prototype specifies unmangled function name and disables unused warning */
+--- 38,43 ----
+*************** __asm__(
+*** 163,169 ****
+--- 162,172 ----
+      "bis $16,$16,$1\n\t"    /* load "this" */
+      "ldq $2,16($15)\n\t"    /* load "methodIndex" */
+      "ldq $1,0($1)\n\t"      /* load vtable */
++ #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++     "s8addq $2,$31,$2\n\t"  /* vtable index = "methodIndex" * 8 */
++ #else /* not G++ V3 ABI */
+      "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
++ #endif /* G++ V3 ABI */
+      "addq $1,$2,$1\n\t"
+      "ldq $27,0($1)\n\t"     /* load address of function */
+      "jsr $26,($27),0\n\t"   /* call virtual function */
+*************** __asm__(
+*** 176,179 ****
+      "ret $31,($26),1\n\t"
+      ".end XPTC_InvokeByIndex"
+      );
+- 
+--- 179,181 ----
+Index: xptcstubs_linux_alpha.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp,v
+retrieving revision 1.3.38.1
+diff -c -3 -p -r1.3.38.1 xptcstubs_linux_alpha.cpp
+*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	10 Apr 2002 03:37:42 -0000	1.3.38.1
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp	20 May 2002 22:37:04 -0000
+***************
+*** 20,25 ****
+--- 20,26 ----
+   * the Initial Developer. All Rights Reserved.
+   *
+   * Contributor(s):
++  *   Glen Nakamura <glen@imodulo.com>
+   *
+   * Alternatively, the contents of this file may be used under the terms of
+   * either the GNU General Public License Version 2 or later (the "GPL"), or 
+***************
+*** 37,44 ****
+  
+  /* Implement shared vtbl methods. */
+  
+- /* contributed by Glen Nakamura <glen.nakamura@usa.net> */
+- 
+  #include "xptcprivate.h"
+  
+  /* Prototype specifies unmangled function name and disables unused warning */
+--- 38,43 ----
+*************** __asm__(
+*** 188,210 ****
+   * nsresult nsXPTCStubBase::Stub##n()
+   *  Sets register $1 to "methodIndex" and jumps to SharedStub.
+   */
+  #define STUB_ENTRY(n) \
+  __asm__( \
+!     "#### Stub"#n" ####\n" \
+! ".text\n\t" \
+!     ".align 5\n\t" \
+!     ".globl Stub"#n"__14nsXPTCStubBase\n\t" \
+!     ".ent Stub"#n"__14nsXPTCStubBase\n" \
+! "Stub"#n"__14nsXPTCStubBase:\n\t" \
+!     ".frame $30,0,$26,0\n\t" \
+!     "ldgp $29,0($27)\n" \
+! "$Stub"#n"__14nsXPTCStubBase..ng:\n\t" \
+!     ".prologue 1\n\t" \
+!     "lda $1,"#n"\n\t" \
+!     "br $31,$SharedStub..ng\n\t" \
+!     ".end Stub"#n"__14nsXPTCStubBase" \
+      );
+  
+  #define SENTINEL_ENTRY(n) \
+  nsresult nsXPTCStubBase::Sentinel##n() \
+  { \
+--- 187,231 ----
+   * nsresult nsXPTCStubBase::Stub##n()
+   *  Sets register $1 to "methodIndex" and jumps to SharedStub.
+   */
++ #define STUB_MANGLED_ENTRY(n, symbol) \
++     "#### Stub"#n" ####"      "\n\t" \
++     ".text"                   "\n\t" \
++     ".align 5"                "\n\t" \
++     ".globl " symbol          "\n\t" \
++     ".ent " symbol            "\n"   \
++ symbol ":"                    "\n\t" \
++     ".frame $30,0,$26,0"      "\n\t" \
++     "ldgp $29,0($27)"         "\n"   \
++ "$" symbol "..ng:"            "\n\t" \
++     ".prologue 1"             "\n\t" \
++     "lda $1,"#n               "\n\t" \
++     "br $31,$SharedStub..ng"  "\n\t" \
++     ".end " symbol
++ 
++ #if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
++ 
++ #define STUB_ENTRY(n) \
++ __asm__( \
++     ".if "#n" < 10"                                              "\n\t" \
++         STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase5Stub"#n"Ev")  "\n\t" \
++     ".elseif "#n" < 100"                                         "\n\t" \
++         STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase6Stub"#n"Ev")  "\n\t" \
++     ".elseif "#n" < 1000"                                        "\n\t" \
++         STUB_MANGLED_ENTRY(n, "_ZN14nsXPTCStubBase7Stub"#n"Ev")  "\n\t" \
++     ".else"                                                      "\n\t" \
++     ".err \"Stub"#n" >= 1000 not yet supported.\""               "\n\t" \
++     ".endif" \
++     );
++ 
++ #else /* not G++ V3 ABI */
++ 
+  #define STUB_ENTRY(n) \
+  __asm__( \
+!     STUB_MANGLED_ENTRY(n, "Stub"#n"__14nsXPTCStubBase") \
+      );
+  
++ #endif /* G++ V3 ABI */
++ 
+  #define SENTINEL_ENTRY(n) \
+  nsresult nsXPTCStubBase::Sentinel##n() \
+  { \
+*************** nsresult nsXPTCStubBase::Sentinel##n() \
+*** 213,216 ****
+  }
+  
+  #include "xptcstubsdef.inc"
+- 
+--- 234,236 ----
--- mozilla-thunderbird-1.5.orig/debian/patches.old/30_nspr_dev_discrim-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/30_nspr_dev_discrim-patch.dpatch
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/nsprpub/config/Makefile.in.orig	2004-06-08 07:52:28.000000000 +0000
++++ mozilla/nsprpub/config/Makefile.in	2004-06-08 07:52:40.000000000 +0000
+@@ -140,6 +140,6 @@
+ 	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
+ endif
+ 
+-real_install:: nspr.m4
++real_install:: mozilla-thunderbird-nspr.m4
+ 	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
+ 	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal
--- mozilla-thunderbird-1.5.orig/debian/patches.old/71_extensionManagerAutoReRegister.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/71_extensionManagerAutoReRegister.dpatch
@@ -0,0 +1,59 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in.orig	2005-03-30 22:09:50.205408701 +0000
++++ mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in	2005-03-30 22:13:05.414956939 +0000
+@@ -72,6 +72,8 @@
+ const FILE_UNINSTALL_LOG              = "Uninstall";
+ const FILE_DEFAULTS                   = "defaults.ini";
+ const FILE_COMPONENT_MANIFEST         = "components.ini";
++const FILE_COMPONENT_REGISTRY         = "compreg.dat";
++const FILE_XUL_MFASL         	      = "XUL.mfasl";
+ const FILE_COMPAT_MANIFEST            = "compatibility.ini";
+ const FILE_INSTALL_MANIFEST           = "install.rdf";
+ const FILE_CHROME_MANIFEST            = "contents.rdf";
+@@ -1620,6 +1622,22 @@
+     if (!componentList.exists())
+       needsRestart = true;
+     
++    else {
++      var compatManifest = getFile(KEY_PROFILEDIR,[FILE_COMPAT_MANIFEST]);
++      var compreg = getFile(KEY_PROFILEDIR,[FILE_COMPONENT_REGISTRY]);
++      var xmfasl = getFile(KEY_PROFILEDIR,[FILE_XUL_MFASL]);
++      var extensionsFile = getFile(KEY_APPDIR,[DIR_DEFAULTS_EXTENSIONS,FILE_EXTENSIONS]);
++
++      if (compatManifest.exists() && compatManifest.lastModifiedTime < extensionsFile.lastModifiedTime) {
++        dump("New Global extensions installed .... ");
++        if(compatManifest.exists()) compatManifest.remove(false); 
++        if(compreg.exists()) compreg.remove(false); 
++        if(xmfasl.exists()) xmfasl.remove(false);   
++        dump("done ... scheduling restart.\n");
++        needsRestart=true;
++      }
++    }
++
+     // XXXben - a bit of a hack - clean up any empty dirs that may not have been
+     //          properly removed by [un]install... I should really investigate those
+     //          cases to see what is stopping these dirs from being removed, but no
--- mozilla-thunderbird-1.5.orig/debian/patches.old/70_exclude_sep_extensions_autobuild.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/70_exclude_sep_extensions_autobuild.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/extensions/Makefile.in.orig	2004-03-18 16:21:05.000000000 +0000
++++ mozilla/extensions/Makefile.in	2004-03-18 16:21:38.000000000 +0000
+@@ -26,6 +26,7 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+-DIRS		= $(MOZ_EXTENSIONS)
++DIRS1		= $(subst typeaheadfind,,$(MOZ_EXTENSIONS))
++DIRS		= $(subst inspector,,$(DIRS1))
+ 
+ include $(topsrcdir)/config/rules.mk
--- mozilla-thunderbird-1.5.orig/debian/patches.old/01_old_mozilla.in.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/01_old_mozilla.in.dpatch
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) cp debian/mozilla.in_1.0.6 build-dir/mozilla/mail/app/mozilla.in;;
+       -unpatch) echo do nothing - lazy man ;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_debian-branding.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_debian-branding.dpatch
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+## 20_debian-enigmail-patch.dpatch by  <@hanson.personalfree.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+PATCH_FILE=build-dir/mozilla/mail/locales/en-US/chrome/messenger/start.html
+OWRT_FILE=debian/branding/start.html
+
+case "$1" in
+       -patch)
+	    line1=$(grep -n "enigmail-skin.jar:" $PATCH_FILE | awk -F: '{ print $1 }') 
+            cp $PATCH_FILE  ${PATCH_FILE}.dorig
+	    cp $OWRT_FILE $PATCH_FILE
+         ;;
+
+       -unpatch) 
+            cp ${PATCH_FILE}.dorig $PATCH_FILE
+            rm -f ${PATCH_FILE}.dorig
+         ;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_debian-mail_config_Makefile_in.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_debian-mail_config_Makefile_in.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## debian/patches/10_debian-branding.dpatch by  <alex@personalfree.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/config/Makefile.in.orig	2004-03-29 19:42:35.000000000 +0000
++++ mozilla/mail/config/Makefile.in	2004-03-29 19:42:52.000000000 +0000
+@@ -36,7 +36,7 @@
+ # packaging file for the pref extension which is optional
+ PREF = pref-win
+ 
+-APP_NAME=thunderbird
++APP_NAME=mozilla-thunderbird
+ 
+ ifeq ($(OS_ARCH),WINNT)
+   _PLATFORM = dos
--- mozilla-thunderbird-1.5.orig/debian/patches.old/20_mailnews_mime_makefile_in.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/20_mailnews_mime_makefile_in.dpatch
@@ -0,0 +1,37 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -u -w -r1.60 Makefile.in
+--- mozilla/mailnews/mime/src/Makefile.in	13 Jul 2003 22:28:30 -0000	1.60
++++ mozilla/mailnews/mime/src/Makefile.in	17 Jun 2004 10:18:02 -0000
+@@ -136,6 +136,8 @@
+ 		mimecth.h \
+ 		mimeobj.h \
+ 		mimei.h \
++		mimecryp.h \
++		mimemoz2.h \
+ 		modmimee.h \
+ 		mimecont.h \
+ 		mimemult.h \
--- mozilla-thunderbird-1.5.orig/debian/patches.old/15_pkgconfig_name_patches.patch
+++ mozilla-thunderbird-1.5/debian/patches.old/15_pkgconfig_name_patches.patch
@@ -0,0 +1,81 @@
+? build/unix/mozilla-thunderbird-config
+? build/unix/mozilla-thunderbird-gtkmozembed.pc
+? build/unix/mozilla-thunderbird-js.pc
+? build/unix/mozilla-thunderbird-nspr.pc
+? build/unix/mozilla-thunderbird-nss.pc
+? build/unix/mozilla-thunderbird-plugin.pc
+? build/unix/mozilla-thunderbird-xpcom.pc
+Index: build/unix/mozilla-gtkmozembed.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-gtkmozembed.pc.in,v
+retrieving revision 1.2
+diff -u -w -r1.2 mozilla-gtkmozembed.pc.in
+--- build/unix/mozilla-gtkmozembed.pc.in	19 Nov 2002 03:11:13 -0000	1.2
++++ build/unix/mozilla-gtkmozembed.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: Mozilla Gtk Embedding Widget
+ Description: Mozilla Embedding Widget for Gtk+
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-xpcom = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-xpcom = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lgtkembedmoz %SUPERWIN_LIBS%
+ Cflags: -I${includedir}/gtkembedmoz
+Index: build/unix/mozilla-js.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-js.pc.in,v
+retrieving revision 1.4
+diff -u -w -r1.4 mozilla-js.pc.in
+--- build/unix/mozilla-js.pc.in	25 Oct 2002 02:30:37 -0000	1.4
++++ build/unix/mozilla-js.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lmozjs
+ Cflags: -I${includedir}/js -DXP_UNIX
+Index: build/unix/mozilla-nss.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-nss.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-nss.pc.in
+--- build/unix/mozilla-nss.pc.in	3 Jun 2002 22:26:01 -0000	1.1
++++ build/unix/mozilla-nss.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: NSS
+ Description: Mozilla Network Security Services
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
+ Cflags: -I${includedir}/nss
+Index: build/unix/mozilla-plugin.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-plugin.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-plugin.pc.in
+--- build/unix/mozilla-plugin.pc.in	30 Oct 2002 00:40:16 -0000	1.1
++++ build/unix/mozilla-plugin.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,5 +6,5 @@
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-xpcom = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-xpcom = %MOZILLA_VERSION%
+ Cflags: -I${includedir}/java -I${includedir}/plugin
+Index: build/unix/mozilla-xpcom.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-xpcom.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-xpcom.pc.in
+--- build/unix/mozilla-xpcom.pc.in	28 May 2002 20:20:42 -0000	1.1
++++ build/unix/mozilla-xpcom.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: XPCOM
+ Description: The Mozilla Cross Platform Component Library
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lxpcom
+ Cflags: -I${includedir}/xpcom -I${includedir}/string
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_profile_migration.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_profile_migration.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/components/migration/src/nsProfileMigrator.cpp.orig	2004-07-12 13:00:20.000000000 +0200
++++ mozilla/mail/components/migration/src/nsProfileMigrator.cpp	2004-07-12 13:00:40.000000000 +0200
+@@ -76,7 +76,7 @@
+ NS_IMETHODIMP
+ nsProfileMigrator::Import()
+ {
+-  if (ImportRegistryProfiles(NS_LITERAL_CSTRING("Thunderbird")))
++  if (ImportRegistryProfiles(NS_LITERAL_CSTRING("Mozilla-Thunderbird")))
+     return NS_OK;
+ 
+   return NS_ERROR_FAILURE;
--- mozilla-thunderbird-1.5.orig/debian/patches.old/20_enigmail-remove-seamonkey-skin-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/20_enigmail-remove-seamonkey-skin-patch.dpatch
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+## 20_debian-enigmail-patch.dpatch by  <@hanson.personalfree.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+PATCH_FILE=build-dir/mozilla/mail/locales/en-US/chrome/messenger/start.html
+OWRT_FILE=debian/branding/start.html
+
+case "$1" in
+       -patch)
+	    line1=$(grep -n "enigmail-skin.jar:" $PATCH_FILE | awk -F: '{ print $1 }') 
+            cp $PATCH_FILE  ${PATCH_FILE}.dorig
+	    cp $OWRT_FILE $PATCH_FILE
+         ;;
+
+       -unpatch) 
+            cp ${PATCH_FILE}.dorig $PATCH_FILE
+            rm -f ${PATCH_FILE}.dorig
+         ;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
--- mozilla-thunderbird-1.5.orig/debian/patches.old/00list
+++ mozilla-thunderbird-1.5/debian/patches.old/00list
@@ -0,0 +1,33 @@
+#01_old_mozilla.in
+#10_mips_optimization_patch
+10_debian-thunderbird
+#10_profile_migration
+#10_debian-basemail-unix
+#10_debian-widget_src_xremoteclient_Makefile_in
+#10_debian-branding
+#10_debranding
+10_configure-MOZAPP-patch
+#20_mailnews_mime_makefile_in.dpatch
+#20_mozilla_in-patch
+#20_run-mozilla_sh_306893_fix
+#21_mozilla_in-patch
+#30_nspr_dev_discrim-patch
+#50_alpha-build-fix
+#50_mozilla-thunderbird-xpcom-xptcall-mips
+#50_ftbfs_alpha+arm+ia64_325536_fix
+#50_hppa-build-fix
+#70_gtk-settings-patch
+#70_exclude_calendar_autobuild
+70_exclude_sep_extensions_autobuild
+#70_config_rules_mk
+#70_extensionManagerBug
+#71_extensionManagerAutoReRegister
+#70_single_typeaheadfind_package
+#80_mailnews_imap_perm-patch
+#80_mozilla-thunderbird-in-reply-to
+#90_new_freetype_fix
+#90_mail_components_miration_src_nsSeamonkeyProfileMigrator_cpp
+#90_gcc4_fix
+#90_xptcinvoke_arm
+#gdk_property_get
+#91_gcc4_imgLoader.fix
--- mozilla-thunderbird-1.5.orig/debian/patches.old/00patch-opts
+++ mozilla-thunderbird-1.5/debian/patches.old/00patch-opts
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+patch_opts="-d build-dir/mozilla"
+export patch_opts
--- mozilla-thunderbird-1.5.orig/debian/patches.old/50_xpcom_xptcall_xptcstubs_asm_mips_s.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/50_xpcom_xptcall_xptcstubs_asm_mips_s.dpatch
@@ -0,0 +1,54 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla-firefox-0.9.3.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
++++ mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
+@@ -38,7 +38,7 @@
+ # functions we invoke). 
+ 
+ LOCALSZ=4		# s0, s1, ra, gp
+-NARGSAVE=4		# a0, a1, a2, a3
++# NARGSAVE=4		# a0, a1, a2, a3
+ HIFRAMESZ=(LOCALSZ*SZREG)
+ LOFRAMESZ=(NARGSAVE*SZREG)
+ FRAMESZ=(HIFRAMESZ+LOFRAMESZ+ALSZ)&ALMASK
+--- mozilla-firefox-0.9.3.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4
++++ mozilla-firefox-0.9.3/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4
+@@ -31,12 +31,12 @@
+ 	.text
+ 	.globl PrepareAndDispatch
+ 
+-NARGSAVE=4  # extra space for the callee to use.  gccism
++# NARGSAVE=4  # extra space for the callee to use.  gccism
+             # we can put our a0-a3 in our callers space.
+ LOCALSZ=2   # gp, ra
+ FRAMESZ=(((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK
+ 
+-define(STUB_NAME, `Stub'$1`__14nsXPTCStubBase')
++define(STUB_NAME, ```_ZN14nsXPTCStubBase'len(Stub'$1`)Stub'$1`Ev'')
+ 
+ define(STUB_ENTRY,
+ `	.globl		'STUB_NAME($1)`
+
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_configure-MOZAPP-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_configure-MOZAPP-patch.dpatch
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+## debian/patches/10_configure-MOZAPP-patch.dpatch by  Alexander Sack <asac@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+APPNAME=mozilla-thunderbird
+CAPPNAME=Mozilla-Thunderbird
+ORGAPPNAME=thunderbird
+ORGCAPPNAME=Thunderbird
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+case "$1" in
+       -patch) 
+          if [ -e build-dir/mozilla/configure.dpatch-sav ]; then
+               echo >&2 "`basename $0`: patch already applied"
+	       exit 1
+	  fi
+          cp build-dir/mozilla/configure build-dir/mozilla/configure.dpatch-sav
+          cat build-dir/mozilla/configure.dpatch-sav | sed -e "s/MOZ_APP_NAME=${ORGAPPNAME}/MOZ_APP_NAME=${APPNAME}/" > build-dir/mozilla/configure 
+          cp build-dir/mozilla/mail/app/Makefile.in build-dir/mozilla/mail/app/Makefile.in-dsav
+          cat build-dir/mozilla/mail/app/Makefile.in-dsav | sed -e "s/${ORGAPPNAME}/${APPNAME}/g" | sed -e "s/${ORGCAPPNAME}/${CAPPNAME}/g" > build-dir/mozilla/mail/app/Makefile.in
+	  cp build-dir/mozilla/mail/app/profile/all-${ORGAPPNAME}.js build-dir/mozilla/mail/app/profile/all-${APPNAME}.js
+           ;;
+       -unpatch) 
+          if [ -e build-dir/mozilla/configure.dpatch-sav ]; then
+	     mv build-dir/mozilla/configure.dpatch-sav build-dir/mozilla/configure
+	     mv build-dir/mozilla/mail/app/Makefile.in-dsav build-dir/mozilla/mail/app/Makefile.in
+	     rm -f build-dir/mozilla/mail/app/profile/all-${APPNAME}.js
+          else
+   	      echo >&2 "`basename $0`: patch not yet applied, cannot unpatch"
+	      exit 1
+          fi
+          ;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
--- mozilla-thunderbird-1.5.orig/debian/patches.old/20_mozilla_in-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/20_mozilla_in-patch.dpatch
@@ -0,0 +1,210 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/app/mozilla.in.orig	2004-09-18 19:34:12.000000000 +0000
++++ mozilla/mail/app/mozilla.in	2004-09-18 19:36:01.000000000 +0000
+@@ -72,6 +72,7 @@
+ #uncomment for debugging
+ #set -x
+ 
++CMDLINE="$@"
+ moz_libdir=%MOZAPPDIR%
+ MRE_HOME=%MREDIR%
+ 
+@@ -109,6 +110,7 @@
+   # Check default compile-time libdir
+   if [ -x "$moz_libdir/run-mozilla.sh" ]; then
+     dist_bin="$moz_libdir"
++    run_moz="$moz_libdir/run-mozilla.sh"
+   else 
+     echo "Cannot find mozilla runtime directory. Exiting."
+     exit 1
+@@ -122,9 +124,9 @@
+ 
+ # The following is to check for a currently running instance.
+ # This is taken almost verbatim from the Mozilla RPM package's launch script.
+-MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
++MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-thunderbird-xremote-client"
+ check_running() {
+-    "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
++    "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' 'ping()' 2>/dev/null >/dev/null
+     RETURN_VAL=$?
+     if [ $RETURN_VAL -eq 0 ]; then
+         echo 1
+@@ -188,14 +190,14 @@
+ 			_open_type="window"
+ 			#_open_type="tab"
+ 			_remote_cmd="openURL(${_optLast} , new-${_open_type})"
+-			"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
++			"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' "${_remote_cmd}"
+ 			unset _remote_cmd _open_type
+ 			exit $?
+ 		fi
+ 	else
+ 		# No command line args. Open new window/tab
+-		#exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
+-		"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)"
++		#exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' "xfeDoCommand(openBrowser)"
++		"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' "xfeDoCommand(openInbox)"
+ 		exit $?
+ 	fi
+ fi
+@@ -225,6 +227,123 @@
+   esac
+ done
+ 
++HOOKS=`find $dist_bin/startup-hooks.d/* 2>/dev/null`
++for i in $HOOKS; do
++  $i
++done
++
++
++LOCALES_DIR=/var/lib/mozilla-thunderbird/locales.d/
++MOZLOCALE=""                                                                               
++LOCALES=$(cat $LOCALES_DIR/* | sed -e "s/#.*$//" | grep -v ^$)
++DEFAULT_LOCALE=$(cat $LOCALES_DIR/* | sed -e "s/#.*$//" | grep -v ^$| 
++head -n 1)
++                                                                                
++# try all locales to match exactly
++for locale in $LOCALES; do
++   # break if already set
++                                                                                
++   lang=$(expr "$locale" : "\(.*\):.*")
++   COUNTRY=$(expr "$locale" : ".*\:\(.*\)")
++   SYSLOCALE="$lang""_$COUNTRY"
++                                                                                
++   MATCHED=$(expr "$LANG" : ".*\($SYSLOCALE\).*")
++                                                                                
++   #echo matched: $MATCHED
++   if test "x$MATCHED" != "x"; then
++        MOZLOCALE="$lang-$COUNTRY"
++        export MOZLOCALE
++   fi
++                                                                                
++   if test "x$MOZLOCALE" != "x"; then
++        break;
++   fi
++done
++                                                                                
++# match locales only with LANGUAGE
++for locale in $LOCALES; do
++   if test "x$MOZLOCALE" != "x"; then
++        break
++   fi
++                                                                                
++   lang=$(expr "$locale" : "\(.*\):.*")
++   COUNTRY=$(expr "$locale" : ".*\:\(.*\)")
++   SYSLOCALE="$lang""_$COUNTRY"
++                                                                                
++   MATCHED=$(expr "$LANG" : "\($lang.*\)")
++                                                                                
++   #echo matched2: $MATCHED
++   if test "x$MATCHED" != "x"; then
++        MOZLOCALE="$lang-$COUNTRY"
++        export MOZLOCALE
++   fi
++done
++                                                                                
++# set absolut default locale
++if test "x$MATCHED" = "x"; then
++   lang=$(expr "$DEFAULT_LOCALE" : "\(.*\):.*")
++   COUNTRY=$(expr "$DEFAULT_LOCALE" : ".*\:\(.*\)")
++   MOZLOCALE="$lang-$COUNTRY"
++   export MOZLOCALE
++fi
++                                                                                
++echo selected locale: $MOZLOCALE
++                                                                               
++LOCALE_ARGS="-contentLocale $MOZLOCALE -UILocale $MOZLOCALE"
++if [ $ALREADY_RUNNING -eq 1 ]; then LOCK_FILE=lock; else LOCK_FILE=; fi 
++
++MOZ_ARGS=
++donext=
++
++for opt_in in $CMDLINE
++do
++  if [ -z $donext ]
++  then 
++     if [ "$opt_in" = "-contentLocale" ]
++     then
++       # let the command line eat the env determined value
++       LOCALE_ARGS=
++       next=
++       donext=
++     elif [ "$opt_in" = -UILocale ]
++     then
++       # let the command line eat the env determined value
++       LOCALE_ARGS=
++       next=
++       donext=
++     elif [ $opt_in = "-compose" ]
++     then 
++       # if -compose and not remote (aka no lockfile)
++       if [ ! -z $LOCK_FILE ]
++       then 
++         next=compose
++         donext=true
++       else
++          MOZ_ARGS="$MOZ_ARGS $opt_in"
++	  donext=
++       fi
++     else
++       MOZ_ARGS="$MOZ_ARGS $opt_in"
++       donext=
++     fi
++  else 
++     # here come the transforming commands
++     if [ "$next" = "compose" ]
++     then
++        # cut off protocol
++        mail_to=$(expr match "$opt_in" "mailto:\(.*\)")
++	"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' "mailto($mail_to)"
++	exit $?
++     fi
++     donext=
++     next=
++  fi
++done
++
++if test -z "$MOZ_ARGS" -a -n "$LOCK_FILE"; then
++  MOZ_ARGS="-remote xfeDoCommand(openInbox)"
++fi
++
+ export MRE_HOME
+ eval "set -- $moreargs"
+ 
+@@ -233,9 +352,10 @@
+ 
+ if [ $debugging = 1 ]
+ then
+-  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
++  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $LOCALE_ARGS $MOZ_ARGS@
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
++"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $LOCALE_ARGS $MOZ_ARGS
++
+ exitcode=$?
+ 
+ ## Stop addon scripts
--- mozilla-thunderbird-1.5.orig/debian/patches.old/90_mail_components_miration_src_nsSeamonkeyProfileMigrator_cpp.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/90_mail_components_miration_src_nsSeamonkeyProfileMigrator_cpp.dpatch
@@ -0,0 +1,77 @@
+#!/bin/sh -e
+## 90_mail_components_miration_src_nsSeamonkeyProfileMigrator_cpp.dpatch by Alexander Sack <asac@jwsdot.com> : fixes debbug 285728
+##
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp.orig	2005-06-12 15:32:06.541760762 +0000
++++ mozilla/mail/components/migration/src/nsSeamonkeyProfileMigrator.cpp	2005-06-12 15:33:54.317400924 +0000
+@@ -697,27 +697,30 @@
+       mTargetProfile->Clone(getter_AddRefs(targetNewsRCFile));
+       targetNewsRCFile->Append(NEWS_DIR_50_NAME); 
+ 
+-      // turn the pref into a nsILocalFile
+-      nsCOMPtr<nsILocalFile> srcNewsRCFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
+-      srcNewsRCFile->SetPersistentDescriptor(nsDependentCString(pref->stringValue));
+-
+-      // now make the copy
+-      PRBool exists; 
+-      srcNewsRCFile->Exists(&exists);
+-      if (exists)
+-      {
+-        nsAutoString leafName;
+-        srcNewsRCFile->GetLeafName(leafName);
+-        srcNewsRCFile->CopyTo(targetNewsRCFile,leafName); // will fail if we've already copied a newsrc file here
+-        targetNewsRCFile->Append(leafName);
+-
+-        // now write out the new descriptor
+-        nsCAutoString descriptorString;
+-        nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(targetNewsRCFile);
+-        localFile->GetPersistentDescriptor(descriptorString);
+-        nsCRT::free(pref->stringValue);
+-        pref->stringValue = ToNewCString(descriptorString);
+-      }      
++      // don't do it if newsrc.file is 0
++      if (pref->stringValue) 
++      {  
++       // turn the pref into a nsILocalFile
++       nsCOMPtr<nsILocalFile> srcNewsRCFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID);
++       srcNewsRCFile->SetPersistentDescriptor(nsDependentCString(pref->stringValue));
++       // now make the copy
++       PRBool exists; 
++       srcNewsRCFile->Exists(&exists);
++       if (exists)
++       {
++          nsAutoString leafName;
++          srcNewsRCFile->GetLeafName(leafName);
++          srcNewsRCFile->CopyTo(targetNewsRCFile,leafName); // will fail if we've already copied a newsrc file here
++          targetNewsRCFile->Append(leafName);
++
++          // now write out the new descriptor
++          nsCAutoString descriptorString;
++          nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(targetNewsRCFile);
++          localFile->GetPersistentDescriptor(descriptorString);
++          nsCRT::free(pref->stringValue);
++          pref->stringValue = ToNewCString(descriptorString);
++        }      
++      }
+     }
+   }
+ 
--- mozilla-thunderbird-1.5.orig/debian/patches.old/70_gtk-settings-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/70_gtk-settings-patch.dpatch
@@ -0,0 +1,115 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/widget/src/gtk2/nsDragService.cpp.orig	2004-02-05 02:04:20.000000000 +0100
++++ mozilla/widget/src/gtk2/nsDragService.cpp	2004-02-05 02:04:28.000000000 +0100
+@@ -41,7 +41,8 @@
+ #include <gtk/gtkinvisible.h>
+ #include <gdk/gdkx.h>
+ #include "nsCRT.h"
+-
++#include "nsIPrefService.h"
++#include "nsIPrefBranch.h"
+ 
+ static PRLogModuleInfo *sDragLm = NULL;
+ 
+@@ -74,8 +75,13 @@
+ {
+     // We have to destroy the hidden widget before the event loop stops
+     // running.
++    nsCOMPtr<nsIPrefService> prefs = do_GetService("@mozilla.org/preferences-service;1");
++    PRInt32 dnd_threshold=-1;
++    PRInt32 double_click_timeout=-1;
++
+     nsCOMPtr<nsIObserverService> obsServ =
+         do_GetService("@mozilla.org/observer-service;1");
++
+     obsServ->AddObserver(this, "quit-application", PR_FALSE);
+ 
+     // our hidden source widget
+@@ -101,6 +107,63 @@
+     mTargetDragDataReceived = PR_FALSE;
+     mTargetDragData = 0;
+     mTargetDragDataLen = 0;
++
++    if (prefs) {
++        nsresult rv; 
++        nsCOMPtr<nsIPrefBranch> prefBranch;
++        prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
++        if (prefBranch) {
++            PRInt32 tmp = -1;
++            PRInt32 tmp1 = -1;
++            rv = prefBranch->GetIntPref("widget.gtk2.dnd.threshold", &tmp);
++            if(!NS_FAILED(rv) && tmp>0) {
++                dnd_threshold = tmp;
++            }
++
++            rv = prefBranch->GetIntPref("widget.gtk2.double_click_timeout", &tmp);
++            if(!NS_FAILED(rv) && tmp>0) {
++                double_click_timeout = tmp;
++            }
++        }
++    }
++
++
++
++    // MAKE gtk settings below 
++
++    GtkSettings* settings = gtk_settings_get_default();
++
++    /* DEBUG output */
++    {
++        gint double_click;
++        g_object_get(
++                     G_OBJECT(settings), 
++                     "gtk-double-click-time", &double_click,
++                     NULL
++                     );
++        printf("DOUBLE-CLICK: %d --> %d ",double_click, double_click_timeout);
++    }
++
++
++    {
++        gint threshold;
++        g_object_get(
++                     G_OBJECT(settings), 
++                     "gtk-dnd-drag-threshold", &threshold,
++                     NULL
++                     );
++        printf("THRESHOLD: %d --> %d ", threshold, dnd_threshold);
++    }
++    /**/
++
++
++    if(dnd_threshold>-1) {
++        gtk_settings_set_long_property(settings, "gtk-dnd-drag-threshold", dnd_threshold , "someline");
++    }
++
++    if(double_click_timeout>-1) {
++        gtk_settings_set_long_property(settings, "gtk-double-click-time", double_click_timeout, "someline");
++    }
+ }
+ 
+ nsDragService::~nsDragService()
--- mozilla-thunderbird-1.5.orig/debian/patches.old/50_hppa-build-fix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/50_hppa-build-fix.dpatch
@@ -0,0 +1,152 @@
+#!/bin/sh -e
+## 50_hppa-build-fix.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -ru mozilla.orig/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/include/pr/_linux.cfg
+--- mozilla.orig/nsprpub/pr/include/md/_linux.cfg       Sat Jul 29 02:38:00 2000
++++ mozilla/nsprpub/pr/include/md/_linux.cfg    Sat Sep 29 19:37:40 2001
+@@ -408,6 +408,51 @@
+ #define PR_ALIGN_OF_INT64   4
+ #define PR_ALIGN_OF_FLOAT   4
+ #define PR_ALIGN_OF_DOUBLE  4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
++#elif defined(__hppa__)
++
++#undef  IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN    1
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
+ #define PR_ALIGN_OF_POINTER 4
+ #define PR_ALIGN_OF_WORD    4
+
+diff -ru mozilla.orig/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg
+--- mozilla.orig/nsprpub/pr/include/md/_linux.cfg       Sat Jul 29 02:38:00 2000
++++ mozilla/nsprpub/pr/include/md/_linux.cfg    Sat Sep 29 19:37:40 2001
+@@ -408,6 +408,51 @@
+ #define PR_ALIGN_OF_INT64   4
+ #define PR_ALIGN_OF_FLOAT   4
+ #define PR_ALIGN_OF_DOUBLE  4
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
++#elif defined(__hppa__)
++
++#undef  IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN    1
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
+ #define PR_ALIGN_OF_POINTER 4
+ #define PR_ALIGN_OF_WORD    4
+
+diff -ru mozilla.orig/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
+--- mozilla/security/coreconf/Linux.mk.org	Tue Oct  9 15:14:09 2001
++++ mozilla/security/coreconf/Linux.mk	Tue Oct  9 15:15:20 2001
+@@ -70,8 +70,13 @@
+ 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
+ 	CPU_ARCH        = sparc
+ else
++ifeq ($(OS_TEST),parisc)
++       OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
++       CPU_ARCH        = hppa
++else
+ 	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+ 	CPU_ARCH	= x86
++endif
+ endif
+ endif
+ endif
--- mozilla-thunderbird-1.5.orig/debian/patches.old/gdk_property_get.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/gdk_property_get.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 90_gcc4_fix.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urN mozilla.orig/gfx/src/gtk/nsScreenGtk.cpp mozilla/gfx/src/gtk/nsScreenGtk.cpp
+--- mozilla.orig/gfx/src/gtk/nsScreenGtk.cpp	2004-04-20 19:35:51.000000000 +0200
++++ mozilla/gfx/src/gtk/nsScreenGtk.cpp	2005-07-17 18:35:57.000000000 +0200
+@@ -143,7 +143,7 @@
+   if (!gdk_property_get(root_window,
+                         gdk_atom_intern ("_NET_WORKAREA", FALSE),
+                         cardinal_atom,
+-                        0, G_MAXLONG, FALSE,
++                        0, G_MAXLONG - 3, FALSE,
+                         &type_returned,
+                         &format_returned,
+                         &length_returned,
--- mozilla-thunderbird-1.5.orig/debian/patches.old/10_debian-basemail-unix.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/10_debian-basemail-unix.dpatch
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+## debian/patches/10_debian-branding.dpatch by  <alex@personalfree.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/config/basemail-unix.orig	2004-05-03 01:06:45.000000000 +0200
++++ mozilla/mail/config/basemail-unix	2004-05-03 01:07:38.000000000 +0200
+@@ -2,7 +2,7 @@
+ ; Base Thunderbird Package File for Linux
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+-[thunderbird]
++[mozilla-thunderbird]
+ 
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ; Mail Specific Files
+@@ -321,8 +321,8 @@
+ 
+ ; core platform files
+ regxpcom
+-thunderbird-bin
+-mozilla-xremote-client
++mozilla-thunderbird-bin
++mozilla-thunderbird-xremote-client
+ components/libappcomps.so
+ components/autocomplete.xpt
+ components/jsdservice.xpt
--- mozilla-thunderbird-1.5.orig/debian/patches.old/20_mozilla_in-patch.dpatch.sav
+++ mozilla-thunderbird-1.5/debian/patches.old/20_mozilla_in-patch.dpatch.sav
@@ -0,0 +1,169 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/app/mozilla.in.orig	2004-04-18 15:03:20.000000000 +0200
++++ mozilla/mail/app/mozilla.in	2004-04-18 15:03:30.000000000 +0200
+@@ -72,6 +72,7 @@
+ #uncomment for debugging
+ #set -x
+ 
++CMDLINE="$@"
+ moz_libdir=%MOZAPPDIR%
+ MRE_HOME=%MREDIR%
+ 
+@@ -146,6 +147,120 @@
+   esac
+ done
+ 
++HOOKS=`find $dist_bin/startup-hooks.d/* 2>/dev/null`
++for i in $HOOKS; do
++  $i
++done
++
++
++LOCALES_DIR=/var/lib/mozilla-thunderbird/locales.d/
++MOZLOCALE=""                                                                               
++LOCALES=$(cat $LOCALES_DIR/* | sed -e "s/#.*$//" | grep -v ^$)
++DEFAULT_LOCALE=$(cat $LOCALES_DIR/* | sed -e "s/#.*$//" | grep -v ^$| 
++head -n 1)
++                                                                                
++# try all locales to match exactly
++for locale in $LOCALES; do
++   # break if already set
++                                                                                
++   lang=$(expr "$locale" : "\(.*\):.*")
++   COUNTRY=$(expr "$locale" : ".*\:\(.*\)")
++   SYSLOCALE="$lang""_$COUNTRY"
++                                                                                
++   MATCHED=$(expr "$LANG" : ".*\($SYSLOCALE\).*")
++                                                                                
++   #echo matched: $MATCHED
++   if test "x$MATCHED" != "x"; then
++        MOZLOCALE="$lang-$COUNTRY"
++        export MOZLOCALE
++   fi
++                                                                                
++   if test "x$MOZLOCALE" != "x"; then
++        break;
++   fi
++done
++                                                                                
++# match locales only with LANGUAGE
++for locale in $LOCALES; do
++   if test "x$MOZLOCALE" != "x"; then
++        break
++   fi
++                                                                                
++   lang=$(expr "$locale" : "\(.*\):.*")
++   COUNTRY=$(expr "$locale" : ".*\:\(.*\)")
++   SYSLOCALE="$lang""_$COUNTRY"
++                                                                                
++   MATCHED=$(expr "$LANG" : "\($lang.*\)")
++                                                                                
++   #echo matched2: $MATCHED
++   if test "x$MATCHED" != "x"; then
++        MOZLOCALE="$lang-$COUNTRY"
++        export MOZLOCALE
++   fi
++done
++                                                                                
++# set absolut default locale
++if test "x$MATCHED" = "x"; then
++   lang=$(expr "$DEFAULT_LOCALE" : "\(.*\):.*")
++   COUNTRY=$(expr "$DEFAULT_LOCALE" : ".*\:\(.*\)")
++   MOZLOCALE="$lang-$COUNTRY"
++   export MOZLOCALE
++fi
++                                                                                
++echo selected locale: $MOZLOCALE
++                                                                                
++LOCALE_ARGS="-contentLocale $MOZLOCALE -UILocale $MOZLOCALE"
++
++LOCK_FILE=`find $HOME/.mozilla-thunderbird/ -name lock` 
++
++MOZ_ARGS=
++donext=
++
++for opt_in in $CMDLINE
++do
++  if [ -z $donext ]
++  then 
++     if [ "$opt_in" = "-contentLocale" ]
++     then
++       # let the command line eat the env determined value
++       LOCALE_ARGS=
++       next=
++       donext=
++     elif [ "$opt_in" = -UILocale ]
++     then
++       # let the command line eat the env determined value
++       LOCALE_ARGS=
++       next=
++       donext=
++     elif [ $opt_in = "-compose" ]
++     then 
++       # if -compose and not remote (aka no lockfile)
++       if [ ! -z $LOCK_FILE ]
++       then 
++         next=compose
++         donext=true
++       else
++          MOZ_ARGS="$MOZ_ARGS $opt_in"
++	  donext=
++       fi
++     else
++       MOZ_ARGS="$MOZ_ARGS $opt_in"
++       donext=
++     fi
++  else 
++     # here come the transforming commands
++     if [ "$next" = "compose" ]
++     then
++        # cut off protocol
++        mail_to=$(expr match "$opt_in" "mailto:\(.*\)")
++        MOZ_ARGS="$MOZ_ARGS -remote mailto($mail_to)"
++     fi
++     donext=
++     next=
++  fi
++done
++
++
+ export MRE_HOME
+ eval "set -- $moreargs"
+ 
+@@ -154,9 +269,10 @@
+ 
+ if [ $debugging = 1 ]
+ then
+-  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
++  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $LOCALE_ARGS $MOZ_ARGS@
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
++"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $LOCALE_ARGS $MOZ_ARGS
++
+ exitcode=$?
+ 
+ ## Stop addon scripts
--- mozilla-thunderbird-1.5.orig/debian/patches.old/21_mozilla_in-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches.old/21_mozilla_in-patch.dpatch
@@ -0,0 +1,131 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/app/mozilla.in.bak	2004-09-26 20:07:03.000000000 -0400
++++ mozilla/mail/app/mozilla.in	2004-09-30 18:16:04.401169369 -0400
+@@ -72,7 +72,6 @@
+ #uncomment for debugging
+ #set -x
+ 
+-CMDLINE="$@"
+ moz_libdir=%MOZAPPDIR%
+ MRE_HOME=%MREDIR%
+ 
+@@ -164,7 +163,7 @@
+ done #last arg
+ 
+ for i in "$@"; do
+-	[ $i = ${_optLast} ] && break
++	[ "$i" = "${_optLast}" ] && break
+ 	_optOthers="${_optOthers} ${i}"
+ done #others arg
+ 
+@@ -221,7 +220,9 @@
+       shift 2
+       ;;
+     *)
+-      moreargs="$moreargs \"$1\""
++      # Protect quotes and $ in command-line arguments from two shell evals
++      moreargs="$moreargs \"$(echo "$1" | sed -e 's/"/\\\\\\\"/g' \
++                                          -e 's/[$]/\\\\\\\$/g')\""
+       shift 1
+       ;;
+   esac
+@@ -295,9 +296,10 @@
+ MOZ_ARGS=
+ donext=
+ 
+-for opt_in in $CMDLINE
++eval "set -- $moreargs"
++for opt_in in "$@"
+ do
+-  if [ -z $donext ]
++  if [ -z "$donext" ]
+   then 
+      if [ "$opt_in" = "-contentLocale" ]
+      then
+@@ -311,19 +313,19 @@
+        LOCALE_ARGS=
+        next=
+        donext=
+-     elif [ $opt_in = "-compose" ]
++     elif [ "$opt_in" = "-compose" -o "$opt_in" = "-mail" ]
+      then 
+        # if -compose and not remote (aka no lockfile)
+-       if [ ! -z $LOCK_FILE ]
++       if [ ! -z "$LOCK_FILE" ]
+        then 
+          next=compose
+          donext=true
+        else
+-          MOZ_ARGS="$MOZ_ARGS $opt_in"
++          MOZ_ARGS="$MOZ_ARGS \"$opt_in\""
+ 	  donext=
+        fi
+      else
+-       MOZ_ARGS="$MOZ_ARGS $opt_in"
++       MOZ_ARGS="$MOZ_ARGS \"$opt_in\""
+        donext=
+      fi
+   else 
+@@ -331,8 +333,10 @@
+      if [ "$next" = "compose" ]
+      then
+         # cut off protocol
+-        mail_to=$(expr match "$opt_in" "mailto:\(.*\)")
+-	"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' "mailto($mail_to)"
++	mail_to="$(expr match "$opt_in" "mailto:\(.*\)")"
++	MOZ_ARGS="\"mailto($mail_to)\""
++	eval "set -- $MOZ_ARGS"
++	"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' "$@"
+ 	exit $?
+      fi
+      donext=
+@@ -340,21 +344,21 @@
+   fi
+ done
+ 
+-if test -z "$MOZ_ARGS" -a -n "$LOCK_FILE"; then
++if test -z "$MOZ_ARGS" && test -n "$LOCK_FILE"; then
+   MOZ_ARGS="-remote xfeDoCommand(openInbox)"
+ fi
+ 
+ export MRE_HOME
+-eval "set -- $moreargs"
++eval "set -- $MOZ_ARGS"
+ 
+ ## Start addon scripts
+ moz_pis_startstop_scripts "start"
+ 
+ if [ $debugging = 1 ]
+ then
+-  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $LOCALE_ARGS $MOZ_ARGS@
++  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $LOCALE_ARGS "$@"@
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $LOCALE_ARGS $MOZ_ARGS
++"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $LOCALE_ARGS "$@"
+ 
+ exitcode=$?
+ 
--- mozilla-thunderbird-1.5.orig/debian/update-mozilla-thunderbird-chrome
+++ mozilla-thunderbird-1.5/debian/update-mozilla-thunderbird-chrome
@@ -0,0 +1,175 @@
+#!/bin/sh
+
+set -e
+
+umask 022
+
+echo -n "Updating mozilla-thunderbird chrome registry..."
+
+if [ "$1" = "-v" ]; then
+    VERBOSE=1
+    RM_FLAGS="-v"
+    MV_FLAGS="-v"
+    INSTALL_FLAGS="-v"
+    echo
+fi
+
+unset MOZILLA_FIVE_HOME || :
+MOZILLA_FIVE_HOME=/usr/lib/mozilla-thunderbird
+export MOZILLA_FIVE_HOME
+
+# PATH
+PATH=/usr/lib/mozilla-thunderbird:$PATH
+export PATH
+
+# added /usr/lib : don't load your local library
+LD_LIBRARY_PATH=/usr/lib/mozilla-thunderbird${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
+
+# fake home to capture .thunderbird
+HOME=`mktemp -d /tmp/mozilla-thunderbird-pkg.XXXXXX`
+export HOME
+
+/sbin/ldconfig
+
+VARDIR=/var/lib/mozilla-thunderbird
+LIBDIR=/usr/lib/mozilla-thunderbird
+EXTDIR=${VARDIR}/extensions.d
+DATADIR=${VARDIR}/chrome.d
+
+# cleaning VARDIR
+rm ${RM_FLAGS} -fr ${VARDIR}/chrome ${VARDIR}/components ${VARDIR}/extensions/*
+
+# cleaning LIBDIR
+rm ${RM_FLAGS} -rf ${LIBDIR}/chrome/overlayinfo
+rm ${RM_FLAGS} -f  ${LIBDIR}/chrome/*.rdf
+rm ${RM_FLAGS} -f  ${LIBDIR}/components/*.dat
+rm ${RM_FLAGS} -f  ${LIBDIR}/components.ini
+rm ${RM_FLAGS} -f  ${LIBDIR}/defaults.ini
+
+# purge ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt symlink
+# we used to create
+if [ -L ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt ]; then
+  rm ${RM_FLAGS} -f ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt
+fi
+
+# create VARDIR
+install ${INSTALL_FLAGS} -d ${VARDIR}/chrome/overlayinfo
+install ${INSTALL_FLAGS} -d ${VARDIR}/components
+
+# create symlinks to LIBDIR
+ln -sf ${VARDIR}/chrome/overlayinfo ${LIBDIR}/chrome/overlayinfo
+ln -sf ${VARDIR}/extensions/installed-extensions.txt \
+    ${LIBDIR}/extensions
+
+# purge installed-extensions-processed.txt
+rm ${RM_FLAGS} -f ${LIBDIR}/extensions/installed-extensions-processed.txt
+
+# purge Extensions.rdf
+rm ${RM_FLAGS} -f ${LIBDIR}/extensions/Extensions.rdf
+
+# Handle extensions {uid} directories (for compatibility purpose with
+# previously packaged extensions):
+# remove those that are symlinks pointing to nowhere
+# and remove those that are directory and are in defaults/profile/extensions
+for f in `find ${LIBDIR}/extensions/ -maxdepth 1 -name '{*}'`; do
+    if [ -L $f ] && [ ! -e $f ]; then
+        rm ${RM_FLAGS} -f $f
+    elif [ ! -L $f ] && [ -d $f ] && [ -d ${LIBDIR}/defaults/profile/extensions/`basename $f` ]; then
+        rm ${RM_FLAGS} -rf $f
+    elif [ -d "$f" ]; then
+      # remove empty chrome directories
+      [ -d "${f}/chrome" ] && rmdir ${RM_FLAGS} --ignore-fail-on-non-empty ${f}/chrome
+      # remove Uninstall file, it will be recreated by thunderbird-bin -register
+      [ -f "$f/uninstall/Uninstall" ] && rm ${RM_FLAGS} ${f}/uninstall/Uninstall
+      # remove empty uninstall directory
+      [ -d "$f/uninstall" ] && rmdir ${RM_FLAGS} --ignore-fail-on-non-empty ${f}/uninstall
+      # remove empty extension directory
+      [ ! -L "$f" ] && rmdir ${RM_FLAGS} --ignore-fail-on-non-empty ${f}
+    fi
+done
+# create symlinks that are not already there
+for f in `find ${LIBDIR}/defaults/profile/extensions/ -maxdepth 1 -name '{*}'`; do
+    [ "${VERBOSE}" ] && echo "W: ${f} should be in ${LIBDIR}/extensions/" >&2
+    if [ ! -e ${LIBDIR}/extensions/`basename $f` ]; then
+        ln -s $f ${LIBDIR}/extensions
+    fi
+done
+
+# gen installed-extensions.txt
+TMPFILE=`tempfile`
+for f in `echo ${EXTDIR}/*.txt | sort`; do
+    while read line; do
+    	EXTUID=`echo ${line} | cut -f 2 -d ,`
+#	echo EEE $EXTUID ${EXTDIR}
+        EXTUIDDIR=${LIBDIR}/extensions/${EXTUID}
+        if [ -e ${EXTUIDDIR} ]; then
+	    if [ -e ${EXTUIDDIR}/install.rdf ]; then
+	        if grep ${EXTUID} ${EXTUIDDIR}/install.rdf 2>&1 > /dev/null; then
+	            echo $line >> ${TMPFILE}
+	        elif [ "${VERBOSE}" ]; then
+		    echo "W: ${f}: ${EXTUIDDIR}/install.rdf doesn't contain the UID." >& 2
+		fi
+	    elif [ "${VERBOSE}" ]; then
+	        echo "W: ${f}: ${EXTUIDDIR}/install.rdf doesn't exist." >&2
+	    fi
+	elif [ "${VERBOSE}" ]; then
+	    echo "W: ${f}: ${EXTUIDDIR} doesn't exist." >&2
+	fi
+    done < $f
+done
+
+mv ${MV_FLAGS} ${TMPFILE} ${VARDIR}/extensions/installed-extensions.txt
+chmod 0644 ${VARDIR}/extensions/installed-extensions.txt
+
+if [ "$VERBOSE" ]; then
+    for f in `find ${LIBDIR}/extensions/ -maxdepth 1 -name '{*}'`; do
+        if ! grep `basename $f` ${VARDIR}/extensions/installed-extensions.txt 2>&1 > /dev/null; then
+	    echo "W: `basename $f` not in ${VARDIR}/extensions/installed-extensions.txt" >&2
+	fi
+    done
+fi
+
+# gen
+mozilla-thunderbird-bin -register >/dev/null 2>&1 || echo "E: Registration process existed with status: $?" >&2
+
+if [ -e ${LIBDIR}/extensions/installed-extensions.txt ]; then
+    echo "E: ${LIBDIR}/extensions/installed-extensions.txt still present. Registration might have gone wrong." >&2
+fi
+
+# move and link
+for file in $(find ${LIBDIR}/components/*.dat 2> /dev/null); do
+    mv ${MV_FLAGS} ${file} ${VARDIR}/components/
+    ln -fs ${VARDIR}/components/`basename "${file}"` ${LIBDIR}/components/
+done
+
+for file in $(find ${LIBDIR}/chrome/*.rdf 2> /dev/null); do
+    mv ${MV_FLAGS} ${file} ${VARDIR}/chrome/
+    ln -fs ${VARDIR}/chrome/`basename "${file}"` ${LIBDIR}/chrome/
+done
+
+mv ${MV_FLAGS} ${LIBDIR}/defaults.ini ${VARDIR}/
+ln -fs ${VARDIR}/defaults.ini ${LIBDIR}/
+
+mv ${MV_FLAGS} ${LIBDIR}/components.ini ${VARDIR}/
+ln -fs ${VARDIR}/components.ini ${LIBDIR}/
+
+mv ${MV_FLAGS} ${LIBDIR}/extensions/Extensions.rdf ${VARDIR}/extensions/
+ln -fs ${VARDIR}/extensions/Extensions.rdf ${LIBDIR}/extensions/
+
+# gen installed-chrome.txt
+TMPFILE=$HOME/installed-chrome.txt
+for f in `echo ${DATADIR}/* | sort`; do
+    cat $f >> ${TMPFILE}
+done
+
+mv ${MV_FLAGS} ${TMPFILE} ${VARDIR}/chrome/installed-chrome.txt
+chmod 0644 ${VARDIR}/chrome/installed-chrome.txt
+
+rm ${RM_FLAGS} -fr ${HOME}
+
+regchrome
+regxpcom
+
+# done
+echo done.
--- mozilla-thunderbird-1.5.orig/debian/overrides/CVS/Tag
+++ mozilla-thunderbird-1.5/debian/overrides/CVS/Tag
@@ -0,0 +1 @@
+TDEV_0_6
--- mozilla-thunderbird-1.5.orig/debian/overrides/CVS/Root
+++ mozilla-thunderbird-1.5/debian/overrides/CVS/Root
@@ -0,0 +1 @@
+:ext:alex@personalfree.com:/var/lib/cvs
--- mozilla-thunderbird-1.5.orig/debian/overrides/CVS/Repository
+++ mozilla-thunderbird-1.5/debian/overrides/CVS/Repository
@@ -0,0 +1 @@
+tbird-debian/overrides
--- mozilla-thunderbird-1.5.orig/debian/overrides/CVS/Entries
+++ mozilla-thunderbird-1.5/debian/overrides/CVS/Entries
@@ -0,0 +1,2 @@
+/mozilla-thunderbird/1.2/Thu Feb 19 19:24:03 2004//TDEV_0_6
+D
--- mozilla-thunderbird-1.5.orig/debian/overrides/mozilla-thunderbird
+++ mozilla-thunderbird-1.5/debian/overrides/mozilla-thunderbird
@@ -0,0 +1,2 @@
+mozilla-thunderbird: menu-icon-has-bad-colors
+mozilla-thunderbird: executable-not-elf-or-script
--- mozilla-thunderbird-1.5.orig/debian/messenger_jar_includes.csv
+++ mozilla-thunderbird-1.5/debian/messenger_jar_includes.csv
@@ -0,0 +1,10 @@
+content/messenger/*
+content/messenger-mapi/*
+content/messenger-mdn/*
+content/messenger-region/*
+content/messenger-smime/*
+content/messenger-views/*
+content/messenger/messengercompose/*
+content/editor/images/*
+content/messenger/addressbook/*
+content/messenger/migration/*
--- mozilla-thunderbird-1.5.orig/debian/clean-extensions.sh
+++ mozilla-thunderbird-1.5/debian/clean-extensions.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+CUR=$PWD
+rm -rf "$CUR/debian/tmp-enigmail/"
+
+cd extensions/ipc
+make clean distclean
+cd ../enigmail
+make clean distclean
+cd $CUR
--- mozilla-thunderbird-1.5.orig/debian/changelog
+++ mozilla-thunderbird-1.5/debian/changelog
@@ -0,0 +1,1000 @@
+mozilla-thunderbird (1.5-0ubuntu3) dapper; urgency=low
+
+  * Revert pango support for now.  We appear to be calling into libpangoxft
+    without linking to it, and I don't have time this week to sort it out.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 20 Jan 2006 01:48:13 +1100
+
+mozilla-thunderbird (1.5-0ubuntu2) dapper; urgency=low
+
+  * Bring back some changes from previous versions, to improve the build:
+    - Compile with "-fno-strict-aliasing" by default.
+    - Disable Xprint support, it's ancient, deprecated, and broken.
+    - Enable Xinerama support (and adjust build-deps accordingly)
+  * Enable pango font rendering, since we use it everywhere else in GNOME.
+  * Add 10_visibility_hidden_patch.dpatch, stealing a fix from firefox
+    for the powerpc build failure triggered by wrapping system includes.
+  * Add -fno-unsigned-char, since the source seems heavily x86-centric.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 19 Jan 2006 17:41:01 +1100
+
+mozilla-thunderbird (1.5-0ubuntu1) dapper; urgency=low
+
+  * Special thanks to Alexander Sack for help with this upload of 1.5:
+    - Removed extension template bits from packaging directories.
+    - Removed -offline extension; this is now completely integrated.
+    - Disable all patches except for those that are obviously needed,
+      please file bugs if run into any nasty regressions due to this.
+    - Use upstream startup script in the hope that it's now fixed.
+    - Branding removed for now; will sort out Debian/Ubuntu branding
+      in the build system between UVF and Feature Freeze.
+  * Based completely on the Debian packages for now, any Ubuntu-specific
+    tweaks will be merged back in over the next few weeks, one by one.
+  * A tarball release of "mozsdk-thunderbird" (for which Alexander Sack
+    is upstream) still needs to be made before enigmail can be built out
+    of tree.  For now, this means that upgrading will remove enigmail.
+  * (NOTE: Because this is an intentionally generic/vanilla build of the
+    Thunderbird sources right now, the prebuilt enigmail binaries from
+    http://enigmail.mozdev.org/download.html will work fine as a stopgap)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 19 Jan 2006 10:42:36 +1100
+
+mozilla-thunderbird (1.0.7-3) unstable; urgency=high
+
+  * apply backported patch for amd64 (Closes: 332481,332484)
+    Thanks to Martin Sarsale <martin@malditainternet.com>
+    for testing and preparing the patch
+    + debian/patches/91_gcc4_imgLoader.fix.dpatch
+  * updated vietnam translation contributed by  Clytie Siddall
+    <clytie@riverland.net.au> (Closes: 324224)
+  * added swedish translation contributed by  Daniel Nylander
+    <yeager@lidkoping.net> (Closes: 331606)
+
+ -- Alexander Sack <asac@debian.org>  Mon, 17 Oct 2005 23:30:00 +0100
+
+mozilla-thunderbird (1.0.7-2) unstable; urgency=high
+
+  * still high to indicate that security bugs have not been
+    fixed in etch.
+  * apply debian/patches/90_xptcinvoke_arm.dpatch to fix ftbfs on
+    arm/sid
+
+ -- Alexander Sack <asac@debian.org>  Mon, 10 Oct 2005 19:00:00 +0100
+
+mozilla-thunderbird (1.0.7-1) unstable; urgency=high
+  * MFSA-2005-57: IDN heap overrun
+    Summary: Tom Ferris reported a Firefox crash when processing a domain
+	     name consisting solely of soft-hyphen characters.
+    Closes: -
+    CVE-Ids: CAN-2005-2871
+    Bugzilla: 307259    
+    Issues addressed:
+      + CAN-2005-2871 - IDN heap overrun
+  * MFSA-2005-58: Accumulated vendor advisory for multiple vulnerabilities
+    Summary: Fixes for multiple vulnerabilities with an overall severity
+	     of "critical" have been released in Mozilla Firefox 1.0.7 and
+	     the Mozilla Suite 1.7.12
+    Closes: -
+    CVE-Ids: CAN-2005-2701 CAN-2005-2702 CAN-2005-2703 CAN-2005-2704
+	     CAN-2005-2705 CAN-2005-2706 CAN-2005-2707
+    Bugzilla: 300936 296134 297078 302263 299518 303213 304754 306261
+	      306804 291178 300853 301180 302100    
+    Issues addressed:
+      + CAN-2005-2701 - Heap overrun in XBM image processing
+      + CAN-2005-2702 - Crash on "zero-width non-joiner" sequence
+      + CAN-2005-2703 - XMLHttpRequest header spoofing
+      + CAN-2005-2704 - Object spoofing using XBL <implements>
+      + CAN-2005-2705 - JavaScript integer overflow
+      + CAN-2005-2706 - Privilege escalation using about: scheme
+      + CAN-2005-2707 - Chrome window spoofing
+      + Regression fixes
+  * MFSA-2005-59: Command-line handling on Linux allows shell execution
+    -> was addressed in 1.0.6-4 already. Reverting upstream changes
+        to mozilla/mail/mozilla.in by copying debian/mozilla.in_1.0.6 over
+        to allow our patches to still apply. debian/patches/01_old_mozilla.in.dpatch
+
+ -- Alexander Sack <asac@debian.org>  Sat, 1 Oct 2005 17:00:00 +0100
+
+mozilla-thunderbird (1.0.6-4) unstable; urgency=high
+
+  * now using bash to overcome possible security flaws of
+    our thunderbird start script (mozilla-thunderbird). Patch
+    by  Florian Weimer <fw@deneb.enyo.de> 
+    debian/mfsa_2005-59.debian.patch (Closes: 329664, 329667)
+  * added patch 50_ftbfs_alpha+arm+ia64_325536_fix.dpatch
+    to build on alpha, arm, and ia64 that now uses 
+    __attribute__((used)) instead of ((unused)) by
+    Steve Langasek <vorlon@debian.org>
+    (Closes: 325536)
+  * fix debsums error reported by Y Giridhar Appaji Nag
+    <debian@appaji.net>. Now removing files in postrm.
+    Further moved /usr/lib/mozilla-thunderbird/chrome/chrome.rdf
+    to the /var/... adding a link to the new location. 
+    (Closes: 292475)
+  * added depends for system libs: mng, png, jpeg to not build with
+    unmaintained image included libs.
+  * modified 21_mozilla_in-patch.dpatch to recognize -mail as a -compose
+    alias. This makes thunderbird work well with current gnome default
+    mailto: command for thunderbird. Thanks to Sam Morris <sam@robots.org.uk>
+    for the workaround patch (Closes: 330168)
+  * still work left: fix window.open(); overlay problem. 
+    added rejar-chrome.sh <jarbasename> util script below debian. It
+    rejars .jar files by extracting paths given in
+    <jarbasename>_jar_includes.csv from the <jarbasename>.jar zip file 
+    and zipping only those files to a new jar file again. Anyway, still
+    broken, thus disabled for this build.
+    (See: 306522)
+ 
+ -- Alexander Sack <asac@debian.org>  Mon, 23 Sep 2005 17:00:00 +0100
+
+mozilla-thunderbird (1.0.6-3) unstable; urgency=low
+
+  * remove gcc-3.4 from amd64 build ... this time for sure
+    (Closes: 320723)
+  * remove special optimization flags for other archs too
+
+ -- Alexander Sack <asac@debian.org>  Mon, 2 Aug 2005 17:00:00 +0100
+
+mozilla-thunderbird (1.0.6-2) unstable; urgency=low
+
+  * remove gcc-3.4 from amd64 build (Closes: 320723)
+  * added arabic po translation by Mohammed Adnène Trojette
+    <adn+deb@diwi.org> (Closes: 320771)
+
+ -- Alexander Sack <asac@debian.org>  Mon, 1 Aug 2005 17:00:00 +0100
+
+mozilla-thunderbird (1.0.6-1) unstable; urgency=high
+
+  * GCC/G++ 4.0 API transition upload.
+  * include 90_new_freetype_fix.dpatch to fix new freetype API 
+      (Closes: 301481, 301481) - consumed from mozilla-firefox packages ... 
+      thx to Eric Dorland <eric@debian.org>
+  * include 90_gcc4_fix.dpatch
+  * fixes multiple security bugs (Closes: 318728)
+      CAN-2005-2270: Code execution through shared function objects
+      CAN-2005-2269: XHTML node spoofing
+      CAN-2005-2266: Same origin violation: frame calling top.focus()
+      CAN-2005-2265: Possible exploitable crash in InstallVersion.compareTo()
+      CAN-2005-2261: XML scripts ran even when Javascript disabled
+      CAN-2005-1532: Privilege escalation via non-DOM property overrides
+      CAN-2005-1160: Privilege escalation via DOM property overrides
+      CAN-2005-1159: Missing Install object instance checks
+      CAN-2005-0989: Javascript "lambda" replace exposes memory contents
+  * fix gdk_property_get problem that might cause a segfault (Closes: 317937)
+      patch by Loic Minier <lool@dooz.org>
+      debian/patches/gdk_property_get.dpatch
+  * fix CAN-2005-2353: insecure tmp file usage in run-mozilla.sh (Closes: 306893)
+      debian/patches/20_run-mozilla_sh_306893_fix.dpatch
+  * include german de.po translation (Closes: 318747)
+      by Alwin Meschede <ameschede@gmx.de>
+  * fixed whitespace in mozilla-thunderbird.templates (Closes: 308961)
+      hint by Clytie Siddall <clytie@riverland.net.au>
+  * apply fix for seamonkey migration crash (Closes: 285728)
+      90_mail_components_miration_src_nsSeamonkeyProfileMigrator_cpp 
+  * fix 'find' in update-mozilla-thunderbird-chrome (Closes: 315588)
+      patch by Michael Spang <mspang@twcny.rr.com>
+
+ -- Alexander Sack <asac@debian.org>  Thu, 21 Jul 2005 21:00:00 +0100
+
+mozilla-thunderbird (1.0.2-3) unstable; urgency=high
+
+  * last maybe sarge upload with urgency high, contains only
+    translations (po files + gnome .desktop file lines)
+     + cs translation by Jan Outrata <outrataj@upcase.inf.upol.cz>
+       (Closes: 309023)
+     + fi translation by Matti P�ll� <mpo@iki.fi>
+       (Closes: 303805)
+     + ja translation by Kenshi Muto <kmuto@debian.org>
+       (Closes: 307005)
+     + pt_BR translation by Andre Luis Lopes <andrelop@debian.org>
+       (Closes: 304261)
+     + vi translation by Clytie Siddall <clytie@riverland.net.au>
+       (Closes: 308959)
+     + added missed translation entries in gnome .desktop files 
+       for it, ko, pl 
+
+ -- Alexander Sack <asac@debian.org>  Thu, 02 Jun 2005 22:00:00 +0100
+
+mozilla-thunderbird (1.0.2-2) unstable; urgency=low
+
+  * fixed TYPO in 71_extensionManagerAutoReRegister.dpatch,
+    probably causing #302218 (Closes: 302218)
+  * extended patch 71_extensionManagerAutoReRegister.dpatch,
+    now checking components.ini timestamp instead of
+    compreg.dat timestamp. removing components.ini compreg.dat
+    and XUL.mfasl if global Extensions.rdf file is newer then
+    components.ini. Probably helping to fix #302218 too.
+  * renamed xprt-xprintorg recommends to xprint (Closes: 300975)
+  * (re-)enabled pref extension (Closes: 302130)
+
+ -- Alexander Sack <asac@debian.org>  Thu, 31 Mar 2005 07:00:00 +0100
+
+mozilla-thunderbird (1.0.2-1) unstable; urgency=medium
+  * new upstream version  (Closes: 301542) fixes some 
+    security issues according to upstream
+    (http://www.mozilla.org/projects/security/known-vulnerabilities.html)
+    1.0.2 fixes the following security related issues.
+  
+     MFSA 2005-30  GIF heap overflow parsing Netscape extension 2
+     MFSA 2005-25 Image drag and drop executable spoofing
+     MFSA 2005-21 Overwrite arbitrary files downloading .lnk twice
+     MFSA 2005-18 Memory overwrite in string library
+     MFSA 2005-17 Install source spoofing with user:pass@host
+     MFSA 2005-15 Heap overflow possible in UTF8 to Unicode conversion
+
+ -- Alexander Sack <asac@debian.org>  Sun, 27 Mar 2005 16:00:00 +0100
+
+mozilla-thunderbird (1.0-4) unstable; urgency=low
+
+  * removed not needed build-deps: csh
+  * included debconf (and gnome .desktop file) translations for 
+    various languages: (Closes: 292072, 294622, 291477, 292507)
+     + debian/po/fr.po (Mohammed Adn�ne TROJETTE <adn+deb@diwi.org>, 
+       Aurelien Jarno <aurel32@debian.org>)
+     + debian/po/nl.po (Luk Claes <luk.claes@ugent.be>)
+     + debian/po/ca.po (Jordi Mallach <jordi@debian.org>)
+     + debian/po/ko.po (Yooseong Yang <yooseong@debian.org>)
+     + debian/po/it.po (Vittorio Palmisano <redclay@email.it>)
+     + debian/po/pl.po (Robert Luberda <robert@debian.org>)
+  * fixed startscript problem
+    - updated 21_mozilla_in-patch.dpatch - thanks to 
+    Kevin B. McCarty <kmccarty@Princeton.EDU>
+  * moved code of component debCleanComp.js to
+    nsExtensionManager, so it can automatically restart the 
+    application if needed.
+    This should again lower the probabilty that
+    some upgrade, downgrade of thunderbird or extensions
+    breaks the chrome or component registry in your profile
+    dir.
+
+ -- Alexander Sack <asac@debian.org>  Sun, 13 Mar 2005 13:00:00 +0100
+
+mozilla-thunderbird (1.0-3) unstable; urgency=low
+
+  * first upload to official archive for tbird 1.0
+    (first since 0.9-6)
+  * finally I decided to upload this package to unstable,
+    though there is a debian-legal discussion going on
+    about the mozilla trademark. Since it might take some
+    time until a solution is found, I decided to upload
+    as usual.
+  * started to debrand the app to 'Debian Thunderbird'
+
+ -- Alexander Sack <asac@debian.org>  Sun, 16 Jan 2005 14:00:00 +0100
+
+mozilla-thunderbird (1.0-2) unstable; urgency=low
+
+  * Uninstall file and dummy-empty-file must not be empty
+  * Included latest patch for extension manager
+  * Included Jaap Haitsma icons (Closes: 257640)
+  * fixed regression compared to 0.9-6 official package
+    that had problems to build because empty files where
+    not included in diff.gz
+
+ -- Alexander Sack <asac@debian.org>  Fri, 10 Dec 2004 23:00:00 +0100
+ 
+mozilla-thunderbird (1.0-1) unstable; urgency=low
+
+  * new upstream release - 1.0 (Closes: 284560)
+  * includes new icons as default theme
+  * changed start.html page to not use the mozilla partical
+    in the package naming. This app is now officially called 
+    'Debian Thunderbird'
+  * removed -O from sparch arch (See: 284532)
+  * README.Debian improved
+  * adapted new manpage inspired by Ralf Katz <ralph.katz@rcn.com>
+       
+ -- Alexander Sack <asac@debian.org>  Tue, 08 Dec 2004 12:00:00 +0100
+
+mozilla-thunderbird (0.9-7) unstable; urgency=low
+
+  * added debconf capability to define what browser
+    integration is wanted
+    -> added /etc/mozilla-thunderbird/auto-config.js
+    to store automatically generated configs by debconf
+       
+ -- Alexander Sack <asac@debian.org>  Thu, 24 Nov 2004 12:00:00 +0100
+
+mozilla-thunderbird (0.9-6) unstable; urgency=low
+
+  * fixed bug in preinst script by strictly testing
+    the existance of files before invoking mv 
+    operations (Closes: 282186)
+  * fixed stupid upgrade bug in preinst script.
+    ls uses now -d to produce no garbage when
+    used as source for moving. This closes
+    a bug reported against enigmail, but is a
+    bug of the thunderbird package. This release
+    fixes it (Closes: 282505)
+  * still missing reply for current grave bug 
+    282506. I think this is due to the initial
+    upgrade problems. Those problem should not
+    occur anymore with the fixes of this packages
+    upgrade mechanism (Closes: 282506)
+       
+ -- Alexander Sack <asac@debian.org>  Thu, 24 Nov 2004 12:00:00 +0100
+
+mozilla-thunderbird (0.9-5) unstable; urgency=low
+
+  * added patch by Kevin B. McCarty <kmccarty@Princeton.EDU>
+    adds In-Reply-To mailto: link capability (Closes: 268055)
+  * late verification of bug fixed by preview package:
+      fixes: message editor steals keyboard focus (Closes: 274313)
+      
+ -- Alexander Sack <asac@debian.org>  Thu, 18 Nov 2004 12:00:00 +0100
+
+mozilla-thunderbird (0.9-4) unstable; urgency=low
+
+  * fixed upgrade bug - when /usr/lib/mozilla-thunderbird/extensions
+    is a link, remove it and create a directory for it! After that
+    move all extensions from /var/lib/mozilla-thunderbird/extensions
+    to the new folder.
+  * added example firefox-config.js.tmpl to use the new wrapper 
+    script. This config should only be used if you are in a non
+    gconf capable window environment, e.g. pure openbox, etc.
+    See the README.Debian for further details on howto integrate
+    thunderbird properly.
+  * added uninstall and extension directory for default theme 
+    extension. This should make it possible to remove the package
+    cleanly.
+  * Bug#280254: mozilla-thunderbird: Please package 
+        thunderbird 0.9 (Closes: 280076)
+  * patch by Kevin McCarty <kmccarty@Princeton.EDU>, fixes
+        Subject munging if thunderbird is running (Closes: 263971)
+  * fixed: typo in welcome message for preview pane (Closes: 278690)
+  * thx to bug submitters that verified the fix of the following
+    bugs in my preview package at people.debian.org:
+     +  Bug#277304: mozilla-thunderbird: thunderbird dies silently on 
+           some mails (Closes: 277304)
+     +  no sound when new mail arrives (Closes: 274044)
+     +  Focus Problem when a filter is selected (Closes: 272157)
+     +  "Get Mail" button fails intermittently on additional accounts
+        (Closes: 280482)
+  * added patch to fix /tmp/ file permissions during processing of
+    imap directory (Closes: 280363)
+  * cleaning up compreg.dat on Extensions.rdf change, so after 
+    restart all troubles with this issue are gone (Closes: 273213)
+  * Already since 0.9-1, but I forgot to mention:
+      + set default smtp server option should work now
+          (Closes: 274177)
+      + with view filter: unread on, newly read messages are
+        not removed from the message list anymore (Closes: 275708)
+  * other bugs resolved by upstream:
+      + problems while threads refresh (Closes: 239203)
+      + Shortcuts conflict with ISO 14755 (Closes: 246916)
+
+ -- Alexander Sack <asac@debian.org>  Mon, 15 Nov 2004 22:45:00 +0100
+
+mozilla-thunderbird (0.9-3) unstable; urgency=low
+
+  * rm -f /usr/lib/mozilla-thunderbird/extensions
+    in postinst if it is a link! After that move 
+    stuff from /var/lib/mozilla-thunderbird/extensions
+    to /usr/lib/mozilla-thunderbird/extensions.
+    The rest will be done by update-mozilla-thunderbird-chrome
+
+ -- Alexander Sack <asac@debian.org>  Thu, 11 Nov 2004 22:45:00 +0100
+
+mozilla-thunderbird (0.9-2) unstable; urgency=low
+
+  * fixed bad bug in mozilla-thunderbird.install,
+  	that removed the fulls extensions dir
+  * fixed broken upgrade problem due to 
+  	mozilla-thunderbird-inspector that tried to 
+        install resource files under /usr/lib/.../res,
+        but that is a link. Now storing under /usr/share/
+
+ -- Alexander Sack <asac@debian.org>  Wed, 10 Nov 2004 22:00:00 +0100
+
+mozilla-thunderbird (0.9-1) unstable; urgency=low
+  
+  * new upstream version (0.9)
+  * include patch amd64:
+  	by Frederik Schueler <fs@lowpingbastards.de>
+	  -> use gcc-3.4,g++3.4 (Closes: 261365)
+  * pasting issues partially fixed (See: 279656)
+  * Local Folders needed, cannot be deleted anymore
+  	(Closes: 226253)
+  * including great patch of Mike Hommey <mh@glandium.org>
+    who brought the final fix for the extension manager
+    problems; changed update-mozilla-thunderbird-chrome
+    according to the new -register capability
+
+ -- Alexander Sack <asac@debian.org>  Wed, 10 Nov 2004 20:00:00 +0100
+
+mozilla-thunderbird (0.8-3) unstable; urgency=medium
+  
+  * respin for new binutils version (Closes: 273354)
+  * removing essential and build-essential build 
+    dependencies to: base-files, libc6-dev
+  * update-mozilla-thunderbird-chrome: output of find(s)
+    to /dev/null (Closes: 267661)
+  * included mozilla-thunderbird-compose script in docs 
+    section
+
+ -- Alexander Sack <asac@debian.org>  Sat, 26 Sep 2004 13:00:00 +0100
+
+mozilla-thunderbird (0.8-2) unstable; urgency=medium
+
+  * include good build_id during build fixes
+    upgrade problems
+      (Closes: 272175, 272182)
+  * fixed some startup-script regressions. Remote
+    commands are almost ready by upstream. Only 
+    -compose argument is interpreted in a debian
+    specific way. Of course, locale settings
+    are still debian specific too.
+  * improved changelog to list important notes
+    for upgrading to 0.8
+  * 10_mips_optimization_patch.dpatch: 
+      thiemo seufers mips(el) workaround
+      removing CFLAGS="$CFLAGS -Wa,-xgot" and
+      CXXFLAGS="$CXXFLAGS -Wa,-xgot" and adding
+      inline when DEBUG is true (Closes: 272162).
+
+ -- Alexander Sack <asac@debian.org>  Sat, 18 Sep 2004 21:00:00 +0100
+
+mozilla-thunderbird (0.8-1) unstable; urgency=medium
+  
+  * new upstream version 0.8
+  * fixes various security issues in sarge and sid
+       (Closes: 263752)
+  * hacked a tiny patch for nsExtensionManager.js.in bug that
+    lets thunderbird (and firefox) loop on startup if 
+    launched with non-root account.
+
+ -- Alexander Sack <asac@debian.org>  Fri, 17 Sep 2004 10:00:00 +0100
+
+mozilla-thunderbird (0.7.3-6) unstable; urgency=high
+
+  * still fixes the security bug in sarge (see #263752) 
+    ... thus urgency=high
+  * applied 50_mozilla-thunderbird-xpcom-xptcall-mips.dpatch
+    provided by Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>
+    (Closes: 267017)
+  * removed <boll@debian.org> as Uploader as he expressed
+    that he has no more time to co-maintaining this package.
+    Thanks for your work!
+
+ -- Alexander Sack <asac@debian.org>  Sun, 12 Sep 2004 17:30:00 +0100
+
+mozilla-thunderbird (0.7.3-5) unstable; urgency=high
+
+  * ping tbird to find a running instance instead of searching
+    for lock file that could still be there after a crash (redone)
+    (Closes: 267144)
+  * still fixes the security bug in sarge ... thus urgency=high
+
+ -- Alexander Sack <asac@debian.org>  Thu, 21 Aug 2004 14:00:00 +0100
+
+mozilla-thunderbird (0.7.3-4) unstable; urgency=high
+
+  * ping tbird to find a running instance instead of searching
+    for lock file that could still be there after a crash
+    (Closes: 267144)
+  * still fixes the security bug in sarge ... thus urgency=high
+
+ -- Alexander Sack <asac@debian.org>  Thu, 21 Aug 2004 14:00:00 +0100
+
+mozilla-thunderbird (0.7.3-3) unstable; urgency=high
+
+  * extended patch for mips: 50_xpcom_xptcall_xptcstubs_asm_mips_s
+    (Closes: 266851)
+  * still fixes the security bug in sarge ... thus urgency=high
+
+ -- Alexander Sack <asac@debian.org>  Thu, 19 Aug 2004 17:00:00 +0100
+
+mozilla-thunderbird (0.7.3-2) unstable; urgency=high
+
+  * included patch for mips: 50_xpcom_xptcall_xptcstubs_asm_mips_s
+  * made global-config.js more up to date (Closes: 261815)
+  * recommend myspell-en-us | myspell-dictionary (Closes: 265272)
+  * enigmail is now suggested and not recommended anymore
+  * still fixes the security bug in sarge ... thus urgency=high
+
+ -- Alexander Sack <asac@debian.org>  Wed, 18 Aug 2004 16:00:00 +0100
+
+mozilla-thunderbird (0.7.3-1) unstable; urgency=high
+
+  * new upstream release 0.7.3 - fixes security issues
+    (Closes: 263752)
+  * changed maintainer email to debian address
+  * removing /var/lib/mozilla-thunderbird dir on purge 
+    (Closes: 260212).
+  * reverting gcc-3.2 and g++-3.2 for hppa architecture to back to 
+    default gcc/g++ compiler
+  * fixed package description of mozilla-thunderbird-inspector and
+    mozilla-thunderbird-offline (Closes: 260374, 260376)
+  * plain mozilla-thunderbird now opens Inbox window to front
+    instead of profile manager when already running (Closes: 259476)
+
+ -- Alexander Sack <asac@debian.org>  Wed, 04 Aug 2004 20:00:00 +0100
+
+mozilla-thunderbird (0.7.1-3) unstable; urgency=low
+
+  * updated README.Debian to be more specific
+    on the lost profile workaround!
+  * added 10_profile_migration.dpatch to fix
+    profile migration issues (Closes: 258741, 258747)
+  * updated .desktop file Comment (Closes: 257596)
+  * trying gcc-3.2 and g++-3.2 for hppa architecture
+
+ -- Alexander Sack <asac@jwsdot.com>  Tue, 13 Jul 2004 11:00:00 +0100
+
+mozilla-thunderbird (0.7.1-2) unstable; urgency=low
+
+  * added 10_profile_migration.dpatch to fix
+    profile migration issues (Closes: 258741, 258747)
+  * updated .desktop file Comment (Closes: 257596)
+  * trying gcc-3.2 and g++-3.2 for alpha and amd64 
+    architecture
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 12 Jul 2004 11:00:00 +0100
+
+mozilla-thunderbird (0.7.1-1) unstable; urgency=low
+  
+  * new upstream source 0.7.1 (Closes: 257320, 256843)
+  * fixed broken theme ID 
+  * include extension descriptions and set them
+    to locked
+  * fixed typo in branding patch ( Hompage ->Homepage )
+  * included movemail for handling local mail (Closes: 219893)
+  * provides new mozilla-thunderbird-dev
+  * does not build enigmail anymore. enigmail has got its
+    own source package for now. Hopefully this package will
+    build soon against mozilla-mailnews and mozilla-thunderbird,
+    so only one package is needed for both.
+  * update-mozilla-thunderbird-chrome: LD_LIBRARY_PATH bug fixed 
+    (Closes: 254144)
+  * verified that -compose mailto:email@host.com works (Closes: 252261)
+  * include upgrade info in README.debian. Documented
+    new global-config.js file in README.debian too (Closes: 253315)
+  * crash on corrupt bmp fixed by upstream (Closes: 248857)
+  * added Provides: mail-reader, imap-client (Closes: 257199)
+  * renamed menu entry to 'Thunderbird Mail' (Closes: 257596)
+ 
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 5 Jul 2004 11:00:00 +0100
+
+mozilla-thunderbird (0.7.1-0.0.asac1) unstable; urgency=low
+  
+  * new upstream source 0.7.1
+  * fixed broken theme ID 
+  * include extension descriptions and set them
+    to locked
+  * fixed typo in branding patch ( Hompage ->Homepage )
+  * included movemail for handling local mail
+ 
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 1 Jul 2004 11:00:00 +0100
+
+mozilla-thunderbird (0.7-0.0.asac1) unstable; urgency=low
+  
+  * new upstream source 0.7
+  * provides new mozilla-thunderbird-dev
+  * does not build enigmail anymore. enigmail has got its
+    own source package for now. Hopefully this package will
+    build soon against mozilla-mailnews and mozilla-thunderbird,
+    so only one package is needed for both.
+  * update-mozilla-thunderbird-chrome: LD_LIBRARY_PATH bug fixed 
+    (Closes: 254144)
+  * verified that -compose mailto:email@host.com works (Closes: 252261)
+  * include upgrade info in README.debian (Closes: 253315)
+  * crash on corrupt bmp fixed by upstream (Closes: 248857)
+ 
+ -- Alexander Sack <asac@jwsdot.com>  Wed, 23 Jun 2004 11:00:00 +0100
+
+mozilla-thunderbird (0.6-asac1) unstable; urgency=low
+  
+  * new binary package for development files 
+    mozilla-thunderbird-dev
+  * mozilla-thunderbird now Provides: mail-reader and imap-client
+ 
+ -- Alexander Sack <asac@jwsdot.com>  Tue, 08 Jun 2004 15:00:00 +0100
+
+mozilla-thunderbird (0.6-3) unstable; urgency=low
+  
+  * added libx11-dev, libxp-dev, libxt-dev to Build-Depends
+  * removed xlibs-dev from Build-Depends
+  * fixed typo in starting screen (Closes: 249850)
+  * removed duplicate readme file (Closes: 247162)
+  * added readme file upgrade note to remove the
+    chrome.rdf in the users profile directory after
+    upgrade.
+ 
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 03 Jun 2004 00:20:00 +0100
+
+mozilla-thunderbird (0.6-2) unstable; urgency=low
+
+  * Fix missing build-dep on xlibs-dev, causing FTBFS errors 
+    (closes: Bug#251166)
+
+ -- Soeren Boll Overgaard <boll@debian.org>  Fri, 28 May 2004 11:02:07 +0000
+
+mozilla-thunderbird (0.6-1) unstable; urgency=low
+  * accumulated changelog: 0.6-0.1rc1 + 0.6-0.1rc2
+  * repackaged upstream source tarball to not-include 
+    non-free icons of the trademarked new branding
+  * changed menu icon size to 32x32
+  * added suggestions for mozilla-thunderbird-typeaheadfind
+    mozilla-thunderbird-offline and mozilla-thunderbird-inspector
+  * new upstream version: 0.6
+  * MAP users can now benefit from support for the IMAP IDLE command
+    which allows the mail server to push notifications such as new 
+    mail arriving as soon as it arrives (Closes: 232544)
+  * Thunderbird supports server wide news filters that apply to all 
+    news groups on a server
+  * Mail filters can now mark messages as junk
+  * Offline support is now available as an extension package
+    (Closes: 231920)
+  * Command line parsing problems fixed (Closes: 232342)
+  * Find broken in view source is fixed (Closes: 232580)
+  * Alerts and crash when deleting multiple nested 
+    folders inside the trash folder is fixed (Closes: 237705, 244414)
+  * shift-c selects all as read (Closes: 245039)
+  * menu hint changed to mail (Closes: 246211)
+  * Alt-A selects all messages (Closes: 229518)
+  * typeahead find extension added as extra package 
+    (Closes: 232562)
+  * suggesting mozilla-firefox now (Closes: 240708, 234918)
+  * changed mozilla-thunderbird.xpm to envelope with flames
+    (Closes: 243028)
+  * new enigmail upstream version included (0.86.6),
+    (Closes: 235553)
+  * now bulding with -O2 on all platforms, but ia64, arm,
+    sparc, alpha, powerpc
+  * global enigmail config file now in 
+     /etc/mozilla-thunderbird/pref/enigmail.js
+  * new binary targets: 
+     mozilla-thunderbird-inspector,
+     mozilla-thunderbird-offline, 
+     mozilla-thunderbird-typeaheadfind
+  * restructured conffiles: now a single global config
+    file exists: /etc/mozilla-thunderbird/global-config.js, 
+    which may be used by admins to make their 
+    preconfigurations.
+    Old config files in /etc/mozilla-thunderbird/pref 
+    will be reserved till next --purge
+
+ -- Alexander Sack <asac@jwsdot.com>  Sat, 08 May 2004 08:45:00 +0100
+
+mozilla-thunderbird (0.5+.040427-1) unstable; urgency=low
+
+  * new snapshot of 040427
+  * added build depend: libgnomevfs2-dev
+  * increased debian policy standard version to 3.6.1
+
+ -- Alexander Sack <asac@jwsdot.com>  Tue, 27 Apr 2004 12:45:00 +0100
+
+mozilla-thunderbird (0.5+.040418-1) unstable; urgency=low
+
+  * new snapshot of 040418
+  * changed desktop icon to envelope with flames (Closes: 243028)
+
+ -- Alexander Sack <asac@jwsdot.com>  Sun, 18 Apr 2004 12:45:00 +0100
+
+mozilla-thunderbird (0.5+.040412-1) unstable; urgency=low
+
+  * new snapshot of 040412
+  * Updated enigmail to 0.83.6 
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 12 Apr 2004 01:37:00 +0100
+
+mozilla-thunderbird (0.5+.040330-1) unstable; urgency=low
+
+  * new snapshot of 040320
+  * Updated enigmail to 0.83.5 (Closes: 235553)
+
+ -- Alexander Sack <asac@jwsdot.com>  Tue, 30 Mar 2004 17:30:20 +0100
+
+mozilla-thunderbird (0.5-4) unstable; urgency=low
+
+  * reenabled hppa patch, which apparently led to FTBFS on hppa
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 04 Mar 2004 21:30:20 +0100
+
+mozilla-thunderbird (0.5-3) unstable; urgency=medium
+
+  * preinst added to allow clean upgrade path to this
+      (Closes: 234118, Closes: 234267)
+  * added prerm script to allow a clean remove of package
+
+ -- Alexander Sack <asac@jwsdot.com>  Sun, 29 Feb 2004 10:30:20 +0100
+
+mozilla-thunderbird (0.5-2) unstable; urgency=low
+
+  * new source package layout!! Now using orig.tar.gz with diff.gz 
+    (Closes: 232055)
+  * moved arch-indep chrome stuff to /usr/share/mozilla-thunderbird/chrome
+  * moved images to /usr/share/mozilla-thunderbird/res 
+      /usr/share/mozilla-thunderbird/icons 
+      /usr/share/mozilla-thunderbird/chrome/icons
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 19 Feb 2004 19:30:20 +0100
+
+mozilla-thunderbird (0.5-1.1) unstable; urgency=low
+
+  * new source package layout!! Now using orig.tar.gz with diff.gz
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 11 Feb 2003 19:30:20 +0100
+
+mozilla-thunderbird (0.5-1) unstable; urgency=low
+
+ Aggregated changes since 0.4-1:
+  * new upstream release 0.5 included
+  * added xprt-xprintorg to Recommends (Closes: 226626)
+  * upgraded enigmail to 0.83.2 (Closes: 228678)
+      + includes a workaround for mozilla bug
+          leading to a crash in rare situations 
+	  (fixed in 0.82.6)
+  * improved package structure. Sources now are included as original archives
+        & are extracted to build-dir. (Closes: 225033)
+  * Minor wording changes in package description, pointed out by
+      Mark Stevenson.
+  * New debianization of appearance (branding)
+  * added switches for pref.js config entries for 
+	individual doubleclick timeout & drag threshold 
+	settings in gtk2 (Closes: 229146)
+  
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 09 Feb 2003 19:30:20 +0100
+
+mozilla-thunderbird (0.5-0.1) unstable; urgency=low
+
+  * preview of thunderbird-0.5 rc2
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 07 Feb 2003 19:30:20 +0100
+
+mozilla-thunderbird (0.4-1.6) unstable; urgency=low
+
+  * added basic gtk settings as mozilla prefs:
+    +	widget.gtk2.dnd.threshold - treshold in pixel before a drag starts
+    +   widget.gtk2.double_click_timeout - 
+		maximum time in milliseconds between two clicks 
+		to become recognized as double-click e.g. to get 
+		rid of unexpected folder moves, etc.
+  * upgraded enigmail to 0.83.2
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 05 Feb 2003 10:30:20 +0100
+
+mozilla-thunderbird (0.4-1.5) unstable; urgency=low
+
+  * added xprt-xprintorg to Recommends
+  * upgraded enigmail to 0.83.1
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 04 Feb 2003 10:30:20 +0100
+
+mozilla-thunderbird (0.4-1.4) unstable; urgency=low
+
+  * improved package structure. Sources now are included as original archives
+      & are extracted to build-dir. (Closes: 225033)
+  * late checkin. Already uploaded to mentors
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 27 Jan 2003 10:30:20 +0100
+
+mozilla-thunderbird (0.4-1.31) unstable; urgency=low
+
+  * Minor wording changes in package description, pointed out by
+    Mark Stevenson.
+
+ -- Soeren Boll Overgaard <boll@debian.org>  Wed, 14 Jan 2004 12:46:23 +0000
+
+mozilla-thunderbird (0.4-1.3) unstable; urgency=low
+
+  * further debinized branding. updated 10_debian-branding patch
+  * do not use MOZILLA_FIVE_HOME. Always set the MOZILLA_FIVE_HOME 
+    correctly. -> This is not anymore mozilla suite, so it is obsolete.
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 06 Jan 2003 10:30:20 +0100
+
+mozilla-thunderbird (0.4-1.2) unstable; urgency=low
+
+  * updated enigmail to 0.82.6 - includes a workaround for mozilla bug
+  	leading to a crash.
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 30 Dec 2003 20:30:20 +0100
+
+mozilla-thunderbird (0.4-1.1) unstable; urgency=low
+
+  * switched to .orig.tgz file approach
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 12 Dec 2003 00:30:20 +0100
+
+mozilla-thunderbird (0.4-1) unstable; urgency=low
+
+  * version for first debian official upload of 0.4
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 12 Dec 2003 00:30:20 +0100
+
+mozilla-thunderbird (0.4-0.3) unstable; urgency=low
+
+  * updated latest enigmail source to version 0.82.5
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 12 Dec 2003 00:30:20 +0100
+
+mozilla-thunderbird (0.4-0.2) unstable; urgency=low
+
+  * added locale support: default locale is en-US
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 12 Dec 2003 00:30:20 +0100
+
+mozilla-thunderbird (0.4-0.1) unstable; urgency=low
+
+  * upgraded official 0.4 release
+  * browser integration works on gnome/kde
+  * new mozilla-theme
+  * latest engimail included
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 10 Nov 2003 00:30:20 +0100
+
+mozilla-thunderbird (0.3-7) unstable; urgency=low
+
+  * added patches for hppa & alpha, arm & mips specfic stuff. took the patches from 
+    the debian mozilla package
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 10 Nov 2003 00:30:20 +0100
+
+mozilla-thunderbird (0.3-6) unstable; urgency=low
+
+  * added patch to switch from ex to sed which certainly won't 
+    have terminal problems
+  * added .desktop file for menu integration in gnome, kde, etc.
+
+ -- Alexander Sack <asac@jwsdot.com>  Sun,  2 Nov 2003 22:23:40 +0100
+
+
+mozilla-thunderbird (0.3-5) unstable; urgency=low
+
+  * Alexander Sack:
+    - added build depend nvi.
+  * Søren Boll Overgaard
+    - added dependency on gnupg for enigmail.
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 29 Oct 2003 21:00:59 +0200
+
+mozilla-thunderbird (0.3-4) unstable; urgency=low
+
+  * Søren Boll Overgaard:
+    - Improve wording in long descriptions.
+    - Fix dependency problem of the enigmail-package.
+
+ -- Søren Boll Overgaard <boll@debian.org>  Tue, 28 Oct 2003 17:08:55 +0100
+
+mozilla-thunderbird (0.3-3) unstable; urgency=low
+
+  * Build-depend on m4
+  * Actually do something in binary-arch
+  * asac: Applied Patch for myspell issue (closes: Bug#217555)
+  * fixed mozilla-thunderbird.sgml according to docbook DTD (closes: Bug#217708)
+
+ -- Søren Boll Overgaard <boll@debian.org>  Sun, 26 Oct 2003 23:24:25 +0100
+
+mozilla-thunderbird (0.3-2) unstable; urgency=low
+
+  * Build-depend on dpatch.
+
+ -- Søren Boll Overgaard <boll@debian.org>  Sun, 26 Oct 2003 13:26:31 +0100
+
+mozilla-thunderbird (0.3-1) unstable; urgency=low
+
+   * Make my name look right in Uploaders.
+   * Change version to one suited to Debian.
+   * Update standards version to 3.6.1 (No changes).
+
+ -- Søren Boll Overgaard <boll@debian.org>  Sun, 26 Oct 2003 09:38:24 +0000
+
+mozilla-thunderbird (0.3-0.3) unstable; urgency=low
+
+  * readded forgotten patch hunks
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 24 Oct 2003 09:00:59 +0200
+
+mozilla-thunderbird (0.3-0.2) unstable; urgency=low
+
+  * New upstream release 
+  * latest patches of mozilla-thunderbird-0.2-3 are included
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 21 Oct 2003 20:55:59 +0200
+
+mozilla-thunderbird (0.2-3) unstable; urgency=low
+
+  * fixed sudo bug (closes: Bug#216469)
+  * repackaging because of enigmail build exception
+
+ -- Alexander Sack <asac@jwsdot.com>  Wed, 15 Oct 2003 17:56:50 +0000
+
+mozilla-thunderbird (0.2-2) unstable; urgency=low
+
+  * Don't limit archs to i386.
+
+ -- Søren Boll Overgaard <boll@debian.org>  Sat, 18 Oct 2003 10:27:05
+	+0000
+
+mozilla-thunderbird (0.2-1) unstable; urgency=low
+
+  * restarted versioning for official debian upload
+  * Uploaded by S. Boll Overgaard <boll@debian.org>
+         - Closes thunderbird ITP (closes: Bug#196504)
+
+ -- Alexander Sack <asac@jwsdot.com>  Wed, 15 Oct 2003 17:56:50 +0000 
+
+
+mozilla-thunderbird (0.3-0.1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 16 Oct 2003 10:51:59 +0200
+
+mozilla-thunderbird (0.2asac-5) unstable; urgency=low
+
+  * some more lintian cleaning of source package
+  * added boll@debian.org as co-maintainer
+  * reduction of build depends redundancy
+
+ -- Alexander Sack <asac@jwsdot.com>  Wed, 15 Oct 2003 17:56:50 +0000
+
+mozilla-thunderbird (0.2asac-4) unstable; urgency=low
+
+  * minimized build-depends & removed version constraints from build-deps to ease backporting
+  * added lintian override
+  * added long description for enigmail
+  * adjusted preference directory to $HOME/.mozilla-thunderbird
+
+ -- Alexander Sack <asac@jwsdot.com>  Mon, 13 Oct 2003 20:53:45 +0000
+
+mozilla-thunderbird (0.2asac-3) unstable; urgency=low
+
+  * needed to get the the source archive up again :( 
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu,  9 Oct 2003 18:51:01 +0200
+
+mozilla-thunderbird (0.2asac-2) unstable; urgency=high
+
+  * fixed the build procedure for enigmail binary package
+
+ -- Alexander Sack <asac@jwsdot.com>  Tue,  7 Oct 2003 23:04:01 +0200
+
+mozilla-thunderbird (0.2asac-1) unstable; urgency=low
+
+  * New upstream release
+  * added binary package mozilla-thunderbird-enigmail
+  * now update-chrome enabled
+  * startup hooks (currently for enigmail) allowed in
+    /var/lib/mozilla-thunderbird/startup-hooks.d
+
+ -- Alexander Sack <asac@jwsdot.com>  Fri,  3 Oct 2003 22:16:05 +0200
+
+mozilla-thunderbird (0.2-5) unstable; urgency=low
+
+  * changed menu entry image to gif image of size 32x32 -> lintian --check
+    tested
+  * added manual pages for mozilla-thunderbird & thunderbird
+  * remove mozilla-thunderbird-config from binary package
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu,  2 Oct 2003 02:30:44 +0200
+
+mozilla-thunderbird (0.2-4) unstable; urgency=low
+
+  * fixed conflict with snapshot build 
+
+
+ -- Alexander Sack <asac@jwsdot.com>  Wed,  1 Oct 2003 16:50:33 +0200
+
+mozilla-thunderbird (0.2-3) unstable; urgency=low
+
+  * apply quickfix for bug #212604 (bugzilla.mozilla.org)
+     -> firebird ist remote startable even if thunderbird is 
+     	running
+  * added basic man pages
+
+ -- Alexander Sack <asac@jwsdot.com>  Wed,  1 Oct 2003 12:21:04 +0200
+
+mozilla-thunderbird (0.2-2) unstable; urgency=low
+
+  * corrected menu entry command to thunderbird 
+
+ -- Alexander Sack <asac@jwsdot.com>  Thu, 25 Sep 2003 12:00:36 +0200
+
+mozilla-thunderbird (0.2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Alexander Sack <asac@jwsdot.com>  Wed, 24 Sep 2003 18:55:50 +0200
+
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-offline.dirs
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-offline.dirs
@@ -0,0 +1,5 @@
+tmp
+var/lib/mozilla-thunderbird/chrome.d
+var/lib/mozilla-thunderbird/extensions.d
+var/lib/mozilla-thunderbird/startup-hooks.d
+usr/lib/mozilla-thunderbird/extensions/offline@thelizards.debian.org
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-pm.desktop
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-pm.desktop
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Name=Thunderbird Profile Manager
+Comment=Select or Edit your profiles
+Exec=mozilla-thunderbird -P
+Terminal=false
+MultipleArgs=false
+Type=Application
+Icon=mozilla-thunderbird-pm-menu.xpm
+Categories=Application;Network
+Name[ca]=Gestor de perfils del Thunderbird
+Name[cs]=Správce profilů Thunderbird
+Name[pl]=Menadżer profili Thunderbirda
+Name[pt_BR]=Gerenciador de Perfis do Thunderbird
+Comment[ca]=Seleccioneu o editeu els vostres perfils
+Comment[cs]=Výběr a editace profilů
+Comment[de]=Profile auswählen und verwalten
+Comment[fr]=Sélectionner ou éditer vos profils
+Comment[it]=Selezionare o modificare i vostri profili
+Comment[ja]=あなたのプロファイルを選択または編集
+Comment[ko]=ÇÁ·ÎÆÄÀÏÀ» Œ±ÅÃÇϰųª ÆíÁýÇ϶ó
+Comment[pl]=Wybór oraz edycja profil
+Comment[pt_BR]=Selecione ou edite seus perfis
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-compose
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-compose
@@ -0,0 +1,36 @@
+#!/bin/sh 
+
+##############################################################
+# Command: mozilla-thunderbird-compose <uri>
+# Options:     uri : <empty>
+#                  : mailto:name@some.tld
+#                  : mailto:name@some.tld?Subject=SubjectText
+#
+# Author: Alexander Sack <asac@debian.org>
+##############################################################
+
+print_usage() {
+   echo " Usage: mozilla-thunderbird-compose [options] mailto:url"
+   echo "    e.g. mozilla-thunderbird-compose mailto:somemail@someaddress.tld"
+}
+
+_optOthers=
+_optLast=
+for i in "$@"; do
+   _optLast="${i}"
+done #last arg
+
+for i in "$@"; do
+   # break if last
+   [ "$i" = "${_optLast}" ] && break
+
+   # omit -compose
+   [ "$i" != "'-compose'" ] && _optOthers="${_optOthers} ${i}"
+done #others arg
+
+if test "$_optLast" = "-?" -o "$_optLast" = "--help"; then
+  print_usage
+  exit 1
+fi
+
+/usr/bin/mozilla-thunderbird ${_optOthers} -compose $_optLast
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-inspector.dirs
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-inspector.dirs
@@ -0,0 +1 @@
+usr/lib/mozilla-thunderbird/
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-typeaheadfind.postinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-typeaheadfind.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ] ; then
+ echo .
+fi
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-inspector.postrm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-inspector.postrm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+case "$1" in
+    abort-install|purge|remove)
+       if [ -e /usr/sbin/update-mozilla-thunderbird-chrome ]; then
+       echo .
+#	       update-mozilla-thunderbird-chrome
+       fi
+       ;;
+    *)
+       ;;
+esac
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/00_locale-en-US
+++ mozilla-thunderbird-1.5/debian/00_locale-en-US
@@ -0,0 +1 @@
+en:US
--- mozilla-thunderbird-1.5.orig/debian/00default-theme.txt
+++ mozilla-thunderbird-1.5/debian/00default-theme.txt
@@ -0,0 +1 @@
+theme,{972ce4c6-7e08-4474-a285-3208198ce6fd}
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-inspector.postinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-inspector.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ] ; then
+echo .
+# update-mozilla-thunderbird-chrome
+fi
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.postinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.postinst
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "configure" ] ; then
+
+    db_input medium mozilla-thunderbird/browser || true
+    db_go || true
+    db_get mozilla-thunderbird/browser || true
+
+    echo Returned debconf: $RET
+
+    if test "$RET" = "Debian"; then
+      W_BROWSER=x-www-browser
+      cat > /etc/mozilla-thunderbird/auto-config.js << EOF
+//####################################################//
+// AUTO generated config file. Don't touch this       //
+// use: dpkg-reconfigure mozilla-thunderbird          //
+//####################################################//
+
+pref("network.protocol-handler.app.http","$W_BROWSER");
+pref("network.protocol-handler.app.https","$W_BROWSER");
+
+EOF
+    else
+       cat > /etc/mozilla-thunderbird/auto-config.js << EOF
+//####################################################//
+// AUTO generated config file. Don't touch this       //
+// use: dpkg-reconfigure mozilla-thunderbird          //
+//####################################################//
+EOF
+    fi
+
+#    update-mozilla-thunderbird-chrome
+    if [ -x /usr/bin/update-menus ]; then update-menus; fi
+fi
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-dev.postrm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-dev.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case "$1" in
+    abort-install|purge|remove)
+       ;;
+    *)
+       ;;
+esac
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.manpages
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.manpages
@@ -0,0 +1,2 @@
+debian/mozilla-thunderbird.1
+debian/update-mozilla-thunderbird-chrome.8
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-dev.postinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-dev.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-dev.manpages
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-dev.manpages
@@ -0,0 +1 @@
+debian/mozilla-thunderbird-config.1
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-menu.xpm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-menu.xpm
@@ -0,0 +1,245 @@
+/* XPM */
+static char * mozilla_thunderbird_menu_xpm[] = {
+"32 32 210 2",
+"  	c None",
+". 	c #8F8064",
+"+ 	c #6C5F49",
+"@ 	c #51432D",
+"# 	c #7B6E58",
+"$ 	c #B1AA9C",
+"% 	c #BAB3A5",
+"& 	c #A39C8D",
+"* 	c #5D503B",
+"= 	c #8B7E66",
+"- 	c #918672",
+"; 	c #BCB6A9",
+"> 	c #BEB8AA",
+", 	c #C2BBAD",
+"' 	c #6D7CAA",
+") 	c #7280AA",
+"! 	c #857A69",
+"~ 	c #A39D93",
+"{ 	c #C4BEB1",
+"] 	c #C6C0B2",
+"^ 	c #C9C2B5",
+"/ 	c #44578C",
+"( 	c #C0C7DB",
+"_ 	c #FAFCFE",
+": 	c #DFE4F0",
+"< 	c #98A9DA",
+"[ 	c #6F7996",
+"} 	c #878992",
+"| 	c #9F9B93",
+"1 	c #ACA79C",
+"2 	c #CCC6B9",
+"3 	c #9B8D73",
+"4 	c #4F5C84",
+"5 	c #F1F6FD",
+"6 	c #DBE1ED",
+"7 	c #B1BCDB",
+"8 	c #8796C1",
+"9 	c #717EA7",
+"0 	c #7C849D",
+"a 	c #8E9098",
+"b 	c #A4A4AA",
+"c 	c #B6AFA0",
+"d 	c #A49981",
+"e 	c #918165",
+"f 	c #7A87AC",
+"g 	c #F5F9FE",
+"h 	c #B5C0DE",
+"i 	c #97A6D1",
+"j 	c #7685B1",
+"k 	c #858DA5",
+"l 	c #9195A3",
+"m 	c #9D9B9B",
+"n 	c #A7A299",
+"o 	c #918978",
+"p 	c #6C6F7D",
+"q 	c #B8C2D8",
+"r 	c #EBF2FD",
+"s 	c #D1DBF2",
+"t 	c #BBC7E8",
+"u 	c #A8B8E1",
+"v 	c #8D9CCA",
+"w 	c #68708B",
+"x 	c #616D91",
+"y 	c #E2E9F7",
+"z 	c #E9EFFC",
+"A 	c #B0B6C1",
+"B 	c #838389",
+"C 	c #AEA083",
+"D 	c #746C5E",
+"E 	c #E7F0FE",
+"F 	c #DEE9FE",
+"G 	c #ADB3C3",
+"H 	c #99968D",
+"I 	c #AB9B7C",
+"J 	c #B3A484",
+"K 	c #9E9175",
+"L 	c #63646B",
+"M 	c #9DA9C9",
+"N 	c #DAE5FD",
+"O 	c #E3ECFD",
+"P 	c #9A9691",
+"Q 	c #C0AF87",
+"R 	c #A7997E",
+"S 	c #A19274",
+"T 	c #D5C9AB",
+"U 	c #BBB099",
+"V 	c #CAD3E6",
+"W 	c #D6E1FC",
+"X 	c #C4B38D",
+"Y 	c #9B8C6F",
+"Z 	c #CEC2A3",
+"` 	c #A4957A",
+" .	c #CDDAF4",
+"..	c #94918E",
+"+.	c #C9B994",
+"@.	c #94856A",
+"#.	c #D8CBAE",
+"$.	c #DDD3BA",
+"%.	c #DBD0B5",
+"&.	c #B1A68B",
+"*.	c #998E7A",
+"=.	c #C8D4EE",
+"-.	c #D0DBFB",
+";.	c #7E8592",
+">.	c #313940",
+",.	c #6C614E",
+"'.	c #BDB090",
+").	c #E0D6BD",
+"!.	c #C3B8A0",
+"~.	c #9C9EA6",
+"{.	c #BAC5E4",
+"].	c #CAD6F8",
+"^.	c #C7D3F5",
+"/.	c #9FA8C4",
+"(.	c #898787",
+"_.	c #645B48",
+":.	c #0C21AB",
+"<.	c #484754",
+"[.	c #897A5E",
+"}.	c #E6DDC8",
+"|.	c #E8DFCA",
+"1.	c #908A83",
+"2.	c #ABB6D3",
+"3.	c #A3ADCB",
+"4.	c #8E98B1",
+"5.	c #B6AB94",
+"6.	c #253293",
+"7.	c #102CE9",
+"8.	c #4A4647",
+"9.	c #7E725A",
+"0.	c #817259",
+"a.	c #EBE4D2",
+"b.	c #ADA189",
+"c.	c #4A4D4D",
+"d.	c #24476C",
+"e.	c #3C4449",
+"f.	c #C1B69B",
+"g.	c #33409E",
+"h.	c #1130F9",
+"i.	c #1022A0",
+"j.	c #3D3E3B",
+"k.	c #7B6C53",
+"l.	c #E3D9C3",
+"m.	c #E8E0CC",
+"n.	c #F1EBDB",
+"o.	c #F9F5E9",
+"p.	c #165EAA",
+"q.	c #787D7F",
+"r.	c #D2CEC4",
+"s.	c #868886",
+"t.	c #0B77EB",
+"u.	c #524C3F",
+"v.	c #5D584C",
+"w.	c #7F7766",
+"x.	c #393848",
+"y.	c #0F5096",
+"z.	c #04294F",
+"A.	c #73644B",
+"B.	c #D9CEB2",
+"C.	c #A6A196",
+"D.	c #2B5D91",
+"E.	c #0C80FB",
+"F.	c #26394A",
+"G.	c #0F3C75",
+"H.	c #1A257A",
+"I.	c #404A4D",
+"J.	c #0851A0",
+"K.	c #F5F0E1",
+"L.	c #859097",
+"M.	c #1A4571",
+"N.	c #0960BC",
+"O.	c #0E5DB1",
+"P.	c #16406C",
+"Q.	c #0A68CC",
+"R.	c #0F2ADA",
+"S.	c #0E219E",
+"T.	c #6A5B43",
+"U.	c #A99C84",
+"V.	c #7E898F",
+"W.	c #0958AD",
+"X.	c #0D23BB",
+"Y.	c #64553E",
+"Z.	c #D2C5A8",
+"`.	c #EEE8D6",
+" +	c #424E59",
+".+	c #0B2AAB",
+"++	c #D1C4A4",
+"@+	c #0B71DC",
+"#+	c #05255E",
+"$+	c #092A8C",
+"%+	c #093C9C",
+"&+	c #574933",
+"*+	c #787974",
+"=+	c #06175E",
+"-+	c #08519D",
+";+	c #08227D",
+">+	c #5A6368",
+",+	c #0A289C",
+"'+	c #4B3D28",
+")+	c #CCBD9A",
+"!+	c #877860",
+"~+	c #1158A4",
+"{+	c #0948AC",
+"]+	c #453722",
+"^+	c #D5C9B0",
+"/+	c #BBAD91",
+"(+	c #3F301D",
+"_+	c #C6B89D",
+":+	c #063567",
+"<+	c #665840",
+"                                                                ",
+"                            . . . . + @                         ",
+"                          . # $ % % % & *                       ",
+"                        = - ; ; ; > > , $ +                     ",
+"                      . & , , , , , , , , % #                   ",
+"                ' ) ) ! ~ $ % , { ] ^ ^ ] ^ , =                 ",
+"              / ( _ : < ) [ } | 1 % , { ^ 2 2 2 3               ",
+"              4 5 _ _ _ _ 6 7 8 9 0 a ~ b c > { ^ d             ",
+"            e f _ _ _ g _ g _ g g 6 h i j f k l m n o           ",
+"          . p q _ _ g 5 5 5 g g _ _ _ _ g r s t u < v ) w       ",
+"        . n x y g g 5 r g 5 r r r r g g 5 r _ r r z 6 A B C     ",
+"      . . D f E r 5 r r r r r r F r r 5 r r r r r : G H C I     ",
+"      J K L M N E z z z E r O F z N r z r z r r 6 A P I Q R     ",
+"    S T U K b V F F F O F E F W N N F F F F F 6 G H S X X S     ",
+"    Y T T Z ` n q s W N F F F N N N F W W N  .G ..S +.+.X Y     ",
+"    @.T #.$.%.&.*.G =.W N F F W -.W F -. .=.;.>.,.'.+.+.X @.    ",
+"    . #.%.$.$.).!.@.~.{.].W  .t h t  .^.t /.(._.:.<.&.+.X e     ",
+"    [.#.%.$.).}.|.%.Y 1.2.h /.l (...~.3.4.>.# 5.6.7.8.I X 9.    ",
+"    0.T %.$.).|.|.a.a.b.! 0 o R c.& b.@.d.e.d f.g.h.i.9.J j.    ",
+"    k.#.%.$.l.m.|.a.a.n., @.U o.p.q.r.s.t.u.v.w.:.h.h.x.K y.z.  ",
+"    A.B.%.$.).l.m.a.a.a.C.5.o.% t.y.H D.E.F.j.G.h.h.h.H.I.t.J.  ",
+"    A.T %.$.$.l.|.}.a.b.b.K.K.L.E.E.M.N.E.O.P.Q.R.h.h.S.Q.E.N.  ",
+"    T.T %.$.$.).}.}.U.d n.n.n.V.E.E.E.N.E.E.W.N.X.h.h.X.E.E.N.  ",
+"    Y.Z.T %.$.$.).d ` `.`.a.|  +N.E.Q.N.E.E.E.N..+h.h..+E.E.z.  ",
+"    * ++T #.%.$.R 3 |.a.a.|.l.D.@+t.#+J.t.E.E.E.t.$+h.%+t.E.Q.  ",
+"    &+++T T #.R @.l.|.|.l.l.).*+Q.t.X.=+-+E.E.E.E.t.;+Q.E.t.y.  ",
+"    @ ++++Z.` . $.l.l.l.).).$.>+W.t.,+X.Q.Q.t.E.E.E.t.E.E.t.    ",
+"    '+)+++S !+$.).).$.%.$.%.B.&.~+E.{+R.O.E.E.E.E.E.E.E.E.E.    ",
+"    ]+)+S # ^+$.%.B.B.#.#.++/+S . O.E.J.#+t.t.E.E.E.E.E.t.      ",
+"    (+Y k.Z.%.#._+C 3 . . =         :+W.t.t.E.t.E.t.t.J.        ",
+"    '+<+. . . . .                                               ",
+"                                                                "};
--- mozilla-thunderbird-1.5.orig/debian/mfsa_2005-59.debian.patch
+++ mozilla-thunderbird-1.5/debian/mfsa_2005-59.debian.patch
@@ -0,0 +1,90 @@
+--- usr/bin/mozilla-thunderbird	2005/09/23 14:17:28	1.1
++++ usr/bin/mozilla-thunderbird	2005/09/23 14:31:25
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # The contents of this file are subject to the Netscape Public License
+ # Version 1.0 (the "NPL"); you may not use this file except in
+@@ -117,7 +117,7 @@
+ fi
+ 
+ script_args=""
+-moreargs=""
++declare -a moreargs
+ debugging=0
+ MOZILLA_BIN="${progbase}-bin"
+ 
+@@ -220,9 +220,7 @@
+       shift 2
+       ;;
+     *)
+-      # Protect quotes and $ in command-line arguments from two shell evals
+-      moreargs="$moreargs \"$(echo "$1" | sed -e 's/"/\\\\\\\"/g' \
+-                                          -e 's/[$]/\\\\\\\$/g')\""
++      moreargs[${#moreargs[@]}]="$1"
+       shift 1
+       ;;
+   esac
+@@ -293,11 +291,10 @@
+ LOCALE_ARGS="-contentLocale $MOZLOCALE -UILocale $MOZLOCALE"
+ if [ $ALREADY_RUNNING -eq 1 ]; then LOCK_FILE=lock; else LOCK_FILE=; fi 
+ 
+-MOZ_ARGS=
++declare -a MOZ_ARGS
+ donext=
+ 
+-eval "set -- $moreargs"
+-for opt_in in "$@"
++for opt_in in "${moreargs[@]}"
+ do
+   if [ -z "$donext" ]
+   then 
+@@ -321,11 +318,11 @@
+          next=compose
+          donext=true
+        else
+-          MOZ_ARGS="$MOZ_ARGS \"$opt_in\""
++          MOZ_ARGS[${#MOZ_ARGS[@]}]="$opt_in"
+ 	  donext=
+        fi
+      else
+-       MOZ_ARGS="$MOZ_ARGS \"$opt_in\""
++       MOZ_ARGS[${#MOZ_ARGS[@]}]="$opt_in"
+        donext=
+      fi
+   else 
+@@ -334,9 +331,9 @@
+      then
+         # cut off protocol
+ 	mail_to="$(expr match "$opt_in" "mailto:\(.*\)")"
+-	MOZ_ARGS="\"mailto($mail_to)\""
+-	eval "set -- $MOZ_ARGS"
+-	"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' "$@"
++        MOZ_ARGS[${#MOZ_ARGS[@]}]="mailto($mail_to)"
++	"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a 'mozilla-thunderbird' \
++          "${MOZ_ARGS[@]}"
+ 	exit $?
+      fi
+      donext=
+@@ -349,16 +346,16 @@
+ fi
+ 
+ export MRE_HOME
+-eval "set -- $MOZ_ARGS"
+ 
+ ## Start addon scripts
+ moz_pis_startstop_scripts "start"
+ 
+ if [ $debugging = 1 ]
+ then
+-  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $LOCALE_ARGS "$@"@
++  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN $LOCALE_ARGS "${MOZ_ARGS[@]}"@
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $LOCALE_ARGS "$@"
++"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" $LOCALE_ARGS \
++  "${MOZ_ARGS[@]}"
+ 
+ exitcode=$?
+ 
+
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-typeaheadfind.install
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-typeaheadfind.install
@@ -0,0 +1,4 @@
+debian/tmp-typeaheadfind/usr/lib/mozilla-thunderbird/chrome/typeaheadfind.jar usr/lib/mozilla-thunderbird/extensions/typeaheadfind@thelizards.debian.org/chrome/
+debian/tmp-typeaheadfind/usr/lib/mozilla-thunderbird/components usr/lib/mozilla-thunderbird/extensions/typeaheadfind@thelizards.debian.org/
+debian/tmpls-typeaheadfind/install.rdf usr/lib/mozilla-thunderbird/extensions/typeaheadfind@thelizards.debian.org/
+debian/tmp-typeaheadfind/chrome.manifest usr/lib/mozilla-thunderbird/extensions/typeaheadfind@thelizards.debian.org/
--- mozilla-thunderbird-1.5.orig/debian/theme.part.defaultclassic
+++ mozilla-thunderbird-1.5/debian/theme.part.defaultclassic
@@ -0,0 +1,14 @@
+  <RDF:Description RDF:about="rdf:#$NDaFW2"
+                   em:id="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+                   em:minVersion="0.7"
+                   em:maxVersion="0.7" />
+  <RDF:Description RDF:about="urn:mozilla:theme:{972ce4c6-7e08-4474-a285-3208198ce6fd}"
+                   em:version="2.0"
+                   em:name="Thunderbird (default)"
+                   em:description="The default theme"
+                   em:creator="Arvid Axelsson"
+                   em:internalName="classic/1.0"
+                   em:locked="true"
+                   em:contributor="Mozilla Contributors">
+    <em:targetApplication RDF:resource="rdf:#$NDaFW2"/>
+  </RDF:Description>
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-inspector.install
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-inspector.install
@@ -0,0 +1 @@
+debian/tmp-inspector/usr/lib/mozilla-thunderbird/extensions/ usr/lib/mozilla-thunderbird/
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-dev.install
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-dev.install
@@ -0,0 +1,7 @@
+debian/tmpbuild/usr/share usr/
+debian/tmpbuild/usr/include usr/
+debian/tmpbuild/usr/include usr/
+debian/tmpbuild/usr/lib/pkgconfig/ usr/lib/
+debian/tmpbuild/usr/bin/mozilla-thunderbird-config usr/bin
+debian/tmpbuild/usr/lib/mozilla-thunderbird/xpt_link usr/lib/mozilla-thunderbird/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/xpidl usr/lib/mozilla-thunderbird/
--- mozilla-thunderbird-1.5.orig/debian/enigmail-startup-hook
+++ mozilla-thunderbird-1.5/debian/enigmail-startup-hook
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+find $HOME/.mozilla-thunderbird/ -name XUL.mfasl 2>/dev/null | xargs rm -f
--- mozilla-thunderbird-1.5.orig/debian/messengerWindow.xpm
+++ mozilla-thunderbird-1.5/debian/messengerWindow.xpm
@@ -0,0 +1,525 @@
+/* XPM */
+static char * messengerWindow_xpm[] = {
+"32 32 490 2",
+"  	c None",
+". 	c #8F8064",
+"+ 	c #9A9181",
+"@ 	c #ACA495",
+"# 	c #8C8271",
+"$ 	c #4F422D",
+"% 	c #766A57",
+"& 	c #B6AFA0",
+"* 	c #BBB3A5",
+"= 	c #BBB4A5",
+"- 	c #A79F8F",
+"; 	c #5D503B",
+"> 	c #908574",
+", 	c #BEB7A8",
+"' 	c #BEB7A9",
+") 	c #BFB8A9",
+"! 	c #BFB8AA",
+"~ 	c #C0B9AB",
+"{ 	c #B3AB9B",
+"] 	c #6C5F49",
+"^ 	c #A39A8A",
+"/ 	c #C0BAAB",
+"( 	c #C2BBAD",
+"_ 	c #C2BCAD",
+": 	c #C3BCAE",
+"< 	c #C3BDAF",
+"[ 	c #C4BDAF",
+"} 	c #BCB5A6",
+"| 	c #7B6E58",
+"1 	c #6D7CAA",
+"2 	c #7380AA",
+"3 	c #7E7D81",
+"4 	c #A29D92",
+"5 	c #B0AA9E",
+"6 	c #BAB4A7",
+"7 	c #C1BAAD",
+"8 	c #C4BEB0",
+"9 	c #C6C0B2",
+"0 	c #C7C1B3",
+"a 	c #C8C1B4",
+"b 	c #C8C2B4",
+"c 	c #C9C2B4",
+"d 	c #8A7D67",
+"e 	c #44578C",
+"f 	c #C0C7DB",
+"g 	c #FBFCFE",
+"h 	c #DDE1EF",
+"i 	c #A2ADCD",
+"j 	c #7280AC",
+"k 	c #6F7996",
+"l 	c #878992",
+"m 	c #9F9A92",
+"n 	c #ADA79C",
+"o 	c #B8B2A6",
+"p 	c #C0BAAD",
+"q 	c #C5BFB2",
+"r 	c #C9C2B5",
+"s 	c #CBC4B7",
+"t 	c #CCC6B9",
+"u 	c #988C77",
+"v 	c #4F5C84",
+"w 	c #F3F5F9",
+"x 	c #F9FBFE",
+"y 	c #FAFCFE",
+"z 	c #F6F8FE",
+"A 	c #DFE4F0",
+"B 	c #B0BBD8",
+"C 	c #8796C1",
+"D 	c #717EA7",
+"E 	c #7C849D",
+"F 	c #8E9098",
+"G 	c #9F9C95",
+"H 	c #ACA79C",
+"I 	c #B6B0A5",
+"J 	c #BDB8AC",
+"K 	c #C3BEB2",
+"L 	c #C8C2B5",
+"M 	c #A19682",
+"N 	c #808DB4",
+"O 	c #FCFEFE",
+"P 	c #F7FAFE",
+"Q 	c #F6FAFF",
+"R 	c #F6F9FE",
+"S 	c #F6F9FD",
+"T 	c #D8DEEE",
+"U 	c #B6C0DE",
+"V 	c #97A6D1",
+"W 	c #8190BD",
+"X 	c #7A87AC",
+"Y 	c #858DA5",
+"Z 	c #9194A0",
+"` 	c #9D9B9B",
+" .	c #A7A299",
+"..	c #918978",
+"+.	c #6C6F7D",
+"@.	c #B8C2D8",
+"#.	c #FCFDFF",
+"$.	c #F9FCFE",
+"%.	c #F5F9FE",
+"&.	c #F2F6FE",
+"*.	c #F4F9FF",
+"=.	c #F2F7FF",
+"-.	c #F5F9FF",
+";.	c #F4F9FE",
+">.	c #FBFDFE",
+",.	c #FAFDFE",
+"'.	c #E7EDF9",
+").	c #D1DAF0",
+"!.	c #BBC7E8",
+"~.	c #A8B8E1",
+"{.	c #98A9DA",
+"].	c #8D9CCA",
+"^.	c #7481A7",
+"/.	c #68708B",
+"(.	c #A6A196",
+"_.	c #616D91",
+":.	c #E2E9F7",
+"<.	c #F6FBFE",
+"[.	c #F1F6FE",
+"}.	c #EDF3FE",
+"|.	c #F5FBFF",
+"1.	c #EBF1FE",
+"2.	c #ECF2FE",
+"3.	c #EEF4FE",
+"4.	c #E9EFFC",
+"5.	c #DBE1EC",
+"6.	c #B0B6C1",
+"7.	c #81828B",
+"8.	c #AFA081",
+"9.	c #746C5E",
+"0.	c #7685B1",
+"a.	c #E9F1FE",
+"b.	c #EAF1FE",
+"c.	c #F1F8FE",
+"d.	c #EBF2FE",
+"e.	c #ECF3FE",
+"f.	c #EDF4FE",
+"g.	c #E4ECFE",
+"h.	c #EBF2FC",
+"i.	c #DDE3ED",
+"j.	c #AFB5C3",
+"k.	c #999692",
+"l.	c #B1A180",
+"m.	c #AE9E7F",
+"n.	c #B5A687",
+"o.	c #9C8E73",
+"p.	c #63646B",
+"q.	c #9DA9C9",
+"r.	c #DDE6FB",
+"s.	c #E6EEFE",
+"t.	c #E6EFFE",
+"u.	c #E7F0FE",
+"v.	c #E9F2FE",
+"w.	c #EBF4FF",
+"x.	c #E3EBFE",
+"y.	c #DFE8FE",
+"z.	c #E9F2FC",
+"A.	c #D4DCED",
+"B.	c #9B9791",
+"C.	c #AC9C7D",
+"D.	c #C0AF87",
+"E.	c #A8987A",
+"F.	c #A29274",
+"G.	c #D4C7A8",
+"H.	c #C0B295",
+"I.	c #9D8F76",
+"J.	c #A4A4AA",
+"K.	c #CAD3E6",
+"L.	c #DEE7FA",
+"M.	c #E1EBFE",
+"N.	c #E0EAFE",
+"O.	c #E2ECFE",
+"P.	c #E3EDFF",
+"Q.	c #E7F1FF",
+"R.	c #DFE9FE",
+"S.	c #D9E2FC",
+"T.	c #DBE4FD",
+"U.	c #DEE8FD",
+"V.	c #E2EBFE",
+"W.	c #E2EBFD",
+"X.	c #D8E1ED",
+"Y.	c #ACB3C4",
+"Z.	c #95918F",
+"`.	c #A79779",
+" +	c #C2B28D",
+".+	c #C4B38B",
+"++	c #9B8C6F",
+"@+	c #D5C9AA",
+"#+	c #D8CCAF",
+"$+	c #CEC2A7",
+"%+	c #A59679",
+"&+	c #A49E94",
+"*+	c #C0C9DA",
+"=+	c #D2DCF5",
+"-+	c #D7E1FD",
+";+	c #DEE8FE",
+">+	c #DFEAFE",
+",+	c #DEE9FF",
+"'+	c #DDE7FE",
+")+	c #DBE6FE",
+"!+	c #D8E3FE",
+"~+	c #DBE5FE",
+"{+	c #DEE9FE",
+"]+	c #D9E4FE",
+"^+	c #D8E2FE",
+"/+	c #DCE6FD",
+"(+	c #D0DAEE",
+"_+	c #ACB4C5",
+":+	c #93918E",
+"<+	c #A29275",
+"[+	c #C5B693",
+"}+	c #C8B892",
+"|+	c #C5B48D",
+"1+	c #958669",
+"2+	c #D6CAAC",
+"3+	c #D9CEB2",
+"4+	c #DCD2B7",
+"5+	c #DBD1B8",
+"6+	c #B0A287",
+"7+	c #998E7A",
+"8+	c #ABB1C4",
+"9+	c #C5CFED",
+"0+	c #D4E0FC",
+"a+	c #DBE7FE",
+"b+	c #DDE9FF",
+"c+	c #DEEBFE",
+"d+	c #D7E2FD",
+"e+	c #D0DBFB",
+"f+	c #D0DBFC",
+"g+	c #C8D3EE",
+"h+	c #7E8592",
+"i+	c #353642",
+"j+	c #6C614E",
+"k+	c #BDB090",
+"l+	c #CABB97",
+"m+	c #C9B994",
+"n+	c #C5B58E",
+"o+	c #D7CBAE",
+"p+	c #DACFB3",
+"q+	c #DDD3B9",
+"r+	c #E0D7BE",
+"s+	c #E3DAC4",
+"t+	c #C3B8A0",
+"u+	c #93856C",
+"v+	c #9C9DA5",
+"w+	c #B9C4E4",
+"x+	c #CAD6F8",
+"y+	c #D0DDFC",
+"z+	c #CDDAF4",
+"A+	c #C1CCE8",
+"B+	c #B5C0DE",
+"C+	c #BCC7E4",
+"D+	c #C9D5EF",
+"E+	c #C7D3F5",
+"F+	c #BCC7E9",
+"G+	c #9FA8C4",
+"H+	c #868488",
+"I+	c #645B48",
+"J+	c #0C21AB",
+"K+	c #484754",
+"L+	c #B3A788",
+"M+	c #C4B691",
+"N+	c #C6B68F",
+"O+	c #897A5E",
+"P+	c #DBD0B5",
+"Q+	c #DED4BA",
+"R+	c #E1D8C0",
+"S+	c #E4DCC6",
+"T+	c #E8E0CB",
+"U+	c #D9D0BC",
+"V+	c #998B71",
+"W+	c #908B85",
+"X+	c #ABB6D3",
+"Y+	c #B2BEDF",
+"Z+	c #9DA7C4",
+"`+	c #9196A6",
+" @	c #898787",
+".@	c #969290",
+"+@	c #9D9FA7",
+"@@	c #A4AECA",
+"#@	c #8E98B1",
+"$@	c #303741",
+"%@	c #7E715A",
+"&@	c #B6AA8F",
+"*@	c #253293",
+"=@	c #102CE9",
+"-@	c #4A4647",
+";@	c #AEA081",
+">@	c #7F7258",
+",@	c #837359",
+"'@	c #DED4BB",
+")@	c #E2D8C1",
+"!@	c #E5DCC6",
+"~@	c #E8E0CC",
+"{@	c #EBE4D2",
+"]@	c #EAE3D2",
+"^@	c #ACA089",
+"/@	c #857A69",
+"(@	c #848999",
+"_@	c #908A81",
+":@	c #A7997E",
+"<@	c #4A4D4D",
+"[@	c #A59D8E",
+"}@	c #ABA089",
+"|@	c #938770",
+"1@	c #24476C",
+"2@	c #3C4449",
+"3@	c #A29983",
+"4@	c #C1B69B",
+"5@	c #33409E",
+"6@	c #1130F9",
+"7@	c #1022A0",
+"8@	c #7E745D",
+"9@	c #B6A784",
+"0@	c #313940",
+"a@	c #7C6D54",
+"b@	c #E2D8C0",
+"c@	c #EBE4D1",
+"d@	c #EEE8D7",
+"e@	c #F1ECDC",
+"f@	c #C4BBA8",
+"g@	c #918165",
+"h@	c #BBB099",
+"i@	c #FAF6EA",
+"j@	c #165EAA",
+"k@	c #787D7F",
+"l@	c #D2CEC4",
+"m@	c #868886",
+"n@	c #0B77EB",
+"o@	c #524C3F",
+"p@	c #5D584C",
+"q@	c #7F7766",
+"r@	c #393848",
+"s@	c #9E9173",
+"t@	c #155496",
+"u@	c #04264B",
+"v@	c #76674E",
+"w@	c #DBD0B4",
+"x@	c #E1D7BF",
+"y@	c #E4DBC5",
+"z@	c #E7DFCA",
+"A@	c #EAE3D0",
+"B@	c #EDE6D5",
+"C@	c #EDE7D7",
+"D@	c #AEA289",
+"E@	c #B6AB94",
+"F@	c #F9F5E8",
+"G@	c #B8B5AB",
+"H@	c #0F5096",
+"I@	c #99968D",
+"J@	c #2B5D91",
+"K@	c #0C80FB",
+"L@	c #26394A",
+"M@	c #3D3E3B",
+"N@	c #0F3C75",
+"O@	c #1A257A",
+"P@	c #404A4D",
+"Q@	c #0851A0",
+"R@	c #706148",
+"S@	c #D7CBAD",
+"T@	c #DDD2B8",
+"U@	c #E0D6BE",
+"V@	c #E3DAC3",
+"W@	c #E6DDC8",
+"X@	c #E9E1CD",
+"Y@	c #E9E2CF",
+"Z@	c #AC9F87",
+"`@	c #AFA38C",
+" #	c #F5F0E1",
+".#	c #F6F0E1",
+"+#	c #859097",
+"@#	c #1A4571",
+"##	c #0960BC",
+"$#	c #0E5DB1",
+"%#	c #16406C",
+"&#	c #0A68CC",
+"*#	c #0F2ADA",
+"=#	c #0E219E",
+"-#	c #6A5B43",
+";#	c #D9CDB1",
+">#	c #DCD1B6",
+",#	c #DFD5BB",
+"'#	c #E5DDC8",
+")#	c #AA9D85",
+"!#	c #A89C84",
+"~#	c #F1EBDB",
+"{#	c #F2ECDC",
+"]#	c #F1EBD9",
+"^#	c #7E898F",
+"/#	c #0858AD",
+"(#	c #0D23BB",
+"_#	c #64553E",
+":#	c #D5C8A9",
+"<#	c #D7CCAE",
+"[#	c #E0D6BD",
+"}#	c #A89B82",
+"|#	c #A2947C",
+"1#	c #EDE6D4",
+"2#	c #EFE8D6",
+"3#	c #EEE6D4",
+"4#	c #A09A8D",
+"5#	c #424E59",
+"6#	c #0B2AAB",
+"7#	c #04294F",
+"8#	c #5E4F38",
+"9#	c #D3C6A7",
+"0#	c #D6CAAB",
+"a#	c #D8CDB0",
+"b#	c #A69980",
+"c#	c #9B8D75",
+"d#	c #E8E0CD",
+"e#	c #ECE4D0",
+"f#	c #EAE2CE",
+"g#	c #E9E0CC",
+"h#	c #E2D9C3",
+"i#	c #1E5692",
+"j#	c #0B71DC",
+"k#	c #05255E",
+"l#	c #08519D",
+"m#	c #092A8C",
+"n#	c #093C9C",
+"o#	c #574933",
+"p#	c #D1C4A3",
+"q#	c #D6CAAD",
+"r#	c #A5977D",
+"s#	c #94866D",
+"t#	c #E4DBC6",
+"u#	c #E8DFCA",
+"v#	c #E7DEC8",
+"w#	c #E6DCC6",
+"x#	c #E5DBC4",
+"y#	c #DFD6BE",
+"z#	c #787974",
+"A#	c #06175E",
+"B#	c #08227D",
+"C#	c #06407F",
+"D#	c #51432D",
+"E#	c #CFC2A0",
+"F#	c #D2C5A4",
+"G#	c #D4C8A9",
+"H#	c #A3957A",
+"I#	c #8D7F66",
+"J#	c #DFD5BF",
+"K#	c #E4D9C2",
+"L#	c #E1D6BE",
+"M#	c #E0D5BC",
+"N#	c #DFD3B9",
+"O#	c #5A6368",
+"P#	c #0A289C",
+"Q#	c #4B3D28",
+"R#	c #CDBF9C",
+"S#	c #D0C2A1",
+"T#	c #A29377",
+"U#	c #877860",
+"V#	c #DACFB7",
+"W#	c #E2D7BE",
+"X#	c #DFD3BA",
+"Y#	c #DED2B8",
+"Z#	c #DDD0B6",
+"`#	c #DBCFB4",
+" $	c #DACDB1",
+".$	c #B0A58E",
+"+$	c #1158A4",
+"@$	c #0948AC",
+"#$	c #453722",
+"$$	c #CBBC98",
+"%$	c #A09174",
+"&$	c #807259",
+"*$	c #D5C9B0",
+"=$	c #DDD1B6",
+"-$	c #DCCFB4",
+";$	c #DBCEB2",
+">$	c #D9CCB0",
+",$	c #D8CAAE",
+"'$	c #D1C3A6",
+")$	c #BBAD91",
+"!$	c #9F9177",
+"~$	c #0C5BAF",
+"{$	c #08469D",
+"]$	c #3F301D",
+"^$	c #9F8F70",
+"/$	c #7A6B53",
+"($	c #D0C3A9",
+"_$	c #DBCEB3",
+":$	c #D8CBAF",
+"<$	c #C6B89D",
+"[$	c #AFA187",
+"}$	c #063567",
+"|$	c #08519F",
+"1$	c #665840",
+"                              . . .                             ",
+"                          . . + @ # $                           ",
+"                        . % & * = = - ;                         ",
+"                      . > , ' ) ! ! ~ { ]                       ",
+"                    . ^ / ( _ : : < [ [ } |                     ",
+"              1 2 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 s u                 ",
+"            v w x y z x A B C D E F G H I J K L M               ",
+"          . N x O x P P Q R P S T U V W X Y Z `  ...            ",
+"        . +.@.#.$.%.&.*.=.-.;.>.,.#.$.%.'.).!.~.{.].^./.        ",
+"      . (._.:.%.<.[.}.|.}.}.1.2.3.%.<.[.}.|.}.}.4.5.6.7.8.      ",
+"    . . 9.0.a.b.c.b.d.e.b.f.f.g.a.b.c.b.d.e.b.h.i.j.k.l.m.      ",
+"    n.o.p.q.r.s.t.u.g.v.w.g.x.x.y.t.t.u.g.v.z.A.j.B.C.D.E.      ",
+"  F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.V.N.O.W.X.Y.Z.`. +.+F.      ",
+"  ++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+++      ",
+"  1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+d+a+f+e+g+h+i+j+k+l+m+n+1+      ",
+"  . 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+`+ @.@+@@@#@$@%@&@*@=@-@;@ +>@      ",
+"  ,@#+P+'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@      ",
+"  a@#+P+'@b@!@~@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@J+6@6@r@s@t@u@    ",
+"  v@#+w@Q+x@y@z@A@B@C@D@E@F@G@n@H@I@J@K@L@M@N@6@6@6@O@P@n@Q@    ",
+"  R@S@p+T@U@V@W@X@Y@Z@`@ #.#+#K@K@@###K@$#%#&#*#6@6@=#&#K@##    ",
+"  -#2+;#>#,#R+y@'#)#!#~#{#]#^#K@K@K@##K@K@/###(#6@6@(#K@K@##    ",
+"  _#:#<#p+T@[#R+}#|#1#2#3#4#5###K@&###K@K@K@##6#6@6@6#K@K@7#    ",
+"  8#9#0#a#P+T@b#c#d#e#f#g#h#i#j#K@k#l#j#K@K@K@j#m#6@n#K@K@&#    ",
+"  o#p#G.q#;#r#s#t#u#v#w#x#y#z#&#K@J+A#l#K@K@K@K@n@B#&#K@K@C#    ",
+"  D#E#F#G#H#I#J#x#K#b@L#M#N#O#/#K@P#(#&###K@K@K@K@n@K@K@n@      ",
+"  Q#R#S#T#U#V#W#M#X#Y#Z#`# $.$+$K@@$*###K@K@K@K@K@K@K@K@K@      ",
+"  #$$$%$&$*$Y#=$-$;$>$,$'$)$!$. ~$K@{$k#n@K@K@K@K@K@K@n@        ",
+"  ]$^$/$($_$:$<$[$V+. . .         }$/#n@n@K@n@K@K@j#|$          ",
+"  Q#1$. . . . .                                                 ",
+"                                                                "};
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-inspector.prerm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-inspector.prerm
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+case "$1" in
+    upgrade|remove)
+
+    if [ -L /usr/lib/mozilla-thunderbird/defaults/pref/inspector.js ]; then
+       rm -f /usr/lib/mozilla-thunderbird/defaults/pref/inspector.js
+    fi
+      ;;
+    *)
+      ;;
+esac
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.dirs
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.dirs
@@ -0,0 +1,16 @@
+var/lib/mozilla-thunderbird/startup-hooks.d
+var/lib/mozilla-thunderbird/chrome.d
+var/lib/mozilla-thunderbird/extensions.d
+var/lib/mozilla-thunderbird/locales.d
+usr/lib/mozilla-thunderbird/chrome
+var/lib/mozilla-thunderbird/extensions
+usr/lib/mozilla-thunderbird/defaults/isp/US
+usr/sbin
+usr/share/lintian/overrides
+etc/mozilla-thunderbird/pref
+usr/share/mozilla-thunderbird/chrome
+usr/share/mozilla-thunderbird/icons
+usr/share/mozilla-thunderbird/res
+usr/share/doc/mozilla-thunderbird
+usr/share/applications
+var/lib/mozilla-thunderbird/components
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.menu
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.menu
@@ -0,0 +1,4 @@
+?package(mozilla-thunderbird):needs="x11" section="Apps/Net" \
+	title="Mozilla Thunderbird" \
+        icon="/usr/share/pixmaps/mozilla-thunderbird-menu.xpm" \
+        command="mozilla-thunderbird" hints="Mail"
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.sgml
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.sgml
@@ -0,0 +1,129 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Alexander</firstname>">
+  <!ENTITY dhsurname   "<surname>Sack</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>September 28, 2003</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>asac@jwsdot.com</email>">
+  <!ENTITY dhusername  "Alexander Sack">
+  <!ENTITY dhucpackage "<refentrytitle>MOZILLA-THUNDERBIRD</refentrytitle>">
+  <!ENTITY dhpackage   "mozilla-thunderbird">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>MPL</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym></acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose> mozilla-thunderbird - Mail User Agent (MUA) and newsgroup/RSS
+        client for X11 derived from the Mozilla suite.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>mozilla-thunderbird</command>
+
+      <arg><option>-P <replaceable>profile</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>Thunderbird provides IMAP/POP support, a built-in RSS reader,
+        support for HTML mail, powerful quick search, saved search
+        folders, advanced message filtering, junk mail controls,
+        message grouping, labels, return receipts, smart address book
+        LDAP address completion, import tools, and the ability to
+        manage multiple identities in email and newsgroup accounts.
+        Thunderbird provides enterprise and government grade security
+        such as S/MIME, digital signing, message encryption, and support
+        for certificates and security devices.</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-P <replaceable>profile</replaceable></option>
+        </term>
+        <listitem>
+          <para>If  no profile is given to the -P option, the profile
+                manager will pop-up. You will be allowed to create or
+                select a profile.  Thunderbird then launches with the
+                selected profile.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+    <literallayout>
+The Thunderbird Homepage:
+http://www.mozilla.org/projects/thunderbird/
+
+The Debian Thunderbird FAQ:
+http://www.jwsdot.com/debian/faq.html
+</literallayout>
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-inspector.preinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-inspector.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+#if test "$1" = "upgrade" -o "$1" = "install"; then
+#   if [ -L /usr/lib/mozilla-thunderbird/defaults/pref ]; then
+#   	rm -f /usr/lib/mozilla-thunderbird/defaults/pref
+#   fi
+#   if [ -L /usr/lib/mozilla-thunderbird/greprefs ]; then
+#   	rm -f /usr/lib/mozilla-thunderbird/greprefs
+#   fi
+#
+#fi
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-dev.preinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-dev.preinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/tmpls-typeaheadfind/content/contents.rdf
+++ mozilla-thunderbird-1.5/debian/tmpls-typeaheadfind/content/contents.rdf
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:typeaheadfind"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:typeaheadfind"
+        chrome:displayName="Typeaheadfind (Debian)"
+        chrome:author="asac@jwsdot.com"
+        chrome:name="typeaheadfind"
+ 	chrome:localeVersion="1.8b5">
+  </RDF:Description>
+
+</RDF:RDF>
+
--- mozilla-thunderbird-1.5.orig/debian/tmpls-typeaheadfind/install.rdf
+++ mozilla-thunderbird-1.5/debian/tmpls-typeaheadfind/install.rdf
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>typeaheadfind@thelizards.debian.org</em:id>
+    <em:version>1.5</em:version>
+    
+    <!-- Target Application (Thunderbird) this extension can install into, 
+         with minimum and maximum supported versions. --> 
+    <em:targetApplication>
+      <Description>
+        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+        <em:minVersion>1.5</em:minVersion>
+        <em:maxVersion>1.5</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+    
+    
+    <!-- Front End MetaData -->
+    <em:name>Typeaheadfind</em:name>
+    <em:description>Find as you type as a debianized extension</em:description>
+    <em:creator>packaged by Alexander Sack &lt;asac@jwsdot.com&gt;</em:creator>
+    <em:homepageURL>http://www.asoftsite.org</em:homepageURL>
+<!--
+    <em:updateURL>http://downloads.mozdev.org/enigmail/getupdate.php?appVer=%APP_VERSION%&ext=enigmail</em:updateURL>
+-->    
+
+    <!-- Front End Integration Hooks (used by Extension Manager)
+    <em:iconURL>chrome://enigmail/skin/enigmail-about.png</em:iconURL>
+    -->
+    
+    <!-- Packages, Skins and Locales that this extension registers -->
+    <em:file>
+      <Description about="urn:mozilla:extension:file:typeaheadfind.jar">
+        <em:package>content/typeaheadfind/</em:package>
+	<em:locale>locale/en-US/typeaheadfind/</em:locale>
+      </Description>
+    </em:file>
+  </Description>      
+
+</RDF>
--- mozilla-thunderbird-1.5.orig/debian/tmpls-typeaheadfind/locale/contents.rdf
+++ mozilla-thunderbird-1.5/debian/tmpls-typeaheadfind/locale/contents.rdf
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the skins being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:typeaheadfind"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:en-US:typeaheadfind"
+                   chrome:localeVersion="1.8b5"/>
+</RDF:RDF>
--- mozilla-thunderbird-1.5.orig/debian/mail-jar.mn
+++ mozilla-thunderbird-1.5/debian/mail-jar.mn
@@ -0,0 +1,165 @@
+# Specify files or whole directories from the chrome that thunderbird
+# needs to include.
+#
+# Format is:
+# 
+# <destination in comm.jar>,<source in unzipped chrome>
+
+#################################################################################################
+# Files we need from messenger.jar
+#################################################################################################
+content/messenger,                                   msg/content/messenger
+content/messenger-mapi,                              msg/content/messenger-mapi
+content/messenger-mdn,                               msg/content/messenger-mdn
+content/messenger-region,                            msg/content/messenger-region
+content/messenger-smime,                             msg/content/messenger-smime
+content/messenger-views,                             msg/content/messenger-views
+content/messenger/messengercompose,                  msg/content/messenger/messengercompose
+content/editor/images,				                       msg/content/editor/images
+content/messenger/addressbook,                       msg/content/messenger/addressbook
+content/messenger/migration,                         msg/content/messenger/migration
+
+#################################################################################################
+# Files we need from comm.jar
+#################################################################################################
+content/editor,                                       comm/content/editor
+content/editor-region,                                comm/content/editor-region
+content/communicator-region,                          comm/content/communicator-region,
+content/communicator-platform,                        comm/content/communicator-platform
+content/communicator/contents.rdf, 		                comm/content/communicator/contents.rdf
+content/communicator/communicatorOverlay.xul,         comm/content/communicator/communicatorOverlay.xul 
+content/communicator/utilityOverlay.xul,              comm/content/communicator/utilityOverlay.xul 
+content/communicator/utilityOverlay.js,               comm/content/communicator/utilityOverlay.js 
+content/communicator/browserBindings.xul,             comm/content/communicator/browserBindings.xul 
+content/communicator/editorBindings.xul,              comm/content/communicator/editorBindings.xul 
+content/communicator/platformBrowserBindings.xul,     comm/content/communicator/platformBrowserBindings.xul 
+content/communicator/platformEditorBindings.xul,      comm/content/communicator/platformEditorBindings.xul 
+content/communicator/platformCommunicatorOverlay.xul, comm/content/communicator/platformCommunicatorOverlay.xul 
+content/communicator/contentAreaUtils.js,             comm/content/communicator/contentAreaUtils.js 
+content/communicator/builtinURLs.js,                  comm/content/communicator/builtinURLs.js
+content/communicator/contentAreaDD.js,                comm/content/communicator/contentAreaDD.js 
+content/communicator/contentAreaClick.js,             comm/content/communicator/contentAreaClick.js 
+content/communicator/contentAreaContextOverlay.xul,   comm/content/communicator/contentAreaContextOverlay.xul 
+content/communicator/nsContextMenu.js,                comm/content/communicator/nsContextMenu.js
+content/communicator/printing.js,                     comm/content/communicator/printing.js
+
+# from xpfe\components jar.mn
+content/communicator/alerts,                          comm/content/communicator/alerts
+content/communicator/pref/pref-fonts.js,              comm/content/communicator/pref/pref-fonts.js
+content/communicator/pref/pref-fonts.xul,             comm/content/communicator/pref/pref-fonts.xul
+content/communicator/pref/pref.xul,                   comm/content/communicator/pref/pref.xul
+content/communicator/pref/nsPrefWindow.js,            comm/content/communicator/pref/nsPrefWindow.js
+content/communicator/pref/pref-calibrate-screen.xul,  comm/content/communicator/pref/pref-calibrate-screen.xul
+
+# dummy contextHelp.js file so we don't get a bunch of errors about this file not being found
+content/help/contextHelp.js,                          comm/content/help/contextHelp.js
+content/help/contents.rdf,                            comm/content/help/contents.rdf
+
+# from layout
+content/xbl-marquee,                                  comm/content/xbl-marquee
+content/necko,                                        comm/content/necko
+content/mozldap,                                      comm/content/mozldap
+
+# from navigator
+content/navigator-region,                             comm/content/navigator-region
+
+# from the password manager
+content/communicator/wallet/SignonViewer.xul,         comm/content/communicator/wallet/SignonViewer.xul
+content/communicator/wallet/SignonViewer.js,          comm/content/communicator/wallet/SignonViewer.js
+content/communicator/wallet/nsWalletTreeUtils.js,     comm/content/communicator/wallet/nsWalletTreeUtils.js
+
+#################################################################################################
+# Files we need from global.jar
+#################################################################################################
+content/global-region,                                toolkit/content/global-region
+content/global-platform,                              toolkit/content/global-platform
+content/global/bindings,                              toolkit/content/global/bindings
+content/global/platformDialogOverlay.xul,             toolkit/content/global/platformDialogOverlay.xul
+content/global/platformXUL.css,                       toolkit/content/global/platformXUL.css
+content/global/contents.rdf,                          toolkit/content/global/contents.rdf
+content/global/hiddenWindow.xul,                      toolkit/content/global/hiddenWindow.xul 
+content/global/globalOverlay.xul,                     toolkit/content/global/globalOverlay.xul 
+content/global/globalOverlay.js,                      toolkit/content/global/globalOverlay.js 
+content/global/dialogOverlay.xul,                     toolkit/content/global/dialogOverlay.xul 
+content/global/dialogOverlay.js,                      toolkit/content/global/dialogOverlay.js 
+content/global/commonDialog.xul,                      toolkit/content/global/commonDialog.xul 
+content/global/commonDialog.js,                       toolkit/content/global/commonDialog.js 
+content/global/strres.js,                             toolkit/content/global/strres.js 
+content/global/charsetOverlay.xul,                    toolkit/content/global/charsetOverlay.xul 
+content/global/charsetOverlay.js,                     toolkit/content/global/charsetOverlay.js 
+content/global/selectDialog.js,                       toolkit/content/global/selectDialog.js 
+content/global/selectDialog.xul,                      toolkit/content/global/selectDialog.xul 
+content/global/nsWidgetStateManager.js,               toolkit/content/global/nsWidgetStateManager.js 
+content/global/widgetStateManager.js,                 toolkit/content/global/widgetStateManager.js 
+content/global/nsTreeController.js,                   toolkit/content/global/nsTreeController.js 
+content/global/nsTreeSorting.js,                      toolkit/content/global/nsTreeSorting.js 
+content/global/nsClipboard.js,                        toolkit/content/global/nsClipboard.js 
+content/global/nsDragAndDrop.js,                      toolkit/content/global/nsDragAndDrop.js 
+content/global/nsTransferable.js,                     toolkit/content/global/nsTransferable.js 
+content/global/nsUserSettings.js,                     toolkit/content/global/nsUserSettings.js 
+content/global/xul.css,                               toolkit/content/global/xul.css 
+content/global/printdialog.xul,                       toolkit/content/global/printdialog.xul
+content/global/printdialog.js,                        toolkit/content/global/printdialog.js
+content/global/printProgress.xul,                     toolkit/content/global/printProgress.xul
+content/global/printProgress.js,                      toolkit/content/global/printProgress.js
+content/global/printPreviewBindings.xml,              toolkit/content/global/printPreviewBindings.xml
+content/global/printPreviewProgress.xul,              toolkit/content/global/printPreviewProgress.xul
+content/global/printPreviewProgress.js,               toolkit/content/global/printPreviewProgress.js
+content/global/printPageSetup.js,                     toolkit/content/global/printPageSetup.js
+content/global/printPageSetup.xul,                    toolkit/content/global/printPageSetup.xul
+content/global/printjoboptions.js,		                toolkit/content/global/printjoboptions.js
+content/global/printjoboptions.xul,		                toolkit/content/global/printjoboptions.xul
+content/global/MPL-1.1.html,                          toolkit/content/global/MPL-1.1.html
+content/global/NPL-1.1.html,                          toolkit/content/global/NPL-1.1.html
+content/global/customizeToolbar.xul,                  toolkit/content/global/customizeToolbar.xul
+content/global/customizeToolbar.js,                   toolkit/content/global/customizeToolbar.js
+content/global/customizeToolbar.css,                  toolkit/content/global/customizeToolbar.css
+content/global/customizeCharset.xul,                  toolkit/content/global/customizeCharset.xul
+content/global/customizeCharset.js,                   toolkit/content/global/customizeCharset.js
+content/global/viewZoomOverlay.js,                    toolkit/content/global/viewZoomOverlay.js
+content/global/viewSource.css,                        toolkit/content/global/viewSource.css
+content/global/viewSource.xul,                        toolkit/content/global/viewSource.xul
+content/global/viewSource.js,                         toolkit/content/global/viewSource.js
+content/global/findUtils.js,                          toolkit/content/global/findUtils.js
+content/global/printUtils.js,                         toolkit/content/global/printUtils.js
+content/global/editMenuOverlay.xul,                   toolkit/content/global/editMenuOverlay.xul
+content/global/editMenuOverlay.js,                    toolkit/content/global/editMenuOverlay.js
+content/global/XPCNativeWrapper.js,                   toolkit/content/global/XPCNativeWrapper.js
+content/global/platformHTMLBindings.xml,              toolkit/content/global/platformHTMLBindings.xml
+
+#from mozapps
+content/mozapps/downloads,                            toolkit/content/mozapps/downloads
+content/mozapps/profile,                              toolkit/content/mozapps/profile
+content/mozapps/extensions,                           toolkit/content/mozapps/extensions
+content/mozapps/update,                               toolkit/content/mozapps/update
+content/mozapps/shared,                               toolkit/content/mozapps/shared
+content/mozapps/xpinstall,                            toolkit/content/mozapps/xpinstall
+content/mozapps/contents.rdf,                         toolkit/content/mozapps/contents.rdf
+
+# from xpfe\components
+content/global/console.js,                            toolkit/content/global/console.js
+content/global/console.xul,                           toolkit/content/global/console.xul
+content/global/console.css,                           toolkit/content/global/console.css
+content/global/consoleBindings.xml,                   toolkit/content/global/consoleBindings.xml
+content/global/finddialog.js,                         toolkit/content/global/finddialog.js
+content/global/finddialog.xul,                        toolkit/content/global/finddialog.xul
+content/global/autocomplete.xml,                      toolkit/content/global/autocomplete.xml
+content/global/autocomplete.css,                      toolkit/content/global/autocomplete.css
+content/global/filepicker.js,                         toolkit/content/global/filepicker.js
+content/global/filepicker.xul,                        toolkit/content/global/filepicker.xul
+
+# embedding\components\ui
+content/global/nsHelperAppDlg.xul,                    toolkit/content/global/nsHelperAppDlg.xul
+content/global/nsProgressDialog.xul,                  toolkit/content/global/nsProgressDialog.xul
+
+#################################################################################################
+# Files we need from pipnss and pippki jars
+#################################################################################################
+content/pipnss/contents.rdf,                          pipnss/content/pipnss/contents.rdf
+content/pippki,                                       pippki/content/pippki
+
+#################################################################################################
+# files needed by the optional pref extension. These files may not necessarily exist if the extension
+# was not built. That's ok.
+#################################################################################################
+content/autoconfig/contents.rdf,                      comm/content/autoconfig/contents.rdf
--- mozilla-thunderbird-1.5.orig/debian/update-mozilla-thunderbird-chrome.sgml
+++ mozilla-thunderbird-1.5/debian/update-mozilla-thunderbird-chrome.sgml
@@ -0,0 +1,95 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+    
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Alexander</firstname>">
+  <!ENTITY dhsurname   "<surname>Sack</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>September 28, 2003</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail     "<email>asac@jwsdot.com</email>">
+  <!ENTITY dhusername  "Alexander Sack">
+  <!ENTITY dhucpackage "<refentrytitle>MOZILLA-THUNDERBIRD</refentrytitle>">
+  <!ENTITY dhpackage   "mozilla-thunderbird">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>MPL</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym></acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>update-mozilla-thunderbird-chrome</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>update-mozilla-thunderbird-chrome</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para> <command>update-mozilla-thunderbird-chrome</command>
+      enables extension package maintainers to install their chrome & 
+      components in during postinst. Extensions must call
+      <command>update-mozilla-thunderbird-chrome</command> in postrm
+      to allow graceful upgrades & removal.</para> 
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
--- mozilla-thunderbird-1.5.orig/debian/README.Debian
+++ mozilla-thunderbird-1.5/debian/README.Debian
@@ -0,0 +1,188 @@
+---------------------------------------------
+---- README.Debian - mozilla-thunderbird ----
+---------------------------------------------
+
+----
+Important Notes
+----
+
+:::
+Firefox/Thunderbird integration:
+
+Gnome users can use the default application configuration
+tool included in gnome-control-center. Set the default
+Mail-Reader Command to: mozilla-thunderbird %s
+
+If you have gconf chances are good that setting the 
+url-handler in the gconf registry to:
+
+   /desktop/gnome/url-handlers/mailto
+                        #command 'mozilla-thunderbird %s'
+			#enabled true
+			#needs_terminal false
+
+use gconftools-2 to set this.
+
+3rd but most broken way for people without gconf is to add
+the handler in $HOME/.firefox/xxx/xxx/prefs.js:
+
+   user_pref("network.protocol-handler.app.mailto",
+             "mozilla-thunderbird");
+
+For a global install use the example included in 
+/usr/share/doc/mozilla-thunderbird/mozilla-firefox.js.tmpl
+and append the content to your global firefox config file:
+/etc/mozilla-firefox/pref/firefox.js
+  
+The mozilla-thunderbird script is now installed to 
+/usr/bin, so you don't need to car for this anymore 
+
+
+:::
+Upgrade to >> 1.0:
+
+Upgrading should be smooth since version 1.0.
+
+Nevertheless, if you have some problems that some
+features of this package are missing or appear to
+be not functional after upgrade, please try:
+
+ 1. stop thunderbird
+ 2. remove XUL.mfasl, chrome.rdf and compreg.dat
+    from inside your profile directory
+    (e.g. /home/user/.mozilla-thunderbird/...)
+ 3. start thunderbird
+
+
+:::
+Upgrade to >> 0.9-4:
+ though I have done my best to make this release work flawlessly
+ in some scenarios the package mechanism is reported to break 
+ during upgrade.
+ Nevertheless, this version contains some massive restructuring
+ in order to switch to the final solution for the new extension
+ manager. If you encounter a bug after upgrading a package, 
+ please post a detailed bug report and backup the 
+ /usr/lib/mozilla-thunderbird and /var/lib/mozilla-thunderbird 
+ directories, so I can make some further examinations. 
+ After that removing and installing mozilla-thunderbird again
+ should solve your problems.
+
+ Note: Since 0.9 extension upgrades should not be a problem anymore, 
+ since the extension manager is now consequently used. After changing
+ the set of installed debian package based extensions, the user will
+ be asked once to restart thunderbird in order to finalize the 
+ component registration. Maybe this manual restart will vanish soon,
+ but for now this is the cleanest solution possible.
+
+:::
+Upgrade to 0.8:
+ though my initial 0.8 package had some problems, 0.8 has made
+ substantial progress to a more consequence handling of
+ upgrade downgrades. With 0.8 you should rarely run into
+ troubles. Anyway, if you still run into problems after 
+ upgrade, please try the steps listed under "3. STRANGE
+ BEHAVIOUR COUNTERMEASURES", listed below!
+
+Updrade to 0.7.1:
+
+1. EXTENSIONS:
+ mozilla-thunderbird disables all your manual installed extensions 
+ the first time it starts up.
+
+
+2. PROFILE MIGRATION (NOT RECOGNIZED OLD SETTINGS)
+
+ I made a mistake when uploading the 0.7.1-1 version. This led
+ to the problem that tbird did not recognize your old profiles.
+ This problem is *fixed* in 0.7.1-2 and later versions so
+ people upgrading versions < 0.7 should not encounter this bug.
+ If you have been one of the unhappy that ran into this problem,
+ you can recover your old settings by the following steps:
+
+   a) open thunderbirds profile manager:
+       #  mozilla-thunderbird -P
+   b) selecte create profile ... -> Next
+   c) select a name of your profile (e.g. default) and
+   d) choose folder ...
+      select your old profile folder 
+       (e.g. /home/user/.mozilla-thunderbird/default/vc3zm897.slt)
+   e) finish the profile creation
+   f) start thunderbird with your new profile
+
+
+3. STRANGE BEHAVIOUR COUNTERMEASURES
+ If you encounter some strange effects like segfaults 
+ after upgrading or simply some extensions not working
+ as expected, try to remove the user profiles 
+ *compreg.dat* file and restart. If that doesn't help
+ you can try to remove the *chrome* directory of your
+ profile to repair your profile.
+ Note: you will have to reinstall your manually installed
+ extensions if you have removed the chrome directory.
+ If you still see such the behaviour, file a bug.
+
+----
+Global Configuration 
+----
+
+The global configuration can now be found in
+/etc/mozilla-thunderbird/global-config.js. Place all your global
+configuration in there.
+
+----
+Source Archives
+----
+
+The thunderbird-free-source-0.x.tar.bz2 is a repackaged upstream archive, 
+since the upstream tarball contains non-free/trademarked icons!
+I removed them for the debian main package!
+
+----
+GTK tweaks available in debian:
+----
+I patch the thunderbird source in order to provide
+a way to configure gtk2 settings. 
+The problem appears to be that default settings are not
+configurable for gtk in non gnome-environments and hence 
+no gnome desktop settings appear to apply.
+As a workaround I provide you with mozilla-thunderbird
+preference switches to set some values on your own.
+
+Current switches are:
+
+  widget.gtk2.dnd.threshold - GTK Default: 3 Pixel before the drag starts
+  widget.gtk2.double_click_timeout - GTK Default: 200 milliseconds
+
+The threshold appears to be too sensitive, which leads to unwanted
+folder moves, etc. To change this behaviour, add the following line
+in your user specific configuration file at 
+[$HOME/.mozilla-thunderbird/default/xcv.123asd/prefs.js]:
+
+	user_pref("widget.gtk2.dnd.threshold", 15);
+
+
+--------
+Bug Reporting
+--------
+Please post bugs initially against the debian bug tracking 
+system. We will forward it to the upstream authors 
+bugzilla after we verified that this bug is not only a 
+debian issue. If you encounter a bug, please verify if the 
+bug is already known. To see a list of open bugs visit the 
+mozilla-thunderbird bug list 
+[http://bugs.debian.org/mozilla-thunderbird]
+
+
+--------
+Maintainer(s)
+--------
+
+To Contact the Maintainers contact either
+asac@jwsdot.com or
+boll@debian.org
+
+
+------------------
+Have Fun!!!
+------------------
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.xpm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.xpm
@@ -0,0 +1,245 @@
+/* XPM */
+static char * mozilla_thunderbird_xpm[] = {
+"32 32 210 2",
+"  	c None",
+". 	c #8F8064",
+"+ 	c #6C5F49",
+"@ 	c #51432D",
+"# 	c #7B6E58",
+"$ 	c #B1AA9C",
+"% 	c #BAB3A5",
+"& 	c #A39C8D",
+"* 	c #5D503B",
+"= 	c #8B7E66",
+"- 	c #918672",
+"; 	c #BCB6A9",
+"> 	c #BEB8AA",
+", 	c #C2BBAD",
+"' 	c #6D7CAA",
+") 	c #7280AA",
+"! 	c #857A69",
+"~ 	c #A39D93",
+"{ 	c #C4BEB1",
+"] 	c #C6C0B2",
+"^ 	c #C9C2B5",
+"/ 	c #44578C",
+"( 	c #C0C7DB",
+"_ 	c #FAFCFE",
+": 	c #DFE4F0",
+"< 	c #98A9DA",
+"[ 	c #6F7996",
+"} 	c #878992",
+"| 	c #9F9B93",
+"1 	c #ACA79C",
+"2 	c #CCC6B9",
+"3 	c #9B8D73",
+"4 	c #4F5C84",
+"5 	c #F1F6FD",
+"6 	c #DBE1ED",
+"7 	c #B1BCDB",
+"8 	c #8796C1",
+"9 	c #717EA7",
+"0 	c #7C849D",
+"a 	c #8E9098",
+"b 	c #A4A4AA",
+"c 	c #B6AFA0",
+"d 	c #A49981",
+"e 	c #918165",
+"f 	c #7A87AC",
+"g 	c #F5F9FE",
+"h 	c #B5C0DE",
+"i 	c #97A6D1",
+"j 	c #7685B1",
+"k 	c #858DA5",
+"l 	c #9195A3",
+"m 	c #9D9B9B",
+"n 	c #A7A299",
+"o 	c #918978",
+"p 	c #6C6F7D",
+"q 	c #B8C2D8",
+"r 	c #EBF2FD",
+"s 	c #D1DBF2",
+"t 	c #BBC7E8",
+"u 	c #A8B8E1",
+"v 	c #8D9CCA",
+"w 	c #68708B",
+"x 	c #616D91",
+"y 	c #E2E9F7",
+"z 	c #E9EFFC",
+"A 	c #B0B6C1",
+"B 	c #838389",
+"C 	c #AEA083",
+"D 	c #746C5E",
+"E 	c #E7F0FE",
+"F 	c #DEE9FE",
+"G 	c #ADB3C3",
+"H 	c #99968D",
+"I 	c #AB9B7C",
+"J 	c #B3A484",
+"K 	c #9E9175",
+"L 	c #63646B",
+"M 	c #9DA9C9",
+"N 	c #DAE5FD",
+"O 	c #E3ECFD",
+"P 	c #9A9691",
+"Q 	c #C0AF87",
+"R 	c #A7997E",
+"S 	c #A19274",
+"T 	c #D5C9AB",
+"U 	c #BBB099",
+"V 	c #CAD3E6",
+"W 	c #D6E1FC",
+"X 	c #C4B38D",
+"Y 	c #9B8C6F",
+"Z 	c #CEC2A3",
+"` 	c #A4957A",
+" .	c #CDDAF4",
+"..	c #94918E",
+"+.	c #C9B994",
+"@.	c #94856A",
+"#.	c #D8CBAE",
+"$.	c #DDD3BA",
+"%.	c #DBD0B5",
+"&.	c #B1A68B",
+"*.	c #998E7A",
+"=.	c #C8D4EE",
+"-.	c #D0DBFB",
+";.	c #7E8592",
+">.	c #313940",
+",.	c #6C614E",
+"'.	c #BDB090",
+").	c #E0D6BD",
+"!.	c #C3B8A0",
+"~.	c #9C9EA6",
+"{.	c #BAC5E4",
+"].	c #CAD6F8",
+"^.	c #C7D3F5",
+"/.	c #9FA8C4",
+"(.	c #898787",
+"_.	c #645B48",
+":.	c #0C21AB",
+"<.	c #484754",
+"[.	c #897A5E",
+"}.	c #E6DDC8",
+"|.	c #E8DFCA",
+"1.	c #908A83",
+"2.	c #ABB6D3",
+"3.	c #A3ADCB",
+"4.	c #8E98B1",
+"5.	c #B6AB94",
+"6.	c #253293",
+"7.	c #102CE9",
+"8.	c #4A4647",
+"9.	c #7E725A",
+"0.	c #817259",
+"a.	c #EBE4D2",
+"b.	c #ADA189",
+"c.	c #4A4D4D",
+"d.	c #24476C",
+"e.	c #3C4449",
+"f.	c #C1B69B",
+"g.	c #33409E",
+"h.	c #1130F9",
+"i.	c #1022A0",
+"j.	c #3D3E3B",
+"k.	c #7B6C53",
+"l.	c #E3D9C3",
+"m.	c #E8E0CC",
+"n.	c #F1EBDB",
+"o.	c #F9F5E9",
+"p.	c #165EAA",
+"q.	c #787D7F",
+"r.	c #D2CEC4",
+"s.	c #868886",
+"t.	c #0B77EB",
+"u.	c #524C3F",
+"v.	c #5D584C",
+"w.	c #7F7766",
+"x.	c #393848",
+"y.	c #0F5096",
+"z.	c #04294F",
+"A.	c #73644B",
+"B.	c #D9CEB2",
+"C.	c #A6A196",
+"D.	c #2B5D91",
+"E.	c #0C80FB",
+"F.	c #26394A",
+"G.	c #0F3C75",
+"H.	c #1A257A",
+"I.	c #404A4D",
+"J.	c #0851A0",
+"K.	c #F5F0E1",
+"L.	c #859097",
+"M.	c #1A4571",
+"N.	c #0960BC",
+"O.	c #0E5DB1",
+"P.	c #16406C",
+"Q.	c #0A68CC",
+"R.	c #0F2ADA",
+"S.	c #0E219E",
+"T.	c #6A5B43",
+"U.	c #A99C84",
+"V.	c #7E898F",
+"W.	c #0958AD",
+"X.	c #0D23BB",
+"Y.	c #64553E",
+"Z.	c #D2C5A8",
+"`.	c #EEE8D6",
+" +	c #424E59",
+".+	c #0B2AAB",
+"++	c #D1C4A4",
+"@+	c #0B71DC",
+"#+	c #05255E",
+"$+	c #092A8C",
+"%+	c #093C9C",
+"&+	c #574933",
+"*+	c #787974",
+"=+	c #06175E",
+"-+	c #08519D",
+";+	c #08227D",
+">+	c #5A6368",
+",+	c #0A289C",
+"'+	c #4B3D28",
+")+	c #CCBD9A",
+"!+	c #877860",
+"~+	c #1158A4",
+"{+	c #0948AC",
+"]+	c #453722",
+"^+	c #D5C9B0",
+"/+	c #BBAD91",
+"(+	c #3F301D",
+"_+	c #C6B89D",
+":+	c #063567",
+"<+	c #665840",
+"                                                                ",
+"                            . . . . + @                         ",
+"                          . # $ % % % & *                       ",
+"                        = - ; ; ; > > , $ +                     ",
+"                      . & , , , , , , , , % #                   ",
+"                ' ) ) ! ~ $ % , { ] ^ ^ ] ^ , =                 ",
+"              / ( _ : < ) [ } | 1 % , { ^ 2 2 2 3               ",
+"              4 5 _ _ _ _ 6 7 8 9 0 a ~ b c > { ^ d             ",
+"            e f _ _ _ g _ g _ g g 6 h i j f k l m n o           ",
+"          . p q _ _ g 5 5 5 g g _ _ _ _ g r s t u < v ) w       ",
+"        . n x y g g 5 r g 5 r r r r g g 5 r _ r r z 6 A B C     ",
+"      . . D f E r 5 r r r r r r F r r 5 r r r r r : G H C I     ",
+"      J K L M N E z z z E r O F z N r z r z r r 6 A P I Q R     ",
+"    S T U K b V F F F O F E F W N N F F F F F 6 G H S X X S     ",
+"    Y T T Z ` n q s W N F F F N N N F W W N  .G ..S +.+.X Y     ",
+"    @.T #.$.%.&.*.G =.W N F F W -.W F -. .=.;.>.,.'.+.+.X @.    ",
+"    . #.%.$.$.).!.@.~.{.].W  .t h t  .^.t /.(._.:.<.&.+.X e     ",
+"    [.#.%.$.).}.|.%.Y 1.2.h /.l (...~.3.4.>.# 5.6.7.8.I X 9.    ",
+"    0.T %.$.).|.|.a.a.b.! 0 o R c.& b.@.d.e.d f.g.h.i.9.J j.    ",
+"    k.#.%.$.l.m.|.a.a.n., @.U o.p.q.r.s.t.u.v.w.:.h.h.x.K y.z.  ",
+"    A.B.%.$.).l.m.a.a.a.C.5.o.% t.y.H D.E.F.j.G.h.h.h.H.I.t.J.  ",
+"    A.T %.$.$.l.|.}.a.b.b.K.K.L.E.E.M.N.E.O.P.Q.R.h.h.S.Q.E.N.  ",
+"    T.T %.$.$.).}.}.U.d n.n.n.V.E.E.E.N.E.E.W.N.X.h.h.X.E.E.N.  ",
+"    Y.Z.T %.$.$.).d ` `.`.a.|  +N.E.Q.N.E.E.E.N..+h.h..+E.E.z.  ",
+"    * ++T #.%.$.R 3 |.a.a.|.l.D.@+t.#+J.t.E.E.E.t.$+h.%+t.E.Q.  ",
+"    &+++T T #.R @.l.|.|.l.l.).*+Q.t.X.=+-+E.E.E.E.t.;+Q.E.t.y.  ",
+"    @ ++++Z.` . $.l.l.l.).).$.>+W.t.,+X.Q.Q.t.E.E.E.t.E.E.t.    ",
+"    '+)+++S !+$.).).$.%.$.%.B.&.~+E.{+R.O.E.E.E.E.E.E.E.E.E.    ",
+"    ]+)+S # ^+$.%.B.B.#.#.++/+S . O.E.J.#+t.t.E.E.E.E.E.t.      ",
+"    (+Y k.Z.%.#._+C 3 . . =         :+W.t.t.E.t.E.t.t.J.        ",
+"    '+<+. . . . .                                               ",
+"                                                                "};
--- mozilla-thunderbird-1.5.orig/debian/mozilla-firefox.js.tmpl
+++ mozilla-thunderbird-1.5/debian/mozilla-firefox.js.tmpl
@@ -0,0 +1,4 @@
+/* put this code into the /etc/mozilla-firefox/pref/firefox.js file
+*/
+
+pref("network.protocol-handler.app.mailto","mozilla-thunderbird-compose");
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.links
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.links
@@ -0,0 +1,23 @@
+usr/share/mozilla-thunderbird/res usr/lib/mozilla-thunderbird/res
+usr/share/mozilla-thunderbird/icons usr/lib/mozilla-thunderbird/icons
+var/lib/mozilla-thunderbird/extensions usr/lib/mozilla-thunderbird/extensions
+usr/share/mozilla-thunderbird/chrome/icons usr/lib/mozilla-thunderbird/chrome/icons
+usr/share/mozilla-thunderbird/chrome/classic.jar usr/lib/mozilla-thunderbird/chrome/classic.jar
+usr/share/mozilla-thunderbird/chrome/classic.manifest usr/lib/mozilla-thunderbird/chrome/classic.manifest
+usr/share/mozilla-thunderbird/chrome/comm.jar usr/lib/mozilla-thunderbird/chrome/comm.jar
+usr/share/mozilla-thunderbird/chrome/comm.manifest usr/lib/mozilla-thunderbird/chrome/comm.manifest
+usr/share/mozilla-thunderbird/chrome/en-US.jar usr/lib/mozilla-thunderbird/chrome/en-US.jar
+usr/share/mozilla-thunderbird/chrome/en-US.manifest usr/lib/mozilla-thunderbird/chrome/en-US.manifest
+usr/share/mozilla-thunderbird/chrome/messenger.jar usr/lib/mozilla-thunderbird/chrome/messenger.jar
+usr/share/mozilla-thunderbird/chrome/messenger.manifest usr/lib/mozilla-thunderbird/chrome/messenger.manifest
+usr/share/mozilla-thunderbird/chrome/pippki.jar usr/lib/mozilla-thunderbird/chrome/pippki.jar
+usr/share/mozilla-thunderbird/chrome/pippki.manifest usr/lib/mozilla-thunderbird/chrome/pippki.manifest
+usr/share/mozilla-thunderbird/chrome/toolkit.jar usr/lib/mozilla-thunderbird/chrome/toolkit.jar
+usr/share/mozilla-thunderbird/chrome/toolkit.manifest usr/lib/mozilla-thunderbird/chrome/toolkit.manifest
+usr/share/mozilla-thunderbird/chrome/newsblog.jar usr/lib/mozilla-thunderbird/chrome/newsblog.jar
+usr/share/mozilla-thunderbird/chrome/newsblog.manifest usr/lib/mozilla-thunderbird/chrome/newsblog.manifest
+usr/share/mozilla-thunderbird/chrome/offline.jar usr/lib/mozilla-thunderbird/chrome/offline.jar
+usr/share/mozilla-thunderbird/chrome/offline.manifest usr/lib/mozilla-thunderbird/chrome/offline.manifest
+usr/share/myspell/dicts usr/lib/mozilla-thunderbird/components/myspell
+etc/mozilla-thunderbird/global-config.js usr/lib/mozilla-thunderbird/defaults/pref/all.js
+etc/mozilla-thunderbird/auto-config.js usr/lib/mozilla-thunderbird/defaults/pref/auto-config.js
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-pm-menu.xpm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-pm-menu.xpm
@@ -0,0 +1,647 @@
+/* XPM */
+static char * mozilla_thunderbird_pm_menu_xpm[] = {
+"32 32 612 2",
+"  	c None",
+". 	c #8F8064",
+"+ 	c #6C5F49",
+"@ 	c #51432D",
+"# 	c #7B6E58",
+"$ 	c #B1AA9C",
+"% 	c #BAB3A5",
+"& 	c #A39C8D",
+"* 	c #5D503B",
+"= 	c #8B7E66",
+"- 	c #918672",
+"; 	c #BCB6A9",
+"> 	c #BEB8AA",
+", 	c #C2BBAD",
+"' 	c #6D7CAA",
+") 	c #7280AA",
+"! 	c #857A69",
+"~ 	c #A39D93",
+"{ 	c #C4BEB1",
+"] 	c #C6C0B2",
+"^ 	c #C9C2B5",
+"/ 	c #44578C",
+"( 	c #C0C7DB",
+"_ 	c #FAFCFE",
+": 	c #DFE4F0",
+"< 	c #98A9DA",
+"[ 	c #6F7996",
+"} 	c #878992",
+"| 	c #9F9B93",
+"1 	c #ACA79C",
+"2 	c #CCC6B9",
+"3 	c #9B8D74",
+"4 	c #4F5C84",
+"5 	c #F1F6FD",
+"6 	c #DBE1ED",
+"7 	c #B1BCDB",
+"8 	c #8796C1",
+"9 	c #717EA7",
+"0 	c #7C849D",
+"a 	c #8E9098",
+"b 	c #A4A4AA",
+"c 	c #B6AFA0",
+"d 	c #A59A82",
+"e 	c #918165",
+"f 	c #7A87AC",
+"g 	c #F5F9FE",
+"h 	c #F4F8FD",
+"i 	c #B5C0DE",
+"j 	c #97A6D1",
+"k 	c #7785B1",
+"l 	c #7B87AC",
+"m 	c #868EA6",
+"n 	c #9296A4",
+"o 	c #9E9C9C",
+"p 	c #A8A39A",
+"q 	c #938B7A",
+"r 	c #6C6F7D",
+"s 	c #B8C2D8",
+"t 	c #F9FBFD",
+"u 	c #EBF2FC",
+"v 	c #D1DBF2",
+"w 	c #BBC7E8",
+"x 	c #A9B9E1",
+"y 	c #9AAADA",
+"z 	c #8F9DCB",
+"A 	c #7582AB",
+"B 	c #6B738D",
+"C 	c #A7A299",
+"D 	c #616D91",
+"E 	c #E2E9F7",
+"F 	c #EBF2FD",
+"G 	c #EFF4FB",
+"H 	c #E9F0FA",
+"I 	c #E8EFFA",
+"J 	c #E8EFF9",
+"K 	c #F2F6FB",
+"L 	c #EAF1FC",
+"M 	c #E9EFFC",
+"N 	c #B2B7C2",
+"O 	c #86868C",
+"P 	c #B0A387",
+"Q 	c #746C5E",
+"R 	c #E7F0FE",
+"S 	c #E9F0FB",
+"T 	c #E7EEF9",
+"U 	c #E5ECF7",
+"V 	c #DCE5EF",
+"W 	c #C8D5E7",
+"X 	c #D4DDE7",
+"Y 	c #D8E1EB",
+"Z 	c #E6ECF2",
+"` 	c #E9EFFA",
+" .	c #EAF0FB",
+"..	c #AFB5C5",
+"+.	c #9D9A91",
+"@.	c #B2A589",
+"#.	c #AFA083",
+"$.	c #B3A484",
+"%.	c #9E9175",
+"&.	c #63646B",
+"*.	c #9DA9C9",
+"=.	c #DAE5FD",
+"-.	c #E8EEFB",
+";.	c #E7EDFA",
+">.	c #E3ECF9",
+",.	c #CDD4DD",
+"'.	c #818481",
+").	c #726B55",
+"!.	c #5E4A23",
+"~.	c #594624",
+"{.	c #5B513E",
+"].	c #6E726E",
+"^.	c #D5DDE6",
+"/.	c #E6EBF7",
+"(.	c #DBE0EC",
+"_.	c #B2B8C2",
+":.	c #9E9B96",
+"<.	c #A79C81",
+"[.	c #AAA183",
+"}.	c #928B76",
+"|.	c #A19274",
+"1.	c #D5C9AB",
+"2.	c #BBB099",
+"3.	c #CAD3E6",
+"4.	c #DEE9FE",
+"5.	c #DDE8FC",
+"6.	c #E0E9F9",
+"7.	c #D5E0F4",
+"8.	c #8D8D8C",
+"9.	c #875916",
+"0.	c #BD790F",
+"a.	c #CD820C",
+"b.	c #B66F0B",
+"c.	c #8F550F",
+"d.	c #684C29",
+"e.	c #939FAB",
+"f.	c #D6E0F1",
+"g.	c #D9E2F4",
+"h.	c #D7DDE7",
+"i.	c #ADB3C1",
+"j.	c #94958D",
+"k.	c #6F6D5A",
+"l.	c #6F684B",
+"m.	c #6F5C2E",
+"n.	c #6F531F",
+"o.	c #5E4215",
+"p.	c #473821",
+"q.	c #9B8C6F",
+"r.	c #CEC2A3",
+"s.	c #A4957B",
+"t.	c #D5E0FA",
+"u.	c #D7E1F8",
+"v.	c #C3CFE1",
+"w.	c #5A5348",
+"x.	c #B96F06",
+"y.	c #EF9701",
+"z.	c #E19001",
+"A.	c #975C00",
+"B.	c #5D3501",
+"C.	c #33240E",
+"D.	c #7E8C98",
+"E.	c #B5C0D0",
+"F.	c #BAC5D8",
+"G.	c #9FA6B2",
+"H.	c #706D62",
+"I.	c #6B5121",
+"J.	c #9C6903",
+"K.	c #BE8200",
+"L.	c #D18E01",
+"M.	c #D38C01",
+"N.	c #BE7504",
+"O.	c #93550D",
+"P.	c #94856A",
+"Q.	c #D8CBAE",
+"R.	c #DDD3BA",
+"S.	c #DBD0B5",
+"T.	c #B1A78C",
+"U.	c #9A8F7B",
+"V.	c #AEB4C3",
+"W.	c #C7D3EC",
+"X.	c #D2DDF6",
+"Y.	c #A7B3C3",
+"Z.	c #2D2E2A",
+"`.	c #8B5504",
+" +	c #DB8D00",
+".+	c #CD8400",
+"++	c #8D5600",
+"@+	c #6D3E00",
+"#+	c #5C3806",
+"$+	c #4D4638",
+"%+	c #565953",
+"&+	c #5E6364",
+"*+	c #494A46",
+"=+	c #6D4814",
+"-+	c #CA7F03",
+";+	c #F0A500",
+">+	c #F5AD00",
+",+	c #F7AA00",
+"'+	c #F4A000",
+")+	c #E58D03",
+"!+	c #B8690E",
+"~+	c #DBD0B6",
+"{+	c #DDD3BB",
+"]+	c #DDD4BB",
+"^+	c #E0D6BE",
+"/+	c #C4B9A2",
+"(+	c #96876D",
+"_+	c #9EA0A7",
+":+	c #B8C2DE",
+"<+	c #8F9AAD",
+"[+	c #3C3527",
+"}+	c #926002",
+"|+	c #D89200",
+"1+	c #D38D02",
+"2+	c #C37802",
+"3+	c #BA7000",
+"4+	c #B06A00",
+"5+	c #905302",
+"6+	c #804D02",
+"7+	c #734810",
+"8+	c #6D4616",
+"9+	c #A86003",
+"0+	c #ED9000",
+"a+	c #F5A300",
+"b+	c #ED9E00",
+"c+	c #E59300",
+"d+	c #DD8700",
+"e+	c #CE7706",
+"f+	c #A85B13",
+"g+	c #897A5E",
+"h+	c #DCD1B7",
+"i+	c #DED4BC",
+"j+	c #E1D7BF",
+"k+	c #E6DEC9",
+"l+	c #E8DFCB",
+"m+	c #DBD0B7",
+"n+	c #9E9176",
+"o+	c #948F89",
+"p+	c #77818C",
+"q+	c #62481C",
+"r+	c #6B4908",
+"s+	c #694B10",
+"t+	c #93650A",
+"u+	c #D78606",
+"v+	c #D98001",
+"w+	c #C17604",
+"x+	c #86540D",
+"y+	c #7B4E0A",
+"z+	c #884F03",
+"A+	c #935202",
+"B+	c #CA6F00",
+"C+	c #F18B00",
+"D+	c #D38000",
+"E+	c #B06B00",
+"F+	c #A05D01",
+"G+	c #985503",
+"H+	c #85480C",
+"I+	c #6A3813",
+"J+	c #817259",
+"K+	c #DCD2B8",
+"L+	c #DED5BD",
+"M+	c #E1D8C0",
+"N+	c #E9E0CC",
+"O+	c #E8DFCC",
+"P+	c #E9E2D2",
+"Q+	c #E4DECE",
+"R+	c #ACA390",
+"S+	c #666859",
+"T+	c #3B3017",
+"U+	c #7C7B7B",
+"V+	c #A5A5A5",
+"W+	c #88837A",
+"X+	c #966616",
+"Y+	c #CB7F08",
+"Z+	c #866F4C",
+"`+	c #B4B2AE",
+" @	c #ADAAA3",
+".@	c #685E4E",
+"+@	c #7C4C08",
+"@@	c #CB7500",
+"#@	c #E08000",
+"$@	c #935200",
+"%@	c #402707",
+"&@	c #343226",
+"*@	c #2D2D25",
+"=@	c #282A25",
+"-@	c #2D3230",
+";@	c #7B6C53",
+">@	c #DDD2B9",
+",@	c #DFD6BE",
+"'@	c #E4DBC7",
+")@	c #E8E1CF",
+"!@	c #E5DECB",
+"~@	c #DFDBCC",
+"{@	c #CCCBBF",
+"]@	c #B9BDB4",
+"^@	c #565E54",
+"/@	c #2A271A",
+"(@	c #909090",
+"_@	c #4D4D4D",
+":@	c #878481",
+"<@	c #8B6529",
+"[@	c #B77A17",
+"}@	c #B1A99D",
+"|@	c #7D7D7D",
+"1@	c #767676",
+"2@	c #8F8D8A",
+"3@	c #724E19",
+"4@	c #E88E00",
+"5@	c #E08700",
+"6@	c #7C4601",
+"7@	c #2B1F0D",
+"8@	c #353831",
+"9@	c #162D42",
+"0@	c #172837",
+"a@	c #313435",
+"b@	c #73644B",
+"c@	c #D9CEB2",
+"d@	c #DED3BB",
+"e@	c #DFD6BF",
+"f@	c #E1D8C2",
+"g@	c #E1D9C5",
+"h@	c #BFBDB0",
+"i@	c #828480",
+"j@	c #686B6A",
+"k@	c #4E5151",
+"l@	c #33332F",
+"m@	c #191611",
+"n@	c #242424",
+"o@	c #1B1B1B",
+"p@	c #44423F",
+"q@	c #6B4D21",
+"r@	c #B58029",
+"s@	c #B4AA9A",
+"t@	c #656565",
+"u@	c #5B5B5B",
+"v@	c #7F7A72",
+"w@	c #8A5E14",
+"x@	c #EA9900",
+"y@	c #AF7000",
+"z@	c #3F2400",
+"A@	c #221B0F",
+"B@	c #1E2526",
+"C@	c #153960",
+"D@	c #1C3B5E",
+"E@	c #E0D7C1",
+"F@	c #DED5C0",
+"G@	c #DCD5C3",
+"H@	c #95978E",
+"I@	c #838382",
+"J@	c #A0A0A0",
+"K@	c #2D2D2D",
+"L@	c #080808",
+"M@	c #000000",
+"N@	c #070707",
+"O@	c #504C43",
+"P@	c #CCB38A",
+"Q@	c #9C8D72",
+"R@	c #8A8986",
+"S@	c #7D7974",
+"T@	c #7C6133",
+"U@	c #BE7C05",
+"V@	c #A97000",
+"W@	c #533500",
+"X@	c #291700",
+"Y@	c #201B0F",
+"Z@	c #153049",
+"`@	c #18416D",
+" #	c #204872",
+".#	c #6A5B43",
+"+#	c #DFD5BE",
+"@#	c #E0D7C2",
+"##	c #DDD5C0",
+"$#	c #D6CFBD",
+"%#	c #8C8E88",
+"&#	c #959595",
+"*#	c #B2B2B2",
+"=#	c #474747",
+"-#	c #171717",
+";#	c #484848",
+">#	c #8C8C8C",
+",#	c #C0C0C0",
+"'#	c #ACAAA7",
+")#	c #94908A",
+"!#	c #787671",
+"~#	c #736044",
+"{#	c #A76A0D",
+"]#	c #925C00",
+"^#	c #4D3000",
+"/#	c #2B1900",
+"(#	c #190E00",
+"_#	c #161814",
+":#	c #183C5A",
+"<#	c #1A4877",
+"[#	c #1F4C7B",
+"}#	c #64553E",
+"|#	c #D2C5A8",
+"1#	c #DAD0B7",
+"2#	c #DED5BF",
+"3#	c #DCD4C1",
+"4#	c #D2CCBA",
+"5#	c #7F847E",
+"6#	c #9C9B9B",
+"7#	c #DBDBDB",
+"8#	c #C2C2C2",
+"9#	c #272727",
+"0#	c #020202",
+"a#	c #525252",
+"b#	c #D4D4D4",
+"c#	c #F5F5F5",
+"d#	c #F1F1F1",
+"e#	c #BBBBBA",
+"f#	c #B1B1B1",
+"g#	c #8A8A89",
+"h#	c #76654C",
+"i#	c #7B4F0F",
+"j#	c #4B2D00",
+"k#	c #251600",
+"l#	c #1C0F00",
+"m#	c #0B0500",
+"n#	c #121512",
+"o#	c #193E5E",
+"p#	c #1C4B7E",
+"q#	c #1B3045",
+"r#	c #D1C4A4",
+"s#	c #DBD1B9",
+"t#	c #DCD2BC",
+"u#	c #DAD2BE",
+"v#	c #D1CBBA",
+"w#	c #7B7F7A",
+"x#	c #EAEAEA",
+"y#	c #E1E1E1",
+"z#	c #616160",
+"A#	c #9F9F9F",
+"B#	c #F3F3F3",
+"C#	c #FAFAFA",
+"D#	c #EEEEEE",
+"E#	c #CCCCCB",
+"F#	c #BABABA",
+"G#	c #898885",
+"H#	c #736142",
+"I#	c #BE790C",
+"J#	c #C37700",
+"K#	c #673C00",
+"L#	c #592E01",
+"M#	c #160B03",
+"N#	c #1D1C18",
+"O#	c #1A3E5F",
+"P#	c #1C5085",
+"Q#	c #1D558E",
+"R#	c #574933",
+"S#	c #DCD2BA",
+"T#	c #DBD1BA",
+"U#	c #D8CFBA",
+"V#	c #AEA795",
+"W#	c #6A706C",
+"X#	c #959697",
+"Y#	c #D9D9D9",
+"Z#	c #BFBFBF",
+"`#	c #6F6F6E",
+" $	c #424242",
+".$	c #E6E6E6",
+"+$	c #ECECEC",
+"@$	c #B1B1B0",
+"#$	c #939392",
+"$$	c #76726B",
+"%$	c #715830",
+"&$	c #C47D07",
+"*$	c #CB7F00",
+"=$	c #A56000",
+"-$	c #8F4B06",
+";$	c #4B230D",
+">$	c #25201C",
+",$	c #194167",
+"'$	c #1D4F83",
+")$	c #204873",
+"!$	c #D9CFB6",
+"~$	c #D9CFB9",
+"{$	c #B6AB99",
+"]$	c #A69D8C",
+"^$	c #7D8681",
+"/$	c #5A5E5F",
+"($	c #818282",
+"_$	c #666666",
+":$	c #9B9B9B",
+"<$	c #B0B0B0",
+"[$	c #686868",
+"}$	c #919190",
+"|$	c #B8B7B7",
+"1$	c #B3B1AF",
+"2$	c #A7A29D",
+"3$	c #887F75",
+"4$	c #5E4E39",
+"5$	c #734C13",
+"6$	c #A66401",
+"7$	c #A86600",
+"8$	c #8F5103",
+"9$	c #743C0B",
+"0$	c #482511",
+"a$	c #252E35",
+"b$	c #1A4571",
+"c$	c #1F548D",
+"d$	c #4B3D28",
+"e$	c #CCBD9A",
+"f$	c #B5AA94",
+"g$	c #A59B8B",
+"h$	c #D7D1C2",
+"i$	c #B7B7AD",
+"j$	c #707874",
+"k$	c #484F4F",
+"l$	c #E8E8E8",
+"m$	c #E9E9E9",
+"n$	c #B3B3B3",
+"o$	c #646464",
+"p$	c #797775",
+"q$	c #8A8176",
+"r$	c #776756",
+"s$	c #5E4B34",
+"t$	c #5E3B12",
+"u$	c #7B4706",
+"v$	c #824901",
+"w$	c #714000",
+"x$	c #5C3105",
+"y$	c #42220A",
+"z$	c #221F1E",
+"A$	c #183550",
+"B$	c #1C4D80",
+"C$	c #2160A2",
+"D$	c #453722",
+"E$	c #B4A891",
+"F$	c #9A9181",
+"G$	c #DAD2C2",
+"H$	c #DBD5C6",
+"I$	c #D0CABB",
+"J$	c #C3BEB0",
+"K$	c #888B86",
+"L$	c #C6C6C6",
+"M$	c #F8F8F8",
+"N$	c #F4F4F4",
+"O$	c #D6D6D6",
+"P$	c #A6A6A6",
+"Q$	c #484644",
+"R$	c #322A21",
+"S$	c #442E13",
+"T$	c #51320B",
+"U$	c #4F2C03",
+"V$	c #462804",
+"W$	c #3B2409",
+"X$	c #2D2111",
+"Y$	c #1E2323",
+"Z$	c #192C3B",
+"`$	c #113455",
+" %	c #194570",
+".%	c #21568F",
+"+%	c #3F301D",
+"@%	c #978B78",
+"#%	c #DBD1BC",
+"$%	c #DFD8C6",
+"%%	c #DBD2C1",
+"&%	c #C9C1B2",
+"*%	c #B4AE9F",
+"=%	c #7C7E7A",
+"-%	c #B9B9B9",
+";%	c #F2F2F2",
+">%	c #C8C8C8",
+",%	c #9E9E9E",
+"'%	c #555553",
+")%	c #262E2D",
+"!%	c #272A27",
+"~%	c #252929",
+"{%	c #202930",
+"]%	c #1A2734",
+"^%	c #152A3E",
+"/%	c #122C44",
+"(%	c #143555",
+"_%	c #16385B",
+":%	c #18426D",
+"<%	c #1D3E62",
+"[%	c #665840",
+"}%	c #A79C86",
+"|%	c #AA9F8B",
+"1%	c #ADA390",
+"2%	c #AEA593",
+"3%	c #AEA695",
+"4%	c #7C8182",
+"5%	c #919292",
+"6%	c #C3C3C3",
+"7%	c #929292",
+"8%	c #6D6D6D",
+"9%	c #353B3B",
+"0%	c #363F40",
+"a%	c #343535",
+"b%	c #2F2F2F",
+"c%	c #2D2E2E",
+"d%	c #2A2B2B",
+"e%	c #29292A",
+"f%	c #292B2A",
+"g%	c #2C2E2E",
+"h%	c #323534",
+"i%	c #888D8E",
+"j%	c #545656",
+"k%	c #787878",
+"l%	c #797979",
+"m%	c #5E5E5E",
+"n%	c #3D3D3D",
+"o%	c #343D3E",
+"p%	c #4E5252",
+"q%	c #4E4F4E",
+"r%	c #484A4A",
+"s%	c #454646",
+"t%	c #444545",
+"u%	c #424343",
+"                                                                ",
+"                            . . . . + @                         ",
+"                          . # $ % % % & *                       ",
+"                        = - ; ; ; > > , $ +                     ",
+"                      . & , , , , , , , , % #                   ",
+"                ' ) ) ! ~ $ % , { ] ^ ^ ] ^ , =                 ",
+"              / ( _ : < ) [ } | 1 % , { ^ 2 2 2 3               ",
+"              4 5 _ _ _ _ 6 7 8 9 0 a ~ b c > { ^ d             ",
+"            e f _ _ _ g _ g _ g h 6 i j k l m n o p q           ",
+"          . r s _ _ g 5 5 5 h h t t t t h u v w x y z A B       ",
+"        . C D E g g 5 F h G H I I J K K G L t u F M 6 N O P     ",
+"      . . Q f R F 5 F L S T U V W X Y Z `  .L u u : ..+.@.#.    ",
+"      $.%.&.*.=.R M -.;.>.,.'.).!.~.{.].^./.H H (._.:.<.[.}.    ",
+"    |.1.2.%.b 3.4.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.",
+"    q.1.1.r.s.C s v t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.",
+"    P.1.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+",
+"    . Q.~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+",
+"    g+Q.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+1.K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@",
+"    ;@Q.>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@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@  ",
+"    b@1.i+E@F@G@H@I@J@t@K@L@M@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #  ",
+"    .#1.+#@###$#%#&#*#=#L@M@-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#  ",
+"    }#|#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#8#x#y#z#-#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#  ",
+"    R#r#S#T#U#V#W#X#Y#Z#`# $F#.$+$7#@$#$$$%$&$*$=$-$;$>$,$'$)$  ",
+"    @ r#!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$b$c$    ",
+"    d$e$!$f$g$h$i$j$k$J@l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$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$`$ %.%      ",
+"    +%q.@%#%$%%%&%*%=%-%;%x#>%,%'%)%!%~%{%]%^%/%(%_%:%<%        ",
+"    d$[%}%|%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% $                "};
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.prerm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.prerm
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+case "$1" in
+    upgrade|remove)
+#    rm -rf /var/lib/mozilla-thunderbird/chrome/overlayinfo
+#    rm -f /usr/lib/mozilla-thunderbird/chrome/chrome.rdf
+#    rm -f /var/lib/mozilla-thunderbird/chrome/*.rdf
+#    rm -f /var/lib/mozilla-thunderbird/chrome/installed-chrome.txt
+#    rm -f /var/lib/mozilla-thunderbird/components/*.dat
+#    rm -f /usr/lib/mozilla-thunderbird/components/*.dat
+
+#    if [ -L /usr/lib/mozilla-thunderbird/defaults/pref ]; then
+#       rm -f /usr/lib/mozilla-thunderbird/defaults/pref
+#    fi
+#    if [ -L /usr/lib/mozilla-thunderbird/greprefs ]; then
+#       rm -f /usr/lib/mozilla-thunderbird/greprefs
+#    fi
+
+#     if [ -d /var/lib/mozilla-thunderbird/ ]; then
+#        find /var/lib/mozilla-thunderbird/ -type d -empty \
+#            | xargs --no-run-if-empty rmdir --ignore-fail-on-non-empty -p
+#     fi
+      ;;
+    *)
+      ;;
+esac
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/tmpls-inspector/install.rdf
+++ mozilla-thunderbird-1.5/debian/tmpls-inspector/install.rdf
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>{afd805d2-fee6-42bb-9db3-86997e11045e}</em:id>
+    <em:version>1.0</em:version>
+    
+    <!-- Target Application (Thunderbird) this extension can install into, 
+         with minimum and maximum supported versions. --> 
+    <em:targetApplication>
+      <Description>
+        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+        <em:minVersion>1.0</em:minVersion>
+        <em:maxVersion>1.0</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+    
+    
+    <!-- Front End MetaData -->
+    <em:name>DOM Inspector</em:name>
+    <em:description>DOM Inspector (for developers)</em:description>
+    <em:creator>official debian package</em:creator>
+    <em:homepageURL>http://www.debian.org</em:homepageURL>
+<!--
+    <em:updateURL>http://downloads.mozdev.org/enigmail/getupdate.php?appVer=%APP_VERSION%&ext=enigmail</em:updateURL>
+-->    
+
+    <!-- Front End Integration Hooks (used by Extension Manager)
+    <em:iconURL>chrome://enigmail/skin/enigmail-about.png</em:iconURL>
+    -->
+    
+    <!-- Packages, Skins and Locales that this extension registers -->
+    <em:file>
+      <Description about="urn:mozilla:extension:file:inspector.jar">
+        <em:package>content/inspector/</em:package>
+	<em:locale>locale/en-US/inspector/</em:locale>
+	<em:skin>skin/modern/inspector/</em:skin>
+	<em:skin>skin/classic/inspector/</em:skin>
+      </Description>
+    </em:file>
+  </Description>      
+
+</RDF>
--- mozilla-thunderbird-1.5.orig/debian/mozilla.in_1.0.6
+++ mozilla-thunderbird-1.5/debian/mozilla.in_1.0.6
@@ -0,0 +1,245 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+## $Id: mozilla.in,v 1.2.6.1 2004/07/24 23:58:06 bryner%brianryner.com Exp $
+## 
+## Usage:
+##
+## $ mozilla [args]
+##
+## This script is meant to run the mozilla-bin binary from either 
+## mozilla/xpfe/bootstrap or mozilla/dist/bin.
+##
+## The script will setup all the environment voodoo needed to make
+## the mozilla-bin binary to work.
+##
+
+moz_pis_startstop_scripts()
+{
+  MOZ_USER_DIR="%MOZ_USER_DIR%"
+  # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
+  # These variables and there meaning are specified in
+  # mozilla/xpfe/bootstrap/init.d/README
+  MOZ_PIS_API=2
+  MOZ_PIS_MOZBINDIR="${dist_bin}"
+  MOZ_PIS_SESSION_PID="$$"
+  MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
+  export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
+  
+  case "${1}" in
+    "start")
+      for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
+        if [ -x "${curr_pis}" ] ; then
+          case "${curr_pis}" in
+            *.sh) .  "${curr_pis}"         ;;
+            *)       "${curr_pis}" "start" ;;
+          esac
+        fi
+      done
+      ;;
+    "stop")
+      for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
+        if [ -x "${curr_pis}" ] ; then
+          case "${curr_pis}" in
+            *.sh) . "${curr_pis}"        ;;
+            *)      "${curr_pis}" "stop" ;;
+          esac
+        fi
+      done
+      ;;
+    *)
+      echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
+      exit 1
+      ;;
+  esac
+}
+
+#uncomment for debugging
+#set -x
+
+moz_libdir=%MOZAPPDIR%
+MRE_HOME=%MREDIR%
+
+# Use run-mozilla.sh in the current dir if it exists
+# If not, then start resolving symlinks until we find run-mozilla.sh
+found=0
+progname="$0"
+curdir=`dirname "$progname"`
+progbase=`basename "$progname"`
+run_moz="$curdir/run-mozilla.sh"
+if test -x "$run_moz"; then
+  dist_bin="$curdir"
+  found=1
+else
+  here=`/bin/pwd`
+  while [ -h "$progname" ]; do
+    bn=`basename "$progname"`
+    cd `dirname "$progname"`
+    progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
+    if [ ! -x "$progname" ]; then
+      break
+    fi
+    curdir=`dirname "$progname"`
+    run_moz="$curdir/run-mozilla.sh"
+    if [ -x "$run_moz" ]; then
+      cd "$curdir"
+      dist_bin=`pwd`
+      found=1
+      break
+    fi
+  done
+  cd "$here"
+fi
+if [ $found = 0 ]; then
+  # Check default compile-time libdir
+  if [ -x "$moz_libdir/run-mozilla.sh" ]; then
+    dist_bin="$moz_libdir"
+  else 
+    echo "Cannot find mozilla runtime directory. Exiting."
+    exit 1
+  fi
+fi
+
+script_args=""
+moreargs=""
+debugging=0
+MOZILLA_BIN="${progbase}-bin"
+
+# The following is to check for a currently running instance.
+# This is taken almost verbatim from the Mozilla RPM package's launch script.
+MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
+check_running() {
+    "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
+    RETURN_VAL=$?
+    if [ $RETURN_VAL -eq 0 ]; then
+        echo 1
+        return 1
+    else
+        echo 0
+        return 0
+    fi
+}
+
+if [ "$OSTYPE" = "beos" ]; then
+  mimeset -F "$MOZILLA_BIN"
+fi
+
+ALREADY_RUNNING=`check_running`
+
+################################################################ Parse Arguments
+# If there's a command line argument but it doesn't begin with a -
+# it's probably a url.  Try to send it to a running instance.
+_USE_EXIST=0
+_NEW_WINDOW=
+_optOne="$1"
+case "${_optOne}" in
+	-*) 
+		;;
+	*)
+		_USE_EXIST=1
+		;;
+esac
+
+_optOthers=
+_optLast=
+for i in "$@"; do 
+	_optLast="${i}"
+done #last arg
+
+for i in "$@"; do
+	[ $i = ${_optLast} ] && break
+	_optOthers="${_optOthers} ${i}"
+done #others arg
+
+#???: needs check if othersopt begin with -* ?
+if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
+	# Last argument seems to be a local file/directory
+	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
+	# If it is just "relatively" (./file) specified, make it absolutely
+	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
+elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
+	_NEW_WINDOW=1
+fi
+################################################################ Parse Arguments
+
+########################################################################### Main
+if [ $ALREADY_RUNNING -eq 1 ]; then
+	# There's an instance already running. Use it.
+	# Any command line args passed in?
+	if [ $# -gt 0 ]; then
+		# There were "some" command line args.
+		if [ ${_USE_EXIST} -eq 1 ]; then
+			# We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
+			_open_type="window"
+			#_open_type="tab"
+			_remote_cmd="openURL(${_optLast} , new-${_open_type})"
+			"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
+			unset _remote_cmd _open_type
+			exit $?
+		fi
+	else
+		# No command line args. Open new window/tab
+		#exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
+		"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)"
+		exit $?
+	fi
+fi
+# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
+########################################################################### Main
+
+while [ $# -gt 0 ]
+do
+  case "$1" in
+    -p | --pure | -pure)
+      MOZILLA_BIN="${MOZILLA_BIN}.pure"
+      shift
+      ;;
+    -g | --debug)
+      script_args="$script_args -g"
+      debugging=1
+      shift
+      ;;
+    -d | --debugger)
+      script_args="$script_args -d $2"
+      shift 2
+      ;;
+    *)
+      moreargs="$moreargs \"$1\""
+      shift 1
+      ;;
+  esac
+done
+
+export MRE_HOME
+eval "set -- $moreargs"
+
+## Start addon scripts
+moz_pis_startstop_scripts "start"
+
+if [ $debugging = 1 ]
+then
+  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
+fi
+"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+exitcode=$?
+
+## Stop addon scripts
+moz_pis_startstop_scripts "stop"
+
+exit $exitcode
+# EOF.
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-typeaheadfind.dirs
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-typeaheadfind.dirs
@@ -0,0 +1,5 @@
+tmp
+var/lib/mozilla-thunderbird/chrome.d
+var/lib/mozilla-thunderbird/extensions.d
+var/lib/mozilla-thunderbird/startup-hooks.d
+usr/lib/mozilla-thunderbird/extensions/typeaheadfind@thelizards.debian.org/chrome/
--- mozilla-thunderbird-1.5.orig/debian/global_jar_includes.csv
+++ mozilla-thunderbird-1.5/debian/global_jar_includes.csv
@@ -0,0 +1,80 @@
+content/global-region/*
+content/global-platform/*
+content/global/bindings/*
+content/global/platformDialogOverlay.xul
+content/global/platformXUL.css
+content/global/contents.rdf
+content/global/hiddenWindow.xul
+content/global/globalOverlay.xul
+content/global/globalOverlay.js
+content/global/dialogOverlay.xul
+content/global/dialogOverlay.js
+content/global/commonDialog.xul
+content/global/commonDialog.js
+content/global/strres.js
+content/global/charsetOverlay.xul
+content/global/charsetOverlay.js
+content/global/selectDialog.js
+content/global/selectDialog.xul
+content/global/nsWidgetStateManager.js
+content/global/widgetStateManager.js
+content/global/nsTreeController.js
+content/global/nsTreeSorting.js
+content/global/nsClipboard.js
+content/global/nsDragAndDrop.js
+content/global/nsTransferable.js
+content/global/nsUserSettings.js
+content/global/xul.css
+content/global/printdialog.xul
+content/global/printdialog.js
+content/global/printProgress.xul
+content/global/printProgress.js
+content/global/printPreviewBindings.xml
+content/global/printPreviewProgress.xul
+content/global/printPreviewProgress.js
+content/global/printPageSetup.js
+content/global/printPageSetup.xul
+content/global/printjoboptions.js
+content/global/printjoboptions.xul
+content/global/MPL-1.1.html
+content/global/NPL-1.1.html
+content/global/customizeToolbar.xul
+content/global/customizeToolbar.js
+content/global/customizeToolbar.css
+content/global/customizeCharset.xul
+content/global/customizeCharset.js
+content/global/viewZoomOverlay.js
+content/global/viewSource.css
+content/global/viewSource.xul
+content/global/viewSource.js
+content/global/findUtils.js
+content/global/printUtils.js
+content/global/editMenuOverlay.xul
+content/global/editMenuOverlay.js
+content/global/XPCNativeWrapper.js
+content/global/platformHTMLBindings.xml
+
+#from mozapps
+content/mozapps/downloads/*
+content/mozapps/profile/*
+content/mozapps/extensions/*
+content/mozapps/update/*
+content/mozapps/shared/*
+content/mozapps/xpinstall/*
+content/mozapps/contents.rdf
+
+# from xpfe\components
+content/global/console.js
+content/global/console.xul
+content/global/console.css
+content/global/consoleBindings.xml
+content/global/finddialog.js
+content/global/finddialog.xul
+content/global/autocomplete.xml
+content/global/autocomplete.css
+content/global/filepicker.js
+content/global/filepicker.xul
+
+# embedding\components\ui
+content/global/nsHelperAppDlg.xul
+content/global/nsProgressDialog.xul
--- mozilla-thunderbird-1.5.orig/debian/global-config.js
+++ mozilla-thunderbird-1.5/debian/global-config.js
@@ -0,0 +1,27 @@
+// ************************************
+// ***     GLOBAL CONFIG FILE       ***
+// *** PUT YOUR GLOBAL CONFIGS HERE ***
+// ************************************
+
+/*
+   use this if you have no access to gnome configuration
+   as described on http://www.jwsdot.com/debian/faq.html#q9
+   and don't care about debian default settings.
+*/
+// pref("network.protocol-handler.app.http","mozilla-firefox");
+// pref("network.protocol-handler.app.https","mozilla-firefox");
+
+
+/* 
+   uncomment this if you want your browser configured as
+   your default by means of the debian alternatives mechanism
+*/
+// pref("network.protocol-handler.app.http","x-www-browser");
+// pref("network.protocol-handler.app.https","x-www-browser");
+
+
+/*
+   use this to tune your gtk2 mouse feeling
+*/
+// pref("widget.gtk2.dnd.threshold",25);
+// pref("widget.gtk2.double_click_timeout", 300);
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.install
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.install
@@ -0,0 +1,48 @@
+debian/tmpbuild/usr/bin/mozilla-thunderbird usr/bin/
+
+debian/tmpbuild/usr/lib/mozilla-thunderbird/components usr/lib/mozilla-thunderbird/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/defaults usr/lib/mozilla-thunderbird/
+build-dir/mozilla/mail/extensions/newsblog/rss.rdf usr/lib/mozilla-thunderbird/defaults/isp
+build-dir/mozilla/mail/extensions/newsblog/rss.rdf usr/lib/mozilla-thunderbird/defaults/isp/US
+build-dir/mozilla/mailnews/base/ispdata/movemail.rdf usr/lib/mozilla-thunderbird/defaults/isp
+build-dir/mozilla/mailnews/base/ispdata/movemail.rdf usr/lib/mozilla-thunderbird/defaults/isp/US
+debian/tmpbuild/usr/lib/mozilla-thunderbird/*.so usr/lib/mozilla-thunderbird/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/reg* usr/lib/mozilla-thunderbird/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/mozilla-* usr/lib/mozilla-thunderbird/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/*.sh usr/lib/mozilla-thunderbird/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/classic.jar usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/classic.manifest usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/comm.jar usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/comm.manifest usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/en-US.jar usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/en-US.manifest usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/messenger.jar usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/messenger.manifest usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/toolkit.jar usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/toolkit.manifest usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/pippki.jar usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/pippki.manifest usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/newsblog.jar usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/newsblog.manifest usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/offline.jar usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/offline.manifest usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/icons usr/share/mozilla-thunderbird/chrome/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/icons usr/share/mozilla-thunderbird/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/res usr/share/mozilla-thunderbird/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/installed-chrome.txt usr/share/mozilla-thunderbird/chrome/
+
+debian/mozilla-thunderbird.xpm usr/share/mozilla-thunderbird/chrome/icons/default/
+debian/mozilla-thunderbird.xpm usr/share/pixmaps/
+debian/mozilla-thunderbird-menu.xpm usr/share/pixmaps/
+debian/mozilla-thunderbird-pm-menu.xpm usr/share/pixmaps/
+debian/messengerWindow16.xpm usr/share/mozilla-thunderbird/chrome/icons/default/
+debian/messengerWindow.xpm usr/share/mozilla-thunderbird/chrome/icons/default/
+debian/overrides/mozilla-thunderbird usr/share/lintian/overrides/
+debian/mozilla-thunderbird.desktop usr/share/applications/
+debian/mozilla-thunderbird-pm.desktop usr/share/applications/
+debian/tmpbuild/usr/lib/mozilla-thunderbird/greprefs usr/lib/mozilla-thunderbird/
+debian/global-config.js etc/mozilla-thunderbird/
+debian/parts usr/share/mozilla-thunderbird/
+debian/theme.part.defaultclassic var/lib/mozilla-thunderbird/extensions.d/
+debian/00default-theme.txt var/lib/mozilla-thunderbird/extensions.d/
+debian/mozilla-firefox.js.tmpl usr/share/doc/mozilla-thunderbird/
--- mozilla-thunderbird-1.5.orig/debian/comm_jar_includes.csv
+++ mozilla-thunderbird-1.5/debian/comm_jar_includes.csv
@@ -0,0 +1,46 @@
+content/editor/*
+content/editor-region/*
+content/communicator-region/*
+content/communicator-platform/*
+content/communicator/contents.rdf
+content/communicator/communicatorOverlay.xul
+content/communicator/utilityOverlay.xul
+content/communicator/utilityOverlay.js
+content/communicator/browserBindings.xul
+content/communicator/editorBindings.xul
+content/communicator/platformBrowserBindings.xul
+content/communicator/platformEditorBindings.xul
+content/communicator/platformCommunicatorOverlay.xul
+content/communicator/contentAreaUtils.js
+content/communicator/builtinURLs.js
+content/communicator/contentAreaDD.js
+content/communicator/contentAreaClick.js
+content/communicator/contentAreaContextOverlay.xul
+content/communicator/nsContextMenu.js
+content/communicator/printing.js
+
+# from xpfe\components jar.mn
+content/communicator/alerts/*
+content/communicator/pref/pref-fonts.js
+content/communicator/pref/pref-fonts.xul
+content/communicator/pref/pref.xul
+content/communicator/pref/nsPrefWindow.js
+content/communicator/pref/pref-calibrate-screen.xul
+
+# dummy contextHelp.js file so we don't get a bunch of errors about this file not being found
+content/help/contextHelp.js
+content/help/contents.rdf
+
+# from layout
+content/xbl-marquee/*
+content/necko/*
+content/mozldap/*
+
+# from navigator
+content/navigator-region/*
+
+# from the password manager
+content/communicator/wallet/SignonViewer.xul
+content/communicator/wallet/SignonViewer.js
+content/communicator/wallet/nsWalletTreeUtils.js
+
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.templates.old
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.templates.old
@@ -0,0 +1,13 @@
+Template: mozilla-thunderbird/browser
+Type: select
+_choices: Debian, GNOME, none
+_description: Please choose your preferred way of browser integration
+ If you are running GNOME, select gnome, so that your settings in gnome
+ control center apply. If you are running kde or any other plain window
+ manager selecting Debian is a wise decision. Otherwise select none.
+ .
+ Note: If you already added a browser configuration in
+ /etc/mozilla-thunderbird/global-config.js the outcome is undefined select
+ none by now and maybe run dpkg-reconfigure after removing your changes to
+ global-config.js
+Default: Debian
--- mozilla-thunderbird-1.5.orig/debian/extensions/Extensions.rdf
+++ mozilla-thunderbird-1.5/debian/extensions/Extensions.rdf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
+     xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <Seq about="urn:mozilla:extension:root"/>
+  <Seq about="urn:mozilla:theme:root"/>
+
+</RDF>
--- mozilla-thunderbird-1.5.orig/debian/patches/10_debian-thunderbird.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/10_debian-thunderbird.dpatch
@@ -0,0 +1,57 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/config/autoconf.mk.in.orig	2004-03-20 00:56:47.000000000 +0000
++++ mozilla/config/autoconf.mk.in	2004-03-20 00:58:15.000000000 +0000
+@@ -31,14 +31,14 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZ_APP_NAME)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @datadir@/idl/$(MOZ_APP_NAME)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/$(MOZ_APP_NAME)
++mredir		= $(libdir)/mre/mre
+ mrelibdir	= $(mredir)/lib
+ 
+ DIST		= $(DEPTH)/dist
+--- mozilla/mail/app/nsMailApp.cpp.orig	2004-06-15 09:07:30.000000000 +0000
++++ mozilla/mail/app/nsMailApp.cpp	2004-06-15 09:07:49.000000000 +0000
+@@ -47,7 +47,7 @@
+ static const nsXREAppData kAppData = {
+   sizeof(nsXREAppData),
+   nsnull,
+   nsnull,
+-  "Thunderbird",
++  "Mozilla-Thunderbird",
+   NS_STRINGIFY(APP_VERSION),
+   NS_STRINGIFY(BUILD_ID),
--- mozilla-thunderbird-1.5.orig/debian/patches/10_visibility_hidden_patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/10_visibility_hidden_patch.dpatch
@@ -0,0 +1,51 @@
+#!/bin/sh -e
+## 10_visibility_hidden_patch.dpatch by Adam Conrad <adconrad@0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0; sh -c "cd build-dir/mozilla && autoconf2.13" ;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/configure.in.orig	2005-10-04 15:53:49.000000000 +1000
++++ mozilla/configure.in	2006-01-19 19:22:12.000000000 +1100
+@@ -2400,8 +2400,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
+--- mozilla/configure.orig	2006-01-19 19:20:27.000000000 +1100
++++ mozilla/configure	2006-01-19 19:22:35.000000000 +1100
+@@ -7635,8 +7635,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
--- mozilla-thunderbird-1.5.orig/debian/patches/10_mips_optimization_patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/10_mips_optimization_patch.dpatch
@@ -0,0 +1,48 @@
+#!/bin/sh -e
+## 10_mips_optimization_patch.dpatch by Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de> 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0; sh -c "cd build-dir/mozilla && autoconf2.13" ;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/configure.in.old	2004-09-09 04:17:48.000000000 +0200
++++ mozilla/configure.in	2004-09-10 11:51:35.000000000 +0200
+@@ -1107,8 +1107,7 @@ case "$target" in
+         MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
+     ;;
+     mips*)
+-        CFLAGS="$CFLAGS -Wa,-xgot"
+-        CXXFLAGS="$CXXFLAGS -Wa,-xgot"
++        MOZ_DEBUG_FLAGS="-g"   # We want inlining
+     ;;
+     esac
+     ;;
+--- mozilla/config/rules.mk.old	2004-09-09 04:18:22.000000000 +0200
++++ mozilla/config/rules.mk	2004-09-12 19:33:49.000000000 +0200
+@@ -455,7 +455,7 @@ endif
+ 
+ ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(filter mips mipsel,$(OS_TEST)))
+-ifeq ($(MODULE),layout)
++ifneq (,$(filter layout content xul xuldoc xultmpl view dom jsurl,$(MODULE)))
+ OS_CFLAGS += -Wa,-xgot
+ OS_CXXFLAGS += -Wa,-xgot
+ endif
--- mozilla-thunderbird-1.5.orig/debian/patches/15_pkgconfig_name_patches.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/15_pkgconfig_name_patches.dpatch
@@ -0,0 +1,95 @@
+#!/bin/sh -e
+## debian/patches/10_debian-branding.dpatch by  <alex@personalfree.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -u -w -r1.2 mozilla-gtkmozembed.pc.in
+--- mozilla/build/unix/mozilla-gtkmozembed.pc.in	19 Nov 2002 03:11:13 -0000	1.2
++++ mozilla/build/unix/mozilla-gtkmozembed.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: Mozilla Gtk Embedding Widget
+ Description: Mozilla Embedding Widget for Gtk+
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-xpcom = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-xpcom = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lgtkembedmoz %SUPERWIN_LIBS%
+ Cflags: -I${includedir}/gtkembedmoz
+Index: build/unix/mozilla-js.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-js.pc.in,v
+retrieving revision 1.4
+diff -u -w -r1.4 mozilla-js.pc.in
+--- mozilla/build/unix/mozilla-js.pc.in	25 Oct 2002 02:30:37 -0000	1.4
++++ mozilla/build/unix/mozilla-js.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lmozjs
+ Cflags: -I${includedir}/js -DXP_UNIX
+Index: build/unix/mozilla-nss.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-nss.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-nss.pc.in
+--- mozilla/build/unix/mozilla-nss.pc.in	3 Jun 2002 22:26:01 -0000	1.1
++++ mozilla/build/unix/mozilla-nss.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: NSS
+ Description: Mozilla Network Security Services
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
+ Cflags: -I${includedir}/nss
+Index: build/unix/mozilla-plugin.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-plugin.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-plugin.pc.in
+--- mozilla/build/unix/mozilla-plugin.pc.in	30 Oct 2002 00:40:16 -0000	1.1
++++ mozilla/build/unix/mozilla-plugin.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,5 +6,5 @@
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-xpcom = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-xpcom = %MOZILLA_VERSION%
+ Cflags: -I${includedir}/java -I${includedir}/plugin
+Index: build/unix/mozilla-xpcom.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-xpcom.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-xpcom.pc.in
+--- mozilla/build/unix/mozilla-xpcom.pc.in	28 May 2002 20:20:42 -0000	1.1
++++ mozilla/build/unix/mozilla-xpcom.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: XPCOM
+ Description: The Mozilla Cross Platform Component Library
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lxpcom
+ Cflags: -I${includedir}/xpcom -I${includedir}/string
--- mozilla-thunderbird-1.5.orig/debian/patches/70_single_typeaheadfind_package.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/70_single_typeaheadfind_package.dpatch
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+## 70_single_typeaheadfind_package.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	2004-12-07 17:47:26.000000000 +0000
++++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h	2004-12-07 17:47:46.000000000 +0000
+@@ -68,9 +68,9 @@
+ #include "nsISound.h"
+ 
+ #define TYPEAHEADFIND_BUNDLE_URL \
+-        "chrome://global/locale/typeaheadfind.properties"
++        "chrome://typeaheadfind/locale/typeaheadfind.properties"
+ #define TYPEAHEADFIND_NOTFOUND_WAV_URL \
+-        "chrome://global/content/notfound.wav"
++        "chrome://typeaheadfind/content/notfound.wav"
+ 
+ enum {
+   eRepeatingNone,
--- mozilla-thunderbird-1.5.orig/debian/patches/30_nspr_dev_discrim-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/30_nspr_dev_discrim-patch.dpatch
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/nsprpub/config/Makefile.in.orig	2004-06-08 07:52:28.000000000 +0000
++++ mozilla/nsprpub/config/Makefile.in	2004-06-08 07:52:40.000000000 +0000
+@@ -140,6 +140,6 @@
+ 	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
+ endif
+ 
+-real_install:: nspr.m4
++real_install:: mozilla-thunderbird-nspr.m4
+ 	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
+ 	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal
--- mozilla-thunderbird-1.5.orig/debian/patches/71_extensionManagerAutoReRegister.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/71_extensionManagerAutoReRegister.dpatch
@@ -0,0 +1,59 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in.orig	2005-03-30 22:09:50.205408701 +0000
++++ mozilla/toolkit/mozapps/extensions/src/nsExtensionManager.js.in	2005-03-30 22:13:05.414956939 +0000
+@@ -72,6 +72,8 @@
+ const FILE_UNINSTALL_LOG              = "Uninstall";
+ const FILE_DEFAULTS                   = "defaults.ini";
+ const FILE_COMPONENT_MANIFEST         = "components.ini";
++const FILE_COMPONENT_REGISTRY         = "compreg.dat";
++const FILE_XUL_MFASL         	      = "XUL.mfasl";
+ const FILE_COMPAT_MANIFEST            = "compatibility.ini";
+ const FILE_INSTALL_MANIFEST           = "install.rdf";
+ const FILE_CHROME_MANIFEST            = "contents.rdf";
+@@ -1620,6 +1622,22 @@
+     if (!componentList.exists())
+       needsRestart = true;
+     
++    else {
++      var compatManifest = getFile(KEY_PROFILEDIR,[FILE_COMPAT_MANIFEST]);
++      var compreg = getFile(KEY_PROFILEDIR,[FILE_COMPONENT_REGISTRY]);
++      var xmfasl = getFile(KEY_PROFILEDIR,[FILE_XUL_MFASL]);
++      var extensionsFile = getFile(KEY_APPDIR,[DIR_DEFAULTS_EXTENSIONS,FILE_EXTENSIONS]);
++
++      if (compatManifest.exists() && compatManifest.lastModifiedTime < extensionsFile.lastModifiedTime) {
++        dump("New Global extensions installed .... ");
++        if(compatManifest.exists()) compatManifest.remove(false); 
++        if(compreg.exists()) compreg.remove(false); 
++        if(xmfasl.exists()) xmfasl.remove(false);   
++        dump("done ... scheduling restart.\n");
++        needsRestart=true;
++      }
++    }
++
+     // XXXben - a bit of a hack - clean up any empty dirs that may not have been
+     //          properly removed by [un]install... I should really investigate those
+     //          cases to see what is stopping these dirs from being removed, but no
--- mozilla-thunderbird-1.5.orig/debian/patches/70_exclude_sep_extensions_autobuild.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/70_exclude_sep_extensions_autobuild.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/extensions/Makefile.in.orig	2004-03-18 16:21:05.000000000 +0000
++++ mozilla/extensions/Makefile.in	2004-03-18 16:21:38.000000000 +0000
+@@ -26,6 +26,7 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+-DIRS		= $(MOZ_EXTENSIONS)
++DIRS1		= $(subst typeaheadfind,,$(MOZ_EXTENSIONS))
++DIRS		= $(subst inspector,,$(DIRS1))
+ 
+ include $(topsrcdir)/config/rules.mk
--- mozilla-thunderbird-1.5.orig/debian/patches/15_pkgconfig_name_patches.patch
+++ mozilla-thunderbird-1.5/debian/patches/15_pkgconfig_name_patches.patch
@@ -0,0 +1,81 @@
+? build/unix/mozilla-thunderbird-config
+? build/unix/mozilla-thunderbird-gtkmozembed.pc
+? build/unix/mozilla-thunderbird-js.pc
+? build/unix/mozilla-thunderbird-nspr.pc
+? build/unix/mozilla-thunderbird-nss.pc
+? build/unix/mozilla-thunderbird-plugin.pc
+? build/unix/mozilla-thunderbird-xpcom.pc
+Index: build/unix/mozilla-gtkmozembed.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-gtkmozembed.pc.in,v
+retrieving revision 1.2
+diff -u -w -r1.2 mozilla-gtkmozembed.pc.in
+--- build/unix/mozilla-gtkmozembed.pc.in	19 Nov 2002 03:11:13 -0000	1.2
++++ build/unix/mozilla-gtkmozembed.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: Mozilla Gtk Embedding Widget
+ Description: Mozilla Embedding Widget for Gtk+
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-xpcom = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-xpcom = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lgtkembedmoz %SUPERWIN_LIBS%
+ Cflags: -I${includedir}/gtkembedmoz
+Index: build/unix/mozilla-js.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-js.pc.in,v
+retrieving revision 1.4
+diff -u -w -r1.4 mozilla-js.pc.in
+--- build/unix/mozilla-js.pc.in	25 Oct 2002 02:30:37 -0000	1.4
++++ build/unix/mozilla-js.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: JavaScript
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lmozjs
+ Cflags: -I${includedir}/js -DXP_UNIX
+Index: build/unix/mozilla-nss.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-nss.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-nss.pc.in
+--- build/unix/mozilla-nss.pc.in	3 Jun 2002 22:26:01 -0000	1.1
++++ build/unix/mozilla-nss.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: NSS
+ Description: Mozilla Network Security Services
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
+ Cflags: -I${includedir}/nss
+Index: build/unix/mozilla-plugin.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-plugin.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-plugin.pc.in
+--- build/unix/mozilla-plugin.pc.in	30 Oct 2002 00:40:16 -0000	1.1
++++ build/unix/mozilla-plugin.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,5 +6,5 @@
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-xpcom = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-xpcom = %MOZILLA_VERSION%
+ Cflags: -I${includedir}/java -I${includedir}/plugin
+Index: build/unix/mozilla-xpcom.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/build/unix/mozilla-xpcom.pc.in,v
+retrieving revision 1.1
+diff -u -w -r1.1 mozilla-xpcom.pc.in
+--- build/unix/mozilla-xpcom.pc.in	28 May 2002 20:20:42 -0000	1.1
++++ build/unix/mozilla-xpcom.pc.in	16 Jun 2004 20:04:10 -0000
+@@ -6,6 +6,6 @@
+ Name: XPCOM
+ Description: The Mozilla Cross Platform Component Library
+ Version: %MOZILLA_VERSION%
+-Requires: mozilla-nspr = %MOZILLA_VERSION%
++Requires: mozilla-thunderbird-nspr = %MOZILLA_VERSION%
+ Libs: -L${libdir} -lxpcom
+ Cflags: -I${includedir}/xpcom -I${includedir}/string
--- mozilla-thunderbird-1.5.orig/debian/patches/10_profile_migration.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/10_profile_migration.dpatch
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 10_debian-thunderbird.dpatch by Alexande Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/mail/components/migration/src/nsProfileMigrator.cpp.orig	2004-07-12 13:00:20.000000000 +0200
++++ mozilla/mail/components/migration/src/nsProfileMigrator.cpp	2004-07-12 13:00:40.000000000 +0200
+@@ -76,7 +76,7 @@
+ NS_IMETHODIMP
+ nsProfileMigrator::Import()
+ {
+-  if (ImportRegistryProfiles(NS_LITERAL_CSTRING("Thunderbird")))
++  if (ImportRegistryProfiles(NS_LITERAL_CSTRING("Mozilla-Thunderbird")))
+     return NS_OK;
+ 
+   return NS_ERROR_FAILURE;
--- mozilla-thunderbird-1.5.orig/debian/patches/00list
+++ mozilla-thunderbird-1.5/debian/patches/00list
@@ -0,0 +1,8 @@
+10_debian-thunderbird
+10_profile_migration
+10_visibility_hidden_patch.dpatch
+10_configure-MOZAPP-patch
+30_nspr_dev_discrim-patch
+70_gtk-settings-patch
+70_exclude_sep_extensions_autobuild
+70_single_typeaheadfind_package.dpatch
--- mozilla-thunderbird-1.5.orig/debian/patches/00patch-opts
+++ mozilla-thunderbird-1.5/debian/patches/00patch-opts
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+patch_opts="-d build-dir/mozilla"
+export patch_opts
--- mozilla-thunderbird-1.5.orig/debian/patches/10_configure-MOZAPP-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/10_configure-MOZAPP-patch.dpatch
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+## debian/patches/10_configure-MOZAPP-patch.dpatch by  Alexander Sack <asac@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+APPNAME=mozilla-thunderbird
+CAPPNAME=Mozilla-Thunderbird
+ORGAPPNAME=thunderbird
+ORGCAPPNAME=Thunderbird
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+case "$1" in
+       -patch) 
+          if [ -e build-dir/mozilla/configure.dpatch-sav ]; then
+               echo >&2 "`basename $0`: patch already applied"
+	       exit 1
+	  fi
+          cp build-dir/mozilla/configure build-dir/mozilla/configure.dpatch-sav
+          cat build-dir/mozilla/configure.dpatch-sav | sed -e "s/MOZ_APP_NAME=${ORGAPPNAME}/MOZ_APP_NAME=${APPNAME}/" > build-dir/mozilla/configure 
+          cp build-dir/mozilla/mail/app/Makefile.in build-dir/mozilla/mail/app/Makefile.in-dsav
+          cat build-dir/mozilla/mail/app/Makefile.in-dsav | sed -e "s/${ORGAPPNAME}/${APPNAME}/g" | sed -e "s/${ORGCAPPNAME}/${CAPPNAME}/g" > build-dir/mozilla/mail/app/Makefile.in
+	  cp build-dir/mozilla/mail/app/profile/all-${ORGAPPNAME}.js build-dir/mozilla/mail/app/profile/all-${APPNAME}.js
+           ;;
+       -unpatch) 
+          if [ -e build-dir/mozilla/configure.dpatch-sav ]; then
+	     mv build-dir/mozilla/configure.dpatch-sav build-dir/mozilla/configure
+	     mv build-dir/mozilla/mail/app/Makefile.in-dsav build-dir/mozilla/mail/app/Makefile.in
+	     rm -f build-dir/mozilla/mail/app/profile/all-${APPNAME}.js
+          else
+   	      echo >&2 "`basename $0`: patch not yet applied, cannot unpatch"
+	      exit 1
+          fi
+          ;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
--- mozilla-thunderbird-1.5.orig/debian/patches/70_gtk-settings-patch.dpatch
+++ mozilla-thunderbird-1.5/debian/patches/70_gtk-settings-patch.dpatch
@@ -0,0 +1,115 @@
+#!/bin/sh -e
+## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack <asac@jwsdot.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mozilla/widget/src/gtk2/nsDragService.cpp.orig	2004-02-05 02:04:20.000000000 +0100
++++ mozilla/widget/src/gtk2/nsDragService.cpp	2004-02-05 02:04:28.000000000 +0100
+@@ -41,7 +41,8 @@
+ #include <gtk/gtkinvisible.h>
+ #include <gdk/gdkx.h>
+ #include "nsCRT.h"
+-
++#include "nsIPrefService.h"
++#include "nsIPrefBranch.h"
+ 
+ static PRLogModuleInfo *sDragLm = NULL;
+ 
+@@ -74,8 +75,13 @@
+ {
+     // We have to destroy the hidden widget before the event loop stops
+     // running.
++    nsCOMPtr<nsIPrefService> prefs = do_GetService("@mozilla.org/preferences-service;1");
++    PRInt32 dnd_threshold=-1;
++    PRInt32 double_click_timeout=-1;
++
+     nsCOMPtr<nsIObserverService> obsServ =
+         do_GetService("@mozilla.org/observer-service;1");
++
+     obsServ->AddObserver(this, "quit-application", PR_FALSE);
+ 
+     // our hidden source widget
+@@ -101,6 +107,63 @@
+     mTargetDragDataReceived = PR_FALSE;
+     mTargetDragData = 0;
+     mTargetDragDataLen = 0;
++
++    if (prefs) {
++        nsresult rv; 
++        nsCOMPtr<nsIPrefBranch> prefBranch;
++        prefs->GetBranch(nsnull, getter_AddRefs(prefBranch));
++        if (prefBranch) {
++            PRInt32 tmp = -1;
++            PRInt32 tmp1 = -1;
++            rv = prefBranch->GetIntPref("widget.gtk2.dnd.threshold", &tmp);
++            if(!NS_FAILED(rv) && tmp>0) {
++                dnd_threshold = tmp;
++            }
++
++            rv = prefBranch->GetIntPref("widget.gtk2.double_click_timeout", &tmp);
++            if(!NS_FAILED(rv) && tmp>0) {
++                double_click_timeout = tmp;
++            }
++        }
++    }
++
++
++
++    // MAKE gtk settings below 
++
++    GtkSettings* settings = gtk_settings_get_default();
++
++    /* DEBUG output */
++    {
++        gint double_click;
++        g_object_get(
++                     G_OBJECT(settings), 
++                     "gtk-double-click-time", &double_click,
++                     NULL
++                     );
++        printf("DOUBLE-CLICK: %d --> %d ",double_click, double_click_timeout);
++    }
++
++
++    {
++        gint threshold;
++        g_object_get(
++                     G_OBJECT(settings), 
++                     "gtk-dnd-drag-threshold", &threshold,
++                     NULL
++                     );
++        printf("THRESHOLD: %d --> %d ", threshold, dnd_threshold);
++    }
++    /**/
++
++
++    if(dnd_threshold>-1) {
++        gtk_settings_set_long_property(settings, "gtk-dnd-drag-threshold", dnd_threshold , "someline");
++    }
++
++    if(double_click_timeout>-1) {
++        gtk_settings_set_long_property(settings, "gtk-double-click-time", double_click_timeout, "someline");
++    }
+ }
+ 
+ nsDragService::~nsDragService()
--- mozilla-thunderbird-1.5.orig/debian/update-mozilla-thunderbird-chrome.old
+++ mozilla-thunderbird-1.5/debian/update-mozilla-thunderbird-chrome.old
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+set -e
+
+umask 022
+
+echo -n "Updating mozilla-thunderbird chrome registry..."
+
+HOME=$(mktemp)
+export HOME
+
+chmod 600 $HOME
+
+unset MOZILLA_FIVE_HOME || :
+MOZILLA_FIVE_HOME=/usr/lib/mozilla-thunderbird
+export MOZILLA_FIVE_HOME
+
+# PATH
+export PATH=/usr/lib/mozilla-thunderbird:$PATH
+
+# added /usr/lib : don't load your local library
+if test -z $LD_LIBRARY_PATH; then
+  LD_LIBRARY_PATH=/usr/lib/mozilla-thunderbird:/usr/lib:${LD_LIBRARY_PATH}
+else
+  LD_LIBRARY_PATH=/usr/lib/mozilla-thunderbird:/usr/lib
+fi
+export LD_LIBRARY_PATH
+
+/sbin/ldconfig
+
+VARDIR=/var/lib/mozilla-thunderbird
+LIBDIR=/usr/lib/mozilla-thunderbird
+SHAREDIR=/usr/share/mozilla-thunderbird
+DATADIR=${VARDIR}/chrome.d
+EDATADIR=${VARDIR}/extensions.d
+
+# cleaning VARDIR
+rm -fr ${VARDIR}/chrome ${VARDIR}/components ${VARDIR}/extensions
+
+# cleaning LIBDIR
+rm -rf ${LIBDIR}/chrome/overlayinfo
+rm -rf ${LIBDIR}/chrome/installed-chrome.txt
+rm -f  ${LIBDIR}/chrome/*.rdf
+rm -f  ${LIBDIR}/components/*.dat
+
+# create VARDIR
+install -d ${VARDIR}/chrome/overlayinfo
+install -d ${VARDIR}/components
+
+# create symlinks to LIBDIR
+ln -sf ${VARDIR}/chrome/overlayinfo ${LIBDIR}/chrome/overlayinfo
+ln -sf ${VARDIR}/chrome/installed-chrome.txt ${LIBDIR}/chrome/
+
+# gen installed-chrome.txt
+TMPFILE=`tempfile`
+for f in `echo ${DATADIR}/* | sort`; do
+    cat $f >> ${TMPFILE}
+done
+
+mv ${TMPFILE} ${VARDIR}/chrome/installed-chrome.txt
+chmod 0644 ${VARDIR}/chrome/installed-chrome.txt
+
+# reset $TMPFILE
+true > $TMPFILE
+# append all extension id files to the new installed-extensions.txt
+for f in `find ${EDATADIR}/*.txt 2> /dev/null | sort`; do
+    cat $f >> ${TMPFILE}
+done
+
+# move it to the processed extensions.txt file
+mkdir -p ${VARDIR}/extensions/
+mv ${TMPFILE} ${VARDIR}/extensions/installed-extensions.txt
+chmod 0644 ${VARDIR}/extensions/installed-extensions.txt
+
+# reset $TMPFILE --> build the Extensions.rdf
+true > $TMPFILE
+
+cat ${SHAREDIR}/parts/Extensions.rdf.head >> $TMPFILE
+
+# append all extension id files to the new installed-extensions.txt
+tmpdata=`find ${EDATADIR}/extension.* 2> /dev/null | sort`
+
+if test -z "${tmpdata}"; then
+  echo "no extension found ... installing zeroextensions.part to Extensions.rdf"
+  cat ${SHAREDIR}/parts/zeroextensions.part >> $TMPFILE
+fi
+
+for f in ${tmpdata}; do
+    cat $f >> ${TMPFILE}
+done
+
+# append all themes
+tmpdata=`find ${EDATADIR}/theme.* 2> /dev/null | sort`
+
+if test -z "${tmpdata}"; then
+  echo "no themes found ... installing zerothemes.part to Extensions.rdf"
+  cat ${SHAREDIR}/parts/zerothemes.part >> $TMPFILE
+fi
+
+for f in ${tmpdata}; do
+    cat $f >> ${TMPFILE}
+done
+
+exts=`cat ${VARDIR}/extensions/installed-extensions.txt | grep ^extension | sed 's/.*,\({.*}\)/\1/'`
+
+for e in ${exts}; do
+   echo '<RDF:Seq RDF:about="urn:mozilla:extension:root">' >> ${TMPFILE}
+   echo '  <RDF:li RDF:resource="urn:mozilla:extension:'${e}'"/>' >> ${TMPFILE}
+   echo '</RDF:Seq>' >> ${TMPFILE}
+done
+
+themes=`cat ${VARDIR}/extensions/installed-extensions.txt | grep ^theme | sed 's/.*,\({.*}\)/\1/'`
+
+for t in "${themes}"; do
+   echo '<RDF:Seq RDF:about="urn:mozilla:theme:root">' >> ${TMPFILE}
+   echo '  <RDF:li RDF:resource="urn:mozilla:theme:'${t}'"/>' >> ${TMPFILE}
+   echo '</RDF:Seq>' >> ${TMPFILE}
+done
+
+cat ${SHAREDIR}/parts/Extensions.rdf.tail >> $TMPFILE
+
+mv ${TMPFILE} ${VARDIR}/extensions/Extensions.rdf
+
+# gen
+regxpcom >/dev/null 
+regchrome >/dev/null
+
+# move and link
+mv ${LIBDIR}/components/*.dat ${VARDIR}/components/ || true
+ln -fs ${VARDIR}/components/*.dat ${LIBDIR}/components/ 
+
+mv ${LIBDIR}/chrome/*.rdf ${VARDIR}/chrome/ || true
+ln -fs ${VARDIR}/chrome/*.rdf ${LIBDIR}/chrome/
+#ln -fs ${VARDIR}/hooks.d/ ${LIBDIR}/hooks.d/
+
+# done
+echo done.
--- mozilla-thunderbird-1.5.orig/debian/update-mozilla-thunderbird-chrome.sav
+++ mozilla-thunderbird-1.5/debian/update-mozilla-thunderbird-chrome.sav
@@ -0,0 +1,175 @@
+#!/bin/sh
+
+set -e
+
+umask 022
+
+echo -n "Updating mozilla-thunderbird chrome registry..."
+
+if [ "$1" = "-v" ]; then
+    VERBOSE=1
+    RM_FLAGS="-v"
+    MV_FLAGS="-v"
+    INSTALL_FLAGS="-v"
+    echo
+fi
+
+unset MOZILLA_FIVE_HOME || :
+MOZILLA_FIVE_HOME=/usr/lib/mozilla-thunderbird
+export MOZILLA_FIVE_HOME
+
+# PATH
+PATH=/usr/lib/mozilla-thunderbird:$PATH
+export PATH
+
+# added /usr/lib : don't load your local library
+LD_LIBRARY_PATH=/usr/lib/mozilla-thunderbird${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
+
+# fake home to capture .thunderbird
+HOME=`mktemp -d /tmp/mozilla-thunderbird-pkg.XXXXXX`
+export HOME
+
+/sbin/ldconfig
+
+VARDIR=/var/lib/mozilla-thunderbird
+LIBDIR=/usr/lib/mozilla-thunderbird
+EXTDIR=${VARDIR}/extensions.d
+DATADIR=${VARDIR}/chrome.d
+
+# cleaning VARDIR
+rm ${RM_FLAGS} -fr ${VARDIR}/chrome ${VARDIR}/components ${VARDIR}/extensions/*
+
+# cleaning LIBDIR
+rm ${RM_FLAGS} -rf ${LIBDIR}/chrome/overlayinfo
+rm ${RM_FLAGS} -f  ${LIBDIR}/chrome/*.rdf
+rm ${RM_FLAGS} -f  ${LIBDIR}/components/*.dat
+rm ${RM_FLAGS} -f  ${LIBDIR}/components.ini
+rm ${RM_FLAGS} -f  ${LIBDIR}/defaults.ini
+
+# purge ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt symlink
+# we used to create
+if [ -e ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt ] || [ -L ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt ]; then
+  rm ${RM_FLAGS} -f ${LIBDIR}/defaults/profile/extensions/installed-extensions.txt
+fi
+
+# create VARDIR
+install ${INSTALL_FLAGS} -d ${VARDIR}/chrome/overlayinfo
+install ${INSTALL_FLAGS} -d ${VARDIR}/components
+
+# create symlinks to LIBDIR
+ln -sf ${VARDIR}/chrome/overlayinfo ${LIBDIR}/chrome/overlayinfo
+ln -sf ${VARDIR}/extensions/installed-extensions.txt \
+    ${LIBDIR}/extensions
+
+# purge installed-extensions-processed.txt
+rm ${RM_FLAGS} -f ${LIBDIR}/extensions/installed-extensions-processed.txt
+
+# purge Extensions.rdf
+rm ${RM_FLAGS} -f ${LIBDIR}/extensions/Extensions.rdf
+
+# Handle extensions {uid} directories (for compatibility purpose with
+# previously packaged extensions):
+# remove those that are symlinks pointing to nowhere
+# and remove those that are directory and are in defaults/profile/extensions
+for f in `find ${LIBDIR}/extensions/ -maxdepth 1 -name '{*}'`; do
+    if [ -L $f ] && [ ! -e $f ]; then
+        rm ${RM_FLAGS} -f $f
+    elif [ ! -L $f ] && [ -d $f ] && [ -d ${LIBDIR}/defaults/profile/extensions/`basename $f` ]; then
+        rm ${RM_FLAGS} -rf $f
+    elif [ -d "$f" ]; then
+      # remove empty chrome directories
+      [ -d "${f}/chrome" ] && rmdir ${RM_FLAGS} --ignore-fail-on-non-empty ${f}/chrome
+      # remove Uninstall file, it will be recreated by thunderbird-bin -register
+      [ -f "$f/uninstall/Uninstall" ] && rm ${RM_FLAGS} ${f}/uninstall/Uninstall
+      # remove empty uninstall directory
+      [ -d "$f/uninstall" ] && rmdir ${RM_FLAGS} --ignore-fail-on-non-empty ${f}/uninstall
+      # remove empty extension directory
+      [ ! -L "$f" ] && rmdir ${RM_FLAGS} --ignore-fail-on-non-empty ${f}
+    fi
+done
+# create symlinks that are not already there
+for f in `find ${LIBDIR}/defaults/profile/extensions/ -maxdepth 1 -name '{*}'`; do
+    [ "${VERBOSE}" ] && echo "W: ${f} should be in ${LIBDIR}/extensions/" >&2
+    if [ ! -e ${LIBDIR}/extensions/`basename $f` ]; then
+        ln -s $f ${LIBDIR}/extensions
+    fi
+done
+
+# gen installed-extensions.txt
+TMPFILE=`tempfile`
+for f in `echo ${EXTDIR}/*.txt | sort`; do
+    while read line; do
+    	EXTUID=`echo ${line} | cut -f 2 -d ,`
+#	echo EEE $EXTUID ${EXTDIR}
+        EXTUIDDIR=${LIBDIR}/extensions/${EXTUID}
+        if [ -e ${EXTUIDDIR} ]; then
+	    if [ -e ${EXTUIDDIR}/install.rdf ]; then
+	        if grep ${EXTUID} ${EXTUIDDIR}/install.rdf 2>&1 > /dev/null; then
+	            echo $line >> ${TMPFILE}
+	        elif [ "${VERBOSE}" ]; then
+		    echo "W: ${f}: ${EXTUIDDIR}/install.rdf doesn't contain the UID." >& 2
+		fi
+	    elif [ "${VERBOSE}" ]; then
+	        echo "W: ${f}: ${EXTUIDDIR}/install.rdf doesn't exist." >&2
+	    fi
+	elif [ "${VERBOSE}" ]; then
+	    echo "W: ${f}: ${EXTUIDDIR} doesn't exist." >&2
+	fi
+    done < $f
+done
+
+mv ${MV_FLAGS} ${TMPFILE} ${VARDIR}/extensions/installed-extensions.txt
+chmod 0644 ${VARDIR}/extensions/installed-extensions.txt
+
+if [ "$VERBOSE" ]; then
+    for f in `find ${LIBDIR}/extensions/ -maxdepth 1 -name '{*}'`; do
+        if ! grep `basename $f` ${VARDIR}/extensions/installed-extensions.txt 2>&1 > /dev/null; then
+	    echo "W: `basename $f` not in ${VARDIR}/extensions/installed-extensions.txt" >&2
+	fi
+    done
+fi
+
+# gen
+mozilla-thunderbird-bin -register >/dev/null 2>&1 || echo "E: Registration process existed with status: $?" >&2
+
+if [ -e ${LIBDIR}/extensions/installed-extensions.txt ]; then
+    echo "E: ${LIBDIR}/extensions/installed-extensions.txt still present. Registration might have gone wrong." >&2
+fi
+
+# move and link
+for file in $(find ${LIBDIR}/components/*.dat 2> /dev/null); do
+    mv ${MV_FLAGS} ${file} ${VARDIR}/components/
+    ln -fs ${VARDIR}/components/`basename "${file}"` ${LIBDIR}/components/
+done
+
+for file in $(find ${LIBDIR}/chrome/*.rdf 2> /dev/null); do
+    mv ${MV_FLAGS} ${file} ${VARDIR}/chrome/
+    ln -fs ${VARDIR}/chrome/`basename "${file}"` ${LIBDIR}/chrome/
+done
+
+mv ${MV_FLAGS} ${LIBDIR}/defaults.ini ${VARDIR}/
+ln -fs ${VARDIR}/defaults.ini ${LIBDIR}/
+
+mv ${MV_FLAGS} ${LIBDIR}/components.ini ${VARDIR}/
+ln -fs ${VARDIR}/components.ini ${LIBDIR}/
+
+mv ${MV_FLAGS} ${LIBDIR}/extensions/Extensions.rdf ${VARDIR}/extensions/
+ln -fs ${VARDIR}/extensions/Extensions.rdf ${LIBDIR}/extensions/
+
+# gen installed-chrome.txt
+TMPFILE=$HOME/installed-chrome.txt
+for f in `echo ${DATADIR}/* | sort`; do
+    cat $f >> ${TMPFILE}
+done
+
+mv ${MV_FLAGS} ${TMPFILE} ${VARDIR}/chrome/installed-chrome.txt
+chmod 0644 ${VARDIR}/chrome/installed-chrome.txt
+
+rm ${RM_FLAGS} -fr ${HOME}
+
+regchrome
+regxpcom
+
+# done
+echo done.
--- mozilla-thunderbird-1.5.orig/debian/copyright
+++ mozilla-thunderbird-1.5/debian/copyright
@@ -0,0 +1,576 @@
+This package was debianized by Alexander Sack <asac@jwsdot.com> on
+25 Sep 2003
+
+It was downloaded from http://www.mozilla.org/projects/thunderbird
+
+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."
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.preinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.preinst
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+#MV_FLAGS="-v"
+#RM_FLAGS="-v"
+
+if test "$1" = "upgrade" -o "$1" = "install"; then
+   if [ -L /usr/lib/mozilla-thunderbird/defaults/pref ]; then
+   	rm ${RM_FLAGS} -f /usr/lib/mozilla-thunderbird/defaults/pref
+   fi
+   if [ -L /usr/lib/mozilla-thunderbird/greprefs ]; then
+   	rm ${RM_FLAGS} -f /usr/lib/mozilla-thunderbird/greprefs
+   fi
+
+   if [ -L /usr/lib/mozilla-thunderbird/extensions ]; then
+   	rm ${RM_FLAGS} -f /usr/lib/mozilla-thunderbird/extensions
+	mkdir /usr/lib/mozilla-thunderbird/extensions
+	if [ -d /var/lib/mozilla-thunderbird/extensions/ ]; then
+	        tmp=$(ls -d /var/lib/mozilla-thunderbird/extensions/* 2> /dev/null) || true
+		if test ! -z "$tmp"; then
+		  mv ${MV_FLAGS} ${tmp} /usr/lib/mozilla-thunderbird/extensions/
+		  if [ -e /usr/lib/mozilla-thunderbird/extensions/installed-extensions.txt ]; then
+		     rm ${RM_FLAGS} -f /usr/lib/mozilla-thunderbird/extensions/installed-extensions.txt
+		  fi 
+		  if [ -e /usr/lib/mozilla-thunderbird/extensions/Extensions.rdf ]; then
+		     rm ${RM_FLAGS} -f /usr/lib/mozilla-thunderbird/extensions/Extensions.rdf
+		  fi
+		  rm ${RM_FLAGS} -f /var/lib/mozilla-thunderbird/extensions/*
+		fi
+	fi
+   fi
+
+   if test -e /usr/lib/mozilla-thunderbird/chrome/chrome.rdf -a ! -L /usr/lib/mozilla-thunderbird/chrome/chrome.rdf; then	
+        mkdir -p /var/lib/mozilla-thunderbird/chrome
+   	mv /usr/lib/mozilla-thunderbird/chrome/chrome.rdf /var/lib/mozilla-thunderbird/chrome/chrome.rdf
+	ln -s /var/lib/mozilla-thunderbird/chrome/chrome.rdf /usr/lib/mozilla-thunderbird/chrome/chrome.rdf
+   fi
+fi
+echo Successful preinst
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-offline.postrm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-offline.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+case "$1" in
+    abort-install|purge|remove)
+       if [ -e /usr/sbin/update-mozilla-thunderbird-chrome ]; then
+       echo .
+       fi
+       ;;
+    *)
+       ;;
+esac
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-compose.1
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-compose.1
@@ -0,0 +1,27 @@
+.\"Created with GNOME Manpages Editor
+.\"http://gmanedit.sourceforge.net
+.\"Sergio Rua <srua@gpul.org>
+.\"
+.TH program 1 "04/09/26" "mozilla-thunderbird-compose"
+
+.SH NAME
+mozilla-thunderbird-compose \- start a mozilla-thunderbird compose window.
+
+.SH SYNOPSIS
+.B mozilla-thunderbird-compose
+.RI [ URI ]
+.br
+
+.SH DESCRIPTION
+mozilla-thunderbird-compose starts a compose window is a debian specific convenience script. The URI parameter fills out the compose window fields, like To: or Subject. If mozilla-thunderbird-compose is launched without any argument, the compose window will be empty.
+
+.SH EXAMPLES
+.B
+mozilla-thunderbird-compose - this will launch an empty compose window
+
+
+.SH LICENCE
+
+.SH BUGS
+
+.SH AUTHOR
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.templates
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.templates
@@ -0,0 +1,17 @@
+Template: mozilla-thunderbird/browser
+Type: select
+_choices: Debian, GNOME, I will do it on my own
+_description: Please choose your preferred way of browser integration
+ Please choose the type of browser integration you want.
+ .
+ If you are running GNOME, select it. This will select the browser
+ configured in gnome control center.
+ .
+ If you are running KDE or any other plain window manager select
+ Debian. This will integrate your preferred x-www-browser
+ alternative. Use update-alternatives(8) to change that alternative.
+ .
+ If you already added a browser configuration in
+ /etc/mozilla-thunderbird/global-config.js the outcome is undefined.
+ Select Manual and maybe run dpkg-reconfigure later.
+Default: Debian
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-dev.prerm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-dev.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+case "$1" in
+    upgrade|remove)
+      ;;
+    *)
+      ;;
+esac
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/dummy-empty-file
+++ mozilla-thunderbird-1.5/debian/dummy-empty-file
@@ -0,0 +1 @@
+<EMPTY>
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-typeaheadfind.postrm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-typeaheadfind.postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+case "$1" in
+    abort-install|purge|remove)
+       if [ -e /usr/sbin/update-mozilla-thunderbird-chrome ]; then
+       echo .
+       fi
+       ;;
+    *)
+       ;;
+esac
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/rejar-chrome.sh
+++ mozilla-thunderbird-1.5/debian/rejar-chrome.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if [ -z "$1" ]; then
+  echo usage: rejar_chrome.sh <jar-basename> $1
+  exit -1
+fi
+
+curdir=$PWD
+jar_basename=$1
+
+cd debian/tmpbuild/usr/lib/mozilla-thunderbird/chrome/
+
+mkdir tmp
+cd tmp
+
+includes=$(cat $curdir/debian/${jar_basename}_jar_includes.csv | sed -e 's/#.*$//')
+
+unzip ../${jar_basename}.jar ${includes}
+
+rm ../${jar_basename}.jar
+
+zip -r ../${jar_basename}.jar .
+
+cd ..
+rm -rf tmp
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-offline.install
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-offline.install
@@ -0,0 +1,3 @@
+debian/tmp-offline/usr/lib/mozilla-thunderbird/chrome/offline.jar usr/lib/mozilla-thunderbird/extensions/offline@thelizards.debian.org/chrome/
+debian/tmp-offline/usr/lib/mozilla-thunderbird/chrome/offline.manifest usr/lib/mozilla-thunderbird/extensions/offline@thelizards.debian.org/chrome/
+debian/tmpls-offline/install.rdf usr/lib/mozilla-thunderbird/extensions/offline@thelizards.debian.org/
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.desktop
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.desktop
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Name=Thunderbird Mail Client
+Comment=Read and write your email
+Exec=mozilla-thunderbird
+Terminal=false
+MultipleArgs=false
+Type=Application
+Icon=mozilla-thunderbird.xpm
+Categories=Application;Network
+Name[cs]=Poštovní klient Thunderbird
+Name[ca]=Client de correu Thunderbird
+Name[pl]=Klient poczty Thunderbird
+Name[pt_BR]=Cliente de E-mail Thunderbird
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[de]=Emails lesen und verfassen
+Comment[fr]=Lire et écrire votre mél
+Comment[it]=Leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Ler e escrever suas mensagens
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird.postrm
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird.postrm
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+case "$1" in
+    abort-install|remove)
+       if [ -x /usr/bin/update-menus ]; then update-menus; fi
+       rm -f /var/lib/mozilla-thunderbird/chrome/chrome.rdf
+       rm -f /usr/lib/mozilla-thunderbird/chrome/chrome.rdf
+       rm -f /var/lib/mozilla-thunderbird/defaults.ini
+       rm -f /var/lib/mozilla-thunderbird/components.ini
+       rm -f /var/lib/mozilla-thunderbird/extensions/Extensions.rdf
+       rm -f /var/lib/mozilla-thunderbird/extensions/installed-extensions.txt
+       rm -f /var/lib/mozilla-thunderbird/components/xpti.dat
+       rm -f /var/lib/mozilla-thunderbird/components/compreg.dat
+       rm -f /var/lib/mozilla-thunderbird/chrome/installed-chrome.txt
+       rm -f /var/lib/mozilla-thunderbird/chrome/overlayinfo/communicator/content/overlays.rdf
+       rm -f /var/lib/mozilla-thunderbird/chrome/overlayinfo/navigator/content/overlays.rdf
+       rm -f /var/lib/mozilla-thunderbird/chrome/overlayinfo/messenger/content/overlays.rdf
+       rm -f /var/lib/mozilla-thunderbird/chrome/overlayinfo/browser/content/overlays.rdf
+       rm -f /usr/lib/mozilla-thunderbird/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/uninstall/Uninstall
+#       rmdir --ignore-fail-on-non-empty /usr/lib/mozilla-thunderbird/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/uninstall
+
+       # dirs
+       rm -rf /usr/lib/mozilla-thunderbird/chrome/
+       rm -rf /var/lib/mozilla-thunderbird/chrome/
+       rm -rf /var/lib/mozilla-thunderbird/defaults/
+       rm -rf /var/lib/mozilla-thunderbird/defaults/
+       rmdir /var/lib/mozilla-thunderbird/components/ &> /dev/null
+       rmdir /var/lib/mozilla-thunderbird/extensions/ &> /dev/null
+
+     ;;
+    purge)
+       if [ -x /usr/bin/update-menus ]; then update-menus; fi
+       rm -f /var/lib/mozilla-thunderbird/chrome/chrome.rdf
+       rm -f /usr/lib/mozilla-thunderbird/chrome/chrome.rdf
+       rm -f /var/lib/mozilla-thunderbird/defaults.ini
+       rm -f /var/lib/mozilla-thunderbird/components.ini
+       rm -f /var/lib/mozilla-thunderbird/extensions/Extensions.rdf
+       rm -f /var/lib/mozilla-thunderbird/extensions/installed-extensions.txt
+       rm -f /var/lib/mozilla-thunderbird/components/xpti.dat
+       rm -f /var/lib/mozilla-thunderbird/components/compreg.dat
+       rm -f /var/lib/mozilla-thunderbird/chrome/installed-chrome.txt
+       rm -f /var/lib/mozilla-thunderbird/chrome/overlayinfo/communicator/content/overlays.rdf
+       rm -f /var/lib/mozilla-thunderbird/chrome/overlayinfo/navigator/content/overlays.rdf
+       rm -f /var/lib/mozilla-thunderbird/chrome/overlayinfo/messenger/content/overlays.rdf
+       rm -f /var/lib/mozilla-thunderbird/chrome/overlayinfo/browser/content/overlays.rdf
+       rm -f /usr/lib/mozilla-thunderbird/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/uninstall/Uninstall
+
+       # dirs
+       rmdir /usr/lib/mozilla-thunderbird/chrome/
+       rm -rf /var/lib/mozilla-thunderbird/chrome/
+       rm -rf /var/lib/mozilla-thunderbird/defaults/
+       rm -rf /var/lib/mozilla-thunderbird/defaults/
+       rmdir /var/lib/mozilla-thunderbird/components/ &> /dev/null
+       rmdir /var/lib/mozilla-thunderbird/extensions/ &> /dev/null
+
+       ;;
+    *)
+      ;;
+esac
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-config.1
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-config.1
@@ -0,0 +1,23 @@
+.\"Created with GNOME Manpages Editor
+.\"http://gmanedit.sourceforge.net
+.\"Sergio Rua <srua@gpul.org>
+.\"
+.TH mozilla-thunderbird-config 1 "Jun, 23 2004" "Mozilla Thunderbird Config"
+
+.SH NAME
+<mozilla-thunderbird-config> \- mozilla-thunderbird development helper
+
+.SH SYNOPSIS
+.B <mozilla-thunderbird-config>
+.RI  [--prefix[=DIR]] 
+[--exec-prefix[=DIR]] 
+[--version] 
+[--defines] 
+[--libs] [libraries] 
+[--cflags] [components] 
+[--idlflags]
+.br
+
+.SH DESCRIPTION
+A pkg-config equivalent helper for the mozilla-thunderbird-dev package. 
+The syntax is similar to pkg-config.
--- mozilla-thunderbird-1.5.orig/debian/build-extensions.sh
+++ mozilla-thunderbird-1.5/debian/build-extensions.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+CUR=$PWD
+rm -rf "$CUR/debian/tmp-enigmail/"
+
+cd build-dir/mozilla/extensions/ipc
+./makemake -r
+make clean
+make
+make install DESTDIR=$CUR/debian/tmp-enigmail
+cd ../enigmail/
+./makemake -r
+make clean
+cd build
+make
+make install DESTDIR=$CUR/debian/tmp-enigmail
+cd ../package
+make
+make install DESTDIR=$CUR/debian/tmp-enigmail
+cd ..
+make
+make install DESTDIR=$CUR/debian/tmp-enigmail
--- mozilla-thunderbird-1.5.orig/debian/tmpls-offline/content_contents.rdf
+++ mozilla-thunderbird-1.5/debian/tmpls-offline/content_contents.rdf
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:inspector"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:inspector"
+        chrome:displayName="Document Inspector"
+        chrome:author="Joe Hewitt"
+        chrome:name="inspector"
+#expand         chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
+#expand         chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
+  </RDF:Description>
+
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+    <RDF:li resource="chrome://inspector/content/commandOverlay.xul"/>
+    <RDF:li resource="chrome://inspector/content/keysetOverlay.xul"/>
+    <RDF:li resource="chrome://inspector/content/popupOverlay.xul"/>
+  </RDF:Seq>
+
+  <!-- Communicator Overlays -->
+
+  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
+    <RDF:li>chrome://inspector/content/tasksOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://inspector/content/prefs/prefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- Inspector Overlays -->
+
+  <RDF:Seq about="chrome://inspector/content/commandOverlay.xul">
+    <RDF:li>chrome://inspector/content/viewers/dom/commandOverlay.xul</RDF:li>
+    <RDF:li>chrome://inspector/content/viewers/styleRules/commandOverlay.xul</RDF:li>
+    <RDF:li>chrome://inspector/content/search/modules/commandOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://inspector/content/keysetOverlay.xul">
+    <RDF:li>chrome://inspector/content/viewers/dom/keysetOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://inspector/content/popupOverlay.xul">
+    <RDF:li>chrome://inspector/content/viewers/dom/popupOverlay.xul</RDF:li>
+    <RDF:li>chrome://inspector/content/viewers/styleRules/popupOverlay.xul</RDF:li>
+    <RDF:li>chrome://inspector/content/search/modules/popupOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+</RDF:RDF>
--- mozilla-thunderbird-1.5.orig/debian/tmpls-offline/install.rdf
+++ mozilla-thunderbird-1.5/debian/tmpls-offline/install.rdf
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>offline@thelizards.debian.org</em:id>
+    <em:version>1.0</em:version>
+    
+    <!-- Target Application (Thunderbird) this extension can install into, 
+         with minimum and maximum supported versions. --> 
+    <em:targetApplication>
+      <Description>
+        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+        <em:minVersion>1.5</em:minVersion>
+        <em:maxVersion>1.5</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+    
+    
+    <!-- Front End MetaData -->
+    <em:name>Offline</em:name>
+    <em:description>Read your mails offline</em:description>
+    <em:creator>packaged by debian maintainer</em:creator>
+    <em:homepageURL>http://www.debian.org</em:homepageURL>
+
+    <!-- Front End Integration Hooks (used by Extension Manager)
+    <em:iconURL>chrome://enigmail/skin/enigmail-about.png</em:iconURL>
+    -->
+    
+    <!-- Packages, Skins and Locales that this extension registers -->
+    <em:file>
+      <Description about="urn:mozilla:extension:file:offline.jar">
+        <em:package>content/messenger-offline/</em:package>
+      </Description>
+    </em:file>
+  </Description>      
+
+</RDF>
--- mozilla-thunderbird-1.5.orig/debian/mozilla-thunderbird-offline.preinst
+++ mozilla-thunderbird-1.5/debian/mozilla-thunderbird-offline.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+#if test "$1" = "upgrade" -o "$1" = "install"; then
+#   if [ -L /usr/lib/mozilla-thunderbird/defaults/pref ]; then
+#   	rm -f /usr/lib/mozilla-thunderbird/defaults/pref
+#   fi
+#   if [ -L /usr/lib/mozilla-thunderbird/greprefs ]; then
+#   	rm -f /usr/lib/mozilla-thunderbird/greprefs
+#   fi
+#
+#fi
+
+#DEBHELPER#
--- mozilla-thunderbird-1.5.orig/debian/rejar-typeaheadfind.sh
+++ mozilla-thunderbird-1.5/debian/rejar-typeaheadfind.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+curdir=$PWD
+
+cd debian/tmp-typeaheadfind/usr/lib/mozilla-thunderbird/chrome/
+
+mkdir tmp
+cd tmp
+unzip -o ../"*".jar
+if [ -d content/global ]; then
+	mv content/global content/typeaheadfind
+fi
+if [ -d locale/en-US/global ]; then
+	mv locale/en-US/global locale/en-US/typeaheadfind
+fi
+cp $curdir/debian/tmpls-typeaheadfind/locale/contents.rdf locale/en-US/typeaheadfind/contents.rdf
+cp $curdir/debian/tmpls-typeaheadfind/content/contents.rdf content/typeaheadfind/contents.rdf
+find . -print | zip -q ../typeaheadfind.jar -@
+cd ..
+rm -rf tmp
+rm -rf en-US* toolkit*