# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1556569827 -3600
# Node ID 132b423f5a800421a7e80ba113b1df73a64a8870
# Parent  291f31c475c0aeba5462c3cac93f5bf5c49767ed
PR3733: Use shortened Java version first in Name field of desktop files

2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR3733: Use shortened Java version first in
	Name field of desktop files
	* NEWS: Updated.
	* jconsole.desktop.in:
	Use @JAVA_VER@ in first part of Name field,
	with the longer @OPENJDK_VER@ appearing at the end.
	* policytool.desktop.in: Likewise.

diff -r 291f31c475c0 -r 132b423f5a80 ChangeLog
--- a/ChangeLog	Mon Apr 29 21:29:15 2019 +0100
+++ b/ChangeLog	Mon Apr 29 21:30:27 2019 +0100
@@ -1,3 +1,13 @@
+2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3733: Use shortened Java version first in
+	Name field of desktop files
+	* NEWS: Updated.
+	* jconsole.desktop.in:
+	Use @JAVA_VER@ in first part of Name field,
+	with the longer @OPENJDK_VER@ appearing at the end.
+	* policytool.desktop.in: Likewise.
+
 2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3732: Use SDK bin directory in jconsole.desktop.in
diff -r 291f31c475c0 -r 132b423f5a80 NEWS
--- a/NEWS	Mon Apr 29 21:29:15 2019 +0100
+++ b/NEWS	Mon Apr 29 21:30:27 2019 +0100
@@ -18,6 +18,7 @@
   - PR3730: Change policytool.desktop.in category Development to Settings
   - PR3731: Use JRE bin directory in policytool.desktop.in
   - PR3732: Use SDK bin directory in jconsole.desktop.in
+  - PR3733: Use shortened Java version first in Name field of desktop files
 
 New in release 2.6.17 (2019-03-16):
 
diff -r 291f31c475c0 -r 132b423f5a80 jconsole.desktop.in
--- a/jconsole.desktop.in	Mon Apr 29 21:29:15 2019 +0100
+++ b/jconsole.desktop.in	Mon Apr 29 21:30:27 2019 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Monitoring & Management Console
+Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
 Comment=Monitor and manage OpenJDK applications
 Exec=_SDKBINDIR_/jconsole
 Icon=java-@JAVA_VER@-@JAVA_VENDOR@
diff -r 291f31c475c0 -r 132b423f5a80 policytool.desktop.in
--- a/policytool.desktop.in	Mon Apr 29 21:29:15 2019 +0100
+++ b/policytool.desktop.in	Mon Apr 29 21:30:27 2019 +0100
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Policy Tool
+Name=OpenJDK @JAVA_VER@ for @target_cpu@ Policy Tool (@OPENJDK_VER@)
 Comment=Manage OpenJDK policy files
 Exec=_JREBINDIR_/policytool
 Icon=java-@JAVA_VER@-@JAVA_VENDOR@