[pkg-java] r5897 - in trunk/statcvs/debian: . manpages wrappers
fourmond at alioth.debian.org
fourmond at alioth.debian.org
Tue Feb 26 23:46:55 UTC 2008
Author: fourmond
Date: 2008-02-26 23:46:55 +0000 (Tue, 26 Feb 2008)
New Revision: 5897
Removed:
trunk/statcvs/debian/wrappers.sh
Modified:
trunk/statcvs/debian/changelog
trunk/statcvs/debian/control
trunk/statcvs/debian/copyright
trunk/statcvs/debian/manpages/statcvs.1
trunk/statcvs/debian/rules
trunk/statcvs/debian/statcvs.dirs
trunk/statcvs/debian/wrappers/statcvs
Log:
[statcvs] Now using the java-wrappers package
Modified: trunk/statcvs/debian/changelog
===================================================================
--- trunk/statcvs/debian/changelog 2008-02-26 23:42:02 UTC (rev 5896)
+++ trunk/statcvs/debian/changelog 2008-02-26 23:46:55 UTC (rev 5897)
@@ -1,3 +1,11 @@
+statcvs (1:0.3.dfsg-2) unstable; urgency=low
+
+ * Switched to using java-wrappers, adapted manual page
+ and dependencies
+ * Clarified a trifle debian/copyright to make lintian happier
+
+ -- Vincent Fourmond <fourmond at debian.org> Wed, 27 Feb 2008 00:24:22 +0100
+
statcvs (1:0.3.dfsg-1) unstable; urgency=low
* New upstream release (Closes: #280326)
Modified: trunk/statcvs/debian/control
===================================================================
--- trunk/statcvs/debian/control 2008-02-26 23:42:02 UTC (rev 5896)
+++ trunk/statcvs/debian/control 2008-02-26 23:46:55 UTC (rev 5897)
@@ -15,7 +15,7 @@
Package: statcvs
Architecture: all
Depends: sun-java5-jre | sun-java6-jre | j2re1.6 | j2re1.5, libjcommon-java,
- libjfreechart-java
+ libjfreechart-java, java-wrappers (>= 0.1.3)
Recommends: cvs
Description: CVS Repository statistic analysis tool, written in Java
StatCvs retrieves information from a CVS repository and generates
Modified: trunk/statcvs/debian/copyright
===================================================================
--- trunk/statcvs/debian/copyright 2008-02-26 23:42:02 UTC (rev 5896)
+++ trunk/statcvs/debian/copyright 2008-02-26 23:46:55 UTC (rev 5897)
@@ -9,6 +9,10 @@
Copyright:
+ 2002 Lukasz Pekacki <lukasz at pekacki.de>
+
+License:
+
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
Modified: trunk/statcvs/debian/manpages/statcvs.1
===================================================================
--- trunk/statcvs/debian/manpages/statcvs.1 2008-02-26 23:42:02 UTC (rev 5896)
+++ trunk/statcvs/debian/manpages/statcvs.1 2008-02-26 23:46:55 UTC (rev 5897)
@@ -84,8 +84,22 @@
.TP
.B \-verbose
print extra progress information
+
+.SH JAVA-WRAPPERS NOTE
+
+This program is a shell script wrapper based on
+.BR java-wrappers (7).
+You therefore benefit from several features; please see the
+.BR java-wrappers (7)
+manual page.
+
+
.SH SEE ALSO
-.br
+
+.BR cvs (1)
+and
+.BR java-wrappers (7)
+
.SH AUTHOR
This manual page was written by Christian Bayle <bayle at debian.org>,
for the Debian project (but may be used by others).
Modified: trunk/statcvs/debian/rules
===================================================================
--- trunk/statcvs/debian/rules 2008-02-26 23:42:02 UTC (rev 5896)
+++ trunk/statcvs/debian/rules 2008-02-26 23:46:55 UTC (rev 5897)
@@ -30,7 +30,6 @@
install/statcvs::
install -m 644 dist/statcvs.jar debian/statcvs/usr/share/java/statcvs-$(VERSION).jar
ln -s statcvs-$(VERSION).jar debian/statcvs/usr/share/java/statcvs.jar
- install -m 644 debian/wrappers.sh debian/statcvs/usr/lib/java/wrappers-statcvs.sh
install -m 755 -t debian/statcvs/usr/bin debian/wrappers/statcvs
Modified: trunk/statcvs/debian/statcvs.dirs
===================================================================
--- trunk/statcvs/debian/statcvs.dirs 2008-02-26 23:42:02 UTC (rev 5896)
+++ trunk/statcvs/debian/statcvs.dirs 2008-02-26 23:46:55 UTC (rev 5897)
@@ -1,3 +1,3 @@
/usr/share/java
/usr/bin
-/usr/lib/java
+
Modified: trunk/statcvs/debian/wrappers/statcvs
===================================================================
--- trunk/statcvs/debian/wrappers/statcvs 2008-02-26 23:42:02 UTC (rev 5896)
+++ trunk/statcvs/debian/wrappers/statcvs 2008-02-26 23:46:55 UTC (rev 5897)
@@ -1,10 +1,10 @@
#!/bin/sh
# Include the wrappers utility script
-. /usr/lib/java/wrappers-statcvs.sh
+. /usr/lib/java-wrappers/java-wrappers.sh
# We unfortunately need sun's runtime
-find_java_runtime sun || echo "statcvs currently still needs Sun's java, probably won't work properly if at all" >&2
+find_java_runtime sun || echo "[WARNING] statcvs currently still needs Sun's java, it probably won't work properly if at all" >&2
find_jars jfreechart jcommon statcvs
run_java net.sf.statcvs.Main "$@"
Deleted: trunk/statcvs/debian/wrappers.sh
===================================================================
--- trunk/statcvs/debian/wrappers.sh 2008-02-26 23:42:02 UTC (rev 5896)
+++ trunk/statcvs/debian/wrappers.sh 2008-02-26 23:46:55 UTC (rev 5897)
@@ -1,161 +0,0 @@
-# Functions for execution of Java wrapper scripts
-
-# Some initializations:
-[ "$DESTDIR" ] || DESTDIR=
-[ "$JAVA_CLASSPATH" ] || JAVA_CLASSPATH=
-
-
-# Display a debugging message
-java_debug() {
- if [ "$DEBUG" ]; then
- echo "[debug] $0: $@" >&2;
- fi
-}
-
-# Displays a warning
-java_warning() {
- echo "[warning] $0: $@" >&2;
-}
-
-# Exit with an error message
-java_fail() {
- echo "[error] $0: $@" >&2;
- exit 1;
-}
-
-
-# Try to find a Java runtime and set JAVA_HOME and JAVACMD accordingly.
-# If JAVACMD exists, nothing is done. If JAVA_HOME exists, only that
-# is searched.
-#
-# In the other cases, the runtime is looked for according to one of the
-# following arguments:
-# * 2 : java runtime 2
-# * swing : a JVM that has swing
-# * fullxml: a JVM that has all XML classes, including
-# javax.xml.stream.util.StreamReaderDelegate
-# * sun: sun's JVM, for stuff depending on the infamous com.sun classes
-# * sun6: sun's JVM version 6
-#
-# If JAVA_DEBUG is set, we try to use jdb rather than java, if it is
-# present.
-#
-# This information is currently *far from complete* !!!
-find_java_runtime() {
- # First, known runtimes:
- sun_java="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.4-sun "
- gcj2="/usr/lib/jvm/java-*-gcj-4.* "
- sablevm="/usr/lib/sablevm"
- kaffe="/usr/lib/kaffe /usr/lib/kaffe/pthreads /usr/lib/kaffe/jthreads"
- icedtea="/usr/lib/jvm/java-7-icedtea"
- cacao="/usr/lib/jvm/cacao"
-
- # Then, classes of JVM:
- all_runtimes="$gcj2 $cacao $sablevm $kaffe $icedtea $sun_java /usr/lib/jvm/*"
-
- # Java2 runtimes:
- java2_runtimes="$gcj2 $iced_tea $sun_java"
-
- # Full swing runtimes:
- full_swing_runtimes="$iced_tea $sun_java"
-
- # Sun java apparently has some XML functions more than concurrents:
- xml_extra="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun"
-
- if [ "$JAVACMD" ]; then
- java_debug "Using already set JAVACMD = $JAVACMD"
- return 0; # Nothing to do
- fi
-
- if [ -z "$JAVA_HOME" ]; then
- # We now try to look for a reasonable JAVA_HOME.
- # First, narrow the choices, approximately according to what
- # was asked
- case $1 in
- # A java2 runtime
- 2) DIRS=$java2_runtimes
- ;;
- swing) DIRS="$icedtea $sun_java";
- ;;
- sun) DIRS=$sun_java
- ;;
- sun6) DIRS=/usr/lib/jvm/java-6-sun
- ;;
- fullxml) DIRS=$xml_extra
- ;;
- *) DIRS=$all_runtimes
- ;;
- esac
- # And pick up the first one that works
- for dir in $DIRS; do
- if [ -x $dir/bin/java ]; then
- JAVA_HOME=$dir
- break;
- fi
- done
- fi
- if [ "$JAVA_HOME" ] ; then
- if [ "$JAVA_DEBUG" ] && [ -x "$JAVA_HOME/bin/jdb" ]; then
- JAVACMD="$JAVA_HOME/bin/jdb"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- java_debug "Found JAVA_HOME = $JAVA_HOME"
- java_debug "Found JAVACMD = $JAVACMD"
- return 0 # Fine
- else
- java_warning "No java runtime was found for flavor '${1:-none}'"
- return 1;
- fi
-}
-
-# Same as find_java_runtime, but fails with an error if
-# nothing is found.
-require_java_runtime() {
- find_java_runtime "$@" || \
- java_fail "Unable to find an appropriate java runtime"
-}
-
-# Find jars and add them to the classpath
-find_jars() {
- for jar in $@ ; do
- if [ -r $DESTDIR/usr/share/java/$jar ]; then
- JAVA_CLASSPATH=$JAVA_CLASSPATH:$DESTDIR/usr/share/java/$jar
- elif [ -r $DESTDIR/usr/share/java/$jar.jar ]; then
- JAVA_CLASSPATH=$JAVA_CLASSPATH:$DESTDIR/usr/share/java/$jar.jar
- else
- java_warning "Unable to locate $jar in $DESTDIR/usr/share/java/"
- fi
- done
-}
-
-# Adds the first jar found to the classpath. Useful for alternative
-# dependencies.
-find_one_jar_in() {
- for jar in $@ ; do
- if [ -r $DESTDIR/usr/share/java/$jar ]; then
- JAVA_CLASSPATH=$JAVA_CLASSPATH:$DESTDIR/usr/share/java/$jar
- return 0
- elif [ -r $DESTDIR/usr/share/java/$jar.jar ]; then
- JAVA_CLASSPATH=$JAVA_CLASSPATH:$DESTDIR/usr/share/java/$jar.jar
- return 0
- fi
- done
- java_warning "Could fine none of $@ in $DESTDIR/usr/share/java/"
- return 1
-}
-
-# Runs the program !
-run_java() {
- if [ -z "$JAVACMD" ]; then
- java_warning "No JAVACMD set for run_java, using JAVACMD = java"
- JAVACMD=java
- fi
- if [ "$JAVA_CLASSPATH" ]; then
- cp="-cp $JAVA_CLASSPATH";
- else
- cp="";
- fi
- java_debug "Runnning $JAVACMD $JAVA_ARGS $cp $@"
- exec $JAVACMD $JAVA_ARGS $cp "$@"
-}
\ No newline at end of file
More information about the pkg-java-commits
mailing list