[metview] 84/97: Reorganise and tidy up rules file

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository metview.

commit af15d83e3ed1e9f6a4e94322cc60c75bdaf1cbac
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 23 14:17:46 2015 +0100

    Reorganise and tidy up rules file
---
 debian/CONFIG.site.in                          |  2 +-
 debian/libmetview-dev.install                  |  1 -
 debian/libmetview-dev.install.in               |  2 ++
 debian/{metview.install => metview.install.in} |  2 +-
 debian/rules                                   | 22 ++++++++--------------
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/debian/CONFIG.site.in b/debian/CONFIG.site.in
index 90d8d5a..775ffbb 100644
--- a/debian/CONFIG.site.in
+++ b/debian/CONFIG.site.in
@@ -11,7 +11,7 @@ PATH=::${PATH}
 INSTALLDIR=/usr
 METVIEW_SCRIPT=metview
 MV_MARS_ACCESS=MARS_webapi
-METVIEW_BIN=/usr/lib/@ARCH@/metview_bin
+METVIEW_BIN=/usr/lib/@ARCH@/metview
 MARS_HOME=
 # Remove METVIEW_DIR_DEV on installation; inherit from environment during build
 # METVIEW_DIR_DEV=UNDEFINED
diff --git a/debian/libmetview-dev.install b/debian/libmetview-dev.install
deleted file mode 100644
index 41a1414..0000000
--- a/debian/libmetview-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/*
diff --git a/debian/libmetview-dev.install.in b/debian/libmetview-dev.install.in
new file mode 100644
index 0000000..5af3108
--- /dev/null
+++ b/debian/libmetview-dev.install.in
@@ -0,0 +1,2 @@
+usr/include/*
+usr/lib/*	/usr/lib/@ARCH@/
diff --git a/debian/metview.install b/debian/metview.install.in
similarity index 54%
rename from debian/metview.install
rename to debian/metview.install.in
index 749333c..fda4ef1 100644
--- a/debian/metview.install
+++ b/debian/metview.install.in
@@ -1,3 +1,3 @@
 usr/bin/metview
-usr/bin/metview_bin/*	/usr/lib/metview
+usr/bin/metview_bin/*	/usr/lib/@ARCH@/metview
 usr/share/applications/metview.desktop
diff --git a/debian/rules b/debian/rules
index 4449679..fb8d9a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ DESTDIR:=$(CURDIR)/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 PATH:=$(PATH):$(CURDIR)/scripts
+AUTOGENERATED:= libmetview-dev.install  metview.install
 MV_DIR:=/usr/lib/$(DEB_HOST_MULTIARCH)/metview
 export METVIEW_DIR_DEV:=$(CURDIR)/debian/build
 
@@ -21,10 +22,8 @@ export METVIEW_DIR_DEV:=$(CURDIR)/debian/build
 
 override_dh_auto_clean:
 	dh_clean
-	rm -f share/metview/icons/make.dep \
-		share/metview/app-defaults/MvVersionDetails  
-	find . -type l -delete
-	find . -name '*.db' -delete
+	rm -rf $(METVIEW_DIR_DEV)
+	rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
 
 # magics++ upstream ships with a copy of terralib, which is not used in Debian. 
 # Instead we use # a shared terralib library, and so need to include terralib.
@@ -40,20 +39,15 @@ override_dh_auto_configure:
 		-DMAGICS_PATH=/usr \
 		-DBUILD_SHARED_LIBS=On \
 		-DENABLE_RPATHS=Off
+	for f in ${AUTOGENERATED} ; do \
+                sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
+                done
+	sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g'  < debian/CONFIG.site.in \
+		> $(METVIEW_DIR_DEV)/scripts/CONFIG.site 
 
 override_dh_auto_test:
 	@echo "Checks disabled for the moment due to syntax errors in tests" 
 
-override_dh_auto_install:
-	# override CONFIG.site to make reproducible, set METVIEW_BIN_DIR
-	sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g'  < debian/CONFIG.site.in \
-		> $(METVIEW_DIR_DEV)/scripts/CONFIG.site 
-	dh_auto_install
-	mkdir -p debian/metview/$(MV_DIR)
-	mv debian/metview/usr/lib/metview debian/metview/$(MV_DIR)
-	mkdir -p debian/libmetview-dev/$(LIBDIR)
-	cp debian/tmp/usr/lib*/*.a debian/libmetview-dev/$(LIBDIR)
-
 override_dh_fixperms:
 	dh_fixperms
 	rm -rf debian/metview-data/usr/share/applications

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git