[SCM] GeoGebra: Dynamic mathematics software for education branch, master, updated. upstream/3.2.47.0+dfsg1-115-gbe0bf03

Giovanni Mascellani mascellani at poisson.phc.unipi.it
Sat Nov 5 17:52:11 UTC 2011


The following commit has been merged in the master branch:
commit be0bf03cdb1e42605dd59c17de570df1ddc7d0a9
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Nov 5 18:51:54 2011 +0100

    There is no Flanagan code anymore! :-)

diff --git a/debian/README.source b/debian/README.source
index 7d4e909..1298569 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -43,15 +43,6 @@ distribution of GeoGebra, but are not included in the Debian package:
    which is not needed for the Debian package (and includes non-free
    software);
 
- * The following files, which are non-free (their functionality are
-   replaced with equivalent code from the Apache Commons Math
-   library):
-   + geogebra/kernel/complex/Complex.java
-   + geogebra/kernel/complex/ComplexPoly.java
-   + geogebra/kernel/roots/RealRoot.java
-   + geogebra/kernel/roots/RealRootFunction.java
-   + geogebra/kernel/integration/GaussQuadIntegration.java;
-
  * Some Apache Commons libraries, that are already included in Debian
    (org/apache/commmons/);
 
diff --git a/debian/get_orig_source.sh b/debian/get_orig_source.sh
index 3f42a19..eb02d7f 100755
--- a/debian/get_orig_source.sh
+++ b/debian/get_orig_source.sh
@@ -37,11 +37,6 @@ done
 
 # Removes code with problematic license
 rm -vfr "$DESTDIR/installer"
-rm -vfr "$DESTDIR/geogebra/kernel/complex/Complex.java"
-rm -vfr "$DESTDIR/geogebra/kernel/complex/ComplexPoly.java"
-rm -vf "$DESTDIR/geogebra/kernel/roots/RealRoot.java"
-rm -vf "$DESTDIR/geogebra/kernel/roots/RealRootFunction.java"
-rm -vf "$DESTDIR/geogebra/kernel/integration/GaussQuadIntegration.java"
 
 # Removes embedded copies of other software
 rm -vfr "$DESTDIR/org"

-- 
GeoGebra: Dynamic mathematics software for education



More information about the pkg-java-commits mailing list