[eso-midas] 05/06: move dh_install and dh_link to extra files and further cleanup debian/rules

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository eso-midas.

commit 7c1253212efb47df354ee97b8bfac831fc0928f2
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Apr 23 11:02:02 2014 +0200

    move dh_install and dh_link to extra files and further cleanup debian/rules
---
 debian/changelog |  2 +-
 debian/control   |  1 +
 debian/install   |  2 ++
 debian/links     |  6 ++++++
 debian/rules     | 41 +++++++++++++++++------------------------
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1232ca9..335878c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ eso-midas (13.09pl1.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #740702)
 
- -- Ole Streicher <debian at liska.ath.cx>  Tue, 04 Mar 2014 08:34:20 +0200
+ -- Ole Streicher <debian at liska.ath.cx>  Tue, 22 Apr 2014 14:44:58 +0200
diff --git a/debian/control b/debian/control
index eae0a59..72fdab2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: debhelper (>= 9),
+	       dh-exec (>=0.3),
                gfortran,
                libmotif-dev,
                libncurses5-dev,
diff --git a/debian/install b/debian/install
new file mode 100755
index 0000000..436a407
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+${MIDVERS} usr/lib/eso-midas/ 
diff --git a/debian/links b/debian/links
new file mode 100755
index 0000000..2ae3b59
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,6 @@
+#! /usr/bin/dh-exec
+${MID_HOME0}/system/unix/inmidas usr/bin/inmidas
+${MID_HOME0}/system/unix/gomidas usr/bin/gomidas
+${MID_HOME0}/system/unix/helpmidas usr/bin/helpmidas
+${MID_HOME0}/libsrc/ftoc-new ${MID_HOME0}/libsrc/ftoc
+${MID_HOME0}/system/ftoc-new ${MID_HOME0}/system/good-ftoc
diff --git a/debian/rules b/debian/rules
index 67d0882..49b25bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,11 @@ export MIDVERS
 MIDASHOME=$(shell pwd)
 export MIDASHOME
 MID_HOME=$(MIDASHOME)/$(MIDVERS)
+MID_HOME0=/usr/lib/eso-midas/$(MIDVERS)
+export MID_HOME0
 
 MID_INSTALL=$(MIDASHOME)/$(MIDVERS)/install/unix
 MID_SYS=$(MIDASHOME)/$(MIDVERS)/system/unix/
-INMIDAS=$(MID_SYS)/inmidas
-CLEANMIDAS=$(MID_SYS)/cleanmidas
 
 %:
 	dh  $@
@@ -29,35 +29,28 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	(cd $(MID_HOME); $(MID_INSTALL)/install1 -a CFLAGS=\"$(CFLAGS)\" )
 	(cd $(MID_HOME)/monit ; make syskeys.unix )
-	$(INMIDAS) -j "@ compile.all"
-	$(INMIDAS) -j "@ ascii_bin no ; bye"
-	(cd $(MID_HOME) ; yes | $(CLEANMIDAS) -a)
+	$(MID_SYS)/inmidas -j "@ compile.all"
+	$(MID_SYS)/inmidas -j "@ ascii_bin no ; bye"
+	(cd $(MID_HOME) ; yes | $(MID_SYS)/cleanmidas -a)
 	sed -e "s:^MIDVERS0=.*:MIDVERS0=$(MIDVERS):" \
 	    -e "s:^MIDASHOME0=.*:MIDASHOME0=/usr/lib/eso-midas:" \
-	    -i $(MIDVERS)/system/unix/inmidas \
-	       $(MIDVERS)/system/unix/helpmidas \
-	       $(MIDVERS)/system/unix/drs
+	    -i $(MID_HOME)/system/unix/inmidas \
+	       $(MID_HOME)/system/unix/helpmidas \
+	       $(MID_HOME)/system/unix/drs
 
 override_dh_install:
-	dh_install $(MIDVERS) usr/lib/eso-midas/ -X.mod -XCOPYING -Xsetup~
-
-override_dh_link:
-	dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/inmidas usr/bin/inmidas
-	dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/gomidas usr/bin/gomidas
-	dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/helpmidas usr/bin/helpmidas
-	dh_link /usr/lib/eso-midas/$(MIDVERS)/libsrc/ftoc-new /usr/lib/eso-midas/$(MIDVERS)/libsrc/ftoc
-	dh_link /usr/lib/eso-midas/$(MIDVERS)/system/ftoc-new /usr/lib/eso-midas/$(MIDVERS)/system/good-ftoc
+	dh_install -X.mod -XCOPYING -Xsetup~
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod 0644 debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.fit \
-	           debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.fmt \
-	           debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.datorg \
-	           debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.prg \
-	           debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.README \
-	           debian/eso-midas/usr/lib/eso-midas/13SEP/system/unix/makefile
-	find debian/eso-midas/usr/lib/eso-midas/13SEP/ -name \*.sh | xargs chmod 0755 
-	chmod 0755 debian/eso-midas/usr/lib/eso-midas/13SEP/util/bench/brun
+	chmod 0644 debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.fit \
+	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.fmt \
+	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.datorg \
+	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.prg \
+	           debian/eso-midas/$(MID_HOME0)/contrib/baches/*/*.README \
+	           debian/eso-midas/$(MID_HOME0)/system/unix/makefile
+	find debian/eso-midas/$(MID_HOME0)/ -name \*.sh | xargs chmod 0755 
+	chmod 0755 debian/eso-midas/$(MID_HOME0)/util/bench/brun
 
 override_dh_makeshlibs:
 	# Avoid Lintian complaint: we don't have public shared libs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git