Giovanni Mascellani pushed to branch master at Debian Java Maintainers / geogebra
Commits: 268313ef by Giovanni Mascellani at 2019-03-21T12:57:12Z Remove dependency on icedtea and old leftovers of topgit. - - - - - ef8abc58 by Giovanni Mascellani at 2019-03-21T18:13:37Z Fix jh_build options. - - - - - a14df6a5 by Giovanni Mascellani at 2019-03-21T18:17:32Z Release to unstable. - - - - - 3 changed files: - debian/changelog - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +geogebra (4.0.34.0+dfsg1-7) unstable; urgency=medium + + * Remove dependency on icedtea, which is going to be removed. + * Fix jh_build options that used to randomly fail the compilation. + + -- Giovanni Mascellani <[email protected]> Thu, 21 Mar 2019 19:16:43 +0100 + geogebra (4.0.34.0+dfsg1-6) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -8,7 +8,6 @@ Build-Depends: javahelper (>= 0.38), javacc, default-jdk, - icedtea-netx-common, xsltproc, docbook-xsl, mathpiper (>= 0.81f+svn4469+dfsg3), ===================================== debian/rules ===================================== @@ -3,17 +3,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# TopGit patches -TG_BRANCHES := patch/ScientificFormat.java -TG_BRANCHES += patch/applet_export -TG_BRANCHES += patch/no_mac -TG_BRANCHES += patch/version -TG_BRANCHES += patch/use_apache_commons_collections - --include /usr/share/topgit/tg2quilt.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/icedtea-web/plugin.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-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 @@ -36,7 +27,7 @@ override_dh_auto_build: javacc -STATIC=false -OUTPUT_DIRECTORY=src/geogebra/kernel/parser/ src/geogebra/kernel/parser/Parser.jj override_jh_build: geogebra.1 ggthumb.1 - jh_build -N -mgeogebra.GeoGebra + jh_build -mgeogebra.GeoGebra # Add resource files to JAR archive ( cd src/ ; find ! -name *.java -type f -print0 ) | xargs -0 jar uf geogebra.jar -C src/ View it on GitLab: https://salsa.debian.org/java-team/geogebra/compare/b5efd021ad4b8b292fade15aca037e9a071c03e7...a14df6a53e658537403f43823e223847cb1486eb -- View it on GitLab: https://salsa.debian.org/java-team/geogebra/compare/b5efd021ad4b8b292fade15aca037e9a071c03e7...a14df6a53e658537403f43823e223847cb1486eb You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
