Bas Couwenberg pushed to branch master at Debian GIS Project / gpsprune
Commits: 886888d5 by Bas Couwenberg at 2020-03-31T06:04:10+02:00 Revert jh_build bug workaround, issue is fixed in javatools 0.72.11. Revert "Add extra files to JAR because jh_build is broken, see: #945917." This reverts commit 53b180c0e7e95cfc0b001cc89bd52b67c021c575. - - - - - 2 changed files: - debian/changelog - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +gpsprune (20-3) UNRELEASED; urgency=medium + + * Revert jh_build bug workaround, issue is fixed in javatools 0.72.11. + + -- Bas Couwenberg <[email protected]> Tue, 31 Mar 2020 06:02:40 +0200 + gpsprune (20-2) unstable; urgency=medium * Add extra files to JAR because jh_build is broken, see: #945917. ===================================== debian/rules ===================================== @@ -9,9 +9,6 @@ export CLASSPATH=/usr/share/java/j3dcore.jar:/usr/share/java/j3dutils.jar:/usr/s export JH_JAR_EXTRA=$(shell find tim/prune/lang/ tim/prune/gui/images -type f) tim/prune/function/srtm/srtmtiles.dat -%: - dh $@ --with javahelper - srtmtiles: javac tim/prune/function/srtm/gen/GenerateTileLookup.java CLASSPATH=. java tim.prune.function.srtm.gen.GenerateTileLookup @@ -27,6 +24,9 @@ override_jh_depends: override_dh_auto_build: dh_auto_build -- build +%: + dh $@ --with javahelper + override_dh_auto_install: dh_auto_install @@ -35,8 +35,3 @@ override_dh_auto_install: install -o root -g root -d $(CURDIR)/debian/gpsprune/usr/share/icons/hicolor/$${size}x$${size}/apps ; \ install -o root -g root -m 644 $(CURDIR)/tim/prune/gui/images/window_icon_$${size}.png $(CURDIR)/debian/gpsprune/usr/share/icons/hicolor/$${size}x$${size}/apps/gpsprune.png ; \ done - -override_dh_install: - dh_install - - jar -uvf $(CURDIR)/debian/gpsprune/usr/share/gpsprune/gpsprune.jar $(JH_JAR_EXTRA) View it on GitLab: https://salsa.debian.org/debian-gis-team/gpsprune/-/commit/886888d5aa4ebb2f53cdc73966160e2b903fb828 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/gpsprune/-/commit/886888d5aa4ebb2f53cdc73966160e2b903fb828 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
