[SCM] GeoGebra: Dynamic mathematics software for education branch, master, updated. upstream/3.2.40.0+dfsg1-34-gba5668b
Giovanni Mascellani
gio at alioth.debian.org
Thu Jul 8 19:47:04 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, master has been updated
via ba5668b50c566701b5865c1f44e27ba0942634f7 (commit)
via 27701c0cd0fc7e08fb80a8cbeb3aa04330f1c625 (commit)
from 80478aff2756cfbd5133691b1840c0632b07d76e (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 ba5668b50c566701b5865c1f44e27ba0942634f7
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Thu Jul 8 21:46:16 2010 +0200
Some files copied from Gabor Ancsin's geogebra package
commit 27701c0cd0fc7e08fb80a8cbeb3aa04330f1c625
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Thu Jul 8 21:45:46 2010 +0200
Other work on debian/copyright (will it ever end?)
-----------------------------------------------------------------------
Summary of changes:
debian/copyright | 112 +++++++++++++++++++++++++--------------
debian/geogebra.desktop | 11 ++++
debian/geogebra.png | Bin 0 -> 2344 bytes
debian/geogebra.sharedmimeinfo | 11 ++++
4 files changed, 94 insertions(+), 40 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index eb59703..a9629f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,6 @@
Files: *
-Copyright: 2001 -
+Copyright: 2001-2010, Markus Hohenwarter
+ Michael Borcherds
License: GPL-2+
Files: jasymca/*
@@ -7,12 +8,22 @@ Copyright: 2006, Helmut Dersch <der at hs-furtwangen.de>
License: GPL-2+
Files: geogebra/gui/hoteqn/*
-Copyright: 2006, Stefan Möller and Christian Schmid
+Copyright: 2006, Stefan Möller
+ 2006, Christian Schmid
License: GPL
+Files: geogebra/gui/PointStyleListRenderer.java
+Copyright: 2009, George Sturr
+License: GPL-2+
+
+Files: geogebra/gui/DecorationAngleListRenderer.java,
+ geogebra/gui/DecorationListRenderer.java
+Copyright: 2006, Loïc Le Coq
+License: GPL-2+
+
Files: geogebra/gui/inputbar/AutoComplete.java
Copyright: 1999-2001, Matt Welsh
-License: ??
+License: GPL-2+
Files: geogebra/kernel/optimization/ExtremumFinder.java
Copyright: 1998, Steve Verrill <steve at www1.fpl.fs.fed.us>
@@ -26,8 +37,12 @@ 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+-link and ISC and IBM
+
+Files: geogebra/util/ScientificFormat.java
+Copyright: Paul Spence
+ Mark Donszelmann
License: GPL-2+
- With exception... blah blah...
Files: geogebra/SplashWindow.java
Copyright: 1999-2003, Werner Randelshofer
@@ -35,40 +50,7 @@ License: GPL-2+
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.
+License: GPL-2+-link
Files: geogebra/kernel/AlgoCurvature.java,
geogebra/kernel/AlgoLengthFunction.java,
@@ -90,5 +72,55 @@ Copyright: 2008, Michael Borcherds
License: GPL-2
Files: debian/*
-Copyright: 2010, Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-License: GPL-3+
+Copyright: 2010, Giovanni Mascellani <gio at debian.org>
+License: GPL-2+
+
+Files: debian/geogebra.png,
+ debian/geogebra.sharedmimeinfo,
+ debian/geogebra.desktop
+Copyright: 2010, Gabor Ancsin <gabor at geogebra.org>
+License: GPL-2+
+
+License: GPL-2+-link
+ Usual term of GPL-2+ apply, with the following expection:
+ .
+ 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.
+
+License: IBM
+ International Business Machines, Inc. (hereinafter called IBM) grants
+ permission under its copyrights to use, copy, modify, and distribute
+ this Software with or without fee, provided that the above copyright
+ notice and all paragraphs of this notice appear in all copies, and
+ that the name of IBM not be used in connection with the marketing of
+ any product incorporating the Software or modifications thereof,
+ without specific, written prior permission.
+ .
+ To the extent it has a right to do so, IBM grants an immunity from
+ suit under its patents, if any, for the use, sale or manufacture of
+ products to the extent that such products are used for performing
+ Domain Name System dynamic updates in TCP/IP networks by means of the
+ Software. No immunity is granted for any product per se or for any
+ other function of any product.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
+ DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE, EVEN IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH
+ DAMAGES.
diff --git a/debian/geogebra.desktop b/debian/geogebra.desktop
new file mode 100644
index 0000000..f6487ec
--- /dev/null
+++ b/debian/geogebra.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=GeoGebra
+Comment=Create interactive mathematical constructions and applets
+Exec=geogebra %f
+Icon=/usr/share/geogebra/geogebra.png
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Math;Education
+MimeType=application/vnd.geogebra.file;application/vnd.geogebra.tool;
+
diff --git a/debian/geogebra.png b/debian/geogebra.png
new file mode 100644
index 0000000..51654ca
Binary files /dev/null and b/debian/geogebra.png differ
diff --git a/debian/geogebra.sharedmimeinfo b/debian/geogebra.sharedmimeinfo
new file mode 100644
index 0000000..5608011
--- /dev/null
+++ b/debian/geogebra.sharedmimeinfo
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/vnd.geogebra.file">
+ <comment>GeoGebra File</comment>
+ <glob pattern="*.ggb"/>
+ </mime-type>
+ <mime-type type="application/vnd.geogebra.tool">
+ <comment>GeoGebra Tool</comment>
+ <glob pattern="*.ggt"/>
+ </mime-type>
+</mime-info>
hooks/post-receive
--
GeoGebra: Dynamic mathematics software for education
More information about the pkg-java-commits
mailing list