From e5e62b053f3a030e73962fd3bcb5f9bf3b33daf2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Perrin?= Date: Sat, 30 Nov 2019 22:39:32 +0000 Subject: [PATCH] [debian] Fix build paths for dev version of GpsPrune --- debian/docs | 2 +- debian/gbp.conf | 3 +++ debian/javabuild | 2 +- debian/rules | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 debian/gbp.conf diff --git a/debian/docs b/debian/docs index 55c8337..3a25edc 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -tim/prune/readme.txt +src/tim/prune/readme.txt diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..d573cbd --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +upstream-tag = v%(version)s +debian-branch = debian/sid diff --git a/debian/javabuild b/debian/javabuild index 7735b60..bf14fc9 100644 --- a/debian/javabuild +++ b/debian/javabuild @@ -1 +1 @@ -gpsprune.jar tim +gpsprune.jar src/tim diff --git a/debian/rules b/debian/rules index 099680e..a0757e7 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ export DH_VERBOSE=1 export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/java/j3dcore.jar:/usr/share/java/j3dutils.jar:/usr/share/java/vecmath.jar -export JH_JAR_EXTRA=$(shell find tim/prune/lang/ tim/prune/gui/images -type f) tim/prune/function/srtm/srtmtiles.dat +export JH_JAR_EXTRA=$(shell find src/tim/prune/lang/ src/tim/prune/gui/images -type f) src/tim/prune/function/srtm/srtmtiles.dat #srtmtiles: # javac tim/prune/function/srtm/gen/GenerateTileLookup.java @@ -33,7 +33,7 @@ override_dh_auto_install: dh_auto_install # Install application icon - for size in 16 22 24 32 36 48 64 72 96 128; do \ + for size in 16 20 22 24 32 36 48 64 72 96 128; do \ 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 ; \ + install -o root -g root -m 644 $(CURDIR)/src/tim/prune/gui/images/window_icon_$${size}.png $(CURDIR)/debian/gpsprune/usr/share/icons/hicolor/$${size}x$${size}/apps/gpsprune.png ; \ done -- 2.43.0