[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. upstream/3.2.40.0+dfsg1-60-g5f209c5
Giovanni Mascellani
gio at alioth.debian.org
Thu Jul 8 20:55:06 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 5f209c50ae988d887bb6383b1c561a910aad0d3e (commit)
via b0799855c03f52e561c5864e4811ea83b8c56d0a (commit)
via d22e7d1b8b622a13e0ed063bb795770abb525a03 (commit)
via 46f0f82d37ba799c87a3d5974525b9cec88f1303 (commit)
via 361f8d062ffe07ec70e811cb04ddbe1c27e4b241 (commit)
via ba5668b50c566701b5865c1f44e27ba0942634f7 (commit)
via 27701c0cd0fc7e08fb80a8cbeb3aa04330f1c625 (commit)
via 80478aff2756cfbd5133691b1840c0632b07d76e (commit)
via 4db1d44f173442b63da8a29064cdcc2d2c311aec (commit)
via 2b8ac88b8d2364f9036a730aec1870b6f08df748 (commit)
from 669e231c0009d4bb76c717479c5562cfd58ff63c (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 5f209c50ae988d887bb6383b1c561a910aad0d3e
Merge: d22e7d1 b079985
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Thu Jul 8 22:50:26 2010 +0200
Merge branch 'master' into build
commit d22e7d1b8b622a13e0ed063bb795770abb525a03
Merge: 669e231 46f0f82
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Thu Jul 8 22:47:01 2010 +0200
Merge branch 'master' into build
-----------------------------------------------------------------------
Summary of changes:
debian/README.source | 27 +++++++++-
debian/TODO | 1 +
debian/control | 5 ++-
debian/copyright | 112 +++++++++++++++++++++++++--------------
debian/docs | 1 -
debian/geogebra.desktop | 11 ++++
debian/geogebra.png | Bin 0 -> 2344 bytes
debian/geogebra.sharedmimeinfo | 11 ++++
debian/get_orig_source.sh | 15 +++---
debian/install | 2 +
debian/rules | 3 +
debian/source/format | 1 +
debian/source/include-binaries | 1 +
13 files changed, 139 insertions(+), 51 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 4823a9a..60f0303 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,9 +1,32 @@
geogebra for Debian
-------------------
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
+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).
+QUILT
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build. Please see:
+
+ /usr/share/doc/quilt/README.source
+
+for more information on how to apply the patches, modify patches, or
+remove a patch.
diff --git a/debian/TODO b/debian/TODO
index 81f4519..cc35673 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,2 +1,3 @@
* Verify hoteqn and jasymca (embedded copies?)
* verify exportable JARs
+ * add a menu entry
diff --git a/debian/control b/debian/control
index 6ebf746..409a269 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: geogebra
Section: java
Priority: extra
-Maintainer: Giovanni Mascellani <gio at debian.org>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Giovanni Mascellani <gio at debian.org>
Build-Depends:
cdbs,
debhelper (>= 7),
@@ -21,6 +22,8 @@ Build-Depends:
libfreehep-graphicsio-emf-java
Standards-Version: 3.9.0
Homepage: http://www.geogebra.org/
+Vcs-Git: git://git.debian.org/git/pkg-java/geogebra.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/geogebra.git
Package: geogebra
Architecture: all
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/docs b/debian/docs
index 6858f83..44620c5 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,2 @@
_LICENSE.txt
-preload.txt
_README.txt
diff --git a/debian/geogebra.desktop b/debian/geogebra.desktop
new file mode 100644
index 0000000..08721fc
--- /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=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>
diff --git a/debian/get_orig_source.sh b/debian/get_orig_source.sh
index eb6e5a5..1cecb7a 100755
--- a/debian/get_orig_source.sh
+++ b/debian/get_orig_source.sh
@@ -15,17 +15,18 @@ svn export "http://geogebra.uni.lu/svn/tags/$TAG/geogebra/" "$DESTDIR"
find "$DESTDIR" -name '*.jar' | xargs rm -vf
# Removes code with problematic license
-rm -fr "$DESTDIR/installer"
-rm -fr "$DESTDIR/geogebra/kernel/complex"
-rm -f "$DESTDIR/geogebra/kernel/roots/RealRoot.java"
-rm -f "$DESTDIR/geogebra/kernel/roots/RealRootFunction.java"
-rm -f "$DESTDIR/geogebra/kernel/integration/GaussQuadIntegration.java"
+rm -vfr "$DESTDIR/installer"
+rm -vfr "$DESTDIR/geogebra/kernel/complex/Complex.java"
+rm -vfr "$DESTDIR/geogebra/kernel/complex/ComplexPoly.java"
+rm -vf "$DESTDIR/geogebra/kernel/roots/RealRoot.java"
+rm -vf "$DESTDIR/geogebra/kernel/roots/RealRootFunction.java"
+rm -vf "$DESTDIR/geogebra/kernel/integration/GaussQuadIntegration.java"
# Removes embedded copies of other software
-rm -fr "$DESTDIR/org"
+rm -vfr "$DESTDIR/org"
# Builds tarball
-tar czf "$DESTTGZ" -C `dirname "$DESTDIR"` `basename "$DESTDIR"`
+tar czfv "$DESTTGZ" -C `dirname "$DESTDIR"` `basename "$DESTDIR"`
# Deletes snapshot dir
rm -fr "$DESTDIR"
diff --git a/debian/install b/debian/install
index c9e25e7..6a1e8de 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,3 @@
build/geogebra.jar build/geogebra_main.jar build/geogebra_gui.jar build/geogebra_cas.jar build/geogebra_export.jar build/geogebra_properties.jar usr/share/geogebra
+debian/geogebra.desktop usr/share/applications
+debian/geogebra.png usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index 8959ce3..9faabf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,3 +26,6 @@ DEB_JARS += /usr/share/java/freehep-graphicsio-emf.jar
install/geogebra::
install -m 755 $(CURDIR)/debian/geogebra.sh $(CURDIR)/debian/geogebra/usr/bin/geogebra
+get-orig-source:
+ ./debian/get_orig_source.sh
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..c89dcaa
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/geogebra.png
hooks/post-receive
--
GeoGebra: Dynamic mathematics software for education
More information about the pkg-java-commits
mailing list