[SCM] GeoGebra: Dynamic mathematics software for education branch, master, updated. upstream/3.2.46.0+dfsg1-106-g9e7fe31

[Giovanni Mascellani]

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  9e7fe31c21b3691865e6c068386e00d16ff1303d (commit)
       via  9b31e7f10d193043481c6a48667fa2baa2ddd4ad (commit)
       via  e6fc50036588e8fa50c0e8e9519f9949304451f6 (commit)
       via  64fed7cfbcce8ef81c196f728ea11de44211c24e (commit)
      from  55727250e4abbc5d8a3deac47aabf205cbcaa605 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    9 +++++++--
 debian/control                    |    7 ++++---
 debian/geogebra.install           |   26 +++++++++++++-------------
 debian/geogebra.lintian-overrides |    2 ++
 debian/rules                      |    1 +
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5293cf..5c9a013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-geogebra (3.2.46.0+dfsg1-2) UNRELEASED; urgency=low
+geogebra (3.2.46.0+dfsg1-2) unstable; urgency=low
 
   * Added suggestion against cups for printing.
+  * Standards-Version bumped to 3.9.2 (no changes required).
+  * Fix FTBFS: netscape.javascript.* classes moved to icedtea-plugin package
+    (closes: #628289, LP: #749271).
+  * Fix incorrect icon installation directory.
+  * Add an override for lintian's false positive (codeless-jar).
 
- -- Giovanni Mascellani <gio at debian.org>  Thu, 20 Jan 2011 17:03:36 +0100
+ -- Giovanni Mascellani <gio at debian.org>  Thu, 02 Jun 2011 16:25:21 +0200
 
 geogebra (3.2.46.0+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8c794b0..8b64586 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,9 @@ Build-Depends:
  libfreehep-graphicsio-java,
  libfreehep-graphicsio-svg-java,
  libfreehep-graphicsio-pdf-java,
- libfreehep-graphicsio-emf-java
-Standards-Version: 3.9.1
+ libfreehep-graphicsio-emf-java,
+ icedtea-plugin
+Standards-Version: 3.9.2
 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
@@ -44,8 +45,8 @@ Depends:
  libfreehep-graphicsio-svg-java,
  libfreehep-graphicsio-pdf-java,
  libfreehep-graphicsio-emf-java,
+ icedtea-plugin,
  ${misc:Depends}
-Recommends: icedtea6-plugin | sun-java6-plugin
 Suggests: cups
 Description: Dynamic mathematics software for education
  GeoGebra is a dynamic geometry system. You can do constructions with points,
diff --git a/debian/geogebra.install b/debian/geogebra.install
index 3cad19d..15badba 100644
--- a/debian/geogebra.install
+++ b/debian/geogebra.install
@@ -1,15 +1,15 @@
 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
 unix/usr/share/applications/geogebra.desktop usr/share/applications
-unix/bsd/icons/hicolor/16x16/apps/geogebra.png usr/share/icons/hicolor/16x16/apps/geogebra.png
-unix/bsd/icons/hicolor/22x22/apps/geogebra.png usr/share/icons/hicolor/22x22/apps/geogebra.png
-unix/bsd/icons/hicolor/24x24/apps/geogebra.png usr/share/icons/hicolor/24x24/apps/geogebra.png
-unix/bsd/icons/hicolor/32x32/apps/geogebra.png usr/share/icons/hicolor/32x32/apps/geogebra.png
-unix/bsd/icons/hicolor/36x36/apps/geogebra.png usr/share/icons/hicolor/36x36/apps/geogebra.png
-unix/bsd/icons/hicolor/48x48/apps/geogebra.png usr/share/icons/hicolor/48x48/apps/geogebra.png
-unix/bsd/icons/hicolor/64x64/apps/geogebra.png usr/share/icons/hicolor/64x64/apps/geogebra.png
-unix/bsd/icons/hicolor/72x72/apps/geogebra.png usr/share/icons/hicolor/72x72/apps/geogebra.png
-unix/bsd/icons/hicolor/96x96/apps/geogebra.png usr/share/icons/hicolor/96x96/apps/geogebra.png
-unix/bsd/icons/hicolor/128x128/apps/geogebra.png usr/share/icons/hicolor/128x128/apps/geogebra.png
-unix/bsd/icons/hicolor/192x192/apps/geogebra.png usr/share/icons/hicolor/192x192/apps/geogebra.png
-unix/bsd/icons/hicolor/256x256/apps/geogebra.png usr/share/icons/hicolor/256x256/apps/geogebra.png
-unix/bsd/icons/hicolor/scalable/apps/geogebra.svgz usr/share/icons/hicolor/scalable/apps/geogebra.svgz
+unix/bsd/icons/hicolor/16x16/apps/geogebra.png usr/share/icons/hicolor/16x16/apps
+unix/bsd/icons/hicolor/22x22/apps/geogebra.png usr/share/icons/hicolor/22x22/apps
+unix/bsd/icons/hicolor/24x24/apps/geogebra.png usr/share/icons/hicolor/24x24/apps
+unix/bsd/icons/hicolor/32x32/apps/geogebra.png usr/share/icons/hicolor/32x32/apps
+unix/bsd/icons/hicolor/36x36/apps/geogebra.png usr/share/icons/hicolor/36x36/apps
+unix/bsd/icons/hicolor/48x48/apps/geogebra.png usr/share/icons/hicolor/48x48/apps
+unix/bsd/icons/hicolor/64x64/apps/geogebra.png usr/share/icons/hicolor/64x64/apps
+unix/bsd/icons/hicolor/72x72/apps/geogebra.png usr/share/icons/hicolor/72x72/apps
+unix/bsd/icons/hicolor/96x96/apps/geogebra.png usr/share/icons/hicolor/96x96/apps
+unix/bsd/icons/hicolor/128x128/apps/geogebra.png usr/share/icons/hicolor/128x128/apps
+unix/bsd/icons/hicolor/192x192/apps/geogebra.png usr/share/icons/hicolor/192x192/apps
+unix/bsd/icons/hicolor/256x256/apps/geogebra.png usr/share/icons/hicolor/256x256/apps
+unix/bsd/icons/hicolor/scalable/apps/geogebra.svgz usr/share/icons/hicolor/scalable/apps
diff --git a/debian/geogebra.lintian-overrides b/debian/geogebra.lintian-overrides
new file mode 100644
index 0000000..9951fd9
--- /dev/null
+++ b/debian/geogebra.lintian-overrides
@@ -0,0 +1,2 @@
+# This JAR doens't contain code, but .properties files. It's perfectly normal.
+geogebra binary: codeless-jar usr/share/geogebra/geogebra_properties.jar
diff --git a/debian/rules b/debian/rules
index 0edc41b..59fe10f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,7 @@ DEB_JARS += /usr/share/java/freehep-graphicsio.jar
 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
+DEB_JARS += /usr/share/icedtea-web/plugin.jar
 
 configure/geogebra::
 	DEB_VERSION=$(DEB_VERSION) ./debian/create_debian_class.sh > $(CURDIR)/geogebra/GeoGebraDebian.java


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