[SCM] mapserver branch, ubuntu/precise, updated. upstream/6.0.1-50-g70b49ee

[Jerome Villeneuve Larouche]

The following commit has been merged in the ubuntu/precise branch:
commit 70b49eedbf280868f1d93883cff7209e3a0c4685
Merge: f3172af693ab1ec80221d09d87a66da547712d61 a1d8f513c275a1fd216b17004a00287312e133d1
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu Nov 22 21:09:34 2012 +0000

    Merge branch 'master' into ubuntu/precise
    
    Cleaned series.orig

diff --combined debian/changelog
index 32dd3d1,dc7fb6d..9e87129
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,8 +1,14 @@@
- mapserver (6.2.0-2~precise4) precise; urgency=high
++mapserver (6.2.0-3~precise1) precise; urgency=high
 +
 +  * Launchpad build for Precise
-   * Added all mapserver headers in libmapserver-dev in /usr/include/mapserver/
 +
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 21:47:08 +0000
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 22 Nov 2012 20:58:46 +0000
 +
- mapserver (6.2.0-2~precise3) precise; urgency=high
+ mapserver (6.2.0-2) unstable; urgency=low
  
-   * Launchpad build for Precise
-   * Fixed libmapserver-dev headers
- 
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 20:51:27 +0000
- 
- 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
+   * Added heikolein's patch to link mapscript-perl to libmapserver
  
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 14:10:22 +0000
+  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 22 Nov 2012 15:21:55 -0500
  
  mapserver (6.2.0-1) unstable; urgency=low
  
diff --combined debian/patches/series
index 8b1a364,4856be3..69080ab
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,2 +1,3 @@@
  fixmapscriptvars.patch
+ mapscriptperllink
++debian-changes-6.2.0-3~precise1

-- 
Mapserver