[Git][debian-gis-team/gpsprune][buster-backports] 2 commits: Reinstate jh_build bug workaround, issue is still present in buster. (closes: #979638)

[Bas Couwenberg]

Bas Couwenberg pushed to branch buster-backports at Debian GIS Project / gpsprune


Commits:
65f35cb1 by Bas Couwenberg at 2021-01-09T18:47:35+01:00
Reinstate jh_build bug workaround, issue is still present in buster. (closes: #979638)

- - - - -
44f3f2ff by Bas Couwenberg at 2021-01-09T18:48:01+01:00
Set distribution to buster-backports.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+gpsprune (20.1-1~bpo10+2) buster-backports; urgency=medium
+
+  * Reinstate jh_build bug workaround, issue is still present in buster.
+    (closes: #979638)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 09 Jan 2021 18:47:50 +0100
+
 gpsprune (20.1-1~bpo10+1) buster-backports; urgency=medium
 
   * Rebuild for buster-backports.


=====================================
debian/rules
=====================================
@@ -9,6 +9,9 @@ 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
@@ -24,9 +27,6 @@ override_jh_depends:
 override_dh_auto_build:
 	dh_auto_build -- build
 
-%:
-	dh $@ --with javahelper
-
 override_dh_auto_install:
 	dh_auto_install
 
@@ -35,3 +35,8 @@ 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/-/compare/6b0c02091a1cab0657158270a5a92bf14329cef0...44f3f2ff120369081065ae9727095f0194bf16df

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/gpsprune/-/compare/6b0c02091a1cab0657158270a5a92bf14329cef0...44f3f2ff120369081065ae9727095f0194bf16df
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-grass-devel/attachments/20210109/a78f1937/attachment-0001.html>