[Bug 2537] [IcedTea7] Desktop files do not allow installation from multiple versions of IcedTea
bugzilla-daemon at icedtea.classpath.org
bugzilla-daemon at icedtea.classpath.org
Thu Jul 16 23:08:05 UTC 2015
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2537
--- Comment #1 from hg commits <mercurial at icedtea.classpath.org> ---
details:
http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=e6ffd4b963d6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 16 19:25:59 2015 +0100
PR2537: Desktop files do not allow installation from multiple versions of
IcedTea
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2537: 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:
(ICEDTEA_ENV): Use @JAVA_VER@ in JRE_RELEASE_VERSION,
rather than hardcoding version.
(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- at JAVA_VER@.desktop
and clean-jconsole- at JAVA_VER@.desktop
(.PHONY): Likewise.
(policytool- at JAVA_VER@.desktop): Generate desktop file
by replacing _BINDIR_ with actual make variable $(bindir).
(clean-policytool- at JAVA_VER@.desktop): Remove generated file.
(jconsole- at JAVA_VER@.desktop): Generate desktop file
by replacing _BINDIR_ with actual make variable $(bindir).
(clean-jconsole- at JAVA_VER@.desktop): Remove generated file.
(install-data-local): Replace hard-coded "1.7.0" with @JAVA_VER at .
Copy desktop files from build directory.
* NEWS: Updated.
* acinclude.m4:
(IT_DETERMINE_VERSION): Set JAVA_VER to 1.7.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.
--
You are receiving this mail because:
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20150716/deb9c6a7/attachment-0001.html>
More information about the distro-pkg-dev
mailing list