[SCM] mapserver branch, ubuntu/precise, updated. upstream/6.0.1-48-gf3172af

[Jerome Villeneuve Larouche]

The following commit has been merged in the ubuntu/precise branch:
commit fe31c1cdf99c44c8dee03322239eb02f2c17b060
Merge: 2e3e846b273cdec1a8c72accf59ce316df7df79b bc25ed5a66ce680a2e9e9bbb44897973c0ba3edc
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu Nov 15 19:39:43 2012 +0000

    Merge branch 'master' into ubuntu/precise

diff --combined debian/changelog
index 1e96ae4,06fdabb..e780bb8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,16 @@@
++mapserver (6.2.0-2~precise2) precise; urgency=medium
++
++  * Launchpad build for Precise
++  * Added libmapserver-dev
++
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 19:40:20 +0000
++
 +mapserver (6.2.0-2~precise1) precise; urgency=low
 +
 +  * Launchpad build for Precise
 +
 + -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 14:10:22 +0000
 +
  mapserver (6.2.0-1) unstable; urgency=low
  
    * New upstream release
diff --combined debian/rules
index 4b4b224,4b4b224..28f3b70
--- a/debian/rules
+++ b/debian/rules
@@@ -185,6 -185,6 +185,8 @@@ install-arch-stamp: build-arc
  
  	#echo 'misc:Depends=libapache2-mod-php5' >> debian/php5-mapscript.substvars
  
++	-mkdir -p debian/tmp/usr/include/
++
  	touch install-arch-stamp
  
  binary-indep: install-indep

-- 
Mapserver