This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch ubuntu/trusty in repository mapserver.
commit e76b30a2eefb48f62b0c02996ffb2fe8cece406b Author: Angelos Tzotsos <[email protected]> Date: Tue Jul 19 23:00:00 2016 +0200 Imported Debian patch 7.0.1-4~trusty2 --- debian/cgi-mapserver.lintian-overrides | 2 - debian/changelog | 13 + debian/control | 39 ++- debian/libmapserver2.symbols | 14 +- debian/mapserver-bin.lintian-overrides | 2 - debian/patches/cmake-ruby2.patch | 334 +++++++++++++++++++++ debian/patches/series | 1 + debian/php-mapscript.install | 2 - debian/php-mapscript.php | 1 - debian/php-mapscript.postrm | 7 - debian/php-mapscript.prerm | 7 - debian/{php-mapscript.docs => php5-mapscript.docs} | 0 ...-mapscript.examples => php5-mapscript.examples} | 0 debian/php5-mapscript.install | 2 + ...-mapscript.postinst => php5-mapscript.postinst} | 4 + debian/php5-mapscript.prerm | 11 + debian/rules | 13 +- debian/watch | 2 +- 18 files changed, 398 insertions(+), 56 deletions(-) diff --git a/debian/cgi-mapserver.lintian-overrides b/debian/cgi-mapserver.lintian-overrides deleted file mode 100644 index 0db61dd..0000000 --- a/debian/cgi-mapserver.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# PIE breaks the build -cgi-mapserver: hardening-no-pie * diff --git a/debian/changelog b/debian/changelog index fdfdd12..173652e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +mapserver (7.0.1-4~trusty2) trusty; urgency=medium + + * Enabled PHP support. + + -- Angelos Tzotsos <[email protected]> Tue, 19 Jul 2016 23:00:00 +0200 + +mapserver (7.0.1-4~trusty0) trusty; urgency=medium + + * Rebuild for GDAL 2.1.0. + * Added CMake Ruby patch. + + -- Angelos Tzotsos <[email protected]> Sun, 03 Jul 2016 14:00:00 +0200 + mapserver (7.0.1-3) unstable; urgency=medium * Disable PHP mapscript, extension doesn't support PHP 7 yet. diff --git a/debian/control b/debian/control index d1cc2c2..f1aa440 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Francesco Paolo Lovergine <[email protected]>, Section: devel Priority: optional Build-Depends: debhelper (>= 9), -# dh-php, dpkg-dev (>= 1.16.1.1), cmake (>= 2.8.12.1-1.2), chrpath, @@ -30,7 +29,7 @@ Build-Depends: debhelper (>= 9), libxml2-dev, libxslt1-dev, zlib1g-dev (>= 1.1.4), -# php-dev, + php5-dev, pkg-config, pkg-kde-tools, python-all (>= 2.6.6-3~), @@ -59,7 +58,7 @@ Suggests: cgi-mapserver, mapserver-bin, mapserver-doc, libmapscript-perl, -# php-mapscript, + php5-mapscript, python-mapscript, ruby-mapscript Pre-Depends: ${misc:Pre-Depends} @@ -96,7 +95,7 @@ Suggests: cgi-mapserver, mapserver-bin, mapserver-doc, libmapscript-perl, -# php-mapscript, + php5-mapscript, python-mapscript, ruby-mapscript Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~), @@ -119,7 +118,7 @@ Depends: ${shlibs:Depends}, Suggests: mapserver-bin, mapserver-doc, libmapscript-perl, -# php-mapscript, + php5-mapscript, python-mapscript, ruby-mapscript Description: CGI executable for MapServer @@ -141,7 +140,7 @@ Suggests: cgi-mapserver, mapserver-doc, shapelib, libmapscript-perl, -# php-mapscript, + php5-mapscript, python-mapscript, ruby-mapscript Description: MapServer utilities @@ -158,7 +157,7 @@ Section: doc Depends: ${misc:Depends} Suggests: cgi-mapserver, libmapscript-perl, -# php-mapscript, + php5-mapscript, python-mapscript, ruby-mapscript Description: documentation for MapServer @@ -169,19 +168,19 @@ Description: documentation for MapServer functionality in MapScript is provided by the suggested mapscript library packages. -#Package: php-mapscript -#Architecture: any -#Section: php -#Depends: ${php:Depends}, -# ${shlibs:Depends}, -# ${misc:Depends} -#Suggests: mapserver-bin, -# mapserver-doc -#Description: php-cgi module for MapServer -# PHP MapScript provides MapServer functions for PHP scripts. -# . -# MapServer is a CGI-based framework for Internet map services which -# supports Open Geospatial Consortium (OGC) standards. +Package: php5-mapscript +Architecture: any +Section: php +Depends: php5-common, + ${shlibs:Depends}, + ${misc:Depends} +Suggests: mapserver-bin, + mapserver-doc +Description: php5-cgi module for MapServer + PHP MapScript provides MapServer functions for PHP scripts. + . + MapServer is a CGI-based framework for Internet map services which + supports Open Geospatial Consortium (OGC) standards. Package: libmapscript-perl Architecture: any diff --git a/debian/libmapserver2.symbols b/debian/libmapserver2.symbols index 01ec833..07b5a6a 100644 --- a/debian/libmapserver2.symbols +++ b/debian/libmapserver2.symbols @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 7.0.1 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64 ppc64el s390x sparc64 x32 +# SymbolsHelper-Confirmed: 7.0.1 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips64el mipsel powerpc ppc64el s390x sparc64 x32 libmapserver.so.2 #PACKAGE# #MINVER# BuildExpressionTree@Base 6.2.1 CleanVSIDir@Base 6.2.1 @@ -368,7 +368,7 @@ libmapserver.so.2 #PACKAGE# #MINVER# (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64 x32)_ZN9mapserver11pod_bvectorIN10ClipperLib8IntPointELj8EE14allocate_blockEj@Base 6.4.0 (optional=templinst)_ZN9mapserver11pod_bvectorIN10ClipperLib8IntPointELj8EED1Ev@Base 6.2.1 (optional=templinst)_ZN9mapserver11pod_bvectorIN10ClipperLib8IntPointELj8EED2Ev@Base 6.2.1 - (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64 x32)_ZN9mapserver11pod_bvectorINS_10point_baseIdEELj6EE14allocate_blockEj@Base 7.0.0 + (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el s390x sparc64 x32)_ZN9mapserver11pod_bvectorINS_10point_baseIdEELj6EE14allocate_blockEj@Base 7.0.0 (optional=templinst)_ZN9mapserver11pod_bvectorINS_10point_baseIdEELj6EED1Ev@Base 6.2.1 (optional=templinst)_ZN9mapserver11pod_bvectorINS_10point_baseIdEELj6EED2Ev@Base 6.2.1 (optional=templinst)_ZN9mapserver11pod_bvectorINS_11vertex_distELj6EED1Ev@Base 6.2.1 @@ -465,7 +465,7 @@ libmapserver.so.2 #PACKAGE# #MINVER# _ZN9mapserver18comp_op_table_rgbaINS_5rgba8ENS_10order_bgraEE14g_comp_op_funcE@Base 7.0.1 (optional=templinst)_ZN9mapserver18conv_adaptor_vcgenI12line_adaptorNS_10vcgen_dashENS_12null_markersEE6vertexEPdS5_@Base 6.2.1 (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64 x32)_ZN9mapserver18conv_adaptor_vcgenI12line_adaptorNS_12vcgen_strokeENS_12null_markersEE6vertexEPdS5_@Base 6.4.0 - (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64 x32)_ZN9mapserver18conv_adaptor_vcgenI16line_adaptor_utfNS_12vcgen_strokeENS_12null_markersEE6vertexEPdS5_@Base 7.0.0 + (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64el s390x sparc64 x32)_ZN9mapserver18conv_adaptor_vcgenI16line_adaptor_utfNS_12vcgen_strokeENS_12null_markersEE6vertexEPdS5_@Base 7.0.0 (optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9conv_dashINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12null_markersEEENS_12vcgen_strokeES6_E6vertexEPdSA_@Base 6.2.1 (optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_10vcgen_dashENS_12null_markersEE6vertexEPdS8_@Base 6.2.1 (optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12vcgen_strokeENS_12null_markersEE6vertexEPdS8_@Base 6.2.1 @@ -585,16 +585,16 @@ libmapserver.so.2 #PACKAGE# #MINVER# _ZNK9mapserver25font_engine_freetype_base9num_facesEv@Base 6.2.1 (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN10ClipperLib9ExPolygonES4_EET0_T_S6_S5_@Base 6.2.1 (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPSt6vectorIN10ClipperLib8IntPointESaIS4_EES7_EET0_T_S9_S8_@Base 6.2.1 - (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPN10ClipperLib9ExPolygonEjS3_EET_S5_T0_RKT1_@Base 7.0.0 - (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPN10ClipperLib9ExPolygonEmS3_EET_S5_T0_RKT1_@Base 7.0.0 + (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64el !s390x !sparc64)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPN10ClipperLib9ExPolygonEjS3_EET_S5_T0_RKT1_@Base 7.0.0 + (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64el s390x sparc64)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPN10ClipperLib9ExPolygonEmS3_EET_S5_T0_RKT1_@Base 7.0.0 (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc sparc x32)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 6.2.1 (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 6.2.1 (optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 6.2.1 (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc sparc x32)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 6.2.1 (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el s390 s390x sparc64)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 6.2.1 (optional=templinst|subst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE7reserveE{size_t}@Base 6.4.0 - (optional=templinst|arch=alpha amd64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64 x32)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EEC1ERKS3_@Base 7.0.0 - (optional=templinst|arch=alpha amd64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64 x32)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EEC2ERKS3_@Base 7.0.0 + (optional=templinst|arch=alpha amd64 hppa kfreebsd-amd64 mips64el ppc64el s390x sparc64 x32)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EEC1ERKS3_@Base 7.0.0 + (optional=templinst|arch=alpha amd64 hppa kfreebsd-amd64 mips64el ppc64el s390x sparc64 x32)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EEC2ERKS3_@Base 7.0.0 (optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EEaSERKS3_@Base 6.2.1 (optional=templinst)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 6.2.1 (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc sparc x32)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 6.2.1 diff --git a/debian/mapserver-bin.lintian-overrides b/debian/mapserver-bin.lintian-overrides deleted file mode 100644 index 0d2a025..0000000 --- a/debian/mapserver-bin.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# PIE breaks the build -mapserver-bin: hardening-no-pie * diff --git a/debian/patches/cmake-ruby2.patch b/debian/patches/cmake-ruby2.patch new file mode 100644 index 0000000..a5b1098 --- /dev/null +++ b/debian/patches/cmake-ruby2.patch @@ -0,0 +1,334 @@ +Description: Update FindRuby.cmake module to support Ruby 2.0 and 2.1. + This FindRuby.cmake is a copy of the one included in CMake 2.8.12.1, + and modified to also support Ruby 2.0 and Ruby 2.1. + . + The first version found is used unless -DRUBY_EXECUTABLE is set. + . + Ruby 2.0 moved the config.h file to the architecture specific path + as reported by: + `ruby -r rbconfig -e "print RbConfig::CONFIG['rubyarchhdrdir']"` + . +Author: Bas Couwenberg <[email protected]> +Bug-Debian: https://bugs.debian.org/739773 +Bug: https://github.com/Kitware/CMake/pull/92 +--- /dev/null ++++ b/cmake/FindRuby.cmake +@@ -0,0 +1,318 @@ ++# - Find Ruby ++# This module finds if Ruby is installed and determines where the include files ++# and libraries are. Ruby 1.8, 1.9, 2.0 and 2.1 are supported. ++# ++# The minimum required version of Ruby can be specified using the ++# standard syntax, e.g. find_package(Ruby 1.8) ++# ++# It also determines what the name of the library is. This ++# code sets the following variables: ++# ++# RUBY_EXECUTABLE = full path to the ruby binary ++# RUBY_INCLUDE_DIRS = include dirs to be used when using the ruby library ++# RUBY_LIBRARY = full path to the ruby library ++# RUBY_VERSION = the version of ruby which was found, e.g. "1.8.7" ++# RUBY_FOUND = set to true if ruby ws found successfully ++# ++# RUBY_INCLUDE_PATH = same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it ++ ++#============================================================================= ++# Copyright 2004-2009 Kitware, Inc. ++# Copyright 2008-2009 Alexander Neundorf <[email protected]> ++# ++# CMake - Cross Platform Makefile Generator ++# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium ++# All rights reserved. ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# ++# * Redistributions of source code must retain the above copyright ++# notice, this list of conditions and the following disclaimer. ++# ++# * Redistributions in binary form must reproduce the above copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# ++# * Neither the names of Kitware, Inc., the Insight Software Consortium, ++# nor the names of their contributors may be used to endorse or promote ++# products derived from this software without specific prior written ++# permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++# ++# ------------------------------------------------------------------------------ ++# ++# The above copyright and license notice applies to distributions of ++# CMake in source and binary form. Some source files contain additional ++# notices of original copyright by their contributors; see each source ++# for details. Third-party software packages supplied with CMake under ++# compatible licenses provide their own copyright notices documented in ++# corresponding subdirectories. ++# ++# ------------------------------------------------------------------------------ ++# ++# CMake was initially developed by Kitware with the following sponsorship: ++# ++# * National Library of Medicine at the National Institutes of Health ++# as part of the Insight Segmentation and Registration Toolkit (ITK). ++# ++# * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel ++# Visualization Initiative. ++# ++# * National Alliance for Medical Image Computing (NAMIC) is funded by the ++# National Institutes of Health through the NIH Roadmap for Medical Research, ++# Grant U54 EB005149. ++# ++# * Kitware, Inc. ++#============================================================================= ++ ++# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` ++# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` ++# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` ++# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'` ++# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` ++ ++# uncomment the following line to get debug output for this file ++# set(_RUBY_DEBUG_OUTPUT TRUE) ++ ++# Determine the list of possible names of the ruby executable depending ++# on which version of ruby is required ++set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby) ++ ++# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8 ++if(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR) ++ set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}") ++ # we can't construct that if only major version is given ++ set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ++ ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR} ++ ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR} ++ ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}) ++else() ++ set(Ruby_FIND_VERSION_SHORT_NODOT "18") ++endif() ++ ++if(NOT Ruby_FIND_VERSION_EXACT) ++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21) ++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20) ++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19) ++ ++ # if we want a version below 1.9, also look for ruby 1.8 ++ if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19") ++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18) ++ endif() ++ ++ list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES) ++endif() ++ ++if(NOT RUBY_EXECUTABLE) ++ find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}) ++endif() ++ ++ ++if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) ++ function(_RUBY_CONFIG_VAR RBVAR OUTVAR) ++ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']" ++ RESULT_VARIABLE _RUBY_SUCCESS ++ OUTPUT_VARIABLE _RUBY_OUTPUT ++ ERROR_QUIET) ++ if(_RUBY_SUCCESS OR NOT _RUBY_OUTPUT) ++ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']" ++ RESULT_VARIABLE _RUBY_SUCCESS ++ OUTPUT_VARIABLE _RUBY_OUTPUT ++ ERROR_QUIET) ++ endif() ++ set(${OUTVAR} "${_RUBY_OUTPUT}" PARENT_SCOPE) ++ endfunction() ++ ++ ++ # query the ruby version ++ _RUBY_CONFIG_VAR("MAJOR" RUBY_VERSION_MAJOR) ++ _RUBY_CONFIG_VAR("MINOR" RUBY_VERSION_MINOR) ++ _RUBY_CONFIG_VAR("TEENY" RUBY_VERSION_PATCH) ++ ++ # query the different directories ++ _RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR) ++ _RUBY_CONFIG_VAR("arch" RUBY_ARCH) ++ _RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR) ++ _RUBY_CONFIG_VAR("rubyarchhdrdir" RUBY_ARCHHDR_DIR) ++ _RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR) ++ _RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR) ++ ++ # site_ruby ++ _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) ++ _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) ++ ++ # vendor_ruby available ? ++ execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" ++ OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) ++ ++ if(RUBY_HAS_VENDOR_RUBY) ++ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) ++ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) ++ endif() ++ ++ # save the results in the cache so we don't have to run ruby the next time again ++ set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) ++ set(RUBY_VERSION_MINOR ${RUBY_VERSION_MINOR} CACHE PATH "The Ruby minor version" FORCE) ++ set(RUBY_VERSION_PATCH ${RUBY_VERSION_PATCH} CACHE PATH "The Ruby patch version" FORCE) ++ set(RUBY_ARCH_DIR ${RUBY_ARCH_DIR} CACHE PATH "The Ruby arch dir" FORCE) ++ set(RUBY_HDR_DIR ${RUBY_HDR_DIR} CACHE PATH "The Ruby header dir (1.9+)" FORCE) ++ set(RUBY_ARCHHDR_DIR ${RUBY_ARCHHDR_DIR} CACHE PATH "The Ruby arch header dir (1.9+)" FORCE) ++ set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE) ++ set(RUBY_RUBY_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE) ++ set(RUBY_SITEARCH_DIR ${RUBY_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE) ++ set(RUBY_SITELIB_DIR ${RUBY_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE) ++ set(RUBY_HAS_VENDOR_RUBY ${RUBY_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE) ++ set(RUBY_VENDORARCH_DIR ${RUBY_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE) ++ set(RUBY_VENDORLIB_DIR ${RUBY_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE) ++ ++ mark_as_advanced( ++ RUBY_ARCH_DIR ++ RUBY_ARCH ++ RUBY_HDR_DIR ++ RUBY_ARCHHDR_DIR ++ RUBY_POSSIBLE_LIB_DIR ++ RUBY_RUBY_LIB_DIR ++ RUBY_SITEARCH_DIR ++ RUBY_SITELIB_DIR ++ RUBY_HAS_VENDOR_RUBY ++ RUBY_VENDORARCH_DIR ++ RUBY_VENDORLIB_DIR ++ RUBY_VERSION_MAJOR ++ RUBY_VERSION_MINOR ++ RUBY_VERSION_PATCH ++ ) ++endif() ++ ++# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling) ++# try to detect which version we found. This is not too good. ++if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) ++ # by default assume 1.8.0 ++ set(RUBY_VERSION_MAJOR 1) ++ set(RUBY_VERSION_MINOR 8) ++ set(RUBY_VERSION_PATCH 0) ++ # check whether we found 1.9.x ++ if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9") ++ set(RUBY_VERSION_MAJOR 1) ++ set(RUBY_VERSION_MINOR 9) ++ endif() ++ # check whether we found 2.0.x ++ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?0") ++ set(RUBY_VERSION_MAJOR 2) ++ set(RUBY_VERSION_MINOR 0) ++ endif() ++ # check whether we found 2.1.x ++ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?1") ++ set(RUBY_VERSION_MAJOR 2) ++ set(RUBY_VERSION_MINOR 1) ++ endif() ++endif() ++ ++if(RUBY_VERSION_MAJOR) ++ set(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}") ++ set(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}") ++ set(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}") ++ set(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}") ++endif() ++ ++find_path(RUBY_INCLUDE_DIR ++ NAMES ruby.h ++ HINTS ++ ${RUBY_HDR_DIR} ++ ${RUBY_ARCH_DIR} ++ /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ ) ++ ++set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} ) ++ ++# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir ++if( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18 OR "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18 OR RUBY_HDR_DIR) ++ find_path(RUBY_CONFIG_INCLUDE_DIR ++ NAMES ruby/config.h config.h ++ HINTS ++ ${RUBY_HDR_DIR}/${RUBY_ARCH} ++ ${RUBY_ARCH_DIR} ++ ${RUBY_ARCHHDR_DIR} ++ ) ++ ++ set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} ) ++endif() ++ ++ ++# Determine the list of possible names for the ruby library ++set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION}) ++ ++if(WIN32) ++ set( _RUBY_MSVC_RUNTIME "" ) ++ if( MSVC60 ) ++ set( _RUBY_MSVC_RUNTIME "60" ) ++ endif() ++ if( MSVC70 ) ++ set( _RUBY_MSVC_RUNTIME "70" ) ++ endif() ++ if( MSVC71 ) ++ set( _RUBY_MSVC_RUNTIME "71" ) ++ endif() ++ if( MSVC80 ) ++ set( _RUBY_MSVC_RUNTIME "80" ) ++ endif() ++ if( MSVC90 ) ++ set( _RUBY_MSVC_RUNTIME "90" ) ++ endif() ++ ++ list(APPEND _RUBY_POSSIBLE_LIB_NAMES ++ "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}" ++ "msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static" ++ "msvcrt-ruby${_RUBY_NODOT_VERSION}" ++ "msvcrt-ruby${_RUBY_NODOT_VERSION}-static" ) ++endif() ++ ++find_library(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} ) ++ ++include(FindPackageHandleStandardArgs) ++set(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY) ++if(_RUBY_VERSION_SHORT_NODOT GREATER 18) ++ list(APPEND _RUBY_REQUIRED_VARS RUBY_CONFIG_INCLUDE_DIR) ++endif() ++ ++if(_RUBY_DEBUG_OUTPUT) ++ message(STATUS "--------FindRuby.cmake debug------------") ++ message(STATUS "_RUBY_POSSIBLE_EXECUTABLE_NAMES: ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}") ++ message(STATUS "_RUBY_POSSIBLE_LIB_NAMES: ${_RUBY_POSSIBLE_LIB_NAMES}") ++ message(STATUS "RUBY_ARCH_DIR: ${RUBY_ARCH_DIR}") ++ message(STATUS "RUBY_HDR_DIR: ${RUBY_HDR_DIR}") ++ message(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}") ++ message(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"") ++ message(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}") ++ message(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}") ++ message(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}") ++ message(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}") ++ message(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}") ++ message(STATUS "--------------------") ++endif() ++ ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby REQUIRED_VARS ${_RUBY_REQUIRED_VARS} ++ VERSION_VAR RUBY_VERSION ) ++ ++mark_as_advanced( ++ RUBY_EXECUTABLE ++ RUBY_LIBRARY ++ RUBY_INCLUDE_DIR ++ RUBY_CONFIG_INCLUDE_DIR ++ ) ++ ++# Set some variables for compatibility with previous version of this file ++set(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR}) ++set(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR}) ++set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_DIRS}) diff --git a/debian/patches/series b/debian/patches/series index 46c2393..0b911f3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ perl-mapscript-install.patch ruby-mapscript-install.patch java-hardening.patch didnt-typo.patch +cmake-ruby2.patch diff --git a/debian/php-mapscript.install b/debian/php-mapscript.install deleted file mode 100644 index 934e0b0..0000000 --- a/debian/php-mapscript.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/php/ -etc/php/*/mods-available/ diff --git a/debian/php-mapscript.php b/debian/php-mapscript.php deleted file mode 100644 index dce27d9..0000000 --- a/debian/php-mapscript.php +++ /dev/null @@ -1 +0,0 @@ -mod debian/mapscript.ini diff --git a/debian/php-mapscript.postrm b/debian/php-mapscript.postrm deleted file mode 100644 index b7ec504..0000000 --- a/debian/php-mapscript.postrm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -exit 0 diff --git a/debian/php-mapscript.prerm b/debian/php-mapscript.prerm deleted file mode 100644 index b7ec504..0000000 --- a/debian/php-mapscript.prerm +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -exit 0 diff --git a/debian/php-mapscript.docs b/debian/php5-mapscript.docs similarity index 100% rename from debian/php-mapscript.docs rename to debian/php5-mapscript.docs diff --git a/debian/php-mapscript.examples b/debian/php5-mapscript.examples similarity index 100% rename from debian/php-mapscript.examples rename to debian/php5-mapscript.examples diff --git a/debian/php5-mapscript.install b/debian/php5-mapscript.install new file mode 100644 index 0000000..69987d2 --- /dev/null +++ b/debian/php5-mapscript.install @@ -0,0 +1,2 @@ +usr/lib/php5/ +etc/php5/mods-available/ diff --git a/debian/php-mapscript.postinst b/debian/php5-mapscript.postinst similarity index 63% rename from debian/php-mapscript.postinst rename to debian/php5-mapscript.postinst index 786d689..d25d7de 100644 --- a/debian/php-mapscript.postinst +++ b/debian/php5-mapscript.postinst @@ -7,4 +7,8 @@ set -e #DEBHELPER# +if [ "$1" = "configure" ]; then + php5enmod mapscript +fi + exit 0 diff --git a/debian/php5-mapscript.prerm b/debian/php5-mapscript.prerm new file mode 100644 index 0000000..01192c9 --- /dev/null +++ b/debian/php5-mapscript.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "remove" ]; then + php5dismod mapscript +fi + +exit 0 diff --git a/debian/rules b/debian/rules index 2e886bb..373ed78 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ CFLAGS += $(CPPFLAGS) CFLAGS += $(LDFLAGS) RUBYVERSIONS := $(shell dh_ruby --print-supported) -#PHPAPI := $(shell php-config --phpapi) +PHP5API := $(shell php-config5 --phpapi) MANPAGES := $(wildcard debian/man/*.*.xml) @@ -83,7 +83,7 @@ override_dh_auto_clean: override_dh_auto_configure: dh_auto_configure -- $(CMAKE_OPTS) \ -DWITH_PYTHON=1 \ - -DWITH_PHP=0 \ + -DWITH_PHP=1 \ -DWITH_PERL=1 \ -DWITH_RUBY=0 \ -DWITH_JAVA=1 \ @@ -142,12 +142,11 @@ override_dh_auto_install: -mkdir -p debian/tmp/usr/lib/cgi-bin install -m755 debian/tmp/usr/bin/mapserv debian/tmp/usr/lib/cgi-bin/mapserv - # TODO: Use dh_php for substvars & mapscript.ini installation # PHP mapscript - #echo 'misc:Depends=phpapi-'$(PHPAPI) >> debian/php-mapscript.substvars + echo 'misc:Depends=phpapi-'$(PHP5API) >> debian/php5-mapscript.substvars - #-mkdir -p debian/tmp/etc/php/7.0/mods-available/ - #install -m644 debian/mapscript.ini debian/tmp/etc/php/7.0/mods-available/ + -mkdir -p debian/tmp/etc/php5/mods-available/ + install -m644 debian/mapscript.ini debian/tmp/etc/php5/mods-available/ override_dh_installchangelogs: dh_installchangelogs HISTORY.TXT @@ -155,7 +154,7 @@ override_dh_installchangelogs: override_dh_installexamples: dh_installexamples - #-chmod a-x $(CURDIR)/debian/php-mapscript/usr/share/doc/php-mapscript/examples/*.phtml + -chmod a-x $(CURDIR)/debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml override_dh_install: dh_install --autodest --list-missing diff --git a/debian/watch b/debian/watch index 499cb8c..a1b0676 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,6 @@ version=3 opts=\ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ -uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/-/./g \ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/-/./g http://download.osgeo.org/mapserver/ \ (?:.*/)?(?:rel|v|mapserver)[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
