[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.43.0+dfsg1-1-23-g74ecb35

Giovanni Mascellani gio at alioth.debian.org
Sat Jul 24 22:58:45 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  74ecb35c853a1a06a946a5db1fa47869c29f273a (commit)
       via  de356d2b71956a690aec9d46e01fa7c21395b1ea (commit)
       via  e0fd64c67d41fa68ff289696150220c9357c0c14 (commit)
       via  75b5809b2b381989ecdd5dbe8b91178caa6142ef (commit)
       via  f5e7e05d66348ba73b26f960ba5798bcfcf03717 (commit)
       via  664d0ac37a78dd2e37958442012a2eb9a5803e70 (commit)
       via  b9bdc4e47f0d8ef86ad22ee2b68ea0212fa856d6 (commit)
       via  62bfddf57007ecb300cf21d5772cac9f0cb665ed (commit)
       via  701e3ad8651bb7636f5e36cf9aa0c2bc8bdd3f4e (commit)
       via  9d4005d8fbfa386c0bd9f93ec1c856057b2ace7a (commit)
       via  f57da38390ccfe6eeebe514edaec621d167e1f50 (commit)
       via  876170d19888bac59c7feb08ce243de5f0d64ebc (commit)
       via  6b666db4bfc8cd1d4880564c16dd9204c8e650a5 (commit)
       via  8239c2d552b25de097a54dcd8c35f8e68419177e (commit)
       via  fc52bbb7d008f0ac7754d4cd986d9b78c80ceb59 (commit)
       via  c87b9b5ac57182713eadc03b308a2e06915c5c35 (commit)
       via  5ff23ad5a1a90296e4a1973a04804fe0d20c0255 (commit)
       via  3fc3b7d85ccc6218115a8bd7e67f2e5ca331f1a8 (commit)
       via  206783c3cf01dc43004a1ffe6d08d8c5a28e451d (commit)
       via  fa4a29ad088bcdc7e5d52db72c16403c2a825131 (commit)
       via  05ee9c7d833243b867ca03fa404b1c27e01c8f66 (commit)
       via  1d9ae8dcde680fe578e9cf6d402992f132f8e80f (commit)
       via  1d97afe7d8e41dcc085fc3b4414b7fbc96e5527c (commit)
      from  258928ad197f046200db7cf1e61496de8d4e7eaa (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 74ecb35c853a1a06a946a5db1fa47869c29f273a
Merge: e0fd64c de356d2
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jul 25 00:41:34 2010 +0200

    Merge branch 'master' into build

commit e0fd64c67d41fa68ff289696150220c9357c0c14
Merge: f5e7e05 75b5809
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jul 25 00:35:20 2010 +0200

    Merge branch 'master' into build

commit f5e7e05d66348ba73b26f960ba5798bcfcf03717
Merge: b9bdc4e 664d0ac
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jul 25 00:32:23 2010 +0200

    Merge branch 'master' into build

commit b9bdc4e47f0d8ef86ad22ee2b68ea0212fa856d6
Merge: 701e3ad 62bfddf
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jul 25 00:30:31 2010 +0200

    Merge branch 'master' into build

commit 701e3ad8651bb7636f5e36cf9aa0c2bc8bdd3f4e
Merge: f57da38 9d4005d
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jul 25 00:27:24 2010 +0200

    Merge branch 'master' into build

commit f57da38390ccfe6eeebe514edaec621d167e1f50
Merge: 6b666db 876170d
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jul 25 00:24:48 2010 +0200

    Merge branch 'master' into build

commit 6b666db4bfc8cd1d4880564c16dd9204c8e650a5
Merge: 258928a 8239c2d
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jul 25 00:23:11 2010 +0200

    Merge branch 'master' into build

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

Summary of changes:
 debian/TODO                          |    4 +++-
 debian/changelog                     |    7 +++++++
 debian/control                       |   20 ++++++++++++++++++++
 debian/copyright                     |    6 ------
 debian/docs                          |    1 -
 debian/geogebra-gnome.dirs           |    1 +
 debian/geogebra-gnome.gconf-defaults |    2 ++
 debian/geogebra-gnome.manpages       |    1 +
 debian/{dirs => geogebra.dirs}       |    0
 debian/{install => geogebra.install} |    0
 debian/geogebra.png                  |  Bin 2344 -> 0 bytes
 debian/ggthumb.sh                    |   17 +++++++++++++++++
 debian/rules                         |    4 ++++
 debian/source/include-binaries       |    1 -
 14 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index e3612fa..2d9e621 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -6,4 +6,6 @@
    + why both signed and unsigned?
  * add a menu entry
  * additional resources in http://groups.google.com/group/geogebra-dev/browse_thread/thread/77c6736ed48688ae
- * add thumbnailer
+   + file icons
+ * add thumbnailer (also for KDE)
+ * fix the manpage
diff --git a/debian/changelog b/debian/changelog
index e5adcb2..5c70fbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+geogebra (3.2.43.0+dfsg1-2) unstable; urgency=low
+
+  * Added package geogebra-gnome, with a GNOME thumbnailer for GeoGebra
+    files.
+
+ -- Giovanni Mascellani <gio at debian.org>  Sun, 25 Jul 2010 00:22:01 +0200
+
 geogebra (3.2.43.0+dfsg1-1) unstable; urgency=low
 
   * New upstream release (mostly bugfixes).
diff --git a/debian/control b/debian/control
index a0b704f..423b16d 100644
--- a/debian/control
+++ b/debian/control
@@ -52,3 +52,23 @@ Description: Dynamic mathematics software for education
  .
  GeoGebra files can be exported in many different formats, or as interactive
  applets for web pages.
+
+Package: geogebra-gnome
+Architecture: all
+Depends:
+ geogebra,
+ imagemagick,
+ ${misc:Depends}
+Description: GNOME integration for GeoGebra
+ GeoGebra is a dynamic geometry system. You can do constructions with points,
+ vectors, segments, lines, conic sections as well as functions and change
+ them dynamically afterwards. On the other hand, equations and coordinates
+ can be entered directly.
+ .
+ Support for many geometric constructions is provided, as well as support
+ for many elementary calculus-based tools (derivatives, osculating circle, ...).
+ .
+ GeoGebra files can be exported in many different formats, or as interactive
+ applets for web pages.
+ .
+ This package contains the GNOME thumbnailer for the GeoGebra file format.
diff --git a/debian/copyright b/debian/copyright
index bc9cf7a..440709b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -183,12 +183,6 @@ Files: debian/*
 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+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/debian/docs b/debian/docs
index 44620c5..5f222ff 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-_LICENSE.txt
 _README.txt
diff --git a/debian/geogebra-gnome.dirs b/debian/geogebra-gnome.dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/geogebra-gnome.dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/geogebra-gnome.gconf-defaults b/debian/geogebra-gnome.gconf-defaults
new file mode 100644
index 0000000..c8c6f32
--- /dev/null
+++ b/debian/geogebra-gnome.gconf-defaults
@@ -0,0 +1,2 @@
+/desktop/gnome/thumbnailers/application at vnd.geogebra.file/command /usr/bin/ggthumb %i %o %s
+/desktop/gnome/thumbnailers/application at vnd.geogebra.file/enable true
diff --git a/debian/geogebra-gnome.manpages b/debian/geogebra-gnome.manpages
new file mode 100644
index 0000000..15dbae8
--- /dev/null
+++ b/debian/geogebra-gnome.manpages
@@ -0,0 +1 @@
+unix/usr/share/man/man1/ggthumb.1.gz
diff --git a/debian/dirs b/debian/geogebra.dirs
similarity index 100%
rename from debian/dirs
rename to debian/geogebra.dirs
diff --git a/debian/install b/debian/geogebra.install
similarity index 100%
rename from debian/install
rename to debian/geogebra.install
diff --git a/debian/geogebra.png b/debian/geogebra.png
deleted file mode 100644
index 51654ca..0000000
Binary files a/debian/geogebra.png and /dev/null differ
diff --git a/debian/ggthumb.sh b/debian/ggthumb.sh
new file mode 100755
index 0000000..ba3f3a9
--- /dev/null
+++ b/debian/ggthumb.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Use: ggthumb input_file output_file size
+
+if [ "$#" -ne "3" ] ; then
+	echo "Usage: ggthumb input_file output_file size"
+	exit 1
+fi
+
+INPUT_FILE="$1"
+OUTPUT_FILE="$2"
+SIZE="$3"
+
+TEMPDIR="`mktemp -d`"
+unzip -qq "$INPUT_FILE" -d "$TEMPDIR"
+convert -resize "$SIZE" "$TEMPDIR/geogebra_thumbnail.png" "$OUTPUT_FILE"
+rm -fr "$TEMPDIR"
+
diff --git a/debian/rules b/debian/rules
index 3b93409..a5c656f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,10 @@ install/geogebra::
 	# This link is created so dh_installmime gets the correct file
 	ln -s ../unix/usr/share/mime/packages/geogebra.xml debian/geogebra.sharedmimeinfo
 
+install/geogebra-gnome::
+	install -m 755 $(CURDIR)/debian/ggthumb.sh $(CURDIR)/debian/geogebra-gnome/usr/bin/ggthumb
+	dh_gconf -pgeogebra-gnome
+
 get-orig-source:
 	./debian/get_orig_source.sh
 
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index c89dcaa..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1 +0,0 @@
-debian/geogebra.png


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

More information about the pkg-java-commits mailing list