Author: fourmond
Date: 2008-01-05 01:27:22 +0000 (Sat, 05 Jan 2008)
New Revision: 5309
Added:
trunk/statcvs/debian/patches/10-fix-null-exception.dpatch
Modified:
trunk/statcvs/debian/changelog
trunk/statcvs/debian/patches/00list
trunk/statcvs/debian/wrappers.sh
Log:
[statcvs] Fix null pointer exception, but does not run (filling up memory) with
gij and kaffe, and fails with cacao
Modified: trunk/statcvs/debian/changelog
===================================================================
--- trunk/statcvs/debian/changelog 2008-01-05 00:25:50 UTC (rev 5308)
+++ trunk/statcvs/debian/changelog 2008-01-05 01:27:22 UTC (rev 5309)
@@ -5,12 +5,16 @@
* 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
Modified: trunk/statcvs/debian/patches/00list
===================================================================
--- trunk/statcvs/debian/patches/00list 2008-01-05 00:25:50 UTC (rev 5308)
+++ trunk/statcvs/debian/patches/00list 2008-01-05 01:27:22 UTC (rev 5309)
@@ -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
Added: trunk/statcvs/debian/patches/10-fix-null-exception.dpatch
===================================================================
--- trunk/statcvs/debian/patches/10-fix-null-exception.dpatch
(rev 0)
+++ trunk/statcvs/debian/patches/10-fix-null-exception.dpatch 2008-01-05
01:27:22 UTC (rev 5309)
@@ -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.
+
[EMAIL PROTECTED]@
+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));
+ }
+ }
Property changes on: trunk/statcvs/debian/patches/10-fix-null-exception.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/statcvs/debian/wrappers.sh
===================================================================
--- trunk/statcvs/debian/wrappers.sh 2008-01-05 00:25:50 UTC (rev 5308)
+++ trunk/statcvs/debian/wrappers.sh 2008-01-05 01:27:22 UTC (rev 5309)
@@ -147,7 +147,7 @@
# 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
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
