This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository visualvm.
commit 9c0f9e24460551467488574345d282ffd1dbf9fb Author: Emmanuel Bourg <[email protected]> Date: Mon May 5 09:45:10 2014 +0200 Use the upstream launcher script instead of debian/jvisualvm.sh --- debian/README.source | 2 +- debian/changelog | 1 + debian/jvisualvm | 74 --------------------------------- debian/patches/03-launcher.patch | 36 ++++++++++++++++ debian/patches/series.netbeans-profiler | 1 + debian/rules | 2 + debian/{jvisualvm.1 => visualvm.1} | 0 debian/visualvm.desktop | 2 +- debian/visualvm.install | 4 +- debian/visualvm.manpages | 2 +- 10 files changed, 45 insertions(+), 79 deletions(-) diff --git a/debian/README.source b/debian/README.source index 23e489e..d63a803 100644 --- a/debian/README.source +++ b/debian/README.source @@ -35,7 +35,7 @@ Here are the steps to create a new upstream tarball: 4) Update the constants in debian/rules. 5) Adjust the version of the NetBeans platform used - (there are references in debian/control and debian/jvisualvm.sh) + (there are references in debian/control and debian/visualvm.links) Applying patches diff --git a/debian/changelog b/debian/changelog index 53696b2..82a9389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ visualvm (1.3.7-1) UNRELEASED; urgency=medium instead of /usr/lib/visualvm * Never use Java 6 at runtime and accept OpenJDK 8 as an alternative JRE * Added a manpage + * Use the upstream launcher script instead of debian/jvisualvm.sh * Enabled hardening on the native libraries * Added debian/README.source to document the workflow used with this package * debian/rules: Revamped to use the dh command sequencer diff --git a/debian/jvisualvm b/debian/jvisualvm deleted file mode 100755 index 2bcf831..0000000 --- a/debian/jvisualvm +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -# -# resolve symlinks -# - -PRG=$0 -progdir=/usr/bin -APPNAME=visualvm -BASEDIR=/usr/share/visualvm -ARCH=`dpkg --print-architecture` - -jdkhome= -for j in /usr/lib/jvm/java-7-openjdk-$ARCH /usr/lib/jvm/java-8-openjdk-$ARCH; do - if [ -x $j/bin/javac ]; then - jdkhome=$j - break - fi -done -if [ -z "$jdkhome" ]; then - echo >&2 "No jdkhome found" - exit 1 -fi - -. "$BASEDIR/etc/$APPNAME".conf - -# XXX does not correctly deal with spaces in non-userdir params -args="" - -userdir="${default_userdir}" - -while [ $# -gt 0 ] ; do - case "$1" in - --userdir) shift; if [ $# -gt 0 ] ; then userdir="$1"; fi - ;; - *) args="$args \"$1\"" - ;; - esac - shift -done - -if [ -f "${userdir}/etc/$APPNAME".conf ] ; then - . "${userdir}/etc/$APPNAME".conf -fi - -readClusters() { - if [ -x /usr/ucb/echo ]; then - echo=/usr/ucb/echo - else - echo=echo - fi - while read X; do - if [ "$X" \!= "" ]; then - $echo "$BASEDIR/$X" - fi - done -} - -clusters=`(cat "$BASEDIR/etc/$APPNAME".clusters; echo) | readClusters | tr '\012' ':'` - -if [ ! -z "$extra_clusters" ] ; then - clusters="$clusters:$extra_clusters" -fi - -nbexec=`echo "$BASEDIR"/platform*/lib/nbexec` -nbexec=/usr/share/netbeans/platform18/lib/nbexec - -eval exec /bin/bash '"$nbexec"' \ - --jdkhome '"$jdkhome"' \ - --branding '"$APPNAME"' \ - --clusters '"$clusters"' \ - --userdir '"${userdir}"' \ - ${default_options} \ - "$args" diff --git a/debian/patches/03-launcher.patch b/debian/patches/03-launcher.patch new file mode 100644 index 0000000..050e72a --- /dev/null +++ b/debian/patches/03-launcher.patch @@ -0,0 +1,36 @@ +Description: Modifies the launcher script to locate the JVM + and the installation directory on a Debian system +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/visualvm/launcher/visualvm ++++ b/visualvm/launcher/visualvm +@@ -44,6 +44,8 @@ + basedir=`pwd` + cd "$old" + ++basedir=/usr/share/visualvm ++ + case "`uname`" in + Darwin*) + # set default userdir and cachedir on Mac OS X +@@ -69,6 +71,20 @@ + . "$progdir"/../etc/visualvm.conf + fi + ++ARCH=`dpkg --print-architecture` ++visualvm_jdkhome= ++for j in /usr/lib/jvm/java-7-openjdk-$ARCH /usr/lib/jvm/java-8-openjdk-$ARCH /usr/lib/jvm/default-java; do ++ if [ -x $j/bin/javac ]; then ++ visualvm_jdkhome=$j ++ break ++ fi ++done ++if [ -z "$visualvm_jdkhome" ]; then ++ echo >&2 "No jdkhome found" ++ exit 1 ++fi ++ ++. /etc/visualvm/visualvm.conf + + export DEFAULT_USERDIR_ROOT + diff --git a/debian/patches/series.netbeans-profiler b/debian/patches/series.netbeans-profiler index cf41e96..2121704 100644 --- a/debian/patches/series.netbeans-profiler +++ b/debian/patches/series.netbeans-profiler @@ -1,2 +1,3 @@ 01-inject-patches.patch 02-relocate-native-libraries.patch +03-launcher.patch diff --git a/debian/rules b/debian/rules index d397d95..ea37565 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,8 @@ override_dh_auto_install: mv debian/visualvm/usr/share/visualvm/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so debian/libvisualvm-jni/usr/lib/jni/libprofilerinterface-jdk16.so rm -Rf debian/visualvm/usr/share/visualvm/profiler/lib/deployed + rm debian/visualvm/usr/bin/jvisualvm + override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) clean-local rm -Rf Makefile Makefile.in aclocal.m4 compile config.* configure install-sh missing visualvm.desktop stamps diff --git a/debian/jvisualvm.1 b/debian/visualvm.1 similarity index 100% rename from debian/jvisualvm.1 rename to debian/visualvm.1 diff --git a/debian/visualvm.desktop b/debian/visualvm.desktop index 0754325..067156a 100644 --- a/debian/visualvm.desktop +++ b/debian/visualvm.desktop @@ -2,7 +2,7 @@ Name=VisualVM Comment=All-in-One Java Troubleshooting Tool Keywords=java;jvm;profiler;monitoring -Exec=/usr/bin/jvisualvm +Exec=/usr/bin/visualvm Icon=visualvm.xpm Categories=Development;Java; Terminal=false diff --git a/debian/visualvm.install b/debian/visualvm.install index 593177b..d8baa8e 100644 --- a/debian/visualvm.install +++ b/debian/visualvm.install @@ -1,2 +1,2 @@ -debian/jvisualvm usr/bin/ -debian/visualvm.desktop usr/share/applications/ +debian/visualvm.desktop usr/share/applications/ +visualvm/launcher/visualvm usr/bin/ diff --git a/debian/visualvm.manpages b/debian/visualvm.manpages index 776c1d7..7de5bde 100644 --- a/debian/visualvm.manpages +++ b/debian/visualvm.manpages @@ -1 +1 @@ -debian/jvisualvm.1 +debian/visualvm.1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
