[metview] 19/97: Iterate on install

[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 d2f3c5fd5afd3ffb56866bccabd4212b0195988e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Feb 23 16:34:39 2014 +0000

    Iterate on install
---
 debian/metview.install | 1 +
 debian/rules           | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/metview.install b/debian/metview.install
index 80697e7..09bcdde 100644
--- a/debian/metview.install
+++ b/debian/metview.install
@@ -1,3 +1,4 @@
 usr/bin/metview
 usr/bin/MetView/*	usr/bin
 usr/share/*
+metview.desktop		usr/share/applications
diff --git a/debian/rules b/debian/rules
index 20efdaa..f416da0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,12 @@ TOPDIR=:=`pwd`
 	dh $@ --with autoreconf
 
 override_dh_auto_clean:
+	-$(MAKE) -k clean
 	dh_clean
 	rm -f share/metview/icons/make.dep config/CONFIG.site share/metview/app-defaults/MvVersionDetails  \
 		share/metview/etc/ConfigDef include/macro_api.h etc/ConfigDef
 	find . -type l -delete
+	find . -name '*.db' -delete
 
 # 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.
@@ -38,4 +40,4 @@ override_dh_auto_test:
 override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/libmetview-dev/$(LIBDIR)
-	cp debian/tmp/usr/lib/*.a debian/libmetview-dev/$(LIBDIR)
+	cp debian/tmp/usr/lib*/*.a debian/libmetview-dev/$(LIBDIR)

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