03/05: gnu: icedtea6, icedtea7: Rename package to "icedtea".

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 5452588c1a662bdcee240342a9df87efa4b1c017
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Dec 30 14:31:16 2015 +0100

    gnu: icedtea6, icedtea7: Rename package to "icedtea".
    
    * gnu/packages/java.scm (icedtea6): Change package name to "icedtea".
    (icedtea7): Inherit package name.
---
 gnu/packages/java.scm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c4ad45e..b4c7bc3 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -186,7 +186,7 @@ build process and its dependencies, whereas Make uses 
Makefile format.")
 
 (define-public icedtea6
   (package
-    (name "icedtea6")
+    (name "icedtea")
     (version "1.13.9")
     (source (origin
               (method url-fetch)
@@ -514,7 +514,8 @@ build process and its dependencies, whereas Make uses 
Makefile format.")
                (alist-replace
                 'install
                 (lambda* (#:key outputs #:allow-other-keys)
-                  (let ((doc (string-append (assoc-ref outputs "doc") 
"/share/doc/" ,name))
+                  (let ((doc (string-append (assoc-ref outputs "doc")
+                                            "/share/doc/icedtea"))
                         (jre (assoc-ref outputs "out"))
                         (jdk (assoc-ref outputs "jdk")))
                     (copy-recursively "openjdk.build/docs" doc)
@@ -585,7 +586,6 @@ build process and its dependencies, whereas Make uses 
Makefile format.")
                          "/icedtea7/" version "/" name ".tar.bz2"))
                    (sha256 (base32 hash))))))
     (package (inherit icedtea6)
-      (name "icedtea7")
       (version version)
       (source (origin
                 (method url-fetch)