[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 2e3e846b273cdec1a8c72accf59ce316df7df79b
Merge: 11fa89eb666e21f7b37f22377bffdcd06d238101 3b4c722608724b81ea5d7798800e750529ac8537
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu Nov 15 14:36:10 2012 +0000

    6.2.0 Precise Update
    
    Merge branch 'master' into ubuntu/precise

diff --combined debian/changelog
index 92e9fab,06fdabb..1e96ae4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,12 +1,18 @@@
- mapserver (6.0.3-2~precise4) precise; urgency=low
++mapserver (6.2.0-2~precise1) precise; urgency=low
 +
-   [Jerome Villeneuve Larouche]
 +  * Launchpad build for Precise
-   * Added back the fixgeos patch
 +
-   [Alan Boudreault]
-   * Added multi-arch patch.
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 14:10:22 +0000
 +
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 08 Jun 2012 13:34:12 +0000
+ mapserver (6.2.0-1) unstable; urgency=low
+ 
+   * New upstream release
+   * Added libmapserver package
+   * Added patch to fix mapscriptvars to send the right argument to ld
+   * Changed php5-mapscript dependencies, removed misc:depends and added
+     libapache2-mod-php5 explicitly
+ 
+  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 13:43:51 +0000
  
  mapserver (6.0.3-1) unstable; urgency=low
  
diff --combined debian/changelog.orig
index 92e9fab,06fdabb..1e96ae4
--- a/debian/changelog.orig
+++ b/debian/changelog.orig
@@@ -1,13 -1,12 +1,18 @@@
- mapserver (6.0.3-2~precise4) precise; urgency=low
++mapserver (6.2.0-2~precise1) precise; urgency=low
 +
-   [Jerome Villeneuve Larouche]
 +  * Launchpad build for Precise
-   * Added back the fixgeos patch
 +
-   [Alan Boudreault]
-   * Added multi-arch patch.
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 14:10:22 +0000
 +
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 08 Jun 2012 13:34:12 +0000
+ mapserver (6.2.0-1) unstable; urgency=low
+ 
+   * New upstream release
+   * Added libmapserver package
+   * Added patch to fix mapscriptvars to send the right argument to ld
+   * Changed php5-mapscript dependencies, removed misc:depends and added
+     libapache2-mod-php5 explicitly
+ 
+  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 15 Nov 2012 13:43:51 +0000
  
  mapserver (6.0.3-1) unstable; urgency=low
  
diff --combined debian/control.orig
index 34adfc4,f71de52..7b316b6
--- a/debian/control.orig
+++ b/debian/control.orig
@@@ -4,22 -4,35 +4,41 @@@ Priority: optiona
  Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
  Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>
  Standards-Version: 3.9.3
++<<<<<<< HEAD
 +Build-Depends: debhelper (>= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4),
 + libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal-dev (>=1.4.0), libproj-dev,
 + libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.2),
++=======
+ Build-Depends: debhelper (>= 8), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4),
+  libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.9.0), libproj-dev,
+  libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.2.1-1~),
++>>>>>>> master
   ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
-  sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev,
+  sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
   libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, 
-  libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev, libcairo2-dev
+  libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev
  Build-Conflicts: libcurl3-openssl-dev
  Homepage: http://www.mapserver.org
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git
  Vcs-Git: git://git.debian.org/git/pkg-grass/mapserver.git
  
+ Package: libmapserver
+ Section: libs
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends}
+ Suggests: cgi-mapserver, mapserver-bin, mapserver-doc
+ Description: Shared library for MapServer
+  This package contains the shared library.
+  .
+  MapServer is a CGI-based framework for Internet map services which
+  supports Open Geospatial Consortium (OGC) standards. Scripting
+  functionality in MapScript is provided by the suggested mapscript
+  library packages.
+ 
  Package: php5-mapscript
  Section: php
  Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
+ Depends: ${shlibs:Depends}, libapache2-mod-php5
  Suggests: mapserver-bin, mapserver-doc
  Description: php5-cgi module for MapServer
   PHP MapScript provides MapServer functions for PHP scripts.
diff --combined debian/patches/series.orig
index 0000000,0000000..9afac79
new file mode 100644
--- /dev/null
+++ b/debian/patches/series.orig
@@@ -1,0 -1,0 +1,7 @@@
++<<<<<<< HEAD
++php54
++multiarch-libgd
++fixgeos
++=======
++fixmapscriptvars.patch
++>>>>>>> master

-- 
Mapserver