PR2544: Desktop files do not allow installation from multiple versions of IcedTea 2016-03-31 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2544: Desktop files do not allow installation from multiple versions of IcedTea * Makefile.am: (uninstall-local): Replace hard-coded "1.8.0" with @JAVA_VER@. 2015-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2544: Desktop files do not allow installation from multiple versions of IcedTea * jconsole.desktop: Moved to jconsole.desktop.in. * policytool.desktop: Moved to policytool.desktop.in. * Makefile.am: (DESKTOP_FILES): Add Java version to filenames. (EXTRA_DIST): Remove $(DESKTOP_FILES) as they are now handled by autoconf and generated versions shouldn't be packaged. (all-local): Depend on $(DESKTOP_FILES) being created. (clean-local): Add clean-policytool-@JAVA_VER@.desktop and clean-jconsole-@JAVA_VER@.desktop (.PHONY): Likewise. (policytool-@JAVA_VER@.desktop): Generate desktop file by replacing _BINDIR_ with actual make variable $(bindir). (clean-policytool-@JAVA_VER@.desktop): Remove generated file. (jconsole-@JAVA_VER@.desktop): Generate desktop file by replacing _BINDIR_ with actual make variable $(bindir). (clean-jconsole-@JAVA_VER@.desktop): Remove generated file. (install-data-local): Replace hard-coded "1.8.0" with @JAVA_VER@. Copy desktop files from build directory. * NEWS: Updated. * acinclude.m4: (IT_DETERMINE_VERSION): Set JAVA_VER to 1.8.0 and include in configure output. * configure.ac: Generate jconsole.desktop and policytool.desktop. Drop AC_PREFIX_DEFAULT invocation, reverting to /usr/local as default installation directory. * jconsole.desktop.in: Moved from jconsole.desktop so that @JAVA_VER@ can be replaced by configure and _BINDIR_ by the build. * policytool.desktop.in: Likewise for policytool.desktop.

[Desktop Entry]
Name=OpenJDK @JAVA_VER@ Policy Tool
Comment=Manage OpenJDK policy files
Exec=_BINDIR_/policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
Categories=Development;Java;
Version=1.0