[med-svn] [figtree] 01/01: fix broken executable

[Fabian Klötzl]

This is an automated email from the git hooks/post-receive script.

kloetzl-guest pushed a commit to branch master
in repository figtree.

commit 254918c4172353a546ec25bb8e5ea25c7d7986d9
Author: Fabian Klötzl <fabian at kloetzl.info>
Date:   Fri Jan 19 14:00:17 2018 +0100

    fix broken executable
---
 debian/changelog                                                  | 1 +
 debian/figtree.install                                            | 1 +
 debian/figtree.links                                              | 1 -
 debian/patches/fix_handling_of_paths_with_spaces_in_wrapper.patch | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34177cf..014bf40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ figtree (1.4.3+dfsg-5) UNRELEASED; urgency=medium
 
   * Remove mention of GIF from -help and manpage
   * Rewrite manpage while I am at it
+  * Fix borked executable
 
  -- Fabian Klötzl <kloetzl at evolbio.mpg.de>  Fri, 22 Dec 2017 12:17:37 +0100
 
diff --git a/debian/figtree.install b/debian/figtree.install
index cf05ee5..abeb0c3 100644
--- a/debian/figtree.install
+++ b/debian/figtree.install
@@ -1,2 +1,3 @@
 dist/figtree.jar	usr/share/java
 debian/*.xpm		usr/share/pixmaps
+release/Linux/scripts/figtree  usr/bin
diff --git a/debian/figtree.links b/debian/figtree.links
deleted file mode 100644
index 944840d..0000000
--- a/debian/figtree.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/figtree.jar usr/bin/figtree
diff --git a/debian/patches/fix_handling_of_paths_with_spaces_in_wrapper.patch b/debian/patches/fix_handling_of_paths_with_spaces_in_wrapper.patch
index e3b6f07..166500b 100644
--- a/debian/patches/fix_handling_of_paths_with_spaces_in_wrapper.patch
+++ b/debian/patches/fix_handling_of_paths_with_spaces_in_wrapper.patch
@@ -14,5 +14,5 @@ index f1ec842..6dd9b68 100755
  #!/bin/sh
  
 -java -Xms64m -Xmx512m -jar lib/figtree.jar $*
-+java -Xms64m -Xmx512m -jar lib/figtree.jar "$@"
++java -Xms64m -Xmx512m -jar /usr/share/java/figtree.jar "$@"
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/figtree.git