From ebc3234b5e83e0ca016df585be75c6b42a7d7212 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Jul 2007 20:33:32 +0000
Subject: [PATCH] * Make Thunderbird 2.x the default.

svn path=/nixpkgs/trunk/; revision=8949
---
 .../mailreaders/{thunderbird => thunderbird-1.x}/builder.sh   | 0
 .../mailreaders/{thunderbird => thunderbird-1.x}/default.nix  | 0
 pkgs/top-level/all-packages.nix                               | 4 +++-
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename pkgs/applications/networking/mailreaders/{thunderbird => thunderbird-1.x}/builder.sh (100%)
 rename pkgs/applications/networking/mailreaders/{thunderbird => thunderbird-1.x}/default.nix (100%)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/builder.sh b/pkgs/applications/networking/mailreaders/thunderbird-1.x/builder.sh
similarity index 100%
rename from pkgs/applications/networking/mailreaders/thunderbird/builder.sh
rename to pkgs/applications/networking/mailreaders/thunderbird-1.x/builder.sh
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-1.x/default.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/thunderbird/default.nix
rename to pkgs/applications/networking/mailreaders/thunderbird-1.x/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 027ac21c6c5..2ac04cadf31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3083,7 +3083,9 @@ rec {
     gpgSupport = true;
   };
 
-  thunderbird = import ../applications/networking/mailreaders/thunderbird {
+  thunderbird = thunderbird2;
+
+  thunderbird1 = import ../applications/networking/mailreaders/thunderbird-1.x {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;