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 022f5c1db34f8a341d407cec6a11159d7fc38262 Author: Andreas Tille <[email protected]> Date: Fri Mar 13 11:48:15 2015 +0100 Complete Emmanuel's patch and do not use freehep jaida files since these do not build --- debian/patches/freehep-aida.patch | 20 ++++++++++++++++++++ debian/rules | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/debian/patches/freehep-aida.patch b/debian/patches/freehep-aida.patch index 0d294be..9628d2a 100644 --- a/debian/patches/freehep-aida.patch +++ b/debian/patches/freehep-aida.patch @@ -91,3 +91,23 @@ Description: Try to get rid of remainings requiring non-free hep aida code /** 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 +--- a/src/cern/colt/matrix/linalg/Property.java ++++ b/src/cern/colt/matrix/linalg/Property.java +@@ -214,7 +214,7 @@ protected static String blanks(int lengt + */ + public void checkRectangular(DoubleMatrix2D A) { + if (A.rows() < A.columns()) { +- throw new IllegalArgumentException("Matrix must be rectangular: "+cern.colt.matrix.doublealgo.Formatter.shape(A)); ++ throw new IllegalArgumentException("Matrix must be rectangular: "+this/*cern.colt.matrix.doublealgo.Formatter.shape(A)*/); + } + } + /** +@@ -222,7 +222,7 @@ public void checkRectangular(DoubleMatri + * @throws IllegalArgumentException if <tt>A.rows() != A.columns()</tt>. + */ + public void checkSquare(DoubleMatrix2D A) { +- if (A.rows() != A.columns()) throw new IllegalArgumentException("Matrix must be square: "+cern.colt.matrix.doublealgo.Formatter.shape(A)); ++ if (A.rows() != A.columns()) throw new IllegalArgumentException("Matrix must be square: "+this/*cern.colt.matrix.doublealgo.Formatter.shape(A)*/); + } + /** + * Returns the matrix's fraction of non-zero cells; <tt>A.cardinality() / A.size()</tt>. diff --git a/debian/rules b/debian/rules index 23228b8..9d08b54 100755 --- a/debian/rules +++ b/debian/rules @@ -6,9 +6,9 @@ JAVA_HOME=/usr/lib/jvm/default-java dh $@ --with javahelper override_dh_auto_configure: - # move files from freehep-jaida into place - mkdir -p src/hep - cp -a debian/freehep-jaida src/hep/aida + # move files from freehep-jaida into place - unfortunately these files do not build + # mkdir -p src/hep + # cp -a debian/freehep-jaida src/hep/aida dh_auto_configure override_dh_auto_build: -- 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
