[med-svn] [imagej] 05/09: Install the imagej script using d/install only

[Carnë Draug]

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

carandraug-guest pushed a commit to branch master
in repository imagej.

commit 62823c624850ba4fdb3877ec5f144b2e69398039
Author: Carnë Draug <carandraug+dev at gmail.com>
Date:   Sat Aug 12 03:21:51 2017 +0100

    Install the imagej script using d/install only
---
 debian/changelog                   | 2 ++
 debian/dirs                        | 1 -
 debian/{imagej.sh => extra/imagej} | 0
 debian/install                     | 3 ++-
 debian/rules                       | 4 ----
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3971c5..a16ee36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ imagej (1.51p+dfsg-1) UNRELEASED; urgency=medium
     the changelog file instead of just another file in docs.
   * Do not install IJ_Props.txt as docs.  This file is included in ij.jar
     and configures the ImageJ menu.
+  * Simplify installation of the imagej wrapper script by making use of
+    d/install only.
 
  -- Andreas Tille <tille at debian.org>  Sat, 12 Aug 2017 00:29:11 +0200
 
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/imagej.sh b/debian/extra/imagej
old mode 100644
new mode 100755
similarity index 100%
rename from debian/imagej.sh
rename to debian/extra/imagej
diff --git a/debian/install b/debian/install
index 209b399..d192ed0 100644
--- a/debian/install
+++ b/debian/install
@@ -3,4 +3,5 @@ debian/extra/microscope.xpm usr/share/pixmaps
 ij.jar                      usr/share/java
 plugins/*.class             usr/share/imagej/plugins
 build/macros/*              usr/share/imagej/macros
-debian/imagej.desktop	    usr/share/applications
+debian/imagej.desktop       usr/share/applications
+debian/extra/imagej         usr/bin
diff --git a/debian/rules b/debian/rules
index 67e77cd..790cc27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@
 %:
 	dh $@ --buildsystem=ant --with maven-repo-helper --with javahelper
 
-# install/imagej::
-override_dh_auto_install:
-	cp -a $(CURDIR)/debian/imagej.sh $(CURDIR)/debian/imagej/usr/bin/imagej
-
 override_dh_auto_build:
 	ant build
 

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