[metview] 01/05: Allow -A builds

[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 f39883afabb90de41fa2fc1a110c4e87efaa8044
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Feb 10 21:47:06 2016 +0000

    Allow -A builds
---
 debian/rules | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 90327b7..3e6546e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,18 +79,19 @@ override_dh_auto_configure:
 override_dh_auto_test:
 	@echo "Checks disabled for the moment due to syntax errors in tests" 
 
-override_dh_fixperms:
+override_dh_fixperms-arch:
 	dh_fixperms
-	rm -rf debian/metview-data/usr/share/applications
-	chmod +x debian/metview/$(MV_DIR)/mv_compress
-	chmod -x debian/metview/$(MV_DIR)/metview_*.common
-	chmod -x debian/metview/$(MV_DIR)/metview_stat
-	chmod -x debian/metview/$(MV_DIR)/metview_patches
+	chmod 755 debian/metview/$(MV_DIR)/mv_compress
+	chmod 644 debian/metview/$(MV_DIR)/metview_*.common
+	chmod 644 debian/metview/$(MV_DIR)/metview_stat
+	chmod 644 debian/metview/$(MV_DIR)/metview_patches
 	file debian/metview/$(MV_DIR)/* | grep ELF | cut -f1 -d: | xargs chrpath -d
-	# This directory won't exist on arch-only builds, so ...
-	[ ! -d debian/metview-data/usr/share/metview ] || (  \
-		chmod -R -x debian/metview-data/usr/share/metview/* ; \
-		find debian/metview-data/usr/share/metview -type d -exec chmod 755 {} \;  )
+
+override_dh_fixperms-indep:
+	dh_fixperms
+	rm -rf debian/metview-data/usr/share/applications
+	find debian/metview-data/usr/share/metview -type f -exec chmod 644 {} \;
+	find debian/metview-data/usr/share/metview -type d -exec chmod 755 {} \; 
 	# Hack. Why weren't these already compressed -n ?
 	gunzip debian/metview-data/usr/share/metview/app-defaults/Sample_Drawers.tar.gz
 	gunzip debian/metview-data/usr/share/metview/app-defaults/User_Dir_Frame.tar.gz

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