+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+URL=$1
+BRANCH=$2
+
+set -e
+
+if [ Z$1 = Z ] ; then
+ echo "Usage: $0 MOZ_URL [BRANCH]"
+ echo
+ echo "Ex: $0 http://hg.mozilla.org/releases/mozilla-1.9.2 default"
+ exit 1
+fi
+
+if [ Z$BRANCH = Z ] ; then
+ BRANCH="default"
+fi
+
+# Get the tip of $BRANCH
+URL_BASE=`echo $URL | sed -e 's,^\(http://[^/]*\)/.*,\1,'`
+TIP=`wget -qO- $URL/summary | sed -e '1,/>branches$BRANCH<" | \
+ sed -e 's,.*'$BRANCH' | changeset.*,\1,'`
+
+# Get the rev-id and hash of this top
+REVS=`wget -qO- $URL_BASE$TIP | grep '^' | sed -e 's/.* changeset \([^<]*\).*/\1/'`
+REV=`echo $REVS | cut -d: -f1`
+HASH=`echo $REVS | cut -d: -f2`
+
+# Get the date of this tip
+DATE=`wget -qO- "$URL/pushlog?changeset=$HASH" | grep '^ ' | tr '<>' '"' | cut -d'"' -f3 | cut -dT -f1 | tr -d '-'`
+
+echo "${DATE}r${REV}"
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.prerm
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+LIBDIR=/usr/lib/thunderbird-3.1.2
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] || [ "$1" = upgrade ]; then
+ rm -f $LIBDIR/.autoreg
+fi
+
+#DEBHELPER#
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.NEWS
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.NEWS
@@ -0,0 +1,9 @@
+thunderbird (3.0.4+nobinonly-0ubuntu3) lucid; urgency=high
+
+ * In the last upload, a recursive symlink might have been created. If
+ Thunderbird will not start, then run 'ls -ld ~/.*thunderbird*' from a
+ terminal. If you see .thunderbird in your home directory linked to itself,
+ remove the .thunderbird link to itself and mv .thunderbird.upstream to
+ .thunderbird
+
+ -- Micah Gersten Thu, 15 Apr 2010 12:00:49 -0500
--- thunderbird-3.1.2+nobinonly.orig/debian/copyright
+++ thunderbird-3.1.2+nobinonly/debian/copyright
@@ -0,0 +1,647 @@
+This package was debianized by Fabien Tassin on 2008-02-25
+
+The package was downloaded from http://ftp.mozilla.org/pub/mozilla.org/thunderbird/
+
+EDIT: downloaded from CVS (until 3.0 is released) using the following commands:
+ debian/rules get-orig-source (you need to install mozilla-devscripts >= 0.05)
+
+The source tarball is an aggregate of several different works in which the
+main one, developed by the Mozilla Project, is thunderbird.
+
+The contents of the debian directory are licensed like the bulk of
+thunderbird, tri-licensed under the GPL/LGPL/MPL.
+
+Other works include gzip, bzip2, sqlite, libjpeg, libpng, cairo, and others.
+Please see the sections following the copyright statements for thunderbird for
+these.
+
+If this file is incomplete, which I'm pretty sure is the case, because it's
+difficult not to forget anything in this huge amount of data, please file
+a bug or contact me.
+
+=== thunderbird
+
+Overall, the thunderbird project is licensed under the terms of the Mozilla
+Public License version 1.1 or, at your option, under the terms of the GNU
+General Public License version 2 or subsequent, or the terms of the GNU
+Lesser General Public License version 2.1 or subsequent.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL' ;
+the complete text of the GNU Lesser General Public License can be
+found in the file `/usr/share/common-licenses/LGPL'.
+
+The complete text of the Mozilla Public License can be found in the MPL file
+in the same directory as this file.
+
+Some of the files are also licensed (single, dual or tri) under the terms of
+the Netscape Public License (NPL) which can be found as amendments to the
+MPL at the end of the file. Please refer to http://www.mozilla.org/MPL/relicensing-faq.html
+
+While the Mozilla Project is undergoing a global relicensing so that the
+aim is to have a full tree with these tri-license terms, there are at the
+moment quite some exceptions as following:
+
+(Note that I sometimes assumed files not explicitely licensed to be licensed
+under the same terms as the files around them and that a lot of the
+information has been extracted automatically, thus maybe leaving some doubt.
+Again, if you find "bugs", please contact me by email or via the BTS.)
+
+The following files are not tri-licenced MPL/GPL/LGPL:
+
+- GPL only:
+ dom/tests/mochitest/ajax/jquery/dist/jquery.js
+ dom/tests/mochitest/ajax/jquery/src/jquery/jquery.js
+
+- MPL and GPL:
+ embedding/browser/activex/src/install/README.txt
+
+- MPL and LGPL:
+ gfx/cairo/cairo/*
+
+- GPL and LGP:
+ extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
+ extensions/pref/system-pref/src/gconf/nsSystemPrefService.h
+ extensions/pref/system-pref/src/nsSystemPref.cpp
+ extensions/pref/system-pref/src/nsSystemPref.h
+ extensions/pref/system-pref/src/nsSystemPrefFactory.cpp
+ extensions/pref/system-pref/src/nsSystemPrefLog.h
+ netwerk/base/public/nsIIOService2.idl
+ netwerk/base/public/nsINetworkLinkService.idl
+ netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
+ netwerk/streamconv/converters/mozTXTToHTMLConv.h
+ netwerk/streamconv/public/mozITXTToHTMLConv.idl
+ toolkit/system/dbus/nsDBusModule.cpp
+ toolkit/system/dbus/nsDBusService.cpp
+ toolkit/system/dbus/nsDBusService.h
+ toolkit/system/dbus/nsNetworkManagerListener.cpp
+ toolkit/system/dbus/nsNetworkManagerListener.h
+
+- NPL only (thus MPL): (EDIT: to investigate)
+ intl/uconv/ucvibm/864i.uf
+ intl/uconv/ucvibm/cp850.uf
+ intl/uconv/ucvibm/cp852.uf
+ intl/uconv/ucvibm/cp855.uf
+ intl/uconv/ucvibm/cp857.uf
+ intl/uconv/ucvibm/cp862.uf
+ intl/uconv/ucvibm/cp864.uf
+ intl/uconv/ucvmath/mathematica1.uf
+ intl/uconv/ucvmath/mathematica2.uf
+ intl/uconv/ucvmath/mathematica3.uf
+ intl/uconv/ucvmath/mathematica4.uf
+ intl/uconv/ucvmath/mathematica5.uf
+ intl/uconv/ucvmath/mtextra.uf
+ intl/uconv/ucvmath/texcmex-t1.uf
+ intl/uconv/ucvmath/texcmex-ttf.uf
+ intl/uconv/ucvmath/texcmmi-t1.uf
+ intl/uconv/ucvmath/texcmmi-ttf.uf
+ intl/uconv/ucvmath/texcmr-ttf.uf
+ intl/uconv/ucvmath/texcmsy-t1.uf
+
+- Public Domain:
+ aclocal.m4
+ build/autoconf/freetype2.m4
+ build/autoconf/gtk.m4
+ build/autoconf/nspr.m4
+ db/mork/src/morkDeque.cpp
+ db/mork/src/morkDeque.h
+
+The file db/mork/src/morkQuickSort.cpp is licensed under the following terms:
+
+ Copyright (c) 1992, 1993
+ The Regents of the University of California. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+The following files come from X11R5, without any clear licensing terms:
+
+ build/autoconf/install-sh
+ directory/c-sdk/config/autoconf/install-sh
+ nsprpub/build/autoconf/install-sh
+
+The embedding/qa/mozembed/public/nsIQABrowserUIGlue.idl file and the files
+under the embedding/tests directory are licensed under the following terms:
+
+ Copyright (c) 2002 Netscape Communications Corporation and
+ other contributors
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this Mozilla sample software and associated documentation files
+ (the "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+=== sqlite
+
+The db/sqlite3 directory contains a copy of sqlite with the following
+licensing terms:
+
+ The author disclaims copyright to this source code. In place of
+ a legal notice, here is a blessing:
+
+ May you do good and not evil.
+ May you find forgiveness for yourself and forgive others.
+ May you share freely, never taking more than you give.
+
+=== dbm
+
+The dbm directory, except the files listed under the thunderbird section, is
+licensed under the following terms:
+
+ Copyright (c) 1991, 1993, 1994
+ The Regents of the University of California. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+=== myspell
+
+The extensions/spellcheck/myspell directory is licensed under the following
+terms:
+
+ Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
+ And Contributors. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ 3. All modifications to the source code must be clearly marked as
+ such. Binary redistributions based on modified source code
+ must be clearly marked as modified versions in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+=== boehm
+
+The gc/boehm directory, except the files listed under the thunderbird section,
+is licensed under the following terms:
+
+ Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
+ Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved.
+ Copyright (c) 1996-1998 by Silicon Graphics. All rights reserved.
+
+ THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
+
+ Permission is hereby granted to use or copy this program
+ for any purpose, provided the above notices are retained on all copies.
+ Permission to modify the code and to distribute modified code is granted,
+ provided the above notices are retained, and a notice that the code was
+ modified is included with the above copyright notice.
+
+=== cairo
+
+The gfx/cairo/cairo directory is licensed under the following terms:
+
+ Copyright (c) 2003 University of Southern California
+ Copyright (c) 1999 Tom Tromey
+ Copyright (c) 2002, 2003 University of Southern California
+ Copyright (c) 2004 Calum Robinson
+ Copyright (c) 2004 David Reveman
+ Copyright (c) 2000, 2002, 2004 Keith Packard
+ Copyright (c) 2004, 2005 Red Hat, Inc
+
+ Cairo is free software and is available to be redistributed and/or
+ modified under the terms of either the GNU Lesser General Public
+ License (LGPL) version 2.1 or the Mozilla Public License (MPL) version
+ 1.1.
+
+=== libpixman
+
+The gfx/cairo/libpixman directory is licensed under the following terms:
+(from gfx/cairo/libpixman/COPYING)
+
+ libpixregion
+
+ Copyright 1987, 1998 The Open Group
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of The Open Group shall not be
+ used in advertising or otherwise to promote the sale, use or other dealings
+ in this Software without prior written authorization from The Open Group.
+
+
+ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+ All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Digital not be
+ used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
+
+ ----------------------------------------------------------------------
+ libic
+
+ Copyright © 2001 Keith Packard
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission. Keith Packard makes no
+ representations about the suitability of this software for any purpose. It
+ is provided "as is" without express or implied warranty.
+
+ KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+ ----------------------------------------------------------------------
+ slim
+
+ slim is Copyright © 2003 Richard Henderson
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Richard Henderson not be
+ used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission. Richard Henderson
+ makes no representations about the suitability of this software for
+ any purpose. It is provided "as is" without express or implied
+ warranty.
+
+ RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+=== libjpeg
+
+The jpeg directory, except the files under the thunderbird section, are licensed
+under the following terms:
+
+ The authors make NO WARRANTY or representation, either express or implied,
+ with respect to this software, its quality, accuracy, merchantability, or
+ fitness for a particular purpose. This software is provided "AS IS", and you,
+ its user, assume the entire risk as to its quality and accuracy.
+
+ This software is copyright (C) 1991-1998, Thomas G. Lane.
+ All Rights Reserved except as specified below.
+
+ Permission is hereby granted to use, copy, modify, and distribute this
+ software (or portions thereof) for any purpose, without fee, subject to these
+ conditions:
+ (1) If any part of the source code for this software is distributed, then this
+ README file must be included, with this copyright and no-warranty notice
+ unaltered; and any additions, deletions, or changes to the original files
+ must be clearly indicated in accompanying documentation.
+ (2) If only executable code is distributed, then the accompanying
+ documentation must state that "this software is based in part on the work of
+ the Independent JPEG Group".
+ (3) Permission for use of this software is granted only if the user accepts
+ full responsibility for any undesirable consequences; the authors accept
+ NO LIABILITY for damages of any kind.
+
+ These conditions apply to any software derived from or based on the IJG code,
+ not just to the unmodified library. If you use our work, you ought to
+ acknowledge us.
+
+ Permission is NOT granted for the use of any IJG author's name or company name
+ in advertising or publicity relating to this software or products derived from
+ it. This software may be referred to only as "the Independent JPEG Group's
+ software".
+
+ We specifically permit and encourage the use of this software as the basis of
+ commercial products, provided that all warranty or liability claims are
+ assumed by the product vendor.
+
+=== bzip2
+
+The modules/libbz2/src directory is licensed under the following terms:
+(from modules/libbz2/src/LICENSE)
+
+ This program, "bzip2", the associated library "libbzip2", and all
+ documentation, are copyright (C) 1996-2005 Julian R Seward. All
+ rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 3. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ Julian Seward, Cambridge, UK.
+ jseward@acm.org
+ bzip2/libbzip2 version 1.0.3 of 15 February 2005
+
+=== libpng
+
+The directory modules/libimg/png is licensed under the following terms:
+(from modules/libimg/png/LICENSE)
+
+ This copy of the libpng notices is provided for your convenience. In case of
+ any discrepancy between this copy and the notices in the file png.h that is
+ included in the libpng distribution, the latter shall prevail.
+
+ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+
+ If you modify libpng you may insert additional notices immediately following
+ this sentence.
+
+ libpng version 1.2.6, September 12, 2004, is
+ Copyright (c) 2004 Glenn Randers-Pehrson, and is
+ distributed according to the same disclaimer and license as libpng-1.2.5
+ with the following individual added to the list of Contributing Authors
+
+ Cosmin Truta
+
+ libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
+ Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+ distributed according to the same disclaimer and license as libpng-1.0.6
+ with the following individuals added to the list of Contributing Authors
+
+ Simon-Pierre Cadieux
+ Eric S. Raymond
+ Gilles Vollant
+
+ and with the following additions to the disclaimer:
+
+ There is no warranty against interference with your enjoyment of the
+ library or against infringement. There is no warranty that our
+ efforts or the library will fulfill any of your particular purposes
+ or needs. This library is provided with all faults, and the entire
+ risk of satisfactory quality, performance, accuracy, and effort is with
+ the user.
+
+ libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+ Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
+ distributed according to the same disclaimer and license as libpng-0.96,
+ with the following individuals added to the list of Contributing Authors:
+
+ Tom Lane
+ Glenn Randers-Pehrson
+ Willem van Schaik
+
+ libpng versions 0.89, June 1996, through 0.96, May 1997, are
+ Copyright (c) 1996, 1997 Andreas Dilger
+ Distributed according to the same disclaimer and license as libpng-0.88,
+ with the following individuals added to the list of Contributing Authors:
+
+ John Bowler
+ Kevin Bracey
+ Sam Bushell
+ Magnus Holmgren
+ Greg Roelofs
+ Tom Tanner
+
+ libpng versions 0.5, May 1995, through 0.88, January 1996, are
+ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+
+ For the purposes of this copyright and license, "Contributing Authors"
+ is defined as the following set of individuals:
+
+ Andreas Dilger
+ Dave Martindale
+ Guy Eric Schalnat
+ Paul Schmidt
+ Tim Wegner
+
+ The PNG Reference Library is supplied "AS IS". The Contributing Authors
+ and Group 42, Inc. disclaim all warranties, expressed or implied,
+ including, without limitation, the warranties of merchantability and of
+ fitness for any purpose. The Contributing Authors and Group 42, Inc.
+ assume no liability for direct, indirect, incidental, special, exemplary,
+ or consequential damages, which may result from the use of the PNG
+ Reference Library, even if advised of the possibility of such damage.
+
+ Permission is hereby granted to use, copy, modify, and distribute this
+ source code, or portions hereof, for any purpose, without fee, subject
+ to the following restrictions:
+
+ 1. The origin of this source code must not be misrepresented.
+
+ 2. Altered versions must be plainly marked as such and must not
+ be misrepresented as being the original source.
+
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
+
+ The Contributing Authors and Group 42, Inc. specifically permit, without
+ fee, and encourage the use of this source code as a component to
+ supporting the PNG file format in commercial products. If you use this
+ source code in a product, acknowledgment is not required but would be
+ appreciated.
+
+
+ A "png_get_copyright" function is available, for convenient use in "about"
+ boxes and the like:
+
+ printf("%s",png_get_copyright(NULL));
+
+ Also, the PNG logo (in PNG format, of course) is supplied in the
+ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+
+ Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
+ certification mark of the Open Source Initiative.
+
+ Glenn Randers-Pehrson
+ glennrp@users.sourceforge.net
+ September 12, 2004
+
+=== zlib
+
+The directories modules/zlib/src and security/nss/cmd/zlib are licensed under
+the following terms:
+
+ (C) 1995-2004 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
+
+ If you use the zlib library in a product, we would appreciate *not*
+ receiving lengthy legal documents to sign. The sources are provided
+ for free but without warranty of any kind. The library has been
+ entirely written by Jean-loup Gailly and Mark Adler; it does not
+ include third-party code.
+
+ If you redistribute modified sources, we would appreciate that you include
+ in the file ChangeLog history information documenting your changes. Please
+ read the FAQ for more information on the distribution of modified source
+ versions.
+
+=== expat
+
+The directory parser/expat is licensed under the following terms:
+(from parser/expat/COPYING)
+
+ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ and Clark Cooper
+ Copyright (c) 2001, 2002 Expat maintainers.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.postinst
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.postinst
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+LIBDIR=/usr/lib/thunderbird-3.1.2
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then
+ touch $LIBDIR/.autoreg
+fi
+
+# Clean a possible left over
+if [ -f /usr/lib/thunderbird-3.0a1pre/.autoreg ] ; then
+ rm -f /usr/lib/thunderbird-3.0a1pre/.autoreg
+ rmdir /usr/lib/thunderbird-3.0a1pre
+fi
+
+#Create symlink to system dictionaries if it doesn't exist
+
+TB_DICTIONARY_DIR=$LIBDIR/dictionaries
+SYS_DICTIONARY_DIR=/usr/share/myspell/dicts
+
+if [ -d $TB_DICTIONARY_DIR -a ! -h $TB_DICTIONARY_DIR ]
+then
+ rmdir $TB_DICTIONARY_DIR
+ ln -s $SYS_DICTIONARY_DIR $TB_DICTIONARY_DIR
+fi
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.1
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.1
@@ -0,0 +1,34 @@
+.TH "THUNDERBIRD" "1"
+.SH "NAME"
+thunderbird \(em thunderbird \- Mail User Agent (MUA) and newsgroup/RSS
+client for X11 derived from the Mozilla suite.
+.SH "SYNOPSIS"
+.PP
+\fBthunderbird\fR [\fB-P \fIprofile\fR\fP]
+.SH "DESCRIPTION"
+.PP
+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.
+.SH "OPTIONS"
+.IP "\fB-P \fIprofile\fR\fP " 10
+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.
+.SH "SEE ALSO"
+.PP
+.nf
+The Thunderbird Homepage:
+http://www.mozilla.org/projects/thunderbird/
+
+The Debian Thunderbird FAQ:
+http://www.jwsdot.com/debian/faq.html
+.fi
+.\" created by instant / docbook-to-man, Fri 13 Aug 2010, 16:17
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.prerm.in
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.prerm.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+LIBDIR=@LIBDIR@
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] || [ "$1" = upgrade ]; then
+ rm -f $LIBDIR/.autoreg
+fi
+
+#DEBHELPER#
--- thunderbird-3.1.2+nobinonly.orig/debian/compat
+++ thunderbird-3.1.2+nobinonly/debian/compat
@@ -0,0 +1 @@
+5
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.desktop
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.desktop
@@ -0,0 +1,38 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Mozilla Thunderbird Mail/News
+Comment=Read/Write Mail/News with Mozilla Thunderbird
+GenericName=Mail Client
+Exec=thunderbird %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=thunderbird
+Categories=Application;Network;Email;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;
+StartupWMClass=Thunderbird
+StartupNotify=true
+Name[es]=Cliente de correo y noticias Thunderbird
+Name[cs]=Poštovní klient Thunderbird
+Name[ca]=Client de correu Thunderbird
+Name[fi]=Thunderbird-sähköposti
+Name[fr]=Messagerie Thunderbird
+Name[hu]=Thunderbird levelezőkliens
+Name[pl]=Klient poczty Thunderbird
+Name[pt_BR]=Cliente de E-mail Thunderbird
+Name[sv]=E-postklienten Thunderbird
+Name[ru]=Почтовый клиент Thunderbird
+Comment[es]=Lea y escriba correos y noticias con Mozilla Thunderbird
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[de]=Emails lesen und verfassen
+Comment[fi]=Lue ja kirjoita sähköposteja
+Comment[fr]=Lire et écrire des courriels
+Comment[hu]=Levelek írása és olvasása a Thunderbirddel
+Comment[it]=Leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Ler e escrever suas mensagens
+Comment[sv]=Läs och skriv e-post
+Comment[ru]=Читайте и пишите письма
+GenericName[hu]=Levelezőkliens
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.sh
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.sh
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+# Firefox launcher containing a Profile migration helper for
+# temporary profiles used during alpha and beta phases.
+
+# Original Authors:
+# Alexander Sack
+# Fabien Tassin
+# Steve Langasek
+
+# Modified for Thunderbird by:
+# Micah Gersten
+# License: GPLv2 or later
+
+# If there's a ~/.mozilla-thunderbird profile, copy to .thunderbird
+# If nothing is found, we'll go for a fresh run and let thunderbird create a
+# default profile for us.
+
+HOMEDIR=$HOME
+LIBDIR=/usr/lib/thunderbird-3.1.2
+APPVER=
+META_NAME=thunderbird
+GDB=/usr/bin/gdb
+DROPPED=abandoned
+
+NAME=`which "$0"`
+if [ "x$META_NAME" != "x" ] ; then
+ NAME="${NAME%%-$APPVER}"
+fi
+APPNAME="$(basename "$NAME")"
+
+while [ ! -f "$LIBDIR/$APPNAME" ] && [ -L "$NAME" ]; do
+ TARGET="$(readlink "$NAME")"
+ if [ "x$TARGET" = "x$(basename "$TARGET")" ]; then
+ TARGET="$(dirname "$NAME")/$TARGET"
+ fi
+ if [ "x$META_NAME" != "x" ] ; then
+ TARGET=${TARGET%%-$APPVER}
+ fi
+ NAME="$TARGET"
+ APPNAME="$(basename "$NAME")"
+ if [ "x$APPNAME" = "xthunderbird.sh" ]; then
+ APPNAME=thunderbird
+ break
+ fi
+done
+
+usage () {
+ $LIBDIR/$APPNAME -h | sed -e 's,/.*/,,'
+ echo
+ echo " -g or --debug Start within $GDB (Must be first)"
+}
+
+want_debug=0
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -h | --help | -help )
+ usage
+ exit 0 ;;
+ -g | --debug )
+ want_debug=1
+ shift ;;
+ -- ) # Stop option prcessing
+ shift
+ break ;;
+ * )
+ break ;;
+ esac
+done
+
+# We always move the thunderbird 2 profile ($HOMEDIR/.mozilla-thunderbird)
+# to $HOMEDIR/.thunderbird
+# if there exists a beta profile (first found: $HOMEDIR/.thunderbird-3.0)
+# and there is a standard thunderbird profile as well, ask the
+# user what to do. In case he decides to import the thunderbird 2.0 profile
+# settings, we keep the imported 2.0 profile, but rename the beta
+# profile by appending the suffix |.abandoned|. In case the user decides to
+# keep using the thunderbird 3.0 profile, we rename the original thunderbird profile
+# to .thunderbird-2.0-replaced and rename the beta profile to be |.thunderbird|.
+#
+# as a third option the user can defer his final decision. This will leave the
+# beta directories untouched, thus making the user use thunderbird 2 by default.
+#
+
+FOUND_OLD=""
+OLD_DIR=.mozilla-thunderbird
+if [ -d $HOMEDIR/$OLD_DIR -a ! -h $HOMEDIR/$OLD_DIR ] ; then
+ FOUND_OLD=$OLD_DIR;
+fi
+
+CURRENT=.thunderbird
+FOUND_CURRENT=""
+if [ -d $HOMEDIR/$CURRENT ] ; then
+ FOUND_CURRENT=$CURRENT
+fi
+
+FOUND_BETA=""
+BETA_LIST=""
+for betaname in .thunderbird-3.0; do
+ if [ -d $HOMEDIR/$betaname ]; then
+ BETA_LIST="$BETA_LIST $betaname"
+ FOUND_BETA=$betaname
+ fi
+done
+
+if [ "$FOUND_OLD" != "" ] ; then
+ if [ "$FOUND_CURRENT" != "" -a ! -d $HOMEDIR/$CURRENT.upstream ] ; then
+ mv $HOMEDIR/$CURRENT $HOMEDIR/$CURRENT.upstream
+ fi
+ # Migrate only if $CURRENT isn't there (Only do this once)
+ # If it exists, probably means that they already migrated
+ if [ ! -d $HOMEDIR/$CURRENT ] ; then
+ mv $HOMEDIR/$OLD_DIR $HOMEDIR/$CURRENT
+ fi
+fi
+
+# If 2.0-replaced dir is found, we consider the beta migration done
+if [ "$FOUND_BETA" != "" -a ! -d $HOMEDIR/$CURRENT-2.0-replaced ] ; then
+ echo -n "Found Beta Participation ..."
+ $LIBDIR/tb-beta-profile-migration-dialog
+ result=$?
+ if [ $result = 1 ]; then
+ if [ $FOUND_CURRENT != "" ] ; then
+ mv $HOMEDIR/$CURRENT $HOMEDIR/$CURRENT-2.0-replaced
+ fi
+ mv $HOMEDIR/$FOUND_BETA $HOMEDIR/$CURRENT
+ for beta in $BETA_LIST ; do
+ if [ $beta != $FOUND_BETA ] ; then
+ mv $HOMEDIR/$beta $HOMEDIR/$beta.$DROPPED
+ fi
+ done
+ echo " keep beta profile."
+ elif [ $result = 2 ]; then
+ #TB2 Profile already imported, so just move Beta profile out of the way
+ for beta in $BETA_LIST ; do
+ mv $HOMEDIR/$beta $HOMEDIR/$beta.$DROPPED
+ done
+ echo " use thunderbird 2.0 profile."
+ else
+ echo " use thunderbird 2.0 profile, but will ask again next time."
+ fi
+fi
+
+if [ ! -h $HOMEDIR/$OLD_DIR -a ! -d $HOMEDIR/$OLD_DIR ] ; then
+ ln -s $HOMEDIR/$CURRENT $HOMEDIR/$OLD_DIR
+fi
+
+if [ $want_debug -eq 1 ] ; then
+ if [ ! -x $GDB ] ; then
+ echo "Sorry, can't find usable $GDB. Please install it."
+ exit 1
+ fi
+ tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
+ trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
+ echo "set args ${1+"$@"}" > $tmpfile
+ echo "sh $LIBDIR/run-mozilla.sh $GDB "$LIBDIR/$META_NAME"-bin -x $tmpfile"
+ # force command name to be thunderbird for run-mozilla.sh
+ CMDNAME_USER=thunderbird sh $LIBDIR/run-mozilla.sh $GDB "$LIBDIR/$META_NAME"-bin -x $tmpfile
+ exit $?
+else
+ # force command name to be thunderbird for run-mozilla.sh
+ CMDNAME_USER=thunderbird exec $LIBDIR/$META_NAME "$@"
+fi
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.postinst.in
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.postinst.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+LIBDIR=@LIBDIR@
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then
+ touch $LIBDIR/.autoreg
+fi
+
+# Clean a possible left over
+if [ -f /usr/lib/thunderbird-3.0a1pre/.autoreg ] ; then
+ rm -f /usr/lib/thunderbird-3.0a1pre/.autoreg
+ rmdir /usr/lib/thunderbird-3.0a1pre
+fi
+
+#Create symlink to system dictionaries if it doesn't exist
+
+TB_DICTIONARY_DIR=$LIBDIR/dictionaries
+SYS_DICTIONARY_DIR=/usr/share/myspell/dicts
+
+if [ -d $TB_DICTIONARY_DIR -a ! -h $TB_DICTIONARY_DIR ]
+then
+ rmdir $TB_DICTIONARY_DIR
+ ln -s $SYS_DICTIONARY_DIR $TB_DICTIONARY_DIR
+fi
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird-gnome-support.install
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird-gnome-support.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/thunderbird-3.1*/components/libmozgnome.so
+debian/thunderbird.xml usr/share/gnome-control-center/default-apps
--- thunderbird-3.1.2+nobinonly.orig/debian/thunderbird.sh.in
+++ thunderbird-3.1.2+nobinonly/debian/thunderbird.sh.in
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+# Firefox launcher containing a Profile migration helper for
+# temporary profiles used during alpha and beta phases.
+
+# Original Authors:
+# Alexander Sack
+# Fabien Tassin
+# Steve Langasek
+
+# Modified for Thunderbird by:
+# Micah Gersten
+# License: GPLv2 or later
+
+# If there's a ~/.mozilla-thunderbird profile, copy to .thunderbird
+# If nothing is found, we'll go for a fresh run and let thunderbird create a
+# default profile for us.
+
+HOMEDIR=$HOME
+LIBDIR=@LIBDIR@
+APPVER=@APPVER@
+META_NAME=@META_NAME@
+GDB=/usr/bin/gdb
+DROPPED=abandoned
+
+NAME=`which "$0"`
+if [ "x$META_NAME" != "x" ] ; then
+ NAME="${NAME%%-$APPVER}"
+fi
+APPNAME="$(basename "$NAME")"
+
+while [ ! -f "$LIBDIR/$APPNAME" ] && [ -L "$NAME" ]; do
+ TARGET="$(readlink "$NAME")"
+ if [ "x$TARGET" = "x$(basename "$TARGET")" ]; then
+ TARGET="$(dirname "$NAME")/$TARGET"
+ fi
+ if [ "x$META_NAME" != "x" ] ; then
+ TARGET=${TARGET%%-$APPVER}
+ fi
+ NAME="$TARGET"
+ APPNAME="$(basename "$NAME")"
+ if [ "x$APPNAME" = "xthunderbird.sh" ]; then
+ APPNAME=thunderbird
+ break
+ fi
+done
+
+usage () {
+ $LIBDIR/$APPNAME -h | sed -e 's,/.*/,,'
+ echo
+ echo " -g or --debug Start within $GDB (Must be first)"
+}
+
+want_debug=0
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -h | --help | -help )
+ usage
+ exit 0 ;;
+ -g | --debug )
+ want_debug=1
+ shift ;;
+ -- ) # Stop option prcessing
+ shift
+ break ;;
+ * )
+ break ;;
+ esac
+done
+
+# We always move the thunderbird 2 profile ($HOMEDIR/.mozilla-thunderbird)
+# to $HOMEDIR/.thunderbird
+# if there exists a beta profile (first found: $HOMEDIR/.thunderbird-3.0)
+# and there is a standard thunderbird profile as well, ask the
+# user what to do. In case he decides to import the thunderbird 2.0 profile
+# settings, we keep the imported 2.0 profile, but rename the beta
+# profile by appending the suffix |.abandoned|. In case the user decides to
+# keep using the thunderbird 3.0 profile, we rename the original thunderbird profile
+# to .thunderbird-2.0-replaced and rename the beta profile to be |.thunderbird|.
+#
+# as a third option the user can defer his final decision. This will leave the
+# beta directories untouched, thus making the user use thunderbird 2 by default.
+#
+
+FOUND_OLD=""
+OLD_DIR=.mozilla-thunderbird
+if [ -d $HOMEDIR/$OLD_DIR -a ! -h $HOMEDIR/$OLD_DIR ] ; then
+ FOUND_OLD=$OLD_DIR;
+fi
+
+CURRENT=.thunderbird
+FOUND_CURRENT=""
+if [ -d $HOMEDIR/$CURRENT ] ; then
+ FOUND_CURRENT=$CURRENT
+fi
+
+FOUND_BETA=""
+BETA_LIST=""
+for betaname in .thunderbird-3.0; do
+ if [ -d $HOMEDIR/$betaname ]; then
+ BETA_LIST="$BETA_LIST $betaname"
+ FOUND_BETA=$betaname
+ fi
+done
+
+if [ "$FOUND_OLD" != "" ] ; then
+ if [ "$FOUND_CURRENT" != "" -a ! -d $HOMEDIR/$CURRENT.upstream ] ; then
+ mv $HOMEDIR/$CURRENT $HOMEDIR/$CURRENT.upstream
+ fi
+ # Migrate only if $CURRENT isn't there (Only do this once)
+ # If it exists, probably means that they already migrated
+ if [ ! -d $HOMEDIR/$CURRENT ] ; then
+ mv $HOMEDIR/$OLD_DIR $HOMEDIR/$CURRENT
+ fi
+fi
+
+# If 2.0-replaced dir is found, we consider the beta migration done
+if [ "$FOUND_BETA" != "" -a ! -d $HOMEDIR/$CURRENT-2.0-replaced ] ; then
+ echo -n "Found Beta Participation ..."
+ $LIBDIR/tb-beta-profile-migration-dialog
+ result=$?
+ if [ $result = 1 ]; then
+ if [ $FOUND_CURRENT != "" ] ; then
+ mv $HOMEDIR/$CURRENT $HOMEDIR/$CURRENT-2.0-replaced
+ fi
+ mv $HOMEDIR/$FOUND_BETA $HOMEDIR/$CURRENT
+ for beta in $BETA_LIST ; do
+ if [ $beta != $FOUND_BETA ] ; then
+ mv $HOMEDIR/$beta $HOMEDIR/$beta.$DROPPED
+ fi
+ done
+ echo " keep beta profile."
+ elif [ $result = 2 ]; then
+ #TB2 Profile already imported, so just move Beta profile out of the way
+ for beta in $BETA_LIST ; do
+ mv $HOMEDIR/$beta $HOMEDIR/$beta.$DROPPED
+ done
+ echo " use thunderbird 2.0 profile."
+ else
+ echo " use thunderbird 2.0 profile, but will ask again next time."
+ fi
+fi
+
+if [ ! -h $HOMEDIR/$OLD_DIR -a ! -d $HOMEDIR/$OLD_DIR ] ; then
+ ln -s $HOMEDIR/$CURRENT $HOMEDIR/$OLD_DIR
+fi
+
+if [ $want_debug -eq 1 ] ; then
+ if [ ! -x $GDB ] ; then
+ echo "Sorry, can't find usable $GDB. Please install it."
+ exit 1
+ fi
+ tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
+ trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
+ echo "set args ${1+"$@"}" > $tmpfile
+ echo "sh $LIBDIR/run-mozilla.sh $GDB "$LIBDIR/$META_NAME"-bin -x $tmpfile"
+ # force command name to be thunderbird for run-mozilla.sh
+ CMDNAME_USER=thunderbird sh $LIBDIR/run-mozilla.sh $GDB "$LIBDIR/$META_NAME"-bin -x $tmpfile
+ exit $?
+else
+ # force command name to be thunderbird for run-mozilla.sh
+ CMDNAME_USER=thunderbird exec $LIBDIR/$META_NAME "$@"
+fi
--- thunderbird-3.1.2+nobinonly.orig/debian/docs
+++ thunderbird-3.1.2+nobinonly/debian/docs
@@ -0,0 +1 @@
+debian/MPL
--- thunderbird-3.1.2+nobinonly.orig/debian/rules
+++ thunderbird-3.1.2+nobinonly/debian/rules
@@ -0,0 +1,238 @@
+#!/usr/bin/make -f
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+DEB_MOZ_NAME=thunderbird
+DEB_MOZ_VERSION=3.1.2
+DEB_MOZ_APPLICATION=$(DEB_MOZ_NAME)
+MOZ_APPLICATION=mail
+XUL_VERSION=1.9.2
+
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p')
+DEBIAN_UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
+DEBIAN_REV_CODE := $(shell echo $(DEBIAN_VERSION) | sed 's/^.*-\([0-9]*\)[^-]*$$/0\1/ ; s/^.*\(..\)$$/\1/')
+
+ifeq ($(XUL_VERSION),1.9.2)
+ TB_VERSION_FILE := version-192.txt
+else
+ TB_VERSION_FILE := version.txt
+endif
+
+DEBIAN_TB_DIR = /usr/lib/$(DEB_MOZ_NAME)-$(shell tail -1 mozilla/$(MOZ_APPLICATION)/config/$(TB_VERSION_FILE))
+DEBIAN_TB_DEV_DIR = /usr/lib/$(DEB_MOZ_NAME)-devel-$(shell tail -1 mozilla/$(MOZ_APPLICATION)/config/$(TB_VERSION_FILE))
+DEBIAN_XUL_DEV := $(wildcard /usr/lib/xulrunner-devel-1.9*)
+
+MOZCLIENT_PROJECTNAME := $(DEB_MOZ_APPLICATION)
+MOZCLIENT_PROJECTDIR := $(CURDIR)/debian/mozclient
+
+DEB_SRCDIR := mozilla
+# DEB_BUILDDIR := objdir-tb
+
+GNOME_SUPPORT_FILES = libmozgnome.so libnkgnomevfs.so
+
+DISTRIB := $(shell lsb_release -i -s)
+ifneq (,$(filter $(DISTRIB),Ubuntu))
+ DISTRIB_VERSION_MAJOR := $(shell lsb_release -s -r | cut -d '.' -f 1)
+ DISTRIB_VERSION_MINOR := $(shell lsb_release -s -r | cut -d '.' -f 2)
+endif
+
+EXTRA_SYSTEM_CONFIGURE_FLAGS = $(NULL)
+
+USE_SYSTEM_XUL := 0
+
+ifeq (1,$(USE_SYSTEM_XUL))
+ EXTRA_SYSTEM_CONFIGURE_FLAGS += --with-libxul-sdk=$(DEBIAN_XUL_DEV)
+endif
+
+USE_SYSTEM_CAIRO := $(shell pkg-config --exists 'cairo >= 1.8.8'; a=$$?; if test $$a != 1; then echo 1; fi)
+
+# for old cairo versions we cannot use system cairo
+ifeq (1,$(USE_SYSTEM_CAIRO))
+ EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-system-cairo
+else
+ EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-system-cairo
+endif
+
+# gutsy doesn't have the right system-nss/nspr
+USE_SYSTEM_NSPR := $(shell pkg-config --exists 'nspr >= 4.8'; a=$$?; if test $$a != 1; then echo 1; fi)
+ifeq (1,$(USE_SYSTEM_NSPR))
+ EXTRA_SYSTEM_CONFIGURE_FLAGS += --with-system-nspr
+endif
+
+USE_SYSTEM_NSS := $(shell pkg-config --exists 'nss >= 3.12.6'; a=$$?; if test $$a != 1; then echo 1; fi)
+ifeq (1,$(USE_SYSTEM_NSS))
+ EXTRA_SYSTEM_CONFIGURE_FLAGS += --with-system-nss
+endif
+
+USE_SYSTEM_HUNSPELL := $(shell pkg-config --exists 'hunspell >= 1.2'; a=$$?; if test $$a != 1; then echo 1; fi)
+ifeq (1,$(USE_SYSTEM_HUNSPELL))
+ EXTRA_SYSTEM_CONFIGURE_FLAGS += --enable-system-hunspell
+else
+ EXTRA_SYSTEM_CONFIGURE_FLAGS += --disable-system-hunspell
+endif
+
+DEB_AUTO_UPDATE_AUTOCONF=2.13
+
+ifneq (,$(wildcard *.tar.bz2)$(DEBIAN_MOZCLIENT_EMBEDDED))
+ DEB_TAR_SRCDIR := mozilla
+ MOZCLIENT_EMBEDDED = 1
+ DEBIAN_TB_DIR = /usr/lib/$(DEB_MOZ_NAME)-$(shell tail -1 build-tree/mozilla/$(MOZ_APPLICATION)/config/$(TB_VERSION_FILE))
+ DEBIAN_TB_DEV_DIR = /usr/lib/$(DEB_MOZ_NAME)-devel-$(shell tail -1 build-tree/mozilla/$(MOZ_APPLICATION)/config/$(TB_VERSION_FILE))
+ include /usr/share/cdbs/1/rules/tarball.mk
+endif
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include $(CURDIR)/debian/mozclient/$(DEB_MOZ_APPLICATION).mk
+include $(CURDIR)/debian/mozclient/compare.mk
+
+DEB_AUTO_UPDATE_DEBIAN_CONTROL=0
+
+DEB_MOZ_EXTENSIONS=default
+
+CFLAGS = -g
+CXXFLAGS = -g
+
+PROCESSORS := $(shell grep -ic ^processor /proc/cpuinfo)
+ifeq (0,$(PROCESSORS))
+PROCESSORS := 1
+endif
+ifneq (1,$(PROCESSORS))
+DEB_MAKE_EXTRA_ARGS += -j$(PROCESSORS)
+endif
+
+DEB_MAKE_ENVVARS += INSTALL_SDK=1
+
+# DEB_CONFIGURE_SCRIPT_ENV = \
+# MOZ_OBJDIR=@TOPSRCDIR@/$(DEB_BUILDDIR) \
+# $(NULL)
+
+ifneq (,$(findstring ~hg,$(DEBIAN_VERSION)))
+ # codename branding for dailies
+ BRANDING = --with-branding=mail/branding/nightly
+else
+ # official branding for releases
+ BRANDING = --enable-official-branding
+endif
+
+DEB_CONFIGURE_USER_FLAGS= \
+ $(EXTRA_SYSTEM_CONFIGURE_FLAGS) \
+ --enable-application=$(MOZ_APPLICATION) \
+ --enable-extensions=$(DEB_MOZ_EXTENSIONS) \
+ --with-default-mozilla-five-home=$(DEBIAN_TB_DIR) \
+ --enable-startup-notification \
+ --with-user-appdir=.mozilla \
+ --with-system-jpeg=/usr \
+ --with-system-zlib=/usr \
+ --disable-javaxpcom \
+ --disable-crashreporter \
+ --disable-elf-dynstr-gc \
+ --disable-installer \
+ --disable-strip \
+ --disable-strip-libs \
+ --disable-install-strip \
+ --disable-tests \
+ --disable-mochitest \
+ --disable-updater \
+ --enable-optimize \
+ --enable-static \
+ --enable-static-mail \
+ --with-distribution-id=com.ubuntu \
+ $(BRANDING) \
+ $(NULL)
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ DEB_CONFIGURE_USER_FLAGS += \
+ --disable-optimize \
+ $(NULL)
+endif
+
+# disable jit on sparc until bmo 502369 is fixable
+ifneq (,$(findstring sparc,$(DEB_BUILD_ARCH)))
+ DEB_CONFIGURE_USER_FLAGS += --disable-jit
+endif
+
+DEBIAN_EXECUTABLES = \
+ thunderbird.sh \
+ $(NULL)
+
+subst_files = \
+ debian/$(DEB_MOZ_APPLICATION).postinst \
+ debian/$(DEB_MOZ_APPLICATION).prerm \
+ debian/thunderbird.sh \
+ $(NULL)
+
+%: %.in
+ sed -e 's,@LIBDIR@,$(DEBIAN_TB_DIR),g' < $< > $@
+
+pre-build:: $(subst_files) debian/migrator/tb-beta-profile-migration-dialog
+ set -e; /usr/bin/docbook-to-man $(CURDIR)/debian/thunderbird.sgml > $(CURDIR)/debian/thunderbird.1 ; \
+ for i in $(DEBIAN_EXECUTABLES); do \
+ chmod a+x debian/$$i; \
+ done
+
+debian/thunderbird.sh: debian/thunderbird.sh.in
+ sed -e 's,@LIBDIR@,$(DEBIAN_TB_DIR),g' \
+ -e 's,@META_NAME@,$(DEB_MOZ_NAME),g' \
+ -e 's,@APPVER@,$(DEBIAN_APP_NAME_VER),g' < $< > $@
+
+debian/migrator/tb-beta-profile-migration-dialog: debian/migrator/main.c
+ $(CC) $(CFLAGS) -o $@ $< $(shell pkg-config --cflags --libs gtk+-2.0)
+
+post-patches:: debian/stamp-autotools-files-moz
+debian/stamp-autotools-files-moz:
+ # Number of processors: $(PROCESSORS) [$(shell grep -E '^(model name|Processor)' /proc/cpuinfo | head -1)]
+ if [ "Z$(DEB_AUTO_UPDATE_AUTOCONF)" != Z ] || [ ! -e $(DEB_SRCDIR)/mozilla/configure ]; \
+ then cd $(DEB_SRCDIR)/mozilla && `which autoconf$(DEB_AUTO_UPDATE_AUTOCONF) || which autoconf`; fi
+ if [ "Z$(DEB_AUTO_UPDATE_AUTOCONF)" != Z ] || [ ! -e $(DEB_SRCDIR)/mozilla/js/src/configure ]; \
+ then cd $(DEB_SRCDIR)/mozilla/js/src && `which autoconf$(DEB_AUTO_UPDATE_AUTOCONF) || which autoconf`; fi
+ touch $@
+
+install/$(DEB_MOZ_APPLICATION)::
+ install -d -m 755 debian/tmp/usr/share/pixmaps
+ install -m 644 $(DEB_SRCDIR)/other-licenses/branding/thunderbird/content/icon64.png debian/tmp/usr/share/pixmaps/$(DEB_MOZ_APPLICATION).png
+
+binary-install/$(DEB_MOZ_APPLICATION)::
+ touch debian/$(DEB_MOZ_NAME)$(DEBIAN_TB_DIR)/.autoreg
+ touch debian/$(DEB_MOZ_NAME)$(DEBIAN_TB_DIR)/update.locale
+ dh_install debian/tmp/usr/share/pixmaps/$(DEB_MOZ_APPLICATION).png usr/share/pixmaps
+ dh_install debian/thunderbird.sh $(DEBIAN_TB_DIR)
+ dh_link etc/$(DEB_MOZ_NAME)/pref $(DEBIAN_TB_DIR)/defaults/syspref
+ dh_link $(DEBIAN_TB_DIR)/thunderbird.sh usr/bin/$(DEB_MOZ_APPLICATION)
+ if [ '$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)' -ge '1010' ]; then \
+ dh_link usr/share/hunspell $(DEBIAN_TB_DIR)/dictionaries ; \
+ else \
+ dh_link usr/share/myspell/dicts $(DEBIAN_TB_DIR)/dictionaries ; \
+ fi
+ dh_install debian/migrator/tb-beta-profile-migration-dialog $(DEBIAN_TB_DIR)
+
+binary-install/$(DEB_MOZ_APPLICATION)-dev::
+ dh_installdirs -p$(DEB_MOZ_APPLICATION)-dev $(DEBIAN_TB_DIR)
+ # sdk stuff
+ifdef USE_SYSTEM_NSPR
+ dh_link -p$(DEB_MOZ_APPLICATION)-dev /usr/bin/nspr-config $(DEBIAN_TB_DIR)/nspr-config
+ dh_link -p$(DEB_MOZ_APPLICATION)-dev /usr/include/nspr $(DEBIAN_TB_DEV_DIR)/include/nspr
+endif
+ifdef USE_SYSTEM_NSS
+ dh_link -p$(DEB_MOZ_APPLICATION)-dev /usr/bin/nss-config $(DEBIAN_TB_DIR)/nss-config
+ dh_link -p$(DEB_MOZ_APPLICATION)-dev /usr/include/nss $(DEBIAN_TB_DEV_DIR)/include/nss
+endif
+
+binary-post-install/$(DEB_MOZ_APPLICATION):: compare
+
+binary-predeb/$(DEB_MOZ_APPLICATION)::
+ $(foreach file,$(GNOME_SUPPORT_FILES), \
+ cp -vf debian/tmp/usr/lib/thunderbird-*/components/$(file) debian/$(DEB_MOZ_APPLICATION)/usr/lib/thunderbird-*/components/;) true
+
+binary-predeb/$(DEB_MOZ_APPLICATION)-gnome-support::
+ $(foreach file,$(GNOME_SUPPORT_FILES), \
+ rm -vf debian/$(DEB_MOZ_APPLICATION)-gnome-support/usr/lib/thunderbird-*/components/$(file);) true
+
+clean::
+ rm -f debian/stamp-autotools-files-moz
+ rm -f debian/migrator/tb-beta-profile-migration-dialog
+ rm -f debian/migrator/*~
--- thunderbird-3.1.2+nobinonly.orig/debian/mozclient/thunderbird.conf
+++ thunderbird-3.1.2+nobinonly/debian/mozclient/thunderbird.conf
@@ -0,0 +1,28 @@
+# Copyright (c) 2007-2009 Fabien Tassin
+# Description: Project Thunderbird 3.1
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+MOZCLIENT_APPNAME = thunderbird
+MOZCLIENT_PROJECT = comm-1.9.2
+MOZCLIENT_VCS = hg
+MOZCLIENT_VCS_LOC = http://hg.mozilla.org/releases/
+MOZCLIENT_POSTCOCMD = cd mozilla && python client.py checkout --comm-rev=`echo ${DEBIAN_TAG} | cut -d= -f1` --mozilla-rev=`echo ${DEBIAN_TAG} | cut -d= -f1`
+MOZCLIENT_FILE = mozilla/mail/config/version-192.txt
+MOZCLIENT_GETVERSION = tail -1 mozilla/mail/config/version-191.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
+MOZCLIENT_GETDATE = sh debian/moz-rev.sh http://hg.mozilla.org/releases/comm-1.9.2 default
+MOZCLIENT_EMBEDDED = 1
+MOZCLIENT_WANTMOZDIR = 1
+MOZCLIENT_TAREXCLUDE = CVS .cvsignore
--- thunderbird-3.1.2+nobinonly.orig/debian/mozclient/compare.mk
+++ thunderbird-3.1.2+nobinonly/debian/mozclient/compare.mk
@@ -0,0 +1,76 @@
+# -*- mode: makefile; coding: utf-8 -*-
+
+# Copyright (c) 2007-2008 Fabien Tassin
+# Description: The 'compare' module of mozilla-devscripts
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+#####################################################################
+
+# Don't include this file directly, include one of the project.mk
+# file instead, which will include this file for you.
+
+# The following target is available to the caller:
+# compare: check the difference between:
+# a/ what has been built (in dists/bin) and what has been installed (in debian/tmp)
+# b/ what has been installed (in debian/tmp) and what has been put in the debs
+# dists/bin is populated by the upstream build system
+# debian/tmp is populated according to upstream installer/package-static files
+#
+# The following variable are available:
+# COMPARE_FILTER_PRE_IN and COMPARE_FILTER_PRE_OUT (for a/)
+# COMPARE_FILTER_IN and COMPARE_FILTER_OUT (for b/)
+# By default, all are 'sed' commands that could be augmented (+=) or
+# overwritten by the caller.
+
+TEMP := $(shell echo $$$$)
+LIST_BUILT := /tmp/built.$(TEMP)
+LIST_INSTALLED := /tmp/installed.$(TEMP)
+LIST_IN_DEBS := /tmp/in_debs.$(TEMP)
+
+PKG_DIRS = $(addprefix debian/,$(shell grep ^Package debian/control | cut -d' ' -f2))
+
+compare:
+ @if [ "Z${COMPARE_FILTER_PRE_IN}Z" = "ZZ" ] ; then \
+ echo "## Can't compare dist/bin and debian/tmp (no COMPARE_FILTER_PRE_IN filter defined)" ; \
+ else \
+ if [ -d mozilla/dist ] ; then \
+ find mozilla/dist/bin \! -type d | cut -d/ -f4- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
+ elif [ -d build-tree/mozilla/dist ] ; then \
+ find build-tree/mozilla/dist/bin \! -type d | cut -d/ -f5- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
+ elif [ -d build-tree/dist ] ; then \
+ find build-tree/dist/bin \! -type d | cut -d/ -f4- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
+ elif [ -d dist ] ; then \
+ find dist/bin \! -type d | cut -d/ -f3- | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
+ elif [ -d $(DEB_BUILDDIR)/mozilla/dist ] ; then \
+ find $(DEB_BUILDDIR)/mozilla/dist/bin \! -type d | sed -e 's,.*mozilla/dist/bin/,,' | $(COMPARE_FILTER_PRE_IN) | sort > $(LIST_BUILT) ; \
+ else \
+ echo "Error: Can't find any suitable dist/bin directory" ; \
+ fi ; \
+ find debian/tmp -type f | cut -d/ -f3- | $(COMPARE_FILTER_PRE_OUT) | sort > $(LIST_INSTALLED) ; \
+ echo "## Compare the content of dist/bin and debian/tmp..." ; \
+ diff -u $(LIST_BUILT) $(LIST_INSTALLED) | grep -E '^(\+|-).' | tail -n +3 ;\
+ echo "## =================================================" ; \
+ fi
+ @if [ "Z${COMPARE_FILTER_IN}Z" = "ZZ" ] ; then \
+ echo "## Can't compare debian/tmp and the debs produced (no COMPARE_FILTER_IN filter defined)" ; \
+ else \
+ echo "## Compare the content of debian/tmp and the debs produced..." ; \
+ find debian/tmp -type f | cut -d/ -f3- | $(COMPARE_FILTER_IN) | sort > $(LIST_INSTALLED) ; \
+ find $(PKG_DIRS) -type f | cut -d/ -f3- | $(COMPARE_FILTER_OUT) | sort > $(LIST_IN_DEBS) ; \
+ diff -u $(LIST_INSTALLED) $(LIST_IN_DEBS) | grep -E '^(\+|-).' | tail -n +3 ; \
+ fi
+ @echo "## End of Compare"
+ @rm -f $(LIST_BUILT) $(LIST_INSTALLED) $(LIST_IN_DEBS)
--- thunderbird-3.1.2+nobinonly.orig/debian/mozclient/thunderbird-remove.binonly.sh
+++ thunderbird-3.1.2+nobinonly/debian/mozclient/thunderbird-remove.binonly.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# We have a mozilla dir containing mozilla-central, so we must call the main
+# remove.binonly.sh in it
+SCRIPT=`echo $0 | sed -e 's,/[^/]*-\(remove.binonly.sh\),/\1,'`
+
+echo "\$ cd mozilla" >&2
+cd mozilla
+
+echo "\$ sh $SCRIPT" >&2
+sh $SCRIPT >> ../REMOVED+nobinonly.txt 2>&1
--- thunderbird-3.1.2+nobinonly.orig/debian/mozclient/thunderbird.mk
+++ thunderbird-3.1.2+nobinonly/debian/mozclient/thunderbird.mk
@@ -0,0 +1,43 @@
+# -*- mode: makefile; coding: utf-8 -*-
+
+# Copyright (c) 2007-2009 Fabien Tassin
+# Description: Project Thunderbird 3.1
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+MOZCLIENT_PROJECTNAME := thunderbird
+
+include /usr/share/mozilla-devscripts/mozclient.mk
+
+COMPARE_FILTER_PRE_IN := sed \
+ -e 's,foo,foo,' \
+ $(NULL)
+
+COMPARE_FILTER_PRE_OUT := sed \
+ -e 's,^usr/lib/thunderbird-3.1[^/]*/,,' \
+ -e 's,^usr/share/pixmaps/.*,,' \
+ $(NULL)
+
+COMPARE_FILTER_IN := sed \
+ -e 's,foo,foo,' \
+ $(NULL)
+
+COMPARE_FILTER_OUT := sed \
+ -e 's,^DEBIAN/.*,,' \
+ -e 's,^usr/lib/debug/.*,,' \
+ -e 's,^usr/share/doc/.*,,' \
+ -e 's,^usr/share/menu/.*,,' \
+ -e 's,^usr/share/applications/.*,,' \
+ $(NULL)
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/series
+++ thunderbird-3.1.2+nobinonly/debian/patches/series
@@ -0,0 +1,7 @@
+fix_installdir.patch
+no_dynamic_nss_softokn.patch
+bzXXX_ftbfs_static_with_system_hunspell.patch
+add_syspref_dir.patch
+fix_install_sdk_bin.patch
+fix_sdk_install_mimecrypt.patch
+bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/bzXXX_ftbfs_static_with_system_hunspell.patch
+++ thunderbird-3.1.2+nobinonly/debian/patches/bzXXX_ftbfs_static_with_system_hunspell.patch
@@ -0,0 +1,12 @@
+Index: mozilla/mail/app/Makefile.in
+===================================================================
+--- mozilla.orig/mail/app/Makefile.in
++++ mozilla/mail/app/Makefile.in
+@@ -133,6 +133,7 @@
+ $(APP_XPCOM_LIBS) \
+ $(NSPR_LIBS) \
+ $(TK_LIBS) \
++ $(MOZ_HUNSPELL_LIBS) \
+ $(NULL)
+
+ # Add explicit X11 dependency when building against X11 toolkits
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/fix_sdk_install_mimecrypt.patch
+++ thunderbird-3.1.2+nobinonly/debian/patches/fix_sdk_install_mimecrypt.patch
@@ -0,0 +1,22 @@
+Index: mozilla/mailnews/mime/src/Makefile.in
+===================================================================
+--- mozilla.orig/mailnews/mime/src/Makefile.in
++++ mozilla/mailnews/mime/src/Makefile.in
+@@ -141,14 +141,17 @@
+
+ EXPORTS = \
+ nsMimeStringResources.h \
++ nsStreamConverter.h \
+ mimetext.h \
+ mimeleaf.h \
+ mimecth.h \
+ mimeobj.h \
+ mimei.h \
+ modmimee.h \
++ mimecryp.h \
+ mimecont.h \
+ mimemult.h \
++ mimemoz2.h \
+ mimemsig.h \
+ mimehdrs.h \
+ mimepbuf.h \
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
+++ thunderbird-3.1.2+nobinonly/debian/patches/bz532198_lp488354_ns_invokebyindex_not_thumb2_safe.patch
@@ -0,0 +1,44 @@
+Index: mozilla/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+===================================================================
+--- mozilla.orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
++++ mozilla/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+@@ -210,16 +210,25 @@
+ "ldr r1, [%1, #12] \n\t" /* prepare to call invoke_count_words */
+ "ldr ip, [%1, #16] \n\t" /* r0=paramCount, r1=params */
+ "ldr r0, [%1, #8] \n\t"
++#ifdef __thumb__
++ "blx ip \n\t" /* call it... */
++#else
+ "mov lr, pc \n\t" /* call it... */
+ "mov pc, ip \n\t"
++#endif
+ "mov r4, r0, lsl #2 \n\t" /* This is the amount of bytes needed. */
+ "sub sp, sp, r4 \n\t" /* use stack space for the args... */
+ "mov r0, sp \n\t" /* prepare a pointer an the stack */
+ "ldr r1, [%1, #8] \n\t" /* =paramCount */
+ "ldr r2, [%1, #12] \n\t" /* =params */
+ "ldr ip, [%1, #20] \n\t" /* =invoke_copy_to_stack */
++#ifdef __thumb__
++ "blx ip \n\t" /* copy args to the stack like the
++ * compiler would */
++#else
+ "mov lr, pc \n\t" /* copy args to the stack like the */
+ "mov pc, ip \n\t" /* compiler would. */
++#endif
+ "ldr r0, [%1] \n\t" /* =that */
+ "ldr r1, [r0, #0] \n\t" /* get that->vtable offset */
+ "ldr r2, [%1, #4] \n\t"
+@@ -237,8 +246,12 @@
+ "addle sp, sp, r4 \n\t" /* and restore stack pointer */
+ "movle r4, #0 \n\t" /* a mark for restoring sp */
+ "ldr r0, [%1, #0] \n\t" /* get (self) */
+- "mov lr, pc \n\t" /* call mathod */
++#ifdef __thumb__
++ "blx ip \n\t" /* call method */
++#else
++ "mov lr, pc \n\t" /* call method */
+ "mov pc, ip \n\t"
++#endif
+ "add sp, sp, r4 \n\t" /* restore stack pointer */
+ "mov %0, r0 \n\t" /* the result... */
+ : "=r" (result)
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/fix_install_sdk_bin.patch
+++ thunderbird-3.1.2+nobinonly/debian/patches/fix_install_sdk_bin.patch
@@ -0,0 +1,12 @@
+Index: mozilla/mozilla/toolkit/mozapps/installer/packager.mk
+===================================================================
+--- mozilla.orig/mozilla/toolkit/mozapps/installer/packager.mk
++++ mozilla/mozilla/toolkit/mozapps/installer/packager.mk
+@@ -476,6 +476,7 @@
+ $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ fi
+ (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
++ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(installdir) && tar -xf -)
+ $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/fix_installdir.patch
+++ thunderbird-3.1.2+nobinonly/debian/patches/fix_installdir.patch
@@ -0,0 +1,26 @@
+Index: mozilla/mail/app/Makefile.in
+===================================================================
+--- mozilla.orig/mail/app/Makefile.in
++++ mozilla/mail/app/Makefile.in
+@@ -302,10 +302,10 @@
+ $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
+
+ install:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES))
+- $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
++ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(installdir)/chrome/icons/default
+
+ install:: $(addprefix $(DIST)/branding,$(BRANDED_ICON_FILES))
+- $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
++ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(installdir)/chrome/icons/default
+ endif
+
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+@@ -313,7 +313,7 @@
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
+
+ install::
+- $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
++ $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(installdir)/chrome/icons/default
+ endif
+
+ ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/no_dynamic_nss_softokn.patch
+++ thunderbird-3.1.2+nobinonly/debian/patches/no_dynamic_nss_softokn.patch
@@ -0,0 +1,13 @@
+Index: mozilla/directory/c-sdk/component_versions.mk
+===================================================================
+--- mozilla.orig/directory/c-sdk/component_versions.mk
++++ mozilla/directory/c-sdk/component_versions.mk
+@@ -46,7 +46,7 @@
+ # NSS - Network Security Services
+ NSSVERS = 3
+ NSS_RELEASE_TAG = NSS_3_9_3_RTM
+-NSS_DYNAMIC_SOFTOKN = 1
++NSS_DYNAMIC_SOFTOKN = 0
+ NSS_RELEASE_TREE = $(COMPONENTS_DIR)
+
+ # SVRCORE - Client/server utility library
--- thunderbird-3.1.2+nobinonly.orig/debian/patches/add_syspref_dir.patch
+++ thunderbird-3.1.2+nobinonly/debian/patches/add_syspref_dir.patch
@@ -0,0 +1,81 @@
+Index: mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp
+===================================================================
+--- mozilla.orig/mozilla/toolkit/xre/nsXREDirProvider.cpp
++++ mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp
+@@ -621,6 +621,7 @@
+ }
+
+ static const char *const kAppendPrefDir[] = { "defaults", "preferences", nsnull };
++static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nsnull };
+
+ #ifdef DEBUG_bsmedberg
+ static void
+@@ -677,6 +678,9 @@
+ LoadAppDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
+ LoadDirsIntoArray(mAppBundleDirectories,
+ kAppendPrefDir, directories);
++ LoadAppDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories);
++ LoadDirsIntoArray(mAppBundleDirectories,
++ kAppendSysPrefDir, directories);
+
+ rv = NS_NewArrayEnumerator(aResult, directories);
+ }
+Index: mozilla/mozilla/modules/libpref/src/nsPrefService.cpp
+===================================================================
+--- mozilla.orig/mozilla/modules/libpref/src/nsPrefService.cpp
++++ mozilla/mozilla/modules/libpref/src/nsPrefService.cpp
+@@ -697,6 +697,14 @@
+ NS_WARNING("Error parsing application default preferences.");
+ }
+
++ /* now, parse the "application" default system preferences */
++ rv = NS_GetSpecialDirectory(NS_APP_SYSPREF_DEFAULTS_50_DIR, getter_AddRefs(defaultPrefDir));
++ NS_ENSURE_SUCCESS(rv, rv);
++ rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
++ if (NS_FAILED(rv)) {
++ NS_WARNING("Error parsing application default preferences.");
++ }
++
+ rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST);
+ NS_ENSURE_SUCCESS(rv, rv);
+
+Index: mozilla/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h
+===================================================================
+--- mozilla.orig/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h
++++ mozilla/mozilla/xpcom/io/nsAppDirectoryServiceDefs.h
+@@ -63,6 +63,7 @@
+
+ #define NS_APP_DEFAULTS_50_DIR "DefRt" // The root dir of all defaults dirs
+ #define NS_APP_PREF_DEFAULTS_50_DIR "PrfDef"
++#define NS_APP_SYSPREF_DEFAULTS_50_DIR "SysPrfDef"
+ #define NS_APP_PROFILE_DEFAULTS_50_DIR "profDef" // The profile defaults of the "current"
+ // locale. Should be first choice.
+ #define NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR "ProfDefNoLoc" // The profile defaults of the "default"
+Index: mozilla/mozilla/xpcom/io/nsAppFileLocationProvider.cpp
+===================================================================
+--- mozilla.orig/mozilla/xpcom/io/nsAppFileLocationProvider.cpp
++++ mozilla/mozilla/xpcom/io/nsAppFileLocationProvider.cpp
+@@ -97,6 +97,7 @@
+
+ #define DEFAULTS_DIR_NAME NS_LITERAL_CSTRING("defaults")
+ #define DEFAULTS_PREF_DIR_NAME NS_LITERAL_CSTRING("pref")
++#define DEFAULTS_SYSPREF_DIR_NAME NS_LITERAL_CSTRING("syspref")
+ #define DEFAULTS_PROFILE_DIR_NAME NS_LITERAL_CSTRING("profile")
+ #define RES_DIR_NAME NS_LITERAL_CSTRING("res")
+ #define CHROME_DIR_NAME NS_LITERAL_CSTRING("chrome")
+@@ -161,6 +162,15 @@
+ rv = localFile->AppendRelativeNativePath(DEFAULTS_PREF_DIR_NAME);
+ }
+ }
++ else if (nsCRT::strcmp(prop, NS_APP_SYSPREF_DEFAULTS_50_DIR) == 0)
++ {
++ rv = CloneMozBinDirectory(getter_AddRefs(localFile));
++ if (NS_SUCCEEDED(rv)) {
++ rv = localFile->AppendRelativeNativePath(DEFAULTS_DIR_NAME);
++ if (NS_SUCCEEDED(rv))
++ rv = localFile->AppendRelativeNativePath(DEFAULTS_SYSPREF_DIR_NAME);
++ }
++ }
+ else if (nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_50_DIR) == 0 ||
+ nsCRT::strcmp(prop, NS_APP_PROFILE_DEFAULTS_NLOC_50_DIR) == 0)
+ {
--- thunderbird-3.1.2+nobinonly.orig/debian/migrator/main.c
+++ thunderbird-3.1.2+nobinonly/debian/migrator/main.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2008 Canonical Ltd.
+ * Author: Alexander Sack
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#define GETTEXT_PACKAGE "ubuntu-migrator"
+#define LOCALEDIR "po"
+#define WINDOW_ICON_PATH "/usr/share/pixmaps/thunderbird.png"
+
+#include
+#include
+
+static int main_response = 128;
+
+static void
+do_reply(GtkWidget *dialog,
+ gint response,
+ gpointer udata)
+{
+ gtk_widget_destroy(dialog);
+ gtk_main_quit();
+ main_response = response;
+}
+
+int
+main(int argc, char** argv)
+{
+
+ GtkWidget *dialog, *label;
+
+ /* intialize gettext */
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+ gtk_init(&argc, &argv);
+
+ gtk_window_set_default_icon_from_file (WINDOW_ICON_PATH, NULL);
+
+ /* Create the widgets */
+ dialog = gtk_dialog_new_with_buttons ("Thunderbird 3.0 - Beta Support",
+ NULL,
+ GTK_DIALOG_MODAL,
+ _("Keep Thunderbird 3.0 Settings"), 1,
+ _("Decide Later"), 0,
+ _("Import Settings"), 2,
+ NULL);
+
+ gtk_dialog_set_default_response (GTK_DIALOG(dialog),
+ 0);
+
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+ 2, 1, 0,
+ -1);
+
+ g_signal_connect (dialog,
+ "response",
+ G_CALLBACK (do_reply),
+ NULL);
+
+ GtkWidget *hbox = gtk_hbox_new(FALSE,
+ 5);
+
+ GtkWidget *icon_view = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
+ GTK_ICON_SIZE_DIALOG);
+
+ label = gtk_label_new (_("Do you want to import your mail and other "
+ "settings from Thunderbird 2, replacing your settings "
+ "from Thunderbird 3.0 Beta?"));
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+
+ gtk_box_pack_start_defaults(GTK_BOX(hbox), icon_view);
+ gtk_box_pack_start_defaults(GTK_BOX(hbox), label);
+
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox),
+ hbox, TRUE, TRUE, 10);
+ gtk_widget_show_all (dialog);
+ gtk_main();
+ return main_response < 0 ? 0 : main_response;
+}
+
|