[SCM] GeoGebra: Dynamic mathematics software for education branch, master, updated. upstream/3.2.47.0+dfsg1-120-gcb2bea2

2011-11-21 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit b53b72c40ecc328af53bbdb2dcca7dace17eb4b8
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date:   Sun Nov 20 12:26:55 2011 +0100

Comments about JUNG dependency.

diff --git a/debian/README.source b/debian/README.source
index e497bee..0627ffe 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -64,7 +64,11 @@ distribution of GeoGebra, but are not included in the Debian 
package:
 
  * Java Universal Network/Graph Framework (JUNG), that will have to be
put in Debian as a separate package (edu/uci/, sources from
-   http://jung.sourceforge.net/);
+   http://jung.sourceforge.net/); actually, the required classes are
+   only a small part of JUNG: since maintaining it all would be quite
+   a burden and it would bring in dependencies that appear to be
+   non-free, I'll probably just include the necessary class files
+   directly in the geogebra package;
 
  * JLaTeXMath, that is already included in Debian (jlatexmath.jar,
jlm_cyrillic.jar, jlm_greek.jar);

-- 
GeoGebra: Dynamic mathematics software for education

___
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] GeoGebra: Dynamic mathematics software for education branch, master, updated. upstream/3.2.47.0+dfsg1-120-gcb2bea2

2011-11-21 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit 62b8b356d38db877a463cb8a8aea986203f98689
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date:   Mon Nov 21 10:51:18 2011 +0100

Dependency: icedtea-plugin - icedtea-netx-common.

diff --git a/debian/changelog b/debian/changelog
index 9ca17a3..3af930d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+geogebra (4.0.0.0+dfsg1-1) UNRELEASED; urgency=low
+
+  * Update dependency: icedtea-plugin - icedtea-netx-common (LP: #893007).
+
+ -- Giovanni Mascellani g...@debian.org  Mon, 21 Nov 2011 10:53:10 +0100
+
 geogebra (3.2.47.0+dfsg1-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 980a93e..08930ff 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  libfreehep-graphicsio-svg-java,
  libfreehep-graphicsio-pdf-java,
  libfreehep-graphicsio-emf-java,
- icedtea-plugin,
+ icedtea-netx-common,
  tofrodos
 Standards-Version: 3.9.2
 Homepage: http://www.geogebra.org/
@@ -46,7 +46,7 @@ Depends:
  libfreehep-graphicsio-svg-java,
  libfreehep-graphicsio-pdf-java,
  libfreehep-graphicsio-emf-java,
- icedtea-plugin,
+ icedtea-netx-common,
  ${misc:Depends}
 Suggests: cups
 Description: Dynamic mathematics software for education

-- 
GeoGebra: Dynamic mathematics software for education

___
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] GeoGebra: Dynamic mathematics software for education branch, master, updated. upstream/3.2.47.0+dfsg1-120-gcb2bea2

2011-11-21 Thread Giovanni Mascellani 
The following commit has been merged in the master branch:
commit cb2bea2c47c8a32140c3afabdf7a5ac12bc52bf1
Merge: 62b8b356d38db877a463cb8a8aea986203f98689 
4a9fe4efa4ce5eedde14f7c0ee7bbc7aa912e9f8
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date:   Mon Nov 21 10:54:24 2011 +0100

Merge branch 'upstream'


-- 
GeoGebra: Dynamic mathematics software for education

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