From 0dc9f7dd4fa529426e9f03d5c833b0fdf8bcea2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Jan 2010 16:35:43 +0000
Subject: [PATCH] * Put the Thunderbird 2 and 3 expressions in one directory.

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/2.x.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
rename to pkgs/applications/networking/mailreaders/thunderbird/2.x.nix
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-3.x/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/thunderbird-3.x/default.nix
rename to pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh b/pkgs/applications/networking/mailreaders/thunderbird/builder.sh
similarity index 100%
rename from pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh
rename to pkgs/applications/networking/mailreaders/thunderbird/builder.sh
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/xlibs.patch b/pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch
similarity index 100%
rename from pkgs/applications/networking/mailreaders/thunderbird-2.x/xlibs.patch
rename to pkgs/applications/networking/mailreaders/thunderbird/xlibs.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bf119c48eb..2032c132213 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7516,7 +7516,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  thunderbird = import ../applications/networking/mailreaders/thunderbird-2.x {
+  thunderbird = import ../applications/networking/mailreaders/thunderbird/2.x.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
@@ -7527,7 +7527,7 @@ let
   /*
   Despaired. Looks like ThunderBird-on-Firefox's-Xulrunner is non-trivial
 
-  thunderbird3 = lowPrio (import ../applications/networking/mailreaders/thunderbird-3.x {
+  thunderbird3 = lowPrio (import ../applications/networking/mailreaders/thunderbird/3.x.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2 libpng alsaLib sqlite
       patchelf nspr;