From 3919e7593ae7feef27c91842a2c49a7539ee7a01 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Sat, 17 Sep 2005 23:40:23 +0000
Subject: [PATCH] Naming conventions

svn path=/nixpkgs/trunk/; revision=3870
---
 pkgs/development/compilers/jdk/default-1.5.nix         | 10 ----------
 .../jdk/{jdk1.5-sun-linux.nix => jdk5-sun-linux.nix}   |  0
 2 files changed, 10 deletions(-)
 delete mode 100644 pkgs/development/compilers/jdk/default-1.5.nix
 rename pkgs/development/compilers/jdk/{jdk1.5-sun-linux.nix => jdk5-sun-linux.nix} (100%)

diff --git a/pkgs/development/compilers/jdk/default-1.5.nix b/pkgs/development/compilers/jdk/default-1.5.nix
deleted file mode 100644
index 15d54865c40..00000000000
--- a/pkgs/development/compilers/jdk/default-1.5.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}: 
-
-if stdenv.system == "i686-linux"
-  then
-    (import ./jdk1.5-sun-linux.nix) {
-      stdenv   = stdenv;
-      fetchurl = fetchurl;
-    }
-  else
-    false
diff --git a/pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix b/pkgs/development/compilers/jdk/jdk5-sun-linux.nix
similarity index 100%
rename from pkgs/development/compilers/jdk/jdk1.5-sun-linux.nix
rename to pkgs/development/compilers/jdk/jdk5-sun-linux.nix