[SCM] mapserver branch, master, updated. upstream/6.0.1-38-g726c38d
Jerome Villeneuve Larouche
jlarouche at mapgears.com
Mon Nov 19 20:08:46 UTC 2012
The following commit has been merged in the master branch:
commit 3b4c722608724b81ea5d7798800e750529ac8537
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date: Thu Nov 15 13:53:09 2012 +0000
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 <jlarouche at mapgears.com> Thu, 15 Nov 2012 13:43:51 +0000
+
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 at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at 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 0000000..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 0000000..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..0000000
--- a/debian/patches/fixgeos
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: mapserver/configure
-===================================================================
---- mapserver.orig/configure 2012-03-05 11:50:29.000000000 +0100
-+++ mapserver/configure 2012-03-05 12:41:30.000000000 +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.in 2012-03-05 11:50:29.000000000 +0100
-+++ mapserver/configure.in 2012-03-05 12:41:00.000000000 +0100
-@@ -1342,7 +1342,7 @@
-
- GEOS_INCDIR=`$GEOS_CONFIG --includes`
- GEOS_INC="-I$GEOS_INCDIR"
-- GEOS_LIB="`$GEOS_CONFIG --libs`_c"
-+ GEOS_LIB=`$GEOS_CONFIG --clibs`
-
- AC_SUBST(GEOS_ENABLED,$GEOS_ENABLED)
- AC_SUBST(GEOS_INC, $GEOS_INC)
diff --git a/debian/patches/fixmapscriptvars.patch b/debian/patches/fixmapscriptvars.patch
new file mode 100644
index 0000000..5370720
--- /dev/null
+++ b/debian/patches/fixmapscriptvars.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -412,7 +412,7 @@
+ echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
+ echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
+ echo $(LIBMAP) >> mapscriptvars
+- echo $(EXE_LDFLAGS) >> mapscriptvars
++ echo -Wl,$(EXE_LDFLAGS) >> mapscriptvars
+ grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
+
+ mapserver-config: Makefile
diff --git a/debian/patches/php54 b/debian/patches/php54
deleted file mode 100644
index 49160df..0000000
--- a/debian/patches/php54
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: mapserver/mapscript/php/php_mapscript_util.c
-===================================================================
---- mapserver.orig/mapscript/php/php_mapscript_util.c 2012-03-05 15:05:16.000000000 +0100
-+++ mapserver/mapscript/php/php_mapscript_util.c 2012-03-05 15:36:06.000000000 +0100
-@@ -37,12 +37,18 @@
- void (*zend_objects_free_object) TSRMLS_DC)
- {
- zend_object_value retval;
-+#if PHP_VERSION_ID < 50399
- zval *temp;
-+#endif
-
- zobj->ce = ce;
- ALLOC_HASHTABLE(zobj->properties);
- zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-+#if PHP_VERSION_ID < 50399
- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+#else
-+ object_properties_init(zobj, ce);
-+#endif
- retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
- retval.handlers = &mapscript_std_object_handlers;
- return retval;
-@@ -54,12 +60,18 @@
- zend_object_handlers *object_handlers TSRMLS_DC)
- {
- zend_object_value retval;
-+#if PHP_VERSION_ID < 50399
- zval *temp;
-+#endif
-
- zobj->ce = ce;
- ALLOC_HASHTABLE(zobj->properties);
- zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-+#if PHP_VERSION_ID < 50399
- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
-+#else
-+ object_properties_init(zobj, ce);
-+#endif
- retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
- retval.handlers = object_handlers;
- return retval;
-Index: mapserver/mapscript/php/image.c
-===================================================================
---- mapserver.orig/mapscript/php/image.c 2012-03-05 15:05:16.000000000 +0100
-+++ mapserver/mapscript/php/image.c 2012-03-05 15:36:06.000000000 +0100
-@@ -303,7 +303,7 @@
- /* no filename - read stdout */
-
- /* if there is no output buffer active, set the header */
-- if (OG(ob_nesting_level)<=0)
-+ if (php_output_get_level()<=0)
- {
- php_header(TSRMLS_C);
- }
-Index: mapserver/mapscript/php/php_mapscript.c
-===================================================================
---- mapserver.orig/mapscript/php/php_mapscript.c 2011-12-23 11:16:03.000000000 +0100
-+++ mapserver/mapscript/php/php_mapscript.c 2012-03-05 15:41:11.000000000 +0100
-@@ -899,7 +899,7 @@
-
- }
-
--function_entry mapscript_functions[] = {
-+zend_function_entry mapscript_functions[] = {
- PHP_FE(ms_GetVersion, NULL)
- PHP_FE(ms_GetVersionInt, NULL)
- PHP_FE(ms_newLineObj, NULL)
diff --git a/debian/patches/series b/debian/patches/series
index c7a7b70..8b1a364 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fixgeos
-php54
+fixmapscriptvars.patch
diff --git a/debian/rules b/debian/rules
index f0aeb5b..4b4b224 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,7 @@ version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
CURDIR := $(shell pwd)
PYVERS=$(shell pyversions -r debian/control)
RUBYVERS=1.8 1.9.1
-PHP5API=$(shell php-config5 --phpapi)
-PHP5DIR=$(shell php-config5 --extension-dir)
-
+#PHP5API=$(shell php-config5 --phpapi)
# Configure config :
# Not using non free libpdf
@@ -26,7 +24,6 @@ PHP5DIR=$(shell php-config5 --extension-dir)
COMMON_CONFIG= --prefix=/usr \
- --enable-debug \
--without-tiff \
--without-pdf \
--with-gd=/usr \
@@ -49,28 +46,20 @@ COMMON_CONFIG= --prefix=/usr \
--with-geos \
--with-fastcgi \
--with-agg \
- --with-experimental-png \
+ --with-php \
--with-cairo
rstoptions=--stylesheet=mapscript.css --link-stylesheet
-MS_CFLAGS=-g -O2
+MS_CFLAGS=-O2
MS_CXXFLAGS=$(MS_CFLAGS)
configure-stamp:
dh_testdir
./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
-
touch configure-stamp
-configure-php5-stamp: clean-first-build
- dh_testdir
- ./configure $(COMMON_CONFIG) \
- --with-php=/usr/include/php5 CFLAGS="$(MS_CFLAGS)" CXXFLAGS="$(MS_CXXFLAGS)"
-
- touch configure-php5-stamp
-
# This is the correct, policy-compliant build target
#build: build-indep build-arch
@@ -81,7 +70,6 @@ build: build-arch
build-indep: build-indep-stamp
build-indep-stamp:
dh_testdir
-
touch build-indep-stamp
build-arch: build-arch-stamp
@@ -94,8 +82,8 @@ build-arch-stamp: configure-stamp
# Build Perl mapscript
cd $(CURDIR)/mapscript/perl && \
- perl Makefile.PL INSTALLDIRS=vendor \
- && $(MAKE) LD_RUN_PATH="" OPTIMIZE="-O2 -g -W -Wall"
+ perl Makefile.PL INSTALLDIRS=vendor \
+ && $(MAKE) LD_RUN_PATH="" OPTIMIZE="-O2 -g -W -Wall"
# Build python
cd $(CURDIR)/mapscript/python && \
@@ -110,12 +98,6 @@ build-arch-stamp: configure-stamp
touch build-arch-stamp
-build-php5-stamp: configure-php5-stamp
- dh_testdir
- -cd mapscript/php && \
- $(MAKE) clean
- # Build php_mapscript
- $(MAKE)
# This is needed to do 'make clean', but will be removed by the clean
# targets. The end result is that 'debuild clean' only can execute
@@ -153,7 +135,8 @@ clean-first-build:
clean: clean-first-build
dh_testdir
dh_prep
- -$(RM) configure-php5-stamp build-php5-stamp install-arch-stamp install-indep-stamp install-php5-stamp
+ -$(RM) install-arch-stamp install-indep-stamp
+ -$(RM) -rf $(CURDIR)/debian/files
[ ! -f Makefile ] || $(MAKE) distclean
rm -f debian/*.debhelper.log
@@ -165,18 +148,12 @@ install-indep-stamp: build-indep
dh_install -i
touch install-indep-stamp
-install-arch: install-arch-stamp install-php5-stamp
+install-arch: install-arch-stamp
install-arch-stamp: build-arch
dh_testdir -a
dh_testroot -a
dh_installdirs -a
-
- -mkdir -p debian/tmp/usr/lib/ debian/tmp/usr/include/ \
- debian/tmp/usr/lib/cgi-bin/ \
- debian/tmp/usr/bin
-
- # CGI mapserver
- install -m755 mapserv debian/tmp/usr/lib/cgi-bin/mapserv
+ dh_auto_install
# Perl mapscript
cd $(CURDIR)/mapscript/perl && \
@@ -196,26 +173,19 @@ install-arch-stamp: build-arch
$(MAKE) distclean ; \
done
- # Mapserver Binary
- install -m755 legend scalebar shp2img shptree \
- shptreetst shptreevis sortshp tile4ms msencrypt \
- debian/tmp/usr/bin
- install -m755 shp2mysql.pl debian/tmp/usr/bin/shp2mysql
- touch install-arch-stamp
+ # removing embedded rpath in binaries
+ -find $(CURDIR)/debian/tmp/usr/bin -type f -exec chrpath --delete {} \;
-install-php5-stamp: build-php5-stamp
- dh_testdir
- dh_testroot
+ # remove la file in php ext dir
+ -$(RM) -rf $(CURDIR)/debian/tmp/usr/lib/php5/20090626/*.la
- -mkdir -p debian/tmp$(PHP5DIR)
+ # CGI mapserver
+ -mkdir -p debian/tmp/usr/lib/cgi-bin
+ install -m755 debian/tmp/usr/bin/mapserv debian/tmp/usr/lib/cgi-bin/mapserv
- # php5-mapscript
- install -m644 mapscript/php/php_mapscript.so \
- debian/tmp$(PHP5DIR)
-
- echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars
+ #echo 'misc:Depends=libapache2-mod-php5' >> debian/php5-mapscript.substvars
- touch install-php5-stamp
+ touch install-arch-stamp
binary-indep: install-indep
dh_testdir -i
--
Mapserver
More information about the Pkg-grass-devel
mailing list