This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository libcolt-free-java.
commit 9dc9d2d9c2720a9d0feb802148e1abee90cdac0f Author: Andreas Tille <[email protected]> Date: Sat Mar 7 10:48:02 2015 +0100 Try to follow https://lists.debian.org/debian-med/2015/02/msg00174.html --- debian/patches/freehep-aida.patch | 93 +++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 3 files changed, 95 insertions(+) diff --git a/debian/patches/freehep-aida.patch b/debian/patches/freehep-aida.patch new file mode 100644 index 0000000..0d294be --- /dev/null +++ b/debian/patches/freehep-aida.patch @@ -0,0 +1,93 @@ +Author: Emmanuel Bourg <[email protected]> + Andreas Tille <[email protected]> +Last-Update: Sat, 07 Mar 2015 10:44:34 +0100 +Description: Try to get rid of remainings requiring non-free hep aida code + See https://lists.debian.org/debian-med/2015/02/msg00174.html + . + This patch does the second part of this mail commenting the toString() and + viewSorted() methods from + src/cern/colt/matrix/DoubleMatrix1D.java + src/cern/colt/matrix/DoubleMatrix2D.java + src/cern/colt/matrix/DoubleMatrix3D.java + . + FIXME: I have no idea how to deal with + src/cern/colt/matrix/linalg/Property.java + +--- a/src/cern/colt/matrix/DoubleMatrix1D.java ++++ b/src/cern/colt/matrix/DoubleMatrix1D.java +@@ -543,9 +543,11 @@ public void toArray(double[] values) { + * Returns a string representation using default formatting. + * @see cern.colt.matrix.doublealgo.Formatter + */ ++/* freehep-jaida + public String toString() { + return new cern.colt.matrix.doublealgo.Formatter().toString(this); + } ++*/ + /** + * Constructs and returns a new view equal to the receiver. + * The view is a shallow clone. Calls <code>clone()</code> and casts the result. +@@ -673,9 +675,11 @@ For further information, see {@link cern + For more advanced sorting functionality, see {@link cern.colt.matrix.doublealgo.Sorting}. + @return a new sorted vector (matrix) view. + */ ++/* freehep-jaida + public DoubleMatrix1D viewSorted() { + return cern.colt.matrix.doublealgo.Sorting.mergeSort.sort(this); + } ++*/ + /** + Constructs and returns a new <i>stride view</i> which is a sub matrix consisting of every i-th cell. + More specifically, the view has size <tt>this.size()/stride</tt> holding cells <tt>this.get(i*stride)</tt> for all <tt>i = 0..size()/stride - 1</tt>. +--- a/src/cern/colt/matrix/DoubleMatrix2D.java ++++ b/src/cern/colt/matrix/DoubleMatrix2D.java +@@ -489,9 +489,11 @@ public double[][] toArray() { + * Returns a string representation using default formatting. + * @see cern.colt.matrix.doublealgo.Formatter + */ ++/* freehep-jaida + public String toString() { + return new cern.colt.matrix.doublealgo.Formatter().toString(this); + } ++*/ + /** + * Constructs and returns a new view equal to the receiver. + * The view is a shallow clone. Calls <code>clone()</code> and casts the result. +@@ -784,9 +786,11 @@ For more advanced sorting functionality, + @return a new sorted vector (matrix) view. + @throws IndexOutOfBoundsException if <tt>column < 0 || column >= columns()</tt>. + */ ++/* freehep-jaida + public DoubleMatrix2D viewSorted(int column) { + return cern.colt.matrix.doublealgo.Sorting.mergeSort.sort(this,column); + } ++*/ + /** + Constructs and returns a new <i>stride view</i> which is a sub matrix consisting of every i-th cell. + More specifically, the view has <tt>this.rows()/rowStride</tt> rows and <tt>this.columns()/columnStride</tt> columns holding cells <tt>this.get(i*rowStride,j*columnStride)</tt> for all <tt>i = 0..rows()/rowStride - 1, j = 0..columns()/columnStride - 1</tt>. +--- a/src/cern/colt/matrix/DoubleMatrix3D.java ++++ b/src/cern/colt/matrix/DoubleMatrix3D.java +@@ -483,9 +483,11 @@ public double[][][] toArray() { + * Returns a string representation using default formatting. + * @see cern.colt.matrix.doublealgo.Formatter + */ ++/* freehep-jaida + public String toString() { + return new cern.colt.matrix.doublealgo.Formatter().toString(this); + } ++*/ + /** + * Constructs and returns a new view equal to the receiver. + * The view is a shallow clone. Calls <code>clone()</code> and casts the result. +@@ -749,9 +751,11 @@ For more advanced sorting functionality, + @return a new sorted vector (matrix) view. + @throws IndexOutOfBoundsException if <tt>row < 0 || row >= rows() || column < 0 || column >= columns()</tt>. + */ ++/* freehep-jaida + public DoubleMatrix3D viewSorted(int row, int column) { + return cern.colt.matrix.doublealgo.Sorting.mergeSort.sort(this,row,column); + } ++*/ + /** + Constructs and returns a new <i>stride view</i> which is a sub matrix consisting of every i-th cell. + More specifically, the view has <tt>this.slices()/sliceStride</tt> slices and <tt>this.rows()/rowStride</tt> rows and <tt>this.columns()/columnStride</tt> columns diff --git a/debian/patches/series b/debian/patches/series index 88f59e7..c8733d8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ use_debian_packaged_concurrent_jar.patch +freehep-aida.patch diff --git a/debian/rules b/debian/rules index fc0e74f..23228b8 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ JAVA_HOME=/usr/lib/jvm/default-java override_dh_auto_configure: # move files from freehep-jaida into place + mkdir -p src/hep cp -a debian/freehep-jaida src/hep/aida dh_auto_configure -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libcolt-free-java.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
