[SCM] Mathpiper: a Java Computer Algebra System branch, master, updated. debian/0.81f+dfsg1-1-5-g122cad7

2011-12-16 Thread Giovanni Mascellani
The following commit has been merged in the master branch:
commit 95f48dbf7938a3f2f1fa4879f84deb8f60063c1a
Author: Giovanni Mascellani 
Date:   Fri Dec 16 14:39:46 2011 +0100

Also download mpreduce code.

diff --git a/debian/get_orig_source.sh b/debian/get_orig_source.sh
index c05de35..4b48d63 100755
--- a/debian/get_orig_source.sh
+++ b/debian/get_orig_source.sh
@@ -13,8 +13,10 @@ if [ "x$ONLYFILTER" == "x" ] ; then
test -d ../tarballs/. || mkdir -p ../tarballs
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"
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"
fi
 else
# Uncompress the previous tarball

-- 
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+dfsg1-1-5-g122cad7

2011-12-16 Thread Giovanni Mascellani
The following commit has been merged in the master branch:
commit 1b3f26501dfd88ea533d11b6fd0e4f7b04b04e94
Author: Giovanni Mascellani 
Date:   Fri Dec 16 15:10:00 2011 +0100

New changelog stanza.

diff --git a/debian/changelog b/debian/changelog
index de32e5d..8c14158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mathpiper (0.81f+svn4469+dfsg2-1) unstable; urgency=low
+
+  * Add mpreduce code.
+
+ -- Giovanni Mascellani   Fri, 16 Dec 2011 15:09:23 +0100
+
 mathpiper (0.81f+dfsg1-1) unstable; urgency=low
 
   * New upstream version, from SVN revision 4053.

-- 
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+dfsg1-1-5-g122cad7

2011-12-16 Thread Giovanni Mascellani
The following commit has been merged in the master branch:
commit 122cad7980970dd78e835d1d1ab9313093d4479b
Author: Giovanni Mascellani 
Date:   Fri Dec 16 15:19:22 2011 +0100

Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 0befa25..60f1eba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,9 @@ Upstream-Name: Mathpiper
 Source: http://code.google.com/p/mathpiper/
 
 Files: *
-Copyright: © 2008-2009 Ted Kosan 
-   © 2008-2009, Sherm Ostrowsky
-   © 1998-2009, Ayal Pinkus 
+Copyright: © 2008 - 2011 Ted Kosan 
+   © 2008 - 2011, Sherm Ostrowsky
+   © 1998 - 2009, Ayal Pinkus 
 License: GPL-2+
 
 Files: src/org/mathpiper/ui/gui/controlpanel/HaltButton.java
@@ -30,6 +30,37 @@ License: GPL
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
 
+Files: src/org/mathpiper/mpreduce/*
+Copyright: © 1998 - 2011, Codemist Ltd.
+   © 1998 - 2011, A. C. Norman
+   © 2002, Vijay Chauhan
+   © 2011, Ted Kosan 
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the relevant
+   copyright notice, this list of conditions and the following
+   disclaimer.
+ * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ 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.
+
 Files: src/org/mathpiper/builtin/javareflection/JavaField.java
src/org/mathpiper/builtin/javareflection/JavaMethod.java
src/org/mathpiper/builtin/javareflection/JavaConstructor.java
@@ -94,7 +125,7 @@ Copyright: © 1995 - 1998, Ross Ihaka
 License: GPL-2+
 
 Files: debian/*
-Copyright: © 2009-2011, Giovanni Mascellani 
+Copyright: © 2009 - 2011, Giovanni Mascellani 
 License: GPL-2+
 
 License: 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+dfsg1-1-5-g122cad7

2011-12-16 Thread Giovanni Mascellani
The following commit has been merged in the master branch:
commit 83052127b62832e186cecd25eaec81e6d0f7b455
Merge: 95f48dbf7938a3f2f1fa4879f84deb8f60063c1a 
29d6157bd99f007b7b530ea963daa1d91bccf3cd
Author: Giovanni Mascellani 
Date:   Fri Dec 16 15:09:17 2011 +0100

Merge commit 'upstream/0.81f+svn4469+dfsg2'


-- 
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