[SCM] mapserver branch, master, updated. upstream/6.4.0_rc1-147-gc8564cc

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit c8564cccb9348c689376889992622226011e6e5b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 20 13:29:46 2013 +0200

    Fix install of mapscript.ini and .h files.

diff --git a/debian/php5-mapscript.install b/debian/php5-mapscript.install
index a6c34b3..69987d2 100644
--- a/debian/php5-mapscript.install
+++ b/debian/php5-mapscript.install
@@ -1 +1,2 @@
 usr/lib/php5/
+etc/php5/mods-available/
diff --git a/debian/rules b/debian/rules
index d84f885..19950ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,12 +123,14 @@ override_dh_auto_install:
 
 	# PHP mapscript
 	echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars
-	install -m755 debian/mapscript.ini /etc/php5/mods-available/
+
+	-mkdir -p debian/tmp/etc/php5/mods-available/
+	install -m644 debian/mapscript.ini debian/tmp/etc/php5/mods-available/
 
 	# libmapserver-dev headers
 	-mkdir -p debian/tmp/usr/include/mapserver/
-	install -m755 *.h debian/tmp/usr/include/mapserver/
-	install -m755 build/*.h debian/tmp/usr/include/mapserver/
+	install -m644 *.h debian/tmp/usr/include/mapserver/
+	install -m644 build/*.h debian/tmp/usr/include/mapserver/
 
 override_dh_installchangelogs:
 	dh_installchangelogs HISTORY.TXT

-- 
Packaging for MapServer