[Git][java-team/geogebra][master] 10 commits: Remove EMFPlus.
Giovanni Mascellani
gitlab at salsa.debian.org
Wed Jul 22 19:59:50 BST 2020
Giovanni Mascellani pushed to branch master at Debian Java Maintainers / geogebra
Commits:
edd33f71 by Giovanni Mascellani at 2020-07-22T20:20:57+02:00
Remove EMFPlus.
- - - - -
be05cdcf by Giovanni Mascellani at 2020-07-22T20:22:18+02:00
Build against FreeHEP >= 2.4.
- - - - -
a6131fc1 by Giovanni Mascellani at 2020-07-22T20:22:58+02:00
Fix classpath.
- - - - -
16984474 by Giovanni Mascellani at 2020-07-22T20:37:39+02:00
Rules-Requires-Root: no
- - - - -
ddc288e7 by Giovanni Mascellani at 2020-07-22T20:39:35+02:00
Bump compat to 13.
- - - - -
30374b00 by Giovanni Mascellani at 2020-07-22T20:43:14+02:00
Bump Std-Ver to 4.5.0.
- - - - -
e4cd6ca3 by Giovanni Mascellani at 2020-07-22T20:44:59+02:00
Minor.
- - - - -
1f3f8cf6 by Giovanni Mascellani at 2020-07-22T20:48:43+02:00
Do not call dpkg-parsechangelog in debian/rules.
- - - - -
8b1da1a6 by Giovanni Mascellani at 2020-07-22T20:55:36+02:00
Typo.
- - - - -
4115a606 by Giovanni Mascellani at 2020-07-22T20:55:48+02:00
Release to unstable.
- - - - -
7 changed files:
- debian/README.Debian
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/0008-Remove-EMFPlus.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/README.Debian
=====================================
@@ -4,7 +4,7 @@ Exportation of interactive worksheet
GeoGebra supports two different ways to export an interactive
worksheet to a HTML page: the default one just exports the HTML page,
-linking the JAR files distribuited on the GeoGebra site; the second
+linking the JAR files distributed on the GeoGebra site; the second
one also exports a copy of the JAR used to run GeoGebra and links the
local copy in the HTML page.
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+geogebra (4.0.34.0+dfsg1-8) unstable; urgency=medium
+
+ * Remove EMFPlus support, which is not compatible anymore with recent
+ FreeHEP versions.
+ * Build against FreeHEP 2.4.
+ + Update classpath for the geogebra executable accordingly.
+ * Do not require root for building package.
+ * Bump debhelper compatibility to 13.
+ * Bump Standards-Version to 4.5.0.
+ * Avoid calling dpkg-parsechangelog in debian/rules.
+
+ -- Giovanni Mascellani <gio at debian.org> Wed, 22 Jul 2020 20:55:46 +0200
+
geogebra (4.0.34.0+dfsg1-7) unstable; urgency=medium
* Remove dependency on icedtea, which is going to be removed.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Giovanni Mascellani <gio at debian.org>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
javahelper (>= 0.38),
javacc,
default-jdk,
@@ -15,26 +15,31 @@ Build-Depends:
libcommons-math-java,
libfreehep-xml-java,
libfreehep-util-java,
- libfreehep-graphics2d-java,
libfreehep-io-java,
- libfreehep-graphicsio-java,
- libfreehep-graphicsio-svg-java,
- libfreehep-graphicsio-pdf-java,
- libfreehep-graphicsio-emf-java (>= 2.1.1-emfplus+dfsg1-2),
+ libfreehep-graphics2d-java (>= 2.4),
+ libfreehep-graphicsio-java (>= 2.4),
+ libfreehep-graphicsio-svg-java (>= 2.4),
+ libfreehep-graphicsio-pdf-java (>= 2.4),
+ libfreehep-graphicsio-ps-java (>= 2.4),
+ libfreehep-graphicsio-emf-java (>= 2.4),
libjfugue-java,
libjlatexmath-java,
librhino-java (>= 1.7R3-5)
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
Homepage: http://www.geogebra.org
Vcs-Browser: https://salsa.debian.org/java-team/geogebra
Vcs-Git: https://salsa.debian.org/java-team/geogebra.git
+Rules-Requires-Root: no
Package: geogebra
Architecture: all
Depends:
${java:Depends}, ${misc:Depends},
mathpiper (>= 0.81f+svn4469+dfsg3),
- libfreehep-graphicsio-emf-java (>= 2.1.1-emfplus+dfsg1-2),
+ libfreehep-graphicsio-svg-java (>= 2.4),
+ libfreehep-graphicsio-pdf-java (>= 2.4),
+ libfreehep-graphicsio-ps-java (>= 2.4),
+ libfreehep-graphicsio-emf-java (>= 2.4),
librhino-java (>= 1.7R3-5)
Suggests: cups
Description: Dynamic mathematics software for education
=====================================
debian/patches/0008-Remove-EMFPlus.patch
=====================================
@@ -0,0 +1,135 @@
+From: Giovanni Mascellani <gio at debian.org>
+Date: Thu, 2 Jul 2020 17:09:59 +0200
+Subject: Remove EMFPlus support
+
+Recent FreeHEP versions (>= 2.4) do not support EMFPlus any more, so
+we remove its support as well. This is unlikely to bother a
+significant amount of users.
+
+---
+ geogebra/export/GraphicExportDialog.java | 28 +++-------------------------
+ 1 file changed, 3 insertions(+), 25 deletions(-)
+
+diff --git a/geogebra/export/GraphicExportDialog.java b/geogebra/export/GraphicExportDialog.java
+index 90d9ece..1e3a5b3 100644
+--- a/geogebra/export/GraphicExportDialog.java
++++ b/geogebra/export/GraphicExportDialog.java
+@@ -54,7 +54,6 @@ import javax.swing.SwingUtilities;
+
+ import org.freehep.graphics2d.VectorGraphics;
+ import org.freehep.graphicsio.emf.EMFGraphics2D;
+-import org.freehep.graphicsio.emf.EMFPlusGraphics2D;
+ import org.freehep.graphicsio.pdf.PDFGraphics2D;
+ import org.freehep.graphicsio.svg.SVGGraphics2D;
+ import org.freehep.util.UserProperties;
+@@ -77,7 +76,6 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+
+ private boolean textAsShapes = true;
+ private boolean transparent = true;
+- private boolean EMFPlus = true;
+
+ private final int FORMAT_PNG = 0;
+ private final int FORMAT_PDF = 1;
+@@ -184,8 +182,6 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ app.getPlain("ResolutionInDPI") + ":");
+ final JCheckBox cbTransparent = new JCheckBox(
+ app.getMenu("Transparent"), transparent);
+- final JCheckBox cbEMFPlus = new JCheckBox(app.getMenu("EMFPlus"),
+- EMFPlus);
+
+ final JCheckBox textAsShapesCB = new JCheckBox(
+ app.getPlain("ExportTextAsShapes"), textAsShapes);
+@@ -195,8 +191,6 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ dpiPanel.add(resolutionInDPILabel);
+ dpiPanel.add(cbDPI);
+ dpiPanel.add(cbTransparent);
+- } else if (cbFormat.getSelectedIndex() == FORMAT_EMF) {
+- dpiPanel.add(cbEMFPlus);
+ } else {
+ dpiPanel.add(textAsShapesCB);
+ }
+@@ -218,12 +212,6 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ }
+ });
+
+- cbEMFPlus.addActionListener(new ActionListener() {
+- public void actionPerformed(final ActionEvent arg0) {
+- EMFPlus = cbEMFPlus.isSelected();
+- }
+- });
+-
+ textAsShapesCB.addActionListener(new ActionListener() {
+ public void actionPerformed(final ActionEvent arg0) {
+ textAsShapes = textAsShapesCB.isSelected();
+@@ -238,21 +226,18 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ case FORMAT_PDF:
+ dpiPanel.remove(resolutionInDPILabel);
+ dpiPanel.remove(cbDPI);
+- dpiPanel.remove(cbEMFPlus);
+ dpiPanel.remove(cbTransparent);
+ dpiPanel.add(textAsShapesCB);
+ break;
+ case FORMAT_EPS:
+ dpiPanel.remove(resolutionInDPILabel);
+ dpiPanel.remove(cbDPI);
+- dpiPanel.remove(cbEMFPlus);
+ dpiPanel.remove(cbTransparent);
+ dpiPanel.add(textAsShapesCB);
+ textAsShapesCB.setEnabled(false);
+ textAsShapesCB.setSelected(true);
+ break;
+ case FORMAT_EMF:
+- dpiPanel.add(cbEMFPlus);
+ dpiPanel.remove(resolutionInDPILabel);
+ dpiPanel.remove(cbDPI);
+ dpiPanel.remove(cbTransparent);
+@@ -261,7 +246,6 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ default: // PNG
+ dpiPanel.add(resolutionInDPILabel);
+ dpiPanel.add(cbDPI);
+- dpiPanel.remove(cbEMFPlus);
+ dpiPanel.add(cbTransparent);
+ dpiPanel.remove(textAsShapesCB);
+ cbDPI.setSelectedItem("300");
+@@ -307,7 +291,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ break;
+
+ case FORMAT_EMF: // EMF
+- exportEMF(false, EMFPlus);
++ exportEMF(false);
+ break;
+
+ case FORMAT_PDF: // PDF
+@@ -344,7 +328,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ break;
+
+ case FORMAT_EMF: // EMF
+- exportEMF(true, EMFPlus);
++ exportEMF(true);
+ break;
+
+ case FORMAT_PDF: // PDF
+@@ -554,8 +538,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ /**
+ * Exports drawing as emf
+ */
+- final private boolean exportEMF(final boolean exportToClipboard,
+- final boolean useEMFplus) {
++ final private boolean exportEMF(final boolean exportToClipboard) {
+
+ // Michael Borcherds 2008-03-02 BEGIN
+ File file;
+@@ -574,13 +557,8 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
+ }
+ try {
+ VectorGraphics g;
+- if (useEMFplus) {
+- g = new EMFPlusGraphics2D(file, new Dimension(pixelWidth,
+- pixelHeight));
+- } else {
+ g = new EMFGraphics2D(file, new Dimension(pixelWidth,
+ pixelHeight));
+- }
+
+ // make sure LaTeX exported at hi res
+ app.exporting = true;
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ version.diff
use_apache_commons_collections.diff
fix_addURL.patch
java11.diff
+0008-Remove-EMFPlus.patch
=====================================
debian/rules
=====================================
@@ -3,8 +3,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpkg/pkg-info.mk
+
export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/mathpiper.jar:/usr/share/java/commons-math.jar:/usr/share/java/freehep-xml.jar:/usr/share/java/freehep-util.jar:/usr/share/java/freehep-graphics2d.jar:/usr/share/java/freehep-io.jar:/usr/share/java/freehep-graphicsio.jar:/usr/share/java/freehep-graphicsio-svg.jar:/usr/share/java/freehep-graphicsio-pdf.jar:/usr/share/java/freehep-graphicsio-emf.jar:/usr/share/java/jlatexmath.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/jfugue.jar:/usr/share/java/js.jar
+export CLASSPATH=/usr/share/java/mathpiper.jar:/usr/share/java/commons-math.jar:/usr/share/java/freehep-xml.jar:/usr/share/java/freehep-util.jar:/usr/share/java/freehep-graphics2d.jar:/usr/share/java/freehep-io.jar:/usr/share/java/freehep-graphicsbase.jar:/usr/share/java/freehep-graphicsio.jar:/usr/share/java/freehep-graphicsio-svg.jar:/usr/share/java/freehep-graphicsio-pdf.jar:/usr/share/java/freehep-graphicsio-emf.jar:/usr/share/java/jlatexmath.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/jfugue.jar:/usr/share/java/js.jar
%:
dh $@ --with javahelper
@@ -16,7 +18,7 @@ XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
$(XP) $(DB2MAN) $<
override_dh_auto_configure:
- ./debian/create_debian_class.sh $$(dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) > $(CURDIR)/geogebra/GeoGebraDebian.java
+ ./debian/create_debian_class.sh $(DEB_VERSION) > $(CURDIR)/geogebra/GeoGebraDebian.java
# Create a directory of hard links to separate sources from
# other files
@@ -43,4 +45,3 @@ override_dh_auto_clean:
get-orig-source:
./debian/get_orig_source.sh
-
View it on GitLab: https://salsa.debian.org/java-team/geogebra/-/compare/a14df6a53e658537403f43823e223847cb1486eb...4115a6061c3f4406911aef21d6520b3d2512c51b
--
View it on GitLab: https://salsa.debian.org/java-team/geogebra/-/compare/a14df6a53e658537403f43823e223847cb1486eb...4115a6061c3f4406911aef21d6520b3d2512c51b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200722/d2788607/attachment.html>
More information about the pkg-java-commits
mailing list