From 0864c1422ea850427e29f65477b4dbc513fffcd9 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 7 May 2010 20:08:31 +0000
Subject: [PATCH] Move qt-4.x into subfolder

svn path=/nixpkgs/trunk/; revision=21658
---
 pkgs/development/libraries/{qt-4.5 => qt-4.x/4.5}/default.nix | 0
 .../libraries/{qt-4.5 => qt-4.x/4.5}/setup-hook.sh            | 0
 pkgs/development/libraries/{qt-4.6 => qt-4.x/4.6}/default.nix | 0
 .../libraries/{qt-4.6 => qt-4.x/4.6}/setup-hook.sh            | 0
 pkgs/top-level/all-packages.nix                               | 4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/{qt-4.5 => qt-4.x/4.5}/default.nix (100%)
 rename pkgs/development/libraries/{qt-4.5 => qt-4.x/4.5}/setup-hook.sh (100%)
 rename pkgs/development/libraries/{qt-4.6 => qt-4.x/4.6}/default.nix (100%)
 rename pkgs/development/libraries/{qt-4.6 => qt-4.x/4.6}/setup-hook.sh (100%)

diff --git a/pkgs/development/libraries/qt-4.5/default.nix b/pkgs/development/libraries/qt-4.x/4.5/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-4.5/default.nix
rename to pkgs/development/libraries/qt-4.x/4.5/default.nix
diff --git a/pkgs/development/libraries/qt-4.5/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/qt-4.5/setup-hook.sh
rename to pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh
diff --git a/pkgs/development/libraries/qt-4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-4.6/default.nix
rename to pkgs/development/libraries/qt-4.x/4.6/default.nix
diff --git a/pkgs/development/libraries/qt-4.6/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/qt-4.6/setup-hook.sh
rename to pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54d8f94c01e..50aa6ac84bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5022,7 +5022,7 @@ let
 
   qt4 = qt46;
 
-  qt45 = import ../development/libraries/qt-4.5 {
+  qt45 = import ../development/libraries/qt-4.x/4.5 {
     inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
       fontconfig freetype pkgconfig libtiff;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
@@ -5031,7 +5031,7 @@ let
     inherit (gnome) glib;
   };
 
-  qt46 = makeOverridable (import ../development/libraries/qt-4.6) {
+  qt46 = makeOverridable (import ../development/libraries/qt-4.x/4.6) {
     inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
       fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib
       postgresql;