[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+svn4469+dfsg2-1-9-g3273871

2012-03-02 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit 3273871f66eacffae9e24fbe7a2e3fb2590f1104
Author: Giovanni Mascellani 
Date:   Sat Mar 3 00:21:13 2012 +0100

Releasing to sid.

diff --git a/debian/changelog b/debian/changelog
index d949ba0..66b2498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ mathpiper (0.81f+svn4469+dfsg3-1) unstable; urgency=low
 algorithms.
   * Do not compile Javadoc, which is discarded anyway.
 
- -- Giovanni Mascellani   Mon, 27 Feb 2012 15:06:56 +0100
+ -- Giovanni Mascellani   Sat, 03 Mar 2012 00:21:04 +0100
 
 mathpiper (0.81f+svn4469+dfsg2-1) unstable; urgency=low
 

-- 
Mathpiper: a Java Computer Algebra System

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+svn4469+dfsg2-1-9-g3273871

2012-03-02 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit edfc930d9848381475af3e5346c81636a3d2126b
Author: Giovanni Mascellani 
Date:   Fri Mar 2 23:30:05 2012 +0100

Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 60f1eba..624ae2f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,20 @@ Files: src/org/mathpiper/ui/gui/controlpanel/HaltButton.java
src/org/mathpiper/ui/gui/MultiSplitPane.java
 Copyright: © 2004, Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 
California 95054, U.S.A.
 License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ .
  On Debian systems, the LGPL-2.1 license text can be found in:
  /usr/share/common-licenses/LGPL-2.1
 
@@ -31,10 +45,32 @@ License: GPL
  along with this program.  If not, see .
 
 Files: src/org/mathpiper/mpreduce/*
+   lib/build_scripts/*
+   src/packages/*
 Copyright: © 1998 - 2011, Codemist Ltd.
© 1998 - 2011, A. C. Norman
© 2002, Vijay Chauhan
© 2011, Ted Kosan 
+  © 1987 - 1996, The RAND Corporation
+  © 1987 - 2005, Anthony C. Hearn
+  © 2008 - 2010, Thomas Sturm
+  © 1996, Neil Langmead
+  © 1988, David Harper
+  © 1990 - 1997, Zuse-Institut Berlin (ZIB)
+  © 1997, Wolfram Koepf
+  © 1997, Harald Boeing
+  © 1987, James W Eastwood
+  © 1987 - 1995, Stanley L. Kameny 
+  © 1988 - 1990, Institute of Nuclear Physics, Moscow State University
+  © 1990 - 1992, Mathias Warns
+  © 1990 - 1996, A. Kryukov 
+  © 1989 - 2010, Rainer M. Schoepf
+  © 1999 - 2009, Andreas Dolzmann
+  © 2003 - 2009, Lorenz Gilch
+  © 2002 - 2009, A. Seidl
+  © J.A. van Hulzen
+  © Alexey Yu. Zharkov
+  © Yuri A. Blinkov
 License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
@@ -60,6 +96,11 @@ License: BSD
  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  DAMAGE.
+Comment: Portions attributed to the RAND Corporation do not carry an
+ explicit license notice. Anyway, they come from the Reduce project,
+ which is now wholly available under the reported license (see
+ http://www.reduce-algebra.com/license.htm). I believe it is safe to
+ consider such code snippets under the same license.
 
 Files: src/org/mathpiper/builtin/javareflection/JavaField.java
src/org/mathpiper/builtin/javareflection/JavaMethod.java
@@ -129,5 +170,19 @@ Copyright: © 2009 - 2011, Giovanni Mascellani 

 License: GPL-2+
 
 License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ .
  On Debian systems, the GPL-2 license text can be found in:
  /usr/share/common-licenses/GPL-2

-- 
Mathpiper: a Java Computer Algebra System

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+svn4469+dfsg2-1-9-g3273871

2012-03-02 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit f04d6e43c7de4c7ae084b0f09aad2873f680a15f
Author: Giovanni Mascellani 
Date:   Fri Mar 2 23:44:54 2012 +0100

Typo.

diff --git a/debian/rules b/debian/rules
index dcb59f6..a5d3b6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,6 @@ override_jh_build:
jh_build -N
 
# Compile the Lisp scripts and put them into the JAR
-   CLASSPATH=$CLASSPATH:./mathpiper.jar java -Xmx300M -Xms300M -Xss8M 
org.mathpiper.mpreduce.Jlisp -w -v -z -o default.img 
lib/build_scripts/buildreduce.lsp -D@srcdir=lib/build_scripts -- reduceimg.log
+   CLASSPATH=$$CLASSPATH:./mathpiper.jar java -Xmx300M -Xms300M -Xss8M 
org.mathpiper.mpreduce.Jlisp -w -v -z -o default.img 
lib/build_scripts/buildreduce.lsp -D@srcdir=lib/build_scripts -- reduceimg.log
jar uf mathpiper.jar default.img
 

-- 
Mathpiper: a Java Computer Algebra System

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+svn4469+dfsg2-1-9-g3273871

2012-03-02 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit 45866ea4faf5b1d9fe3a95d13a8e1c7416eb0e01
Author: Giovanni Mascellani 
Date:   Mon Feb 27 14:31:55 2012 +0100

Changelog stanza.

diff --git a/debian/changelog b/debian/changelog
index 8c14158..d949ba0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mathpiper (0.81f+svn4469+dfsg3-1) unstable; urgency=low
+
+  * Add Lisp scripts from mpreduce, needed to execute Reduce
+algorithms.
+  * Do not compile Javadoc, which is discarded anyway.
+
+ -- Giovanni Mascellani   Mon, 27 Feb 2012 15:06:56 +0100
+
 mathpiper (0.81f+svn4469+dfsg2-1) unstable; urgency=low
 
   * Add mpreduce code.

-- 
Mathpiper: a Java Computer Algebra System

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+svn4469+dfsg2-1-9-g3273871

2012-03-02 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit 2353177ab69cdddabba149220091640a0f2efbd3
Author: Giovanni Mascellani 
Date:   Mon Feb 27 15:11:08 2012 +0100

Add downloading of Reduce Lisp scripts in get_orig_source.sh.

diff --git a/debian/README.source b/debian/README.source
index d5400be..d024237 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -8,8 +8,11 @@ the desired version and then:
  * Deleting the misc/ directory, which are not necessary for the
Debian package;
 
- * Deleteing a few embedded copies of other pieces of software,
-   documented below.
+ * Deleting a few embedded copies of other pieces of software,
+   documented below;
+
+ * Deleting a few script files distributed under the non-DFSG-free
+   license "CCL Public License".
 
 
 QUILT
diff --git a/debian/get_orig_source.sh b/debian/get_orig_source.sh
index 4b48d63..a0cc729 100755
--- a/debian/get_orig_source.sh
+++ b/debian/get_orig_source.sh
@@ -14,9 +14,15 @@ if [ "x$ONLYFILTER" == "x" ] ; then
if [ "x$REVISION" == "x" ] ; then
svn export 
"http://mathpiper.googlecode.com/svn/trunk/src/library_apps/mathpiper"; 
"$DESTDIR"
svn export 
"http://mathpiper.googlecode.com/svn/trunk/src/library_apps/mpreduce/src/java/org/mathpiper/mpreduce";
 "$DESTDIR/src/org/mathpiper/mpreduce"
+   svn export 
"http://mathpiper.googlecode.com/svn/trunk/src/library_apps/mpreduce/src/packages";
 "$DESTDIR/src/packages"
+   mkdir "$DESTDIR/lib"
+   svn export 
"http://mathpiper.googlecode.com/svn/trunk/src/library_apps/mpreduce/lib/build_scripts";
 "$DESTDIR/lib/build_scripts"
else
svn export -r "$REVISION" 
"http://mathpiper.googlecode.com/svn/trunk/src/library_apps/mathpiper"; 
"$DESTDIR"
svn export -r "$REVISION" 
"http://mathpiper.googlecode.com/svn/trunk/src/library_apps/mpreduce/src/java/org/mathpiper/mpreduce";
 "$DESTDIR/src/org/mathpiper/mpreduce"
+   svn export -r "$REVISION" 
"http://mathpiper.googlecode.com/svn/trunk/src/library_apps/mpreduce/src/packages";
 "$DESTDIR/src/packages"
+   mkdir "$DESTDIR/lib"
+   svn export -r "$REVISION" 
"http://mathpiper.googlecode.com/svn/trunk/src/library_apps/mpreduce/lib/build_scripts";
 "$DESTDIR/lib/build_scripts"
fi
 else
# Uncompress the previous tarball
@@ -35,6 +41,12 @@ rm -vfr "$DESTDIR/misc"
 rm -vf "$DESTDIR/src/org/mathpiper/test/matheclipse/ParseRubiFiles.java"
 rm -vf 
"$DESTDIR/src/org/mathpiper/builtin/functions/optional/ViewGeoGebra.java"
 
+# Remove other files with problematic licenses
+rm -f "$DESTDIR/lib/build_scripts/buildcsl.lsp"
+rm -f "$DESTDIR/lib/build_scripts/ccomp.lsp"
+rm -f "$DESTDIR/lib/build_scripts/mkbytes.red"
+rm -f "$DESTDIR/lib/build_scripts/opcodes.red"
+
 # 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

-- 
Mathpiper: a Java Computer Algebra System

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+svn4469+dfsg2-1-9-g3273871

2012-03-02 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit e144c007b4d43aee9b66955d026117e31fd70636
Author: Giovanni Mascellani 
Date:   Mon Feb 27 14:26:08 2012 +0100

Build Lisp scripts.

diff --git a/debian/rules b/debian/rules
index 16f9ec7..dcb59f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,12 @@ override_dh_auto_build:
true
 
 override_dh_auto_clean:
-   true
+   rm -f reduceimg.log default.img
 
 override_jh_build:
jh_build -N
 
+   # Compile the Lisp scripts and put them into the JAR
+   CLASSPATH=$CLASSPATH:./mathpiper.jar java -Xmx300M -Xms300M -Xss8M 
org.mathpiper.mpreduce.Jlisp -w -v -z -o default.img 
lib/build_scripts/buildreduce.lsp -D@srcdir=lib/build_scripts -- reduceimg.log
+   jar uf mathpiper.jar default.img
+

-- 
Mathpiper: a Java Computer Algebra System

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+svn4469+dfsg2-1-9-g3273871

2012-03-02 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit 90b0455bb0b3fad023edc259db3da14f9f629433
Author: Giovanni Mascellani 
Date:   Mon Feb 27 14:13:33 2012 +0100

Do not compile Javadoc.

diff --git a/debian/rules b/debian/rules
index 38d333e..16f9ec7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,3 +16,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
true
+
+override_jh_build:
+   jh_build -N
+

-- 
Mathpiper: a Java Computer Algebra System

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+svn4469+dfsg2-1-9-g3273871

2012-03-02 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit 6c446f4fac6501be5365044fc0fcb4f7073ebef4
Merge: 2353177ab69cdddabba149220091640a0f2efbd3 
a6ab2f4559e7e3d69281bf201bc3b54d8dc4f09b
Author: Giovanni Mascellani 
Date:   Mon Feb 27 15:15:31 2012 +0100

Merge tag 'upstream/0.81f+svn4469+dfsg3'

Upstream version 0.81f+svn4469+dfsg3


-- 
Mathpiper: a Java Computer Algebra System

___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits