From: Petteri Räty <betelgeuse@gentoo.org>
Date: Sun, 17 Dec 2006 13:58:09 +0000 (+0000)
Subject: Improve the desktop entry Name.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f989231ff6c42764d50e5789e363315960e84aa8;p=gentoo.git

Improve the desktop entry Name.
Package-Manager: portage-2.1.2_rc3-r6
---

diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest
index 5d993e533520..f069097008e5 100644
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX construct-1.6.sh 6794 RMD160 d22f39b648c6a306312b54bc89218dc76d3bcfc3 SHA1 a74be01576444a16d7212255a0e2f376595cb6df SHA256 baae7893300663f5c1bb702fbf40ddd1eb086bbbd4c7665998baf54e1273dc26
 MD5 e11b521d69bf1a8a90fc16693065490c files/construct-1.6.sh 6794
 RMD160 d22f39b648c6a306312b54bc89218dc76d3bcfc3 files/construct-1.6.sh 6794
@@ -56,10 +59,10 @@ EBUILD sun-jre-bin-1.5.0.10.ebuild 3839 RMD160 9953890d379a23266669ae40bec710b48
 MD5 006e178438065b2ce976b59e5429c860 sun-jre-bin-1.5.0.10.ebuild 3839
 RMD160 9953890d379a23266669ae40bec710b482b0ed55 sun-jre-bin-1.5.0.10.ebuild 3839
 SHA256 93e25a95dd175e50a8398d90d0599214188e9a843bac505423954a671616d7fa sun-jre-bin-1.5.0.10.ebuild 3839
-EBUILD sun-jre-bin-1.6.0-r1.ebuild 3863 RMD160 449844bf07a1e8251868f16d87fe4a4a3918941d SHA1 eeb3d6bdaad41a8ba52a85e5d2cc1e41e65c99f4 SHA256 113dfc8b0f596a3dbbc44bd29c6f43090b2e517ef7e6d61e4a54d08884753017
-MD5 0c11e6dbf5390eca3703eb9149b1e813 sun-jre-bin-1.6.0-r1.ebuild 3863
-RMD160 449844bf07a1e8251868f16d87fe4a4a3918941d sun-jre-bin-1.6.0-r1.ebuild 3863
-SHA256 113dfc8b0f596a3dbbc44bd29c6f43090b2e517ef7e6d61e4a54d08884753017 sun-jre-bin-1.6.0-r1.ebuild 3863
+EBUILD sun-jre-bin-1.6.0-r1.ebuild 3871 RMD160 09f680e34a94f9bb722f8ad3323c08a2d23f6771 SHA1 070668f4aa8ffb6261683cf844ec9d20ab21b4a8 SHA256 b9cc97124230a73b0afe784d8df0086a6fa9339faac869a8ea9a7c630f5ef070
+MD5 9b6a242ea5bba670fd5a3e56dca146d2 sun-jre-bin-1.6.0-r1.ebuild 3871
+RMD160 09f680e34a94f9bb722f8ad3323c08a2d23f6771 sun-jre-bin-1.6.0-r1.ebuild 3871
+SHA256 b9cc97124230a73b0afe784d8df0086a6fa9339faac869a8ea9a7c630f5ef070 sun-jre-bin-1.6.0-r1.ebuild 3871
 EBUILD sun-jre-bin-1.6.0.ebuild 3882 RMD160 967b27493f5dade14bccee0a626c5f70cd2d4e72 SHA1 bf720eea7f7a7e66cafe0b747a0beb1c3278e5ec SHA256 dc9b72020dbd0084421564773c733a104845f4d4f94ad872af2c1f82a2bea4cc
 MD5 eaabfc7a033301ed532b757f6d8f8c35 sun-jre-bin-1.6.0.ebuild 3882
 RMD160 967b27493f5dade14bccee0a626c5f70cd2d4e72 sun-jre-bin-1.6.0.ebuild 3882
@@ -96,3 +99,10 @@ SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/di
 MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jre-bin-1.6.0-r1 521
 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jre-bin-1.6.0-r1 521
 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jre-bin-1.6.0-r1 521
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFhU0EcxLzpIGCsLQRArC6AJ4+4r078ql1hPMY8PtpADE/eHlKKwCglnrD
+Cx+Iq0/tHN3Yhz9fid8Wqmc=
+=yZH2
+-----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild
index ed45f298c2d7..b9c7f067f8c8 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-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-jre-bin/sun-jre-bin-1.6.0-r1.ebuild,v 1.1 2006/12/16 22:47:54 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild,v 1.2 2006/12/17 13:58:09 betelgeuse Exp $
 
 inherit pax-utils eutils java-vm-2
 
@@ -104,7 +104,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 Control Panel for Sun JRE ${SLOT}/" \
 		-e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
 		-e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
 		${D}/opt/${P}/plugin/desktop/sun_java.desktop > \