[SCM] mapserver branch, ubuntu/oneiric, updated. upstream/6.0.1-47-g64ba56a

[Jerome Villeneuve Larouche]

The following commit has been merged in the ubuntu/oneiric branch:
commit 64ba56abfbe1417418e0d288e460f755939fde8f
Merge: 5903ccc4b47c43736e78e9bd702ef87a4d3e7701 a1d8f513c275a1fd216b17004a00287312e133d1
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu Nov 22 21:14:00 2012 +0000

    Merge branch 'master' into ubuntu/oneiric

diff --combined debian/changelog
index 0946690,dc7fb6d..c94aab0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,8 +1,14 @@@
- mapserver (6.2.0-2~oneiric4) oneiric; urgency=medium
++mapserver (6.2.0-3~oneiric1) oneiric; urgency=low
 +
 +  * Launchpad build for Oneiric
-   * Added every mapserver headers in libmapserver-dev in
-     /usr/include/mapserver/
 +
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 21:52:27 +0000
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 22 Nov 2012 21:13:26 +0000
 +
- mapserver (6.2.0-2~oneiric3) oneiric; urgency=high
+ mapserver (6.2.0-2) unstable; urgency=low
  
-   * Launchpad build for Oneiric
-   * Added fix for libmapserver-dev headers
- 
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 20:59:32 +0000
- 
- mapserver (6.2.0-2~oneiric2) oneiric; urgency=low
- 
-   * Launchpad build for Oneiric
-   * Added libmapserver-dev
- 
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 20:09:43 +0000
- 
- mapserver (6.2.0-2~oneiric1) oneiric; urgency=medium
- 
-   * Launchpad build for Oneiric
- 
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 14:38:54 +0000
- 
- mapserver (6.2.0-1ubuntu1) oneiric; urgency=low
- 
-   * Launchpad build for Oneiric
+   * Added heikolein's patch to link mapscript-perl to libmapserver
  
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 14:38:43 +0000
+  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 22 Nov 2012 15:21:55 -0500
  
  mapserver (6.2.0-1) unstable; urgency=low
  

-- 
Mapserver