[debian] Fix build paths for dev version of GpsPrune

diff --git a/debian/docs b/debian/docs
index 55c83370ece41bda1df14c7f5d47bd209d55b4b5..3a25edc3fda1882f17782b1a79bfaa3028278bee 100644 (file)
--- 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 (file)
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 7735b6065b369bc075d8f85e0ad034a29c2a2afb..bf14fc95daf6924b08ac6ccdf80ba5ed981b0b3c 100644 (file)
--- a/debian/javabuild
+++ b/debian/javabuild
@@ -1 +1 @@
-gpsprune.jar   tim
+gpsprune.jar   src/tim

diff --git a/debian/rules b/debian/rules
index 099680ea2a07225003975012d2750841362fe2f1..a0757e764ca2e454205af3fb4df13b92114e74f5 100755 (executable)
--- 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