This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository statcvs.
commit 9724ef820ce9ac7d2a64ff731e484959cc05a438 Author: Vincent Fourmond <[email protected]> Date: Sat Jan 5 01:27:22 2008 +0000 [statcvs] Fix null pointer exception, but does not run (filling up memory) with gij and kaffe, and fails with cacao --- debian/changelog | 6 +++++- debian/patches/00list | 3 ++- debian/patches/10-fix-null-exception.dpatch | 21 +++++++++++++++++++++ debian/wrappers.sh | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 387850c..db84011 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,12 +5,16 @@ statcvs (1:0.3.dfsg-1) UNRELEASED; urgency=low * Updated standards to 3.7.3, with amazingly no changes needed. * Watchfile + debian/new-upstream to repackage upstream tarball * Switching to CDBS + dpatch + * 01-disable-unjar to remove incorporation of removed jars into the + final jar * Moving away from contrib, as it builds fine with gcj * New statcvs script (closes: #343869) * Does not depend on libjdom-java anymore (closes: #331703) * Recommends: cvs as users won't make much of statcvs without it. + * 10-fix-null-exception to take care of a small API change for + jfreechart - -- Vincent Fourmond <[email protected]> Sat, 05 Jan 2008 00:51:38 +0100 + -- Vincent Fourmond <[email protected]> Sat, 05 Jan 2008 01:51:53 +0100 statcvs (20030713-4) unstable; urgency=high diff --git a/debian/patches/00list b/debian/patches/00list index 5fa4290..a741cef 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1 +1,2 @@ -01-disable-unjar \ No newline at end of file +01-disable-unjar +10-fix-null-exception \ No newline at end of file diff --git a/debian/patches/10-fix-null-exception.dpatch b/debian/patches/10-fix-null-exception.dpatch new file mode 100755 index 0000000..ffd09f0 --- /dev/null +++ b/debian/patches/10-fix-null-exception.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-fix-null-exception.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: XYItemRenderer.getSeriesPaint return value has switched from +## DP: never null to possibly null. Check that. + +@DPATCH@ +diff -urNad statcvs-0.3.dfsg~/src/net/sf/statcvs/charts/LOCChartMaker.java statcvs-0.3.dfsg/src/net/sf/statcvs/charts/LOCChartMaker.java +--- statcvs-0.3.dfsg~/src/net/sf/statcvs/charts/LOCChartMaker.java 2006-12-16 20:17:08.000000000 +0100 ++++ statcvs-0.3.dfsg/src/net/sf/statcvs/charts/LOCChartMaker.java 2008-01-05 01:48:45.000000000 +0100 +@@ -112,7 +112,8 @@ + if (colors == null) { + // We don't like the bright yellow color early on in the series, use a darker one + for (int i = 0; i < plot.getSeriesCount(); i++) { +- if (plot.getRenderer().getSeriesPaint(i).equals(new Color(0xFF, 0xFF, 0x55))) { ++ if (plot.getRenderer().getSeriesPaint(i) != null && ++ plot.getRenderer().getSeriesPaint(i).equals(new Color(0xFF, 0xFF, 0x55))) { + plot.getRenderer().setSeriesPaint(i, new Color(240, 220, 0x55)); + } + } diff --git a/debian/wrappers.sh b/debian/wrappers.sh index 69d774a..a571bd7 100644 --- a/debian/wrappers.sh +++ b/debian/wrappers.sh @@ -147,7 +147,7 @@ find_one_jar_in() { # Runs the program ! run_java() { - if [ -z "$JAVACMD"]; then + if [ -z "$JAVACMD" ]; then java_warning "No JAVACMD set for run_java, using JAVACMD = java" JAVACMD=java fi -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statcvs.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
