[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit 1dbb73ee7bceac49ced38ae145d9d2b02303edc4 Merge: d8046e4997b434728e39fce3ea0a38f1f0966ff9 56a0ab5ee8105ce243b174d3223e645c4322b0b8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Sep 11 15:57:34 2013 +0200 Merge upstream version 6.4.0-beta2. -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit d513c17991ff8e7fbb4e79b5467a000b3c0e02ca Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Sep 1 15:55:47 2013 +0200 Build system changed from autotools to cmake. Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config. diff --git a/debian/changelog b/debian/changelog index 27bc391..d97530e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low + + * New upstream release: 6.4.0-beta2. + * Build system changed from autotools to cmake. + * Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config. + + -- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200 + mapserver (6.2.1-4) unstable; urgency=low * Use pkgkde-gensymbols pkgkde-symbolshelper to handle C++ symbols. diff --git a/debian/control b/debian/control index d9a2dc4..fdf5982 100644 --- a/debian/control +++ b/debian/control @@ -4,17 +4,18 @@ 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, Bas Couwenberg sebas...@xs4all.nl Standards-Version: 3.9.4 -Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), autotools-dev, +Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), libcurl4-gnutls-dev, libpng-dev, libjpeg-dev, zlib1g-dev (= 1.1.4), libgd-dev (= 2.1.0~rc1-2), libfreetype6-dev (= 2.0.9), libgdal1-dev (= 1.9.0), libproj-dev, libgeos-dev (= 3.3.1-1~), libfribidi-dev, libcairo2-dev, + libgif-dev, librsvg2-dev, libpq-dev, php5-dev, swig, python-all (= 2.6.6-3~), python-all-dev (= 2.6.6-3~), ruby1.9.1, ruby1.9.1-dev, sharutils, libsdl1.2-dev, libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, libedit-dev, libepsilon-dev, pkg-kde-tools, - autoconf, dh-autoreconf, chrpath, + chrpath, cmake (= 2.8.0), pkg-config, docbook2x, docbook-xsl, docbook-xml, xsltproc Build-Conflicts: libcurl3-openssl-dev XS-Ruby-Versions: ruby1.9.1 diff --git a/debian/python-mapscript.install b/debian/python-mapscript.install new file mode 100644 index 000..2453ce7 --- /dev/null +++ b/debian/python-mapscript.install @@ -0,0 +1 @@ +usr/lib/python*/ diff --git a/debian/rules b/debian/rules index 68fa351..e2a1836 100755 --- a/debian/rules +++ b/debian/rules @@ -12,96 +12,84 @@ export DH_OPTIONS # pie: causes build failure export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie +DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) CFLAGS+=$(CPPFLAGS) +CFLAGS+=$(LDFLAGS) -# Perl mapscript requires CPPFLAGS LDFLAGS in CFLAGS -PERL_CFLAGS=$(CFLAGS) -PERL_CFLAGS+=$(LDFLAGS) - -# Ruby mapscript fails to build with -Werror=format-security -RUBY_CPPFLAGS=$(subst -Werror=format-security,,$(CFLAGS)) -RUBY_CPPFLAGS+=$(LDFLAGS) - PYVERS=$(shell pyversions -r debian/control) RUBYVERS=1.9.1 PHP5API=$(shell php-config5 --phpapi) MANPAGES:=$(wildcard debian/man/*.*.xml) -MS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') - -COMMON_CONFIG= --prefix=/usr \ - --with-gd=/usr \ - --with-freetype=/usr \ - --with-fribidi-config \ - --with-gdal \ - --with-ogr \ - --with-proj \ - --with-postgis \ - --with-wcs \ - --with-sos \ - --with-wms \ - --with-wmsclient \ - --with-wfs \ - --with-wfsclient \ - --with-threads \ - --with-geos \ - --with-fastcgi \ - --with-php \ - --with-cairo - -MS_CFLAGS=$(CFLAGS) -MS_CXXFLAGS=$(CFLAGS) -MS_CPPFLAGS=$(CPPFLAGS) -MS_LDFLAGS=$(LDFLAGS) +MS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -ne 's/^\(.*\)~.*/\1/p') + +COMMON_CONFIG= -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_PROJ=1 \ + -DWITH_KML=1 \ + -DWITH_SOS=1 \ + -DWITH_WMS=1 \ + -DWITH_GD=1 \ + -DWITH_FRIBIDI=1 \ + -DWITH_ICONV=1 \ + -DWITH_CAIRO=1 \ + -DWITH_SVGCAIRO=0 \ + -DWITH_RSVG=1 \ + -DWITH_MYSQL=0 \ + -DWITH_FCGI=1 \ + -DWITH_GEOS=1 \ + -DWITH_POSTGIS=1 \ + -DWITH_GDAL=1 \ + -DWITH_OGR=1 \ + -DWITH_CURL=1 \ + -DWITH_CLIENT_WMS=1 \ + -DWITH_CLIENT_WFS=1 \ + -DWITH_WFS=1 \ + -DWITH_WCS=1 \ + -DWITH_LIBXML2=1 \ + -DWITH_THREADS=1 \ + -DWITH_GIF=1 \ + -DWITH_PYTHON=1 \ +
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch:
commit e51ab8ea4f8a0eed868ea6ad8fe08933c791cbe4
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Sep 1 17:33:46 2013 +0200
Drop obsolete patch: php_segfault.patch.
diff --git a/debian/changelog b/debian/changelog
index 18b4414..2e389c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
* Update hardening.patch for CMake build.
* Drop patches:
- fixmapscriptvars.patch (mapscriptvars no longer used)
+- php_segfault.patch (applied upstream)
-- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200
diff --git a/debian/patches/php_segfault.patch
b/debian/patches/php_segfault.patch
deleted file mode 100644
index 2f36265..000
--- a/debian/patches/php_segfault.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix segfault in ms_newMapObjFromString (PHP/MapScript).
-Author: Alan Boudreault aboudrea...@mapgears.com
-Applied-Upstream: 6.2.2,
https://github.com/mapserver/mapserver/commit/dc3915db24d73d00e188c0537476eac6639853a6
-Last-Update: 2013-06-14
a/mapscript/php/php_mapscript.c
-+++ b/mapscript/php/php_mapscript.c
-@@ -169,7 +169,7 @@
- map = mapObj_newFromString(string, path);
-
- if (map == NULL) {
--mapscript_throw_mapserver_exception(Failed to open map file \%s\, or
map file error. TSRMLS_CC, string);
-+mapscript_throw_mapserver_exception(Error while loading map file from
string. TSRMLS_CC);
- return;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 3dcc945..fe578cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-php_segfault.patch
mapows-contenttype.patch
hardening.patch
shp2img-typo.patch
--
Packaging for MapServer
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch:
commit 6897e8652cdd90e6d27c330bd03d89e802fb3933
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Sep 1 17:35:32 2013 +0200
Drop obsolete patch: mapows-contenttype.patch.
diff --git a/debian/changelog b/debian/changelog
index 2e389c1..5737efe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
* Drop patches:
- fixmapscriptvars.patch (mapscriptvars no longer used)
- php_segfault.patch (applied upstream)
+- mapows-contenttype.patch (applied upstream)
-- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200
diff --git a/debian/patches/mapows-contenttype.patch
b/debian/patches/mapows-contenttype.patch
deleted file mode 100644
index 78ffcca..000
--- a/debian/patches/mapows-contenttype.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Handle Content-Type HTTP headers with a charset appended.
-Author: Bas Couwenberg sebas...@xs4all.nl
-Bug: https://github.com/mapserver/mapserver/pull/4663
-Applied-Upstream: 6.2.2,
https://github.com/mapserver/mapserver/commit/72a9a19831c2e434e7beb0fc55acadbfdc26cfd1
-Last-Update: 2013-06-04
a/mapows.c
-+++ b/mapows.c
-@@ -95,7 +95,7 @@ static int msOWSPreParseRequest(cgiReque
- owsRequestObj *ows_request)
- {
- /* decide if KVP or XML */
-- if (request-type == MS_GET_REQUEST || (request-type == MS_POST_REQUEST
strcmp(request-contenttype, application/x-www-form-urlencoded)==0)) {
-+ if (request-type == MS_GET_REQUEST || (request-type == MS_POST_REQUEST
strncmp(request-contenttype, application/x-www-form-urlencoded,
strlen(application/x-www-form-urlencoded)) == 0)) {
- int i;
- /* parse KVP parameters service, version and request */
- for (i = 0; i request-NumParams; ++i) {
diff --git a/debian/patches/series b/debian/patches/series
index fe578cb..f7d70be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-mapows-contenttype.patch
hardening.patch
shp2img-typo.patch
ruby-shebang.patch
--
Packaging for MapServer
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch:
commit 26d0a2836f69dbe0d2c6c3567a3d057924e95ee7
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Sep 2 21:25:57 2013 +0200
Add patch to fix the Perl mapscript module installation directory:
perl-mapscript-install.patch.
diff --git a/debian/changelog b/debian/changelog
index 0f9e04c..56cf633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
- shp2img-typo.patch (applied upstream)
* Add patch to install the Ruby mapscript extension:
install-ruby-mapscript.patch
+ * Add patch to fix the Perl mapscript module installation directory:
+perl-mapscript-install.patch
-- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200
diff --git a/debian/libmapscript-perl.install b/debian/libmapscript-perl.install
new file mode 100644
index 000..1312331
--- /dev/null
+++ b/debian/libmapscript-perl.install
@@ -0,0 +1 @@
+usr/lib/perl5/
diff --git a/debian/patches/perl-mapscript-install.patch
b/debian/patches/perl-mapscript-install.patch
new file mode 100644
index 000..2a639cf
--- /dev/null
+++ b/debian/patches/perl-mapscript-install.patch
@@ -0,0 +1,23 @@
+Description: Fix the Perl mapscript module installation directory.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-09-02
+--- a/mapscript/perl/CMakeLists.txt
b/mapscript/perl/CMakeLists.txt
+@@ -2,7 +2,7 @@ FIND_PACKAGE(SWIG REQUIRED)
+ INCLUDE(${SWIG_USE_FILE})
+ FIND_PACKAGE(Perl REQUIRED)
+ FIND_PACKAGE(PerlLibs REQUIRED)
+-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITEARCH} CACHE DIR Custom installation
directory for perl binary extension)
++set(CUSTOM_PERL_VENDOR_ARCH_DIR ${PERL_VENDORARCH} CACHE DIR Custom
installation directory for perl binary extension)
+ INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH})
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/swiginc)
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/)
+@@ -20,6 +20,6 @@ endif(APPLE)
+
+ get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_perlmapscript_REAL_NAME}
LOCATION)
+ set(mapscript_files ${LOC_MAPSCRIPT_LIB}
${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm)
+-install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION
${CUSTOM_PERL_SITE_ARCH_DIR}/auto/mapscript)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm DESTINATION
${CUSTOM_PERL_SITE_ARCH_DIR})
++install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION
${CUSTOM_PERL_VENDOR_ARCH_DIR}/auto/mapscript)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm DESTINATION
${CUSTOM_PERL_VENDOR_ARCH_DIR})
+
diff --git a/debian/patches/series b/debian/patches/series
index 8f553f0..f4ce7d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
hardening.patch
ruby-shebang.patch
install-ruby-mapscript.patch
+perl-mapscript-install.patch
--
Packaging for MapServer
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch:
commit b9328f2a86183d015a3da1510114f4e160144626
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Sep 2 21:20:42 2013 +0200
Add patch to install the Ruby mapscript extension:
install-ruby-mapscript.patch.
diff --git a/debian/changelog b/debian/changelog
index 5bec8c1..0f9e04c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
- php_segfault.patch (applied upstream)
- mapows-contenttype.patch (applied upstream)
- shp2img-typo.patch (applied upstream)
+ * Add patch to install the Ruby mapscript extension:
+install-ruby-mapscript.patch
-- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200
diff --git a/debian/patches/install-ruby-mapscript.patch
b/debian/patches/install-ruby-mapscript.patch
new file mode 100644
index 000..f825f68
--- /dev/null
+++ b/debian/patches/install-ruby-mapscript.patch
@@ -0,0 +1,20 @@
+Description: Install Ruby mapscript with CMake
+Author: Bas Couwenberg sebas...@xs4all.nl
+Bug: https://github.com/mapserver/mapserver/pull/4749
+Applied-Upstream: 6.4.0,
https://github.com/mapserver/mapserver/commit/1cfdd59ff246d7c8b74a1894a30232600ea67fe2
+Last-Update: 2013-09-02
+--- a/mapscript/ruby/CMakeLists.txt
b/mapscript/ruby/CMakeLists.txt
+@@ -12,9 +12,6 @@ SWIG_LINK_LIBRARIES(rubymapscript ${RUBY
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES
PREFIX )
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES
OUTPUT_NAME mapscript)
+
+-#get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_mapscript_REAL_NAME}
LOCATION)
+-#set(mapscript_files ${LOC_MAPSCRIPT_LIB}
${CMAKE_CURRENT_BINARY_DIR}/mapscript.py)
+-#install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES})
+-
+-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py DESTINATION
${PYTHON_SITE_PACKAGES})
+-#install(TARGETS mapscript DESTINATION ${PYTHON_SITE_PACKAGES})
++get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME}
LOCATION)
++execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e puts
RbConfig::CONFIG['archdir'] OUTPUT_VARIABLE RUBY_ARCHDIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
++install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_ARCHDIR})
diff --git a/debian/patches/series b/debian/patches/series
index 49df62d..8f553f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
hardening.patch
ruby-shebang.patch
+install-ruby-mapscript.patch
diff --git a/debian/ruby-mapscript.install b/debian/ruby-mapscript.install
new file mode 100644
index 000..1b95a42
--- /dev/null
+++ b/debian/ruby-mapscript.install
@@ -0,0 +1 @@
+usr/lib/ruby/*/*/mapscript.so
--
Packaging for MapServer
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch:
commit c8fa9158ffaf7afbada3709e72122c741c34ce19
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Wed Sep 11 11:58:05 2013 +0200
Add patch to install ruby mapscript into vendorarchdir instead of archdir.
diff --git a/debian/changelog b/debian/changelog
index c6f0585..ec37a4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
* Rename WITH_THREADS to WITH_THREAD_SAFETY.
* Drop patch install-ruby-mapscript.patch, applied upstream.
* Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE.
+ * Add patch to install ruby mapscript into vendorarchdir instead of archdir.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 07 Sep 2013 20:56:16 +0200
diff --git a/debian/patches/ruby-mapscript-install.patch
b/debian/patches/ruby-mapscript-install.patch
new file mode 100644
index 000..9e45736
--- /dev/null
+++ b/debian/patches/ruby-mapscript-install.patch
@@ -0,0 +1,13 @@
+Description: Install Ruby mapscript to vendorarchdir instead of archdir.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-09-11
+--- a/mapscript/ruby/CMakeLists.txt
b/mapscript/ruby/CMakeLists.txt
+@@ -30,5 +30,5 @@ set_target_properties(${SWIG_MODULE_ruby
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES
OUTPUT_NAME mapscript)
+
+ get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME}
LOCATION)
+-execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e puts
RbConfig::CONFIG['archdir'] OUTPUT_VARIABLE RUBY_ARCHDIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
+-install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_ARCHDIR})
++execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e puts
RbConfig::CONFIG['vendorarchdir'] OUTPUT_VARIABLE RUBY_VENDORARCHDIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
++install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_VENDORARCHDIR})
diff --git a/debian/patches/series b/debian/patches/series
index b1b1b94..b8dc8f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hardening.patch
ruby-shebang.patch
perl-mapscript-install.patch
install-threads.patch
+ruby-mapscript-install.patch
diff --git a/debian/ruby-mapscript.install b/debian/ruby-mapscript.install
index 1b95a42..f3e7ea1 100644
--- a/debian/ruby-mapscript.install
+++ b/debian/ruby-mapscript.install
@@ -1 +1 @@
-usr/lib/ruby/*/*/mapscript.so
+usr/lib/ruby/vendor_ruby/*/*/mapscript.so
--
Packaging for MapServer
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch:
commit 51751ba83c895d1ef24986bf17e1903cf2e392ad
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Sep 7 21:12:07 2013 +0200
Drop patch install-ruby-mapscript.patch, applied upstream.
diff --git a/debian/changelog b/debian/changelog
index 76315c4..62ce886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
* New upstream release: 6.4.0-rc1.
* Rename WITH_THREADS to WITH_THREAD_SAFETY.
+ * Drop patch install-ruby-mapscript.patch, applied upstream.
-- Bas Couwenberg sebas...@xs4all.nl Sat, 07 Sep 2013 20:56:16 +0200
diff --git a/debian/patches/install-ruby-mapscript.patch
b/debian/patches/install-ruby-mapscript.patch
deleted file mode 100644
index f825f68..000
--- a/debian/patches/install-ruby-mapscript.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Install Ruby mapscript with CMake
-Author: Bas Couwenberg sebas...@xs4all.nl
-Bug: https://github.com/mapserver/mapserver/pull/4749
-Applied-Upstream: 6.4.0,
https://github.com/mapserver/mapserver/commit/1cfdd59ff246d7c8b74a1894a30232600ea67fe2
-Last-Update: 2013-09-02
a/mapscript/ruby/CMakeLists.txt
-+++ b/mapscript/ruby/CMakeLists.txt
-@@ -12,9 +12,6 @@ SWIG_LINK_LIBRARIES(rubymapscript ${RUBY
- set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES
PREFIX )
- set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES
OUTPUT_NAME mapscript)
-
--#get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_mapscript_REAL_NAME}
LOCATION)
--#set(mapscript_files ${LOC_MAPSCRIPT_LIB}
${CMAKE_CURRENT_BINARY_DIR}/mapscript.py)
--#install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES})
--
--#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py DESTINATION
${PYTHON_SITE_PACKAGES})
--#install(TARGETS mapscript DESTINATION ${PYTHON_SITE_PACKAGES})
-+get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME}
LOCATION)
-+execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e puts
RbConfig::CONFIG['archdir'] OUTPUT_VARIABLE RUBY_ARCHDIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
-+install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_ARCHDIR})
diff --git a/debian/patches/series b/debian/patches/series
index f4ce7d1..d157b06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
hardening.patch
ruby-shebang.patch
-install-ruby-mapscript.patch
perl-mapscript-install.patch
--
Packaging for MapServer
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit 388401bfcd886a93542c9a5857b5375ae0b6dd4f Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Sep 1 17:31:31 2013 +0200 Drop obsolete patch: fixmapscriptvars.patch. diff --git a/debian/changelog b/debian/changelog index 9b39ab0..18b4414 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low * Build system changed from autotools to cmake. * Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config. * Update hardening.patch for CMake build. + * Drop patches: +- fixmapscriptvars.patch (mapscriptvars no longer used) -- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200 diff --git a/debian/patches/fixmapscriptvars.patch b/debian/patches/fixmapscriptvars.patch deleted file mode 100644 index 24d5ecd..000 --- a/debian/patches/fixmapscriptvars.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix mapscriptvars to send the right argument to ld. -Author: Jerome Villeneuve Larouche jlarou...@mapgears.com -Last-Update: 2012-11-15 a/Makefile.in -+++ b/Makefile.in -@@ -415,7 +415,7 @@ mapscriptvars: Makefile - 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/series b/debian/patches/series index 981b3de..3dcc945 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -fixmapscriptvars.patch php_segfault.patch mapows-contenttype.patch hardening.patch -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit 06b1f82c860a74f8fa76ae7f887126659c1beba6 Merge: a77f86ede61642f4bdd82d1027b3fc74db4f29e8 d3dd19a5194edf20555c2f7b0be57a3942341189 Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Sep 11 17:42:23 2013 +0200 Merge upstream version 6.4.0-rc1. -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch:
commit 478997425ad4e59b080a5cbc4d23d8693d525c09
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Sep 2 21:47:53 2013 +0200
SONAME of libmapserver changed from libmapserver-6.2.1.so to
libmapserver.so.1.
diff --git a/debian/changelog b/debian/changelog
index 56cf633..d45d1da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
install-ruby-mapscript.patch
* Add patch to fix the Perl mapscript module installation directory:
perl-mapscript-install.patch
+ * SONAME of libmapserver changed from libmapserver-6.2.1.so to
+libmapserver.so.1.
-- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200
diff --git a/debian/control b/debian/control
index fdf5982..a29131a 100644
--- a/debian/control
+++ b/debian/control
@@ -24,16 +24,26 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-grass/mapserver.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/mapserver.git
Package: libmapserver
-Depends: libmapserver-6.2.1, ${misc:Depends}
+Depends: libmapserver1, ${misc:Depends}
Architecture: all
Section: oldlibs
-Description: Transitional dummy package for libmapserver-6.2.1
- This is a transitional dummy package to ease upgrades to the
- libmapserver-6.2.1 package. It can safely be removed.
+Description: Dummy package for libmapserver to libmapserver1 transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver package to the libmapserver1 package.
+ It can safely be removed.
Package: libmapserver-6.2.1
-Replaces: libmapserver ( 6.2.1-3~)
-Breaks: libmapserver ( 6.2.1-3~)
+Depends: libmapserver1, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: Dummy package for libmapserver-6.2.1 to libmapserver1 transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-6.2.1 package to the libmapserver1 package.
+ It can safely be removed.
+
+Package: libmapserver1
+Replaces: libmapserver ( 6.2.1-3~), libmapserver-6.2.1
+Breaks: libmapserver ( 6.2.1-3~), libmapserver-6.2.1
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
@@ -49,19 +59,29 @@ Description: Shared library for MapServer
library packages.
Package: libmapserver-dev
-Depends: libmapserver-6.2.1-dev, ${misc:Depends}
+Depends: libmapserver1-dev, ${misc:Depends}
Architecture: all
Section: oldlibs
-Description: Transitional dummy package for libmapserver-6.2.1-dev
- This is a transitional dummy package to ease upgrades to the
- libmapserver-6.2.1-dev package. It can safely be removed.
+Description: Transitional dummy package for libmapserver1-dev
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-dev package to the libmapserver1-dev package.
+ It can safely be removed.
Package: libmapserver-6.2.1-dev
-Replaces: libmapserver-dev ( 6.2.1-3~)
-Breaks: libmapserver-dev ( 6.2.1-3~)
+Depends: libmapserver1-dev, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: Dummy package for libmapserver1-dev transition
+ This is a transitional dummy package to ease upgrades from the
+ libmapserver-6.2.1-dev package to the libmapserver1-dev package.
+ It can safely be removed.
+
+Package: libmapserver1-dev
+Replaces: libmapserver-dev ( 6.2.1-3~), libmapserver-6.2.1-dev
+Breaks: libmapserver-dev ( 6.2.1-3~), libmapserver-6.2.1-dev
Section: libdevel
Architecture: any
-Depends: libmapserver-6.2.1 (=${binary:Version}), ${misc:Depends}
+Depends: libmapserver1 (=${binary:Version}), ${misc:Depends}
Suggests: cgi-mapserver, mapserver-bin, mapserver-doc,
libmapscript-perl, php5-mapscript, python-mapscript, ruby-mapscript
Description: Shared library development files for MapServer
diff --git a/debian/libmapserver-6.2.1-dev.install
b/debian/libmapserver-6.2.1-dev.install
deleted file mode 100644
index bbe1641..000
--- a/debian/libmapserver-6.2.1-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/mapserver-config
-usr/include/mapserver/*
-usr/lib/*/libmapserver.la
-usr/lib/*/libmapserver.so
diff --git a/debian/libmapserver-6.2.1-dev.manpages
b/debian/libmapserver-6.2.1-dev.manpages
deleted file mode 100644
index 4951557..000
--- a/debian/libmapserver-6.2.1-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/mapserver-config.1
diff --git a/debian/libmapserver-6.2.1.install
b/debian/libmapserver-6.2.1.install
deleted file mode 100644
index 01666b4..000
--- a/debian/libmapserver-6.2.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libmapserver-*.so
diff --git a/debian/libmapserver1-dev.install b/debian/libmapserver1-dev.install
new file mode 100644
index 000..37c593f
--- /dev/null
+++ b/debian/libmapserver1-dev.install
@@ -0,0 +1,2 @@
+usr/include/mapserver/*
+usr/lib/*/libmapserver.so
diff --git a/debian/libmapserver1.install b/debian/libmapserver1.install
new file mode 100644
index 000..d66fe12
--- /dev/null
+++ b/debian/libmapserver1.install
@@ -0,0
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit a77f86ede61642f4bdd82d1027b3fc74db4f29e8 Author: Bas Couwenberg sebas...@xs4all.nl Date: Mon Sep 2 22:48:13 2013 +0200 Update libmapserver symbols file for 6.4.0 on amd64. diff --git a/debian/changelog b/debian/changelog index d45d1da..d0d5e2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low perl-mapscript-install.patch * SONAME of libmapserver changed from libmapserver-6.2.1.so to libmapserver.so.1. + * Update libmapserver symbols file for 6.4.0 on amd64. -- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200 diff --git a/debian/libmapserver1.symbols b/debian/libmapserver1.symbols index bdfcf0c..d8f41d6 100644 --- a/debian/libmapserver1.symbols +++ b/debian/libmapserver1.symbols @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 6.2.1 amd64 i386 +# SymbolsHelper-Confirmed: 6.4.0 amd64 libmapserver.so.1 #PACKAGE# #MINVER# BuildExpressionTree@Base 6.2.1 CleanVSIDir@Base 6.2.1 @@ -168,7 +168,7 @@ libmapserver.so.1 #PACKAGE# #MINVER# _ZN10ClipperLib17E2InsertsBeforeE1ERNS_5TEdgeES1_@Base 6.2.1 _ZN10ClipperLib17FindAppendLinkEndEPNS_6OutRecE@Base 6.2.1 _ZN10ClipperLib17GetOverlapSegmentENS_8IntPointES0_S0_S0_RS0_S1_@Base 6.2.1 - _ZN10ClipperLib17PolyOffsetBuilder8DoSquareEd@Base 6.2.1 +#MISSING: 6.4.0# _ZN10ClipperLib17PolyOffsetBuilder8DoSquareEd@Base 6.2.1 _ZN10ClipperLib17PolyOffsetBuilderC1ERKSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EERS6_dNS_8JoinTypeEd@Base 6.2.1 _ZN10ClipperLib17PolyOffsetBuilderC2ERKSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EERS6_dNS_8JoinTypeEd@Base 6.2.1 _ZN10ClipperLib18GetNextNonDupOutPtEPNS_5OutPtERS1_@Base 6.2.1 @@ -255,6 +255,42 @@ libmapserver.so.1 #PACKAGE# #MINVER# _ZN10ClipperLiblsERSoRNS_8IntPointE@Base 6.2.1 _ZN10ClipperLiblsERSoRSt6vectorINS_8IntPointESaIS2_EE@Base 6.2.1 _ZN10ClipperLiblsERSoRSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EE@Base 6.2.1 + _ZN11KmlRenderer10renderLineEP8imageObjP8shapeObjP14strokeStyleObj@Base 6.4.0 + _ZN11KmlRenderer10startShapeEP8imageObjP8shapeObj@Base 6.4.0 + _ZN11KmlRenderer11createImageEiiP15outputFormatObjP8colorObj@Base 6.4.0 + _ZN11KmlRenderer12getAliasNameEP8layerObjPcPKc@Base 6.4.0 + _ZN11KmlRenderer12getLayerNameEP8layerObj@Base 6.4.0 + _ZN11KmlRenderer12processLayerEP8layerObjP15outputFormatObj@Base 6.4.0 + _ZN11KmlRenderer12renderGlyphsEP8imageObjddP13labelStyleObjPc@Base 6.4.0 + _ZN11KmlRenderer12renderSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base 6.4.0 + _ZN11KmlRenderer13addCoordsNodeEP8_xmlNodeP8pointObji@Base 6.4.0 + _ZN11KmlRenderer13closeNewLayerEP8imageObjP8layerObj@Base 6.4.0 + _ZN11KmlRenderer13renderPolygonEP8imageObjP8shapeObjP8colorObj@Base 6.4.0 + _ZN11KmlRenderer13startNewLayerEP8imageObjP8layerObj@Base 6.4.0 + _ZN11KmlRenderer14flushPlacemarkEv@Base 6.4.0 + _ZN11KmlRenderer15checkProjectionEP6mapObj@Base 6.4.0 + _ZN11KmlRenderer15createIconImageEPcP9symbolObjP14symbolStyleObj@Base 6.4.0 + _ZN11KmlRenderer15lookupSymbolUrlEP8imageObjP9symbolObjP14symbolStyleObj@Base 6.4.0 + _ZN11KmlRenderer17getGeomParentNodeEPKc@Base 6.4.0 + _ZN11KmlRenderer17mergeRasterBufferEP8imageObjP15rasterBufferObj@Base 6.4.0 + _ZN11KmlRenderer18addLineStyleToListEP14strokeStyleObj@Base 6.4.0 + _ZN11KmlRenderer18renderPixmapSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base 6.4.0 + _ZN11KmlRenderer18renderVectorSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base 6.4.0 + _ZN11KmlRenderer19createPlacemarkNodeEP8_xmlNodePc@Base 6.4.0 + _ZN11KmlRenderer19renderEllipseSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base 6.4.0 + _ZN11KmlRenderer20lookupPlacemarkStyleEv@Base 6.4.0 + _ZN11KmlRenderer20renderTruetypeSymbolEP8imageObjddP9symbolObjP14symbolStyleObj@Base 6.4.0 + _ZN11KmlRenderer20setupRenderingParamsEP12hashTableObj@Base 6.4.0 + _ZN11KmlRenderer21createDescriptionNodeEP8shapeObj@Base 6.4.0 + _ZN11KmlRenderer23createGroundOverlayNodeEP8_xmlNodePcP8layerObj@Base 6.4.0 + _ZN11KmlRenderer29addAddRenderingSpecificationsEP8_xmlNode@Base 6.4.0 + _ZN11KmlRenderer8endShapeEP8imageObjP8shapeObj@Base 6.4.0 + _ZN11KmlRenderer9saveImageEP8imageObjP8_IO_FILEP15outputFormatObj@Base 6.4.0 + _ZN11KmlRendererC1EiiP15outputFormatObjP8colorObj@Base 6.4.0 + _ZN11KmlRendererC2EiiP15outputFormatObjP8colorObj@Base 6.4.0 + _ZN11KmlRendererD0Ev@Base 6.4.0 + _ZN11KmlRendererD1Ev@Base 6.4.0 + _ZN11KmlRendererD2Ev@Base 6.4.0 _ZN12line_adaptor6vertexEPdS0_@Base 6.2.1 _ZN12line_adaptorD0Ev@Base 6.2.1 _ZN12line_adaptorD1Ev@Base 6.2.1 @@ -263,9 +299,9 @@ libmapserver.so.1 #PACKAGE# #MINVER# _ZN15polygon_adaptorD0Ev@Base 6.2.1 _ZN15polygon_adaptorD1Ev@Base 6.2.1 _ZN15polygon_adaptorD2Ev@Base 6.2.1 - (optional=templinst)_ZN9mapserver10conv_curveINS_20path_storage_integerIiLj6EEENS_6curve3ENS_6curve4EE6vertexEPdS6_@Base 6.2.1 -
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit e7f2bd8acb311c1d586858218d5865f8a81e5134 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Sep 7 21:09:45 2013 +0200 Rename WITH_THREADS to WITH_THREAD_SAFETY. diff --git a/debian/changelog b/debian/changelog index d0d5e2e..76315c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low + + * New upstream release: 6.4.0-rc1. + * Rename WITH_THREADS to WITH_THREAD_SAFETY. + + -- Bas Couwenberg sebas...@xs4all.nl Sat, 07 Sep 2013 20:56:16 +0200 + mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low * New upstream release: 6.4.0-beta2. diff --git a/debian/rules b/debian/rules index e2a1836..5d3d7b6 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ COMMON_CONFIG=-DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_WFS=1 \ -DWITH_WCS=1 \ -DWITH_LIBXML2=1 \ - -DWITH_THREADS=1 \ + -DWITH_THREAD_SAFETY=1 \ -DWITH_GIF=1 \ -DWITH_PYTHON=1 \ -DWITH_PHP=1 \ -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit 5221eec665c76fe3f3972fdc2db441adb1284eef Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Sep 7 21:24:14 2013 +0200 Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE. diff --git a/debian/changelog b/debian/changelog index 62ce886..c6f0585 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low * New upstream release: 6.4.0-rc1. * Rename WITH_THREADS to WITH_THREAD_SAFETY. * Drop patch install-ruby-mapscript.patch, applied upstream. + * Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE. -- Bas Couwenberg sebas...@xs4all.nl Sat, 07 Sep 2013 20:56:16 +0200 diff --git a/debian/patches/install-threads.patch b/debian/patches/install-threads.patch new file mode 100644 index 000..ce4832a --- /dev/null +++ b/debian/patches/install-threads.patch @@ -0,0 +1,14 @@ +Description: Rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE too. +Author: Bas Couwenberg sebas...@xs4all.nl +Last-Update: 2013-09-07 +--- a/INSTALL.CMAKE b/INSTALL.CMAKE +@@ -140,7 +140,7 @@ of these can be enabled or disabled by p + - option(WITH_WFS Enable WFS Server support (requires PROJ and OGR support) ON) + - option(WITH_WCS Enable WCS Server support (requires PROJ and GDAL support) ON) + - option(WITH_LIBXML2 Choose if libxml2 support should be built in (used for sos, wcs 1.1,2.0 and wfs 1.1) ON) +- - option(WITH_THREADS Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts) OFF) ++ - option(WITH_THREAD_SAFETY Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts) OFF) + - option(WITH_GIF Enable GIF support (for PIXMAP loading) ON) + - option(WITH_PYTHON Enable Python mapscript support OFF) + - option(WITH_PHP Enable Python mapscript support OFF) diff --git a/debian/patches/series b/debian/patches/series index d157b06..b1b1b94 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ hardening.patch ruby-shebang.patch perl-mapscript-install.patch +install-threads.patch -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit 743096794bfa468331022d47beb1a8ec492f2262 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Sep 1 17:38:50 2013 +0200 Drop obsolete patch: shp2img-typo.patch. diff --git a/debian/changelog b/debian/changelog index 5737efe..5bec8c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low - fixmapscriptvars.patch (mapscriptvars no longer used) - php_segfault.patch (applied upstream) - mapows-contenttype.patch (applied upstream) +- shp2img-typo.patch (applied upstream) -- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200 diff --git a/debian/patches/series b/debian/patches/series index f7d70be..49df62d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ hardening.patch -shp2img-typo.patch ruby-shebang.patch diff --git a/debian/patches/shp2img-typo.patch b/debian/patches/shp2img-typo.patch deleted file mode 100644 index 502d2a8..000 --- a/debian/patches/shp2img-typo.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix typo in usage information. -Author: Bas Couwenberg sebas...@xs4all.nl -Bug: https://github.com/mapserver/mapserver/pull/4740 -Applied-Upstream: https://github.com/mapserver/mapserver/commit/cbc9683b3a3fd07059312583aaa10b267907e711 -Last-Update: 2013-06-14 a/shp2img.c -+++ b/shp2img.c -@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) - fprintf(stdout, -o image: output filename (stdout if not provided)\n); - fprintf(stdout, -e minx miny maxx maxy: extents to render\n); - fprintf(stdout, -s sizex sizey: output image size\n); -- fprintf(stdout, -l layers: layers / groups to enable - make sure they are quoted and space seperated if more than one listed\n ); -+ fprintf(stdout, -l layers: layers / groups to enable - make sure they are quoted and space separated if more than one listed\n ); - fprintf(stdout, -all_debug n: Set debug level for map and all layers\n ); - fprintf(stdout, -map_debug n: Set map debug level\n ); - fprintf(stdout, -layer_debug layer_name n: Set layer debug level\n ); -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch:
commit 3c466e668cc56deb6edfae9abe40f7c384d21f75
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Sep 1 17:43:58 2013 +0200
Update hardening.patch for CMake build.
diff --git a/debian/changelog b/debian/changelog
index d97530e..9b39ab0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
* New upstream release: 6.4.0-beta2.
* Build system changed from autotools to cmake.
* Update Build-Depends to include: libgif-dev, librsvg2-dev, pkg-config.
+ * Update hardening.patch for CMake build.
-- Bas Couwenberg sebas...@xs4all.nl Sun, 01 Sep 2013 14:14:54 +0200
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index accb53d..480bfab 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -1,103 +1,29 @@
Description: Add support for hardening build flags.
Author: Bas Couwenberg sebas...@xs4all.nl
-Last-Update: 2013-06-30
a/Makefile.in
-+++ b/Makefile.in
-@@ -254,6 +254,11 @@ FLAGS = @DEBUG_FLAGS@ $(DEFINES) $(INCLU
-
- CFLAGS = @CFLAGS@ $(FLAGS)
- CXXFLAGS = @CXXFLAGS@ $(FLAGS)
-+LDFLAGS = @LDFLAGS@
+Last-Update: 2013-09-02
+--- a/mapscript/ruby/CMakeLists.txt
b/mapscript/ruby/CMakeLists.txt
+@@ -7,6 +7,23 @@ include_directories(${PROJECT_SOURCE_DIR
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/ruby)
+ SWIG_ADD_MODULE(rubymapscript ruby ../mapscript.i)
+
++# Ruby mapscript fails to build with -Werror=format-security
+
-+HARDENING_FLAGS = @CFLAGS@ @LDFLAGS@
++if(${CMAKE_C_FLAGS} MATCHES -Werror=format-security)
++ string(REPLACE -Werror=format-security TMP ${CMAKE_C_FLAGS})
++ set(CMAKE_C_FLAGS ${TMP})
++endif(${CMAKE_C_FLAGS} MATCHES -Werror=format-security)
+
-+LINK+=$(LDFLAGS)
-
- # Link flags and shared libs only
- SUP_LIBS = $(FT_LIB) $(GD_LIB) $(OGL_LIB) $(FTGL_LIB) $(PROJ_LIBS) \
-@@ -417,6 +422,7 @@ mapscriptvars: Makefile
- echo $(LIBMAP) mapscriptvars
- echo -Wl,$(EXE_LDFLAGS) mapscriptvars
- grep '#define MS_VERSION ' mapserver.h mapscriptvars
-+ echo $(HARDENING_FLAGS) mapscriptvars
-
- mapserver-config: Makefile
- rm -f mapserver-config
a/mapscript/perl/Makefile.PL.in
-+++ b/mapscript/perl/Makefile.PL.in
-@@ -1,5 +1,6 @@
- # File : Makefile.PL
- use ExtUtils::MakeMaker;
-+use Config;
-
- open(STREAM, '../../mapscriptvars') or die('Unable to open mapscriptvars,
have you built the MapServer yet?');
-
-@@ -33,10 +34,14 @@ if ($ms_version_line) {
- # Default is 4.3
- else { $ms_version = '4.3'; }
-
-+$hardening_flags = STREAM;
-+chomp $hardening_flags;
++if(${CMAKE_CXX_FLAGS} MATCHES -Werror=format-security)
++ string(REPLACE -Werror=format-security TMP ${CMAKE_CXX_FLAGS})
++ set(CMAKE_CXX_FLAGS ${TMP})
++endif(${CMAKE_CXX_FLAGS} MATCHES -Werror=format-security)
+
- print $inc.\n;
- print $libs.\n;
- print $static_libs.\n;
- print $ms_version.\n;
-+print $hardening_flags.\n;
-
- my $swigInterfaceFile = ../mapscript.i;
- my $swigWrapperFile = mapscript_wrap.c;
-@@ -75,6 +80,8 @@ WriteMakefile(
- 'DEFINE' = $define,
- 'INC' = $inc,
- 'LIBS'= [$libs,$static_libs],
-+'OPTIMIZE'= $hardening_flags,
-+'LD' = $Config{ld} $hardening_flags,
- 'OBJECT' = 'mapscript_wrap.o',
- 'VERSION' = $ms_version
- );
a/mapscript/php/Makefile.in
-+++ b/mapscript/php/Makefile.in
-@@ -58,6 +58,7 @@ XTRALIBS= @XTRALIBS@
- RUNPATHS= -rpath $(libdir)
-
- CFLAGS = @CFLAGS@ @USE_PHP_REGEX@ -DCOMPILE_DL=1 @PHP_VERSION_FLAG@
-+LDFLAGS=@LDFLAGS@
-
-
- PHP_INC = `$(PHPCONFIG) --includes ` @APACHE_INC@
-@@ -88,7 +89,7 @@ PHP_EXT_DIR=`$(PHPCONFIG) --extension-di
-
- LT_LDFLAGS=-rpath $(PHP_EXT_DIR) -module
- OBJ_SUFFIX=lo
--LINK=$(LTLD) $(LD) $(LT_LDFLAGS)
-+LINK=$(LTLD) $(LD) $(LDFLAGS) $(LT_LDFLAGS)
- MS_LIBS = ../../libmapserver.la
-
- MS_VERSION = @MS_VERSION@
a/mapscript/python/Makefile.in
-+++ b/mapscript/python/Makefile.in
-@@ -29,10 +29,11 @@ PYINCDIR=`$(PYTHON) -c from distutils.s
- RUNPATH= -rpath $(PYLIBDIR)
- DEFINES=@ALL_ENABLED@
- CFLAGS = $(DEFINES) @CFLAGS@ -I$(PYINCDIR) @MS_INC@ @ALL_INC@
-+LDFLAGS=@LDFLAGS@
-
- LT_LDFLAGS= $(RUNPATH) -module
- OBJ_SUFFIX=lo
--LINK=$(LTLD) $(LD) $(LT_LDFLAGS)
-+LINK=$(LTLD) $(LD) $(LDFLAGS) $(LT_LDFLAGS)
- MS_LIB = $(top_builddir)/libmapserver.la
-
-
a/mapscript/ruby/extconf.rb
-+++ b/mapscript/ruby/extconf.rb
-@@ -14,7 +14,7 @@ MAPSERVER_LOCAL_LIBS=Pathname.new(File.d
++if(${CMAKE_CPP_FLAGS} MATCHES -Werror=format-security)
++ string(REPLACE -Werror=format-security TMP ${CMAKE_CPP_FLAGS})
++ set(CMAKE_CPP_FLAGS ${TMP})
++endif(${CMAKE_CPP_FLAGS} MATCHES -Werror=format-security)
++
+ SWIG_LINK_LIBRARIES(rubymapscript ${RUBY_LIBRARY} ${MAPSERVER_LIBMAPSERVER})
- # $CFLAGS works only with 1.8 ??? - the -Wall
[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915
The following commit has been merged in the master branch: commit e12da9e53c8339c5290eb1f553bd4b193b3b4a8d Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Sep 7 21:50:20 2013 +0200 Update patch header, applied upstream. diff --git a/debian/patches/install-threads.patch b/debian/patches/install-threads.patch index ce4832a..5d476f1 100644 --- a/debian/patches/install-threads.patch +++ b/debian/patches/install-threads.patch @@ -1,5 +1,7 @@ Description: Rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE too. Author: Bas Couwenberg sebas...@xs4all.nl +Bug: https://github.com/mapserver/mapserver/pull/4750 +Applied-Upstream: 6.4.0, https://github.com/mapserver/mapserver/commit/458d224e46c1b26ab2400ff766d4df359cc8e703 Last-Update: 2013-09-07 --- a/INSTALL.CMAKE +++ b/INSTALL.CMAKE -- Packaging for MapServer ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
