[pkg-java] r12837 - trunk/sun-java6/debian

[Torsten Werner]

Author: twerner
Date: 2010-07-28 14:26:21 +0000 (Wed, 28 Jul 2010)
New Revision: 12837

Added:
   trunk/sun-java6/debian/JB-jvisualvm.desktop.in
Modified:
   trunk/sun-java6/debian/JB-jdk.menu.in
   trunk/sun-java6/debian/changelog
   trunk/sun-java6/debian/rules
Log:
Install the desktop file for jvisualvm and remove the one for jconsole.
(Closes: #539288)

Modified: trunk/sun-java6/debian/JB-jdk.menu.in
===================================================================
--- trunk/sun-java6/debian/JB-jdk.menu.in	2010-07-28 13:55:47 UTC (rev 12836)
+++ trunk/sun-java6/debian/JB-jdk.menu.in	2010-07-28 14:26:21 UTC (rev 12837)
@@ -1,7 +1,7 @@
 ?package(@basename at -jdk):\
 	needs="x11"\
 	section="Applications/System/Monitoring"\
-	title="@vendor@ Java @RELEASE@ Console at ia32txt@"\
+	title="@vendor@ Java @RELEASE@ VisualVM at ia32txt@"\
 	command="/@basedir@/bin/jvisualvm"\
 	icon="/usr/share/pixmaps/@basename at .xpm"\
 	hints="Java2"

Copied: trunk/sun-java6/debian/JB-jvisualvm.desktop.in (from rev 12829, trunk/sun-java6/debian/JB-jconsole.desktop.in)
===================================================================
--- trunk/sun-java6/debian/JB-jvisualvm.desktop.in	                        (rev 0)
+++ trunk/sun-java6/debian/JB-jvisualvm.desktop.in	2010-07-28 14:26:21 UTC (rev 12837)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=@vendor@ Java @RELEASE@ VisualVM at ia32txt@
+Comment=@vendor@ Java @RELEASE@ Monitoring & Management (VisualVM)@ia32txt@
+Exec=/@basedir@/bin/jvisualvm
+Terminal=false
+Type=Application
+Icon=@basename@
+Categories=Application;System;

Modified: trunk/sun-java6/debian/changelog
===================================================================
--- trunk/sun-java6/debian/changelog	2010-07-28 13:55:47 UTC (rev 12836)
+++ trunk/sun-java6/debian/changelog	2010-07-28 14:26:21 UTC (rev 12837)
@@ -2,8 +2,10 @@
 
   UNRELEASED
   * Add file /etc/java-6-sun/swing.properties. (Closes: #480570)
+  * Install the desktop file for jvisualvm and remove the one for jconsole.
+    (Closes: #539288)
 
- -- Torsten Werner <twerner at debian.org>  Wed, 28 Jul 2010 15:49:32 +0200
+ -- Torsten Werner <twerner at debian.org>  Wed, 28 Jul 2010 16:08:33 +0200
 
 sun-java6 (6.21-1) unstable; urgency=low
 

Modified: trunk/sun-java6/debian/rules
===================================================================
--- trunk/sun-java6/debian/rules	2010-07-28 13:55:47 UTC (rev 12836)
+++ trunk/sun-java6/debian/rules	2010-07-28 14:26:21 UTC (rev 12837)
@@ -838,7 +838,10 @@
 	    $(d_jdk)/$(basedir)/bin/java-rmi.cgi
 
 	: # add menu stuff
-	cp -p debian/$(basename)-jconsole.desktop \
+	#jconsole is obsolete, see #539288
+	#cp -p debian/$(basename)-jconsole.desktop \
+	#      $(d_jdk)/usr/share/applications/
+	cp -p debian/$(basename)-jvisualvm.desktop \
 	      $(d_jdk)/usr/share/applications/
 
 	: # add lintian overrides