Author: tbooth-guest Date: 2014-04-07 10:13:53 +0000 (Mon, 07 Apr 2014) New Revision: 16578
Added: trunk/packages/libdsol1-java/trunk/debian/changelog trunk/packages/libdsol1-java/trunk/debian/compat trunk/packages/libdsol1-java/trunk/debian/control trunk/packages/libdsol1-java/trunk/debian/copyright trunk/packages/libdsol1-java/trunk/debian/get-orig-source.sh trunk/packages/libdsol1-java/trunk/debian/manifest trunk/packages/libdsol1-java/trunk/debian/patches/ trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-BoxAndWhiskerPlot.patch trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-HistogramDataset.patch trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-HistogramSeries.patch trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-XYDataset.patch trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-XYSeries.patch trunk/packages/libdsol1-java/trunk/debian/patches/series trunk/packages/libdsol1-java/trunk/debian/rules trunk/packages/libdsol1-java/trunk/debian/source/ trunk/packages/libdsol1-java/trunk/debian/source/format Log: Working build for libdsol1. Note the upstream source is in CVS. Added: trunk/packages/libdsol1-java/trunk/debian/changelog =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/changelog (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/changelog 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,16 @@ +libdsol1-java (1.6.9-0biolinux3) precise; urgency=low + + * Fix missing deps + + -- Tim Booth <[email protected]> Thu, 03 Apr 2014 18:25:27 +0100 + +libdsol1-java (1.6.9-0biolinux2) precise; urgency=low + + * Initial release to support Acacia. + * Note the DSOL page says there is a 1.6.10 version but the only source + I can find declares itself to be 1.6.9. + * There are build files for Maven but I will try to build manually as I + think Mavenhelper is overkill here. + * Split docs into their own package. + + -- Tim Booth <[email protected]> Wed, 02 Apr 2014 17:28:26 +0100 Added: trunk/packages/libdsol1-java/trunk/debian/compat =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/compat (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/compat 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1 @@ +7 Added: trunk/packages/libdsol1-java/trunk/debian/control =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/control (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/control 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,44 @@ +Source: libdsol1-java +Section: java +Priority: optional +Maintainer: Tim Booth <[email protected]> +Build-Depends-Indep: debhelper (>= 9), + javahelper, default-jdk, libcolt-java, libcommons-math-java, + libjcommon-java, libjfreechart-java, libjaxp1.3-java, libjava3d-java, + libvecmath-java, junit +Standards-Version: 3.9.3 +Homepage: http://sk-3.tbm.tudelft.nl/dsol/1.6/dsol/source-repository.html + +Package: libdsol1-java +Architecture: all +Depends: ${misc:Depends}, ${java:Depends} +Description: Distributed simulation environment for Java + DSOL is a full featured multi-formalism, distributed simulation environment + developed at Delft University of Technology (The Netherlands). DSOL has support + for discrete event and for continuous modeling. Formalisms supported are event + scheduling, DEVS, flow-based simulation, and continuous modeling through sets + of differential equations. The first release was introduced at IEEE's Winter + Simulation Conference in 2002. Since then, numerous papers and PhD + dissertations have been developed, with applications in the fields of + transportation and traffic, logistics, supply chain management, gaming and + training, health care, and many others. + . + This package installs the following DSOL components: + - event + - interpreter + - introspection + - jstats + - language + - logger + - naming + +Package: libdsol1-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: libdsol1-java +Description: Documentation for DSOL1 + DSOL is a full featured multi-formalism, distributed simulation environment + developed at Delft University of Technology (The Netherlands). + . + This package contains the javadoc for DSOL1. Added: trunk/packages/libdsol1-java/trunk/debian/copyright =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/copyright (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/copyright 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,17 @@ +This package was debianized by Tim Booth. + +It was downloaded from :pserver:[email protected]:/home/dsol/1.6 + +Upstream Authors: Alexander Verbraeck + Peter Jacobs + Roy Chin + Stijn-Pieter van Houten + Niels Lang <[email protected]> + +Copyright: © 2002-2007 Delft University of Technology Jaffalaan 5, 2628 BX + Delft, the Netherlands. All rights reserved. + +License: LGPL + +On Debian systems the full text of the LGPL License can be found +in `/usr/share/common-licenses/LGPL'. Added: trunk/packages/libdsol1-java/trunk/debian/get-orig-source.sh =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/get-orig-source.sh (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/get-orig-source.sh 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,27 @@ +#!/bin/bash + +if ! [ -e debian/changelog ] ; then + echo "Run this from the source directory" + exit 1 +fi + +# We just assume that DSOL is v1.6.9 as it's not been updated in ever. +cd .. +if [ -e libdsol1-java-1.6.9 ] ; then + echo "../libdsol1-java-1.6.9 already exists, so won't overwrite it." + exit 1 +fi + +mkdir libdsol1-java-1.6.9 +cd libdsol1-java-1.6.9 + +cvs -d :pserver:[email protected]:/home/dsol/1.6 export -r HEAD -d dsol-language language +cvs -d :pserver:[email protected]:/home/dsol/1.6 export -r HEAD -d dsol-event event +cvs -d :pserver:[email protected]:/home/dsol/1.6 export -r HEAD -d dsol-logger logger +cvs -d :pserver:[email protected]:/home/dsol/1.6 export -r HEAD -d dsol-naming naming +cvs -d :pserver:[email protected]:/home/dsol/1.6 export -r HEAD -d dsol-jstats jstats +cvs -d :pserver:[email protected]:/home/dsol/1.6 export -r HEAD -d dsol-interpreter interpreter +cvs -d :pserver:[email protected]:/home/dsol/1.6 export -r HEAD -d dsol-introspection introspection + +tar -cvJf libdsol1-java_1.6.9.orig.tar.xz libdsol1-java-1.6.9 +mv libdsol1-java-1.6.9 libdsol1-java-1.6.9.orig Property changes on: trunk/packages/libdsol1-java/trunk/debian/get-orig-source.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/packages/libdsol1-java/trunk/debian/manifest =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/manifest (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/manifest 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,16 @@ +# This is about right, I think. + +usr/share/java/dsol-event.jar: + Class-Path: colt.jar commons-math.jar jaxp-1.3.jar xml-apis.jar +usr/share/java/dsol-language.jar: + Class-Path: dsol-event.jar vecmath.jar j3dcore.jar jcommon.jar jfreechart.jar +usr/share/java/dsol-logger.jar: + Class-Path: dsol-event.jar dsol-language.jar +usr/share/java/dsol-naming.jar: + Class-Path: dsol-event.jar dsol-language.jar dsol-logger.jar +usr/share/java/dsol-jstats.jar: + Class-Path: dsol-event.jar dsol-language.jar dsol-logger.jar +usr/share/java/dsol-interpreter.jar: + Class-Path: dsol-event.jar dsol-language.jar dsol-logger.jar +usr/share/java/dsol-introspection.jar: + Class-Path: dsol-event.jar dsol-language.jar dsol-logger.jar Added: trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-BoxAndWhiskerPlot.patch =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-BoxAndWhiskerPlot.patch (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-BoxAndWhiskerPlot.patch 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,24 @@ +### http://sisyphus.ru/en/srpm/Sisyphus/dsol-basic/patches/0 +--- x/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/boxAndWhisker/BoxAndWhiskerPlot.java.jfree 2010-06-03 11:12:11.000000000 +0200 ++++ y/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/boxAndWhisker/BoxAndWhiskerPlot.java 2010-06-03 11:15:38.000000000 +0200 +@@ -271,6 +271,13 @@ + } + } + ++ public void draw(final Graphics2D g2, final Rectangle2D rectangle, ++ final java.awt.geom.Point2D point, ++ final PlotState plotState, final PlotRenderingInfo plotRenderingInfo) ++ { ++ draw(g2, rectangle, plotState, plotRenderingInfo); ++ } ++ + /** + * @see org.jfree.chart.plot.Plot#draw(java.awt.Graphics2D, + * java.awt.geom.Rectangle2D, org.jfree.chart.plot.PlotState, +@@ -317,4 +324,4 @@ + { + this.confidenceInterval = confidenceInterval; + } +-} +\ No newline at end of file ++} Added: trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-HistogramDataset.patch =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-HistogramDataset.patch (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-HistogramDataset.patch 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,161 @@ +### http://sisyphus.ru/en/srpm/Sisyphus/dsol-basic/patches/4 +--- x/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/histogram/HistogramDataset.java.jfree 2007-01-06 14:25:43.000000000 +0100 ++++ y/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/histogram/HistogramDataset.java 2010-06-03 12:37:18.000000000 +0200 +@@ -14,10 +14,10 @@ + import java.util.Arrays; + import java.util.List; + +-import org.jfree.data.AbstractDataset; +-import org.jfree.data.DatasetChangeEvent; +-import org.jfree.data.DatasetChangeListener; +-import org.jfree.data.IntervalXYDataset; ++import org.jfree.data.general.AbstractDataset; ++import org.jfree.data.general.DatasetChangeEvent; ++import org.jfree.data.general.DatasetChangeListener; ++import org.jfree.data.xy.IntervalXYDataset; + + /** + * The dataset defines a histogram data set. A dataset contains multiple series +@@ -112,33 +112,33 @@ + /** + * @see org.jfree.data.IntervalXYDataset#getEndXValue(int, int) + */ +- public Number getEndXValue(final int series, final int bin) ++ public double getEndXValue(final int series, final int bin) + { +- return this.series[series].getEndXValue(bin); ++ return this.series[series].getEndXValue(bin).doubleValue(); + } + + /** + * @see org.jfree.data.IntervalXYDataset#getEndYValue(int, int) + */ +- public Number getEndYValue(final int series, final int bin) ++ public double getEndYValue(final int series, final int bin) + { +- return this.series[series].getEndYValue(bin); ++ return this.series[series].getEndYValue(bin).doubleValue(); + } + + /** + * @see org.jfree.data.IntervalXYDataset#getStartXValue(int, int) + */ +- public Number getStartXValue(final int series, final int bin) ++ public double getStartXValue(final int series, final int bin) + { +- return this.series[series].getStartXValue(bin); ++ return this.series[series].getStartXValue(bin).doubleValue(); + } + + /** + * @see org.jfree.data.IntervalXYDataset#getStartYValue(int, int) + */ +- public Number getStartYValue(final int series, final int bin) ++ public double getStartYValue(final int series, final int bin) + { +- return this.series[series].getStartYValue(bin); ++ return this.series[series].getStartYValue(bin).doubleValue(); + } + + /** +@@ -152,17 +152,17 @@ + /** + * @see org.jfree.data.XYDataset#getXValue(int, int) + */ +- public Number getXValue(final int series, final int bin) ++ public double getXValue(final int series, final int bin) + { +- return this.series[series].getXValue(bin); ++ return this.series[series].getXValue(bin).doubleValue(); + } + + /** + * @see org.jfree.data.XYDataset#getYValue(int, int) + */ +- public Number getYValue(final int series, final int bin) ++ public double getYValue(final int series, final int bin) + { +- return this.series[series].getYValue(bin); ++ return this.series[series].getYValue(bin).doubleValue(); + } + + /** +@@ -184,48 +184,64 @@ + /** + * @see org.jfree.data.IntervalXYDataset#getEndX(int, int) + */ +- public double getEndX(final int series, final int bin) ++ public Number getEndX(final int series, final int bin) + { +- return this.series[series].getEndXValue(bin).doubleValue(); ++ return this.series[series].getEndXValue(bin); + } + + /** + * @see org.jfree.data.IntervalXYDataset#getEndY(int, int) + */ +- public double getEndY(final int series, final int bin) ++ public Number getEndY(final int series, final int bin) + { +- return this.series[series].getEndYValue(bin).doubleValue(); ++ return this.series[series].getEndYValue(bin); + } + + /** + * @see org.jfree.data.IntervalXYDataset#getStartX(int, int) + */ +- public double getStartX(final int series, final int bin) ++ public Number getStartX(final int series, final int bin) + { +- return this.series[series].getStartXValue(bin).doubleValue(); ++ return this.series[series].getStartXValue(bin); + } + + /** + * @see org.jfree.data.IntervalXYDataset#getStartY(int, int) + */ +- public double getStartY(final int series, final int bin) ++ public Number getStartY(final int series, final int bin) + { +- return this.series[series].getStartYValue(bin).doubleValue(); ++ return this.series[series].getStartYValue(bin); + } + + /** + * @see org.jfree.data.XYDataset#getX(int, int) + */ +- public double getX(final int series, final int bin) ++ public Number getX(final int series, final int bin) + { +- return this.series[series].getXValue(bin).doubleValue(); ++ return this.series[series].getXValue(bin); + } + + /** + * @see org.jfree.data.XYDataset#getY(int, int) + */ +- public double getY(final int series, final int bin) ++ public Number getY(final int series, final int bin) + { +- return this.series[series].getYValue(bin).doubleValue(); ++ return this.series[series].getYValue(bin); + } +-} +\ No newline at end of file ++ ++ public org.jfree.data.DomainOrder getDomainOrder() ++ { ++ return org.jfree.data.DomainOrder.NONE; ++ } ++ ++ public int indexOf(Comparable seriesKey) ++ { ++ return -1; ++ } ++ ++ public Comparable getSeriesKey(int series) ++ { ++ return ""; ++ } ++ ++} Added: trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-HistogramSeries.patch =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-HistogramSeries.patch (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-HistogramSeries.patch 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,19 @@ +### http://sisyphus.ru/en/srpm/Sisyphus/dsol-basic/patches/3 +--- x/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/histogram/HistogramSeries.java.jfree 2010-06-03 09:18:59.000000000 +0200 ++++ y/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/histogram/HistogramSeries.java 2010-06-03 09:19:11.000000000 +0200 +@@ -12,7 +12,7 @@ + import nl.tudelft.simulation.event.EventInterface; + import nl.tudelft.simulation.event.EventListenerInterface; + +-import org.jfree.data.AbstractDataset; ++import org.jfree.data.general.AbstractDataset; + + /** + * The serie defines a histogram series containing the entries of a set. +@@ -309,4 +309,4 @@ + } + + } +-} +\ No newline at end of file ++} Added: trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-XYDataset.patch =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-XYDataset.patch (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-XYDataset.patch 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,92 @@ +### http://sisyphus.ru/en/srpm/Sisyphus/dsol-basic/patches/2 +--- x/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/xy/XYDataset.java.jfree 2007-01-06 14:25:44.000000000 +0100 ++++ y/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/xy/XYDataset.java 2010-06-03 12:38:07.000000000 +0200 +@@ -15,9 +15,9 @@ + + import nl.tudelft.simulation.language.filters.Filterinterface; + +-import org.jfree.data.AbstractDataset; +-import org.jfree.data.DatasetChangeEvent; +-import org.jfree.data.DatasetChangeListener; ++import org.jfree.data.general.AbstractDataset; ++import org.jfree.data.general.DatasetChangeEvent; ++import org.jfree.data.general.DatasetChangeListener; + + /** + * The xyDataset specifies the xyDataset in DSOL +@@ -34,7 +34,7 @@ + * @since 1.0 + */ + public class XYDataset extends AbstractDataset implements +- org.jfree.data.XYDataset, DatasetChangeListener ++ org.jfree.data.xy.XYDataset, DatasetChangeListener + { + + /** series contains the series of the set */ +@@ -86,17 +86,17 @@ + /** + * @see org.jfree.data.XYDataset#getXValue(int, int) + */ +- public Number getXValue(final int serie, final int item) ++ public double getXValue(final int serie, final int item) + { +- return this.series[serie].getXValue(item); ++ return this.series[serie].getXValue(item).doubleValue(); + } + + /** + * @see org.jfree.data.XYDataset#getYValue(int, int) + */ +- public Number getYValue(final int serie, final int item) ++ public double getYValue(final int serie, final int item) + { +- return this.series[serie].getYValue(item); ++ return this.series[serie].getYValue(item).doubleValue(); + } + + /** +@@ -118,17 +118,17 @@ + /** + * @see org.jfree.data.XYDataset#getX(int, int) + */ +- public double getX(final int serie, final int item) ++ public Number getX(final int serie, final int item) + { +- return this.series[serie].getXValue(item).doubleValue(); ++ return this.series[serie].getXValue(item); + } + + /** + * @see org.jfree.data.XYDataset#getY(int, int) + */ +- public double getY(final int serie, final int item) ++ public Number getY(final int serie, final int item) + { +- return this.series[serie].getYValue(item).doubleValue(); ++ return this.series[serie].getYValue(item); + } + + /** +@@ -143,4 +143,20 @@ + this.series[i].setFilter(filter); + } + } +-} +\ No newline at end of file ++ ++ public org.jfree.data.DomainOrder getDomainOrder() ++ { ++ return org.jfree.data.DomainOrder.NONE; ++ } ++ ++ public int indexOf(Comparable seriesKey) ++ { ++ return -1; ++ } ++ ++ public Comparable getSeriesKey(int series) ++ { ++ return ""; ++ } ++ ++} Added: trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-XYSeries.patch =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-XYSeries.patch (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/patches/dsol-jstats-1.6.9-XYSeries.patch 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,19 @@ +### http://sisyphus.ru/en/srpm/Sisyphus/dsol-basic/patches/1 +--- x/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/xy/XYSeries.java.jfree 2010-06-03 10:18:50.000000000 +0200 ++++ y/dsol-jstats/src/main/java/nl/tudelft/simulation/jstats/charts/xy/XYSeries.java 2010-06-03 10:19:13.000000000 +0200 +@@ -22,7 +22,7 @@ + import nl.tudelft.simulation.language.filters.ZeroFilter; + import nl.tudelft.simulation.logger.Logger; + +-import org.jfree.data.AbstractDataset; ++import org.jfree.data.general.AbstractDataset; + + /** + * The xySerie specifies an xySerie for XY Plots in DSOL. +@@ -188,4 +188,4 @@ + { + this.filter = filter; + } +-} +\ No newline at end of file ++} Added: trunk/packages/libdsol1-java/trunk/debian/patches/series =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/patches/series (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/patches/series 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,5 @@ +dsol-jstats-1.6.9-HistogramDataset.patch +dsol-jstats-1.6.9-HistogramSeries.patch +dsol-jstats-1.6.9-XYDataset.patch +dsol-jstats-1.6.9-XYSeries.patch +dsol-jstats-1.6.9-BoxAndWhiskerPlot.patch Added: trunk/packages/libdsol1-java/trunk/debian/rules =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/rules (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/rules 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +export CLASSPATH=/usr/share/java/colt.jar:/usr/share/java/commons-math.jar:/usr/share/java/jcommon.jar:/usr/share/java/jfreechart.jar:/usr/share/java/jaxp-1.3.jar:/usr/share/java/xml-apis.jar:/usr/share/java/junit.jar:/usr/share/java/j3dcore.jar:/usr/share/java/vecmath.jar + +%: + dh $@ --with javahelper + +override_dh_auto_build: + #Build order is important. + for d in event language logger naming interpreter jstats introspection ; do \ + jh_build "dsol-$$d.jar" "dsol-$$d"/src ; \ + CLASSPATH="$$CLASSPATH:dsol-$$d.jar" ; \ + done + +override_dh_install: + jh_installlibs *.jar + dh_installdocs -plibdsol1-java-doc debian/_jh_build.javadoc/api/ + +override_dh_auto_clean: + dh_auto_clean + rm -f *.jar Property changes on: trunk/packages/libdsol1-java/trunk/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: trunk/packages/libdsol1-java/trunk/debian/source/format =================================================================== --- trunk/packages/libdsol1-java/trunk/debian/source/format (rev 0) +++ trunk/packages/libdsol1-java/trunk/debian/source/format 2014-04-07 10:13:53 UTC (rev 16578) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
