[Git][java-team/javamorph][master] 6 commits: Rework wrapper script for JVM detection and xdg-open
Tony Mancill
gitlab at salsa.debian.org
Sun Dec 13 21:09:26 GMT 2020
Tony Mancill pushed to branch master at Debian Java Maintainers / javamorph
Commits:
6184dce4 by tony mancill at 2020-12-13T12:38:09-08:00
Rework wrapper script for JVM detection and xdg-open
- - - - -
dae22f7c by tony mancill at 2020-12-13T12:38:24-08:00
Use debhelper-compat 13
- - - - -
e165990c by tony mancill at 2020-12-13T12:38:24-08:00
Bump Standards-Version to 4.5.1
- - - - -
6e1740d5 by tony mancill at 2020-12-13T12:38:24-08:00
Set Rules-Requires-Root: no in debian/control
- - - - -
83046398 by tony mancill at 2020-12-13T12:40:18-08:00
prepare changelog for upload to unstable
- - - - -
d3c21bdf by tony mancill at 2020-12-13T13:02:35-08:00
whitespace
- - - - -
4 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/wrapper/javamorph
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+javamorph (0.0.20100201-3) unstable; urgency=medium
+
+ * Rework wrapper script for JVM detection and xdg-open
+ * Set Rules-Requires-Root: no in debian/control
+ * Bump Standards-Version to 4.5.1
+ * Use debhelper-compat 13
+
+ -- tony mancill <tmancill at debian.org> Sun, 13 Dec 2020 12:38:30 -0800
+
javamorph (0.0.20100201-2) unstable; urgency=medium
* Team upload.
@@ -56,7 +65,7 @@ javamorph (0.0.20100201-1) unstable; urgency=low
javamorph (0.0.20090514-3) unstable; urgency=low
* Encoding in desktop-file.
- * Doc-Base entry.
+ * Doc-Base entry.
-- Claus Wimmer <claus.erhard.wimmer at googlemail.com> Sun, 24 Jan 2010 20:48:56 +0100
@@ -80,7 +89,7 @@ javamorph (0.0.20090514-1) unstable; urgency=low
* One of two JVMs required: GCJ or OPENJDK.
* ITP bug number obtained and inserted into changelog.
* Upstream changelog added.
-
+
* Closes: #564804.
-- Claus Wimmer <claus.erhard.wimmer at googlemail.com> Tue, 12 Jan 2010 01:35:56 +0100
@@ -91,6 +100,6 @@ javamorph (0.0.20090514-1) unstable; urgency=low
* Java project provided as executable JAR which extracts some content to
* the user's home directory. Source is included into the provided binary
* JAR archive and has been used as compilable source.
-
+
-- Claus Wimmer <claus.erhard.wimmer at googlemail.com> Sat, 09 Jan 2010 21:18:16 +0100
-
+
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -3,21 +3,22 @@ Section: graphics
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Claus Wimmer <claus.erhard.wimmer at googlemail.com>, tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 11), default-jdk
-Standards-Version: 4.4.0
+Build-Depends: debhelper-compat (= 13), default-jdk
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/javamorph.git
Vcs-Browser: https://salsa.debian.org/java-team/javamorph
Homepage: http://code.google.com/p/javamorph/
+Rules-Requires-Root: no
Package: javamorph
Architecture: all
-Depends: ${misc:Depends}, default-jre (>= 2:1.7) | java7-runtime, doc-base
-Recommends: evince | okular
+Depends: ${misc:Depends}, default-jre (>= 2:1.7) | java7-runtime, java-wrappers, doc-base
+Recommends: xdg-utils, pdfviewer | evince
Description: Java morphing film-make program for pixel picture-input
Give two human-face pictures as inputs into the program. Then mark
important locations whithin both faces by pairs of corresponding points..
The program will create a short enumerated picture series in which the left
- face moves (morphs) into the right one. You can then create a MPEG (see
- mencoder) from the picture series. An animated GIF (see GIMP) is also
+ face moves (morphs) into the right one. You can then create a MPEG (see
+ mencoder) from the picture series. An animated GIF (see GIMP) is also
possible.
=====================================
debian/wrapper/javamorph
=====================================
@@ -1,40 +1,25 @@
-#!/bin/bash
-
+#!/bin/sh
+#
# Start JavaMorph - Morphing Program.
+#
# Contains all help files.
HELPDIR="/usr/share/doc/javamorph/"
# Tutorial PDF.
HELPFILE=${HELPDIR}JavaMorph.pdf.gz
-# Pass DEBIAN specific help file locations to the JVM.
-OPTS="-DHELPDIR=${HELPDIR} -DHELPFILE=${HELPFILE}"
-# Location of the OPENJDK JVM.
-J_OPEN="/usr/lib/jvm/default-java/bin/java"
-# Choose the JVM if installed.
-if test -a ${J_OPEN}
-then
- JAVA=${J_OPEN}
- echo "I take OpenJDK."
-else
- # Stop if no JVM is installed.
- echo "ERROR: No Java VM found for JavaMorph!"
- exit 1
-fi
+HELPVIEW=/usr/bin/xdg-open
-# Choose the helpviewer.
-if test -a /usr/bin/evince
-then
- HELPVIEW=/usr/bin/evince
-else
- if test -a /usr/bin/okular
- then
- HELPVIEW=/usr/bin/okular
- else
- echo "WARNING: Help viewer not found!"
- fi
+# can we use xdg-open for the helpviewer?
+if [ ! -x /usr/bin/xdg-open ]; then
+ echo "xdg-open not found; please install xdg-utils to enable the helpviewer"
fi
-# Start the JavaMorph program.
-${JAVA} ${OPTS} -DHELPVIEW=${HELPVIEW} -jar /usr/share/javamorph/javamorph.jar
-# Say good bye.
-echo "Open me again if I'm good or report bugs otherwise! Bye ..."
+# Pass DEBIAN specific help file locations to the JVM.
+JAVA_ARGS="-DHELPDIR=${HELPDIR} -DHELPFILE=${HELPFILE} -DHELPVIEW=${HELPVIEW}"
+
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+find_java_runtime java8
+
+# Start the JavaMorph program.
+run_java ${OPTS} -jar /usr/share/javamorph/javamorph.jar
View it on GitLab: https://salsa.debian.org/java-team/javamorph/-/compare/cc83d2f5fce1308924b771cd667fcb2848d0f30c...d3c21bdfc6ee1b2350fdaacd05cdbf5fba4082c2
--
View it on GitLab: https://salsa.debian.org/java-team/javamorph/-/compare/cc83d2f5fce1308924b771cd667fcb2848d0f30c...d3c21bdfc6ee1b2350fdaacd05cdbf5fba4082c2
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201213/0ec23354/attachment.html>
More information about the pkg-java-commits
mailing list