[metview] 34/97: Fix multiple lintian warnings

[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 c7543bb1a2ba9ebe5b6862cc6efa61c0b3d2b7bf
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 20 01:00:29 2014 +0100

    Fix multiple lintian warnings
---
 debian/metview.install |  2 +-
 debian/rules           | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/metview.install b/debian/metview.install
index 75ecebc..666c2c5 100644
--- a/debian/metview.install
+++ b/debian/metview.install
@@ -1,3 +1,3 @@
 usr/bin/metview
-usr/bin/Metview/*	usr/bin/Metview
+usr/bin/Metview/*	/usr/lib/metview
 usr/share/*
diff --git a/debian/rules b/debian/rules
index ebbba05..fa21866 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,14 +11,16 @@ export DH_VERBOSE=1
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
-TOPDIR=:=`pwd`
+TOPDIR=:=$(shell pwd)
+
+MV_COMP:=$(TOP)/debian/tmp/usr/lib/MetView/mv_compress
 
 # magic debhelper rule
 %:
 	dh $@ --with autoreconf
 
 override_dh_auto_clean:
-	-$(MAKE) -k clean
+	[-f Makefile ] && $(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
@@ -32,7 +34,11 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--enable-magics \
-		LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " CXXFLAGS=" -fPIC " CFLAGS=" -fPIC"
+		LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " \
+		CXXFLAGS=" -fPIC " CFLAGS=" -fPIC"
+	sed -e 's%function findCommonPath()%findCommonpath()%' <  \
+		< $(MV_COMP) >  $(MV_COMP).tmp
+	mv $(MV_COMP).tmp  $(MV_COMP)
 
 override_dh_auto_test:
 	@echo "Checks disabled for the moment due to syntax errors in tests" 
@@ -42,3 +48,7 @@ override_dh_auto_install:
 	mkdir -p debian/libmetview-dev/$(LIBDIR)
 	cp debian/tmp/usr/lib*/*.a debian/libmetview-dev/$(LIBDIR)
 	chmod -R -x debian/tmp/usr/share/metview/*
+
+override_dh_auto_fixperms:
+	dh_fixperms
+	find debian/metview/usr/share/metview -type d -exec chmod 755 {} \;

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