summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2006-12-17 12:54:24 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2006-12-17 12:54:24 +0000
commitd38e3ae769459ee0b14ff2703486ca1c0f4487fe (patch)
tree5ef7115083153efe886e113b0f5215a44d4c7290 /dev-java/sun-jdk
parentremove old versions (diff)
downloadgentoo-2-d38e3ae769459ee0b14ff2703486ca1c0f4487fe.tar.gz
gentoo-2-d38e3ae769459ee0b14ff2703486ca1c0f4487fe.tar.bz2
gentoo-2-d38e3ae769459ee0b14ff2703486ca1c0f4487fe.zip
Change the desktop entry to be more similar to earlier slots.
(Portage version: 2.1.2_rc3-r6)
Diffstat (limited to 'dev-java/sun-jdk')
-rw-r--r--dev-java/sun-jdk/ChangeLog6
-rw-r--r--dev-java/sun-jdk/metadata.xml4
-rw-r--r--dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index ff9ab5b1100a..375de87c4684 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/sun-jdk
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.171 2006/12/16 22:56:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.172 2006/12/17 12:54:24 betelgeuse Exp $
+
+ 17 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+ sun-jdk-1.6.0-r1.ebuild:
+ Change the desktop entry to be more similar to earlier slots.
*sun-jdk-1.6.0-r1 (16 Dec 2006)
diff --git a/dev-java/sun-jdk/metadata.xml b/dev-java/sun-jdk/metadata.xml
index 9127d732d6a7..8f2a797fcb84 100644
--- a/dev-java/sun-jdk/metadata.xml
+++ b/dev-java/sun-jdk/metadata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
- <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription>
+ <herd>java</herd>
+ <longdescription>Sun Java Development Kit Package. AKA.J2SE</longdescription>
</pkgmetadata>
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
index 3eadba653c7b..713e94384738 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.1 2006/12/16 22:56:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.2 2006/12/17 12:54:24 betelgeuse Exp $
inherit java-vm-2 eutils pax-utils
@@ -117,7 +117,7 @@ src_install() {
chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile
# install control panel for Gnome/KDE
- sed -e "s/\(Name=Java\)/\1 Control Panel (${PN}-${SLOT})/" \
+ sed -e "s/\(Name=\)Java/\1 Sun Java Control Panel ${SLOT}/" \
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \