From d4578254b0c9c35deb00084d3a9099359c66df37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Oct 2006 08:07:15 +0000
Subject: [PATCH] * Move.

svn path=/nixpkgs/trunk/; revision=6817
---
 .../networking/browsers/{firefox-2.0 => firefox}/builder.sh     | 0
 .../networking/browsers/{firefox-2.0 => firefox}/default.nix    | 0
 .../browsers/{firefox-2.0 => firefox}/writable-copies.patch     | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/networking/browsers/{firefox-2.0 => firefox}/builder.sh (100%)
 rename pkgs/applications/networking/browsers/{firefox-2.0 => firefox}/default.nix (100%)
 rename pkgs/applications/networking/browsers/{firefox-2.0 => firefox}/writable-copies.patch (100%)

diff --git a/pkgs/applications/networking/browsers/firefox-2.0/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox-2.0/builder.sh
rename to pkgs/applications/networking/browsers/firefox/builder.sh
diff --git a/pkgs/applications/networking/browsers/firefox-2.0/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox-2.0/default.nix
rename to pkgs/applications/networking/browsers/firefox/default.nix
diff --git a/pkgs/applications/networking/browsers/firefox-2.0/writable-copies.patch b/pkgs/applications/networking/browsers/firefox/writable-copies.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox-2.0/writable-copies.patch
rename to pkgs/applications/networking/browsers/firefox/writable-copies.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64eb6a201cce..3fe56954ebd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2369,7 +2369,7 @@ rec {
     inherit (gtkLibs) glib;
   };
 
-  firefox = import ../applications/networking/browsers/firefox-2.0 {
+  firefox = import ../applications/networking/browsers/firefox {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;