[SCM] mapserver branch, master, updated. upstream/6.2.1-58-g2519c98

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit ddb1645aa610b70c476ab5026b8b6a82aabfc908
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 14 22:35:57 2013 +0200

    Depend on PHP API version instead of libapache2-mod-php5.

diff --git a/debian/changelog b/debian/changelog
index a11daae..f8eea61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mapserver (6.2.1-3) UNRELEASED; urgency=low
 
-  * Merge change from 6.0.1-4: Migrated to debhelper level 9.
+  * Merge changes from 6.0.1-4: 
+    - Migrated to debhelper level 9.
+    - Depend on PHP API version instead of libapache2-mod-php5.
   * Drop possible-gpl-code-linked-with-openssl lintian override.
   * Empty dependency_libs in la files.
   * Use PHP5API variable instead of hardcoded path to la file.
diff --git a/debian/control b/debian/control
index 5c06887..6474d2f 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Description: Shared library for MapServer
 Package: php5-mapscript
 Section: php
 Architecture: any
-Depends: ${shlibs:Depends}, libapache2-mod-php5
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: mapserver-bin, mapserver-doc
 Description: php5-cgi module for MapServer
  PHP MapScript provides MapServer functions for PHP scripts.
diff --git a/debian/rules b/debian/rules
index c432bd7..45ed9d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,7 +186,7 @@ install-arch-stamp: build-arch
 	-mkdir -p debian/tmp/usr/lib/cgi-bin
 	install -m755 debian/tmp/usr/bin/mapserv debian/tmp/usr/lib/cgi-bin/mapserv
 
-	#echo 'misc:Depends=libapache2-mod-php5' >> debian/php5-mapscript.substvars
+	echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars
 
 	# libmapserver-dev headers
 	-mkdir -p debian/tmp/usr/include/mapserver/

-- 
Mapserver