[statsvn] 17/37: [statsvn] Can move to main !
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Apr 19 22:55:42 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository statsvn.
commit a829ec86449972c6ee30109bf1cf658780facf5e
Author: Vincent Fourmond <fourmond at debian.org>
Date: Sat Apr 19 19:14:19 2008 +0000
[statsvn] Can move to main !
---
debian/changelog | 9 ++-
debian/control | 4 +-
debian/wrappers.sh | 161 ------------------------------------------------
debian/wrappers/statsvn | 4 +-
4 files changed, 11 insertions(+), 167 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 95edcce..6efb964 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-statsvn (0.3.1.dfsg-4) UNRELEASED; urgency=low
+statsvn (0.3.1.dfsg-4) unstable; urgency=low
+ [ Michael Koch ]
* Updated watch file to remove ".dfsg" part from debian version before
comparison.
- -- Michael Koch <konqueror at gmx.de> Wed, 02 Apr 2008 20:07:56 +0200
+ [ Vincent Fourmond ]
+ * Now that statcvs has moved to main, statsvn also works fine
+ within main; moving there (closes: #469820)
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 19 Apr 2008 21:13:17 +0200
statsvn (0.3.1.dfsg-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ce86ba9..1075185 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: statsvn
-Section: contrib/devel
+Section: devel
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Vincent Fourmond <fourmond at debian.org>
@@ -15,7 +15,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/statsvn
Package: statsvn
Architecture: all
-Depends: sun-java5-jre | sun-java6-jre | java2-runtime, libjcommon-java,
+Depends: java-gcj-compat | java-runtime, libjcommon-java,
libjfreechart-java, libbackport-util-concurrent-java, statcvs (>= 3),
subversion, java-wrappers (>= 0.1.4)
Description: SVN repository statistics
diff --git a/debian/wrappers.sh b/debian/wrappers.sh
deleted file mode 100644
index a571bd7..0000000
--- a/debian/wrappers.sh
+++ /dev/null
@@ -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
diff --git a/debian/wrappers/statsvn b/debian/wrappers/statsvn
index 903b561..c961047 100755
--- a/debian/wrappers/statsvn
+++ b/debian/wrappers/statsvn
@@ -3,8 +3,8 @@
# Include the wrappers utility script
. /usr/lib/java-wrappers/java-wrappers.sh
-# We unfortunately need sun's runtime
-find_java_runtime sun
+# We first look for sun's runtime, and then for all the rest
+find_java_runtime sun || find_java_runtime
find_jars jfreechart jcommon statcvs backport-util-concurrent statsvn
run_java net.sf.statsvn.Main "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statsvn.git
More information about the pkg-java-commits
mailing list