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

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit fecf5bfa6796e56bfeaa04ae64268f2bcc4dd3d3
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Nov 5 21:39:58 2011 +0100

    Fix code and docs about embedded copies removal.

diff --git a/debian/README.source b/debian/README.source
index 1298569..e497bee 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,25 +1,16 @@
 geogebra for Debian
 -------------------
 
-The upstream source tarball is obtained by the script get_orig_source.sh
-by exporing a copy of the SVN tag corresponding to the desired version
-and then:
- * Deleting all precompiled JAR files;
- * Deleting the installer/ directory, which is non free (Creative Commons
-   Attribution-Non Commercial-Share Alike 3.0 or later)
- * Deleting the files:
-   + 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
-   These files are non free (they use an ad-hoc license which, for instance,
-   doesn't allow commercial use).
- * Deleting the org/ directory, which contains copies of other software
-   already package in Debian (which is used instead of the embedded copy).
- * Deleting the geogebra/kernel/jama/ directory, except
-   the geogebra/kernel/jama/GgbMat.java file, which is a copy of
-   another software already in Debian.
+The upstream source tarball is obtained by the script
+get_orig_source.sh by exporing a copy of the SVN tag corresponding to
+the desired version and then:
+
+ * Deleting the scripts/, installer/ and webstart/ directory, which
+   are not necessary for the Debian package (and possibily contain
+   non-free pieces);
+
+ * Deleteing many embedded copies of other pieces of software,
+   documented below.
 
 
 QUILT
@@ -34,14 +25,12 @@ for more information on how to apply the patches, modify patches, or
 remove a patch.
 
 
-EMBEDDED COPIES
+EMBEDDED SOFTWARE
 
 The following pieces of software are present in the upstream
 distribution of GeoGebra, but are not included in the Debian package:
 
- * The installer/ directory, that contains the GeoGebra installer,
-   which is not needed for the Debian package (and includes non-free
-   software);
+ * JavaCC, that is already included in Debian;
 
  * Some Apache Commons libraries, that are already included in Debian
    (org/apache/commmons/);
@@ -52,7 +41,7 @@ distribution of GeoGebra, but are not included in the Debian package:
  * The FreeHEP libraries, that are already included in Debian
    (org/freehep/);
 
- * A few "JDesktop" classes, which appear to be unnecessary and are
+ * A few JDesktop classes, which appear to be unnecessary and are
    anyway already included in package libswing-layout-java
    (org/jdesktop/);
 
@@ -65,4 +54,20 @@ distribution of GeoGebra, but are not included in the Debian package:
 
  * Rhino (or at least some pieces of it), a JavaScript implementation
    written in Java, which is already contained in _many_ Debian
-   packages (the autoritative one appears to be librhino-java);
+   packages (the main one appears to be librhino-java);
+
+ * Java Algebra System (JAS), that will have to be put in Debian as a
+   separate package (edu/jas/, sources from
+   http://krum.rz.uni-mannheim.de/jas/);
+
+ * A file in the edu/mas/ directory, that appears to be unnecessary;
+
+ * Java Universal Network/Graph Framework (JUNG), that will have to be
+   put in Debian as a separate package (edu/uci/, sources from
+   http://jung.sourceforge.net/);
+
+ * JLaTeXMath, that is already included in Debian (jlatexmath.jar,
+   jlm_cyrillic.jar, jlm_greek.jar);
+
+ * Some other minor JAR archives, not necessary for compiling the
+   Debian pacakge.
diff --git a/debian/get_orig_source.sh b/debian/get_orig_source.sh
index eb02d7f..88c0711 100755
--- a/debian/get_orig_source.sh
+++ b/debian/get_orig_source.sh
@@ -30,24 +30,20 @@ else
 	tar xzfv "$DESTTGZ" -C `dirname "$DESTDIR"`
 fi
 
-# Removes all upstream JARs, DLLs, SOs and JNILIBs
-for ext in jar dll so jnilib ; do
-	find "$DESTDIR" -iname '*'."$ext" | xargs rm -vf
-done
-
-# Removes code with problematic license
-rm -vfr "$DESTDIR/installer"
-
 # Removes embedded copies of other software
 rm -vfr "$DESTDIR/org"
-mv -v "$DESTDIR/geogebra/kernel/jama/GgbMat.java" "$TEMPDIR"
-rm -vfr "$DESTDIR/geogebra/kernel/jama/"*
-mv -v "$TEMPDIR/GgbMat.java" "$DESTDIR/geogebra/kernel/jama"
+rm -vfr "$DESTDIR/edu"
 
 # Remove other unecessary files
-rm -vfr "$DESTDIR/jogl1"
-rm -vfr "$DESTDIR/jogl2"
+rm -vfr "$DESTDIR/installer"
 rm -vfr "$DESTDIR/webstart"
+rm -vfr "$DESTDIR/scripts"
+rm -vfr "$DESTDIR/javacc"
+
+# Removes all upstream JARs, DLLs, SOs and JNILIBs
+for ext in jar dll so jnilib ; do
+	find "$DESTDIR" -iname '*'."$ext" -print0 | xargs -0 rm -vf
+done
 
 # Builds tarball
 tar czfv "$DESTTGZ" -C `dirname "$DESTDIR"` `basename "$DESTDIR"`

-- 
GeoGebra: Dynamic mathematics software for education