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

[Bas Couwenberg]

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

    Use PHP5API variable instead of hardcoded path to la file.

diff --git a/debian/changelog b/debian/changelog
index 1d4f91e..a11daae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Merge change from 6.0.1-4: Migrated to debhelper level 9.
   * 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.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/rules b/debian/rules
index 8429cd5..c432bd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 CURDIR := $(shell pwd)
 PYVERS=$(shell pyversions -r debian/control)
 RUBYVERS=1.8 1.9.1
-#PHP5API=$(shell php-config5 --phpapi)
+PHP5API=$(shell php-config5 --phpapi)
 
 # Configure config :
 # Not using non free libpdf
@@ -177,7 +177,7 @@ install-arch-stamp: build-arch
 	-find $(CURDIR)/debian/tmp/usr/bin -type f  -exec chrpath --delete {} \;
 
 	# remove la file in php ext dir
-	-$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/20090626/*.la
+	-$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/$(PHP5API)/*.la
 
 	# empty dependency_libs in la file
 	sed -i "/dependency_libs/ s/'.*'/''/" $(CURDIR)/debian/tmp/usr/lib/libmapserver.la

-- 
Mapserver