[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. ef4c66d687c20e9d9e9ad373472e3278d532b07c

Thu May 20 14:45:50 UTC 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GeoGebra: Dynamic mathematics software for education".

The branch, build has been updated
       via  ef4c66d687c20e9d9e9ad373472e3278d532b07c (commit)
       via  d4ef1da521b082fdf85d26f89fa90882ea0c28a2 (commit)
       via  8f07878c70d49afc8402db9b14a52c1d8b75c4d1 (commit)
       via  2b585744d8564cb5a7af0df424fb04a27825d94f (commit)
       via  761e7a411f65916a9e496febc9dc54441f46d876 (commit)
       via  1faa7fea9e4e76557de108d5649174d12272a541 (commit)
      from  016e2d565c99e13a52407a389488311f44da5579 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ef4c66d687c20e9d9e9ad373472e3278d532b07c
Merge: 2b585744d8564cb5a7af0df424fb04a27825d94f d4ef1da521b082fdf85d26f89fa90882ea0c28a2
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Thu May 20 16:43:20 2010 +0200

    Merge branch 'master' into build

commit 2b585744d8564cb5a7af0df424fb04a27825d94f
Merge: 016e2d565c99e13a52407a389488311f44da5579 761e7a411f65916a9e496febc9dc54441f46d876
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Thu May 20 16:36:58 2010 +0200

    Merge branch 'master' into build

-----------------------------------------------------------------------

Summary of changes:
 debian/copyright   |  110 ++++++++++++++++++++++++++++++++++++++-------------
 debian/geogebra.sh |   10 +++++
 debian/rules       |    3 +
 3 files changed, 95 insertions(+), 28 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index cd4abee..ecc7448 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,91 @@
-This work was packaged for Debian by:
+Files: *
+Copyright: 
+License: GPL-2+
 
-    Giovanni Mascellani <mascellani at poisson.phc.unipi.it> on Fri, 12 Mar 2010 16:12:24 +0100
+Files: jasymca/*
+Copyright: 2006, Helmut Dersch <der at hs-furtwangen.de>
+License: GPL-2+
 
-It was downloaded from:
+Files: geogebra/gui/hoteqn/*
+Copyright: 2006, Stefan MÃ¶ller and Christian Schmid
+License: GPL
 
-    <url://example.com>
+Files: geogebra/gui/inputbar/AutoComplete.java
+Copyright: 1999-2001, Matt Welsh
+License: ??
 
-Upstream Author(s):
+Files: geogebra/kernel/optimization/ExtremumFinder.java
+Copyright: 1998, Steve Verrill <steve at www1.fpl.fs.fed.us>
+           2004, Markus Hohenwarter
+License: PD
+ This software was translated from the FORTRAN version
+ to Java by a US government employee on official time.  
+ Thus this software is also in the public domain.
 
-    <put author's name and email here>
-    <likewise for another author>
+Files: geogebra/kernel/complex/Complex.java,
+       geogebra/kernel/complex/ComplexPoly.java,
+       geogebra/kernel/roots/RealRootFunction.java,
+       geogebra/kernel/roots/RealRoot.java
+Copyright:  2002-2004, Michael Thomas Flanagan <m.flanagan at ee.ucl.ac.uk>
+License: non-free !!!
+ PERMISSION TO COPY:
+ Permission to use, copy and modify this software and its documentation for
+ NON-COMMERCIAL purposes is granted, without fee, provided that an acknowledgement
+ to the author, Michael Thomas Flanagan at www.ee.ucl.ac.uk/~mflanaga, appears in all copies.
+ .
+ Dr Michael Thomas Flanagan makes no representations about the suitability
+ or fitness of the software for any or for a particular purpose.
+ Michael Thomas Flanagan shall not be liable for any damages suffered
+ as a result of using, modifying or distributing this software or its derivatives.
 
-Copyright:
+Files: geogebra/util/Base64.java
+Copyright: 2003, Casey Marshall <rsdio at metastatic.org>
+           1996, Internet Software Consortium
+           1995, International Business Machines, Inc.
+License: GPL-2+
+ With exception... blah blah...
 
-    <Copyright (C) YYYY Firstname Lastname>
-    <likewise for another author>
+Files: geogebra/SplashWindow.java
+Copyright: 1999-2003, Werner Randelshofer
+License: GPL-2+
 
-License:
+Files: jasymca/MPN.java, jasymca/Random.java
+Copyright: 1998, 1999, 2000, 2001, 2002, Free Software Foundation, Inc
+License: GPL-2+
+ This file is part of GNU Classpath.
+ .
+ GNU Classpath 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, or (at your option)
+ any later version.
+  .
+ GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA.
+ .
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library.  Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+ .
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module.  An independent module is a module which is not derived from
+ or based on this library.  If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so.  If you do not wish to do so, delete this
+ exception statement from your version.
 
-    <Put the license of the package here indented by 4 spaces>
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-
-# Please chose a license for your packaging work. If the program you package
-# uses a mainstream license, using the same license is the safest choice.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
-# If you just want it to be GPL version 3, leave the following lines in.
-
-and is licensed under the GPL version 3,
-see "/usr/share/common-licenses/GPL-3".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+Files: debian/*
+Copyright: 2010, Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+License: GPL-3+
diff --git a/debian/geogebra.sh b/debian/geogebra.sh
new file mode 100755
index 0000000..1699404
--- /dev/null
+++ b/debian/geogebra.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Simple script to start GeoGebra
+
+if [ -z "$JAVACMD" ] ; then
+	JAVACMD=java
+fi
+
+exec $JAVACMD $JAVA_OPTS -jar /usr/share/geogebra/geogebra.jar "$@"
+	
+
diff --git a/debian/rules b/debian/rules
index 837e768..1d8d87b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,3 +22,6 @@ DEB_JARS += /usr/share/java/freehep-graphicsio-svg.jar
 DEB_JARS += /usr/share/java/freehep-graphicsio-pdf.jar
 DEB_JARS += /usr/share/java/freehep-graphicsio-emf.jar
 
+install/geogebra::
+	install -m 755 $(CURDIR)/debian/geogebra.sh $(CURDIR)/debian/geogebra/usr/bin/geogebra
+


hooks/post-receive
-- 
GeoGebra: Dynamic mathematics software for education

