The following commit has been merged in the master branch:
commit 3b4c722608724b81ea5d7798800e750529ac8537
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date: Thu Nov 15 13:53:09 2012 +
New upstream release: 6.2.0
diff --git a/debian/changelog b/debian/changelog
index c50d8df..06fdabb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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 jlarou...@mapgears.com Thu, 15 Nov 2012
13:43:51 +
+
mapserver (6.0.3-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index ec63514..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+8
diff --git a/debian/control b/debian/control
index 73679f0..f71de52 100644
--- a/debian/control
+++ b/debian/control
@@ -4,22 +4,35 @@ Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org, Alan Boudreault
aboudrea...@mapgears.com
Standards-Version: 3.9.3
-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,
libgdal1-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.3.1-1~),
+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~),
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 --git a/debian/libmapserver-dev.install b/debian/libmapserver-dev.install
new file mode 100644
index 000..d942dcd
--- /dev/null
+++ b/debian/libmapserver-dev.install
@@ -0,0 +1,3 @@
+usr/bin/mapserver-config
+usr/include
+usr/lib/libmapserver.la
diff --git a/debian/libmapserver.install b/debian/libmapserver.install
new file mode 100644
index 000..6546608
--- /dev/null
+++ b/debian/libmapserver.install
@@ -0,0 +1 @@
+usr/lib/libmapserver*.so*
\ No newline at end of file
diff --git a/debian/mapserver-bin.install b/debian/mapserver-bin.install
index 1df36c6..8cd575d 100644
--- a/debian/mapserver-bin.install
+++ b/debian/mapserver-bin.install
@@ -1 +1,10 @@
-usr/bin/*
+/usr/bin/msencrypt
+/usr/bin/shptreevis
+/usr/bin/tile4ms
+/usr/bin/shptreetst
+/usr/bin/shp2img
+/usr/bin/mapserv
+/usr/bin/sortshp
+/usr/bin/scalebar
+/usr/bin/legend
+/usr/bin/shptree
diff --git a/debian/patches/fixgeos b/debian/patches/fixgeos
deleted file mode 100644
index bf29841..000
--- a/debian/patches/fixgeos
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: mapserver/configure
-===
mapserver.orig/configure 2012-03-05 11:50:29.0 +0100
-+++ mapserver/configure2012-03-05 12:41:30.0 +0100
-@@ -11567,7 +11567,7 @@
-
- GEOS_INCDIR=`$GEOS_CONFIG --includes`
- GEOS_INC=-I$GEOS_INCDIR
-- GEOS_LIB=`$GEOS_CONFIG --libs`_c
-+ GEOS_LIB=`$GEOS_CONFIG --clibs`
-
- GEOS_ENABLED=$GEOS_ENABLED
-
-Index: mapserver/configure.in
-===
mapserver.orig/configure.in2012-03-05 11:50:29.0 +0100
-+++ mapserver/configure.in 2012-03-05
