[Git][debian-gis-team/mapserver][master] 4 commits: Drop PHP packages, incompatible with PHP 8.x. (closes: #977658)
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Nov 28 14:21:56 GMT 2021
Bas Couwenberg pushed to branch master at Debian GIS Project / mapserver
Commits:
abffc80d by Bas Couwenberg at 2021-11-28T14:40:34+01:00
Drop PHP packages, incompatible with PHP 8.x. (closes: #977658)
- - - - -
cb2b8ee3 by Bas Couwenberg at 2021-11-28T14:52:19+01:00
Update symbols for amd64.
- - - - -
16cb7126 by Bas Couwenberg at 2021-11-28T14:59:42+01:00
Update lintian overrides.
- - - - -
c7ae95ff by Bas Couwenberg at 2021-11-28T14:59:42+01:00
Set distribution to unstable.
- - - - -
20 changed files:
- debian/changelog
- debian/control
- debian/libmapserver2.symbols
- − debian/mapscript-ng.ini
- − debian/mapscript.ini
- − debian/php-mapscript-ng.install
- − debian/php-mapscript-ng.lintian-overrides
- − debian/php-mapscript-ng.php
- − debian/php-mapscript-ng.postinst
- − debian/php-mapscript-ng.postrm
- − debian/php-mapscript-ng.prerm
- − debian/php-mapscript.docs
- − debian/php-mapscript.examples
- − debian/php-mapscript.install
- − debian/php-mapscript.php
- − debian/php-mapscript.postinst
- − debian/php-mapscript.postrm
- − debian/php-mapscript.prerm
- debian/python3-mapscript.lintian-overrides
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-mapserver (7.6.4-2) UNRELEASED; urgency=medium
+mapserver (7.6.4-2) unstable; urgency=medium
* Bump Standards-Version to 4.6.0, no changes.
* Bump debhelper compat to 12, changes:
@@ -7,8 +7,11 @@ mapserver (7.6.4-2) UNRELEASED; urgency=medium
* Drop --autodest from dh_install.
* Don't use ttf-bitstream-vera package.
(closes: #998263)
+ * Drop PHP packages, incompatible with PHP 8.x.
+ (closes: #977658)
+ * Update symbols for amd64.
- -- Bas Couwenberg <sebastic at debian.org> Wed, 08 Sep 2021 16:40:47 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 28 Nov 2021 14:40:40 +0100
mapserver (7.6.4-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -6,7 +6,6 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Section: devel
Priority: optional
Build-Depends: debhelper-compat (= 12),
- dh-php,
dh-python,
dpkg-dev (>= 1.16.1.1),
cmake (>= 3.0),
@@ -32,7 +31,6 @@ Build-Depends: debhelper-compat (= 12),
libxml2-dev,
libxslt1-dev,
zlib1g-dev (>= 1.1.4),
- php-dev,
pkg-config,
pkg-kde-tools,
protobuf-c-compiler,
@@ -49,7 +47,6 @@ Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/mapserver
Vcs-Git: https://salsa.debian.org/debian-gis-team/mapserver.git
Homepage: https://mapserver.org
-XS-Ruby-Versions: all
Package: libmapserver2
Architecture: any
@@ -60,8 +57,6 @@ Suggests: cgi-mapserver,
mapserver-bin,
mapserver-doc,
libmapscript-perl,
- php-mapscript,
- php-mapscript-ng,
python3-mapscript
Pre-Depends: ${misc:Pre-Depends}
Description: Shared library for MapServer
@@ -81,8 +76,6 @@ Suggests: cgi-mapserver,
mapserver-bin,
mapserver-doc,
libmapscript-perl,
- php-mapscript,
- php-mapscript-ng,
python3-mapscript
Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~),
libmapserver1-dev (<< 7.0.0~)
@@ -103,8 +96,6 @@ Depends: mapserver-bin,
${misc:Depends}
Suggests: mapserver-doc,
libmapscript-perl,
- php-mapscript,
- php-mapscript-ng,
python3-mapscript
Description: CGI executable for MapServer
This package contains the mapserv CGI program. It provides the
@@ -125,8 +116,6 @@ Suggests: cgi-mapserver,
mapserver-doc,
shapelib,
libmapscript-perl,
- php-mapscript,
- php-mapscript-ng,
python3-mapscript
Description: MapServer utilities
This package provides command-line utilities for MapServer.
@@ -142,8 +131,6 @@ Section: doc
Depends: ${misc:Depends}
Suggests: cgi-mapserver,
libmapscript-perl,
- php-mapscript,
- php-mapscript-ng,
python3-mapscript
Description: documentation for MapServer
This package provides some brief documentation for MapServer.
@@ -153,38 +140,6 @@ 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.
- .
- This package provides the traditional MapScript for PHP.
-
-Package: php-mapscript-ng
-Architecture: any
-Section: php
-Depends: ${php:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Suggests: mapserver-bin,
- mapserver-doc
-Description: PHP MapServer module (SWIG)
- 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.
- .
- This package provides MapScript for PHP based on SWIG.
-
Package: libmapscript-perl
Architecture: any
Section: perl
=====================================
debian/libmapserver2.symbols
=====================================
@@ -361,7 +361,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
_ZN9mapserver10vcgen_dash8add_dashEdd at Base 6.2.1
_ZN9mapserver10vcgen_dashC1Ev at Base 6.2.1
_ZN9mapserver10vcgen_dashC2Ev at Base 6.2.1
- (optional=templinst)_ZN9mapserver11math_strokeINS_11pod_bvectorINS_10point_baseIdEELj6EEEE10calc_miterERS4_RKNS_11vertex_distES9_S9_ddddNS_11line_join_eEdd at Base 6.2.1
(optional=templinst)_ZN9mapserver11math_strokeINS_11pod_bvectorINS_10point_baseIdEELj6EEEE8calc_arcERS4_dddddd at Base 6.2.1
(optional=templinst|arch=armel armhf i386 mipsel powerpc sh4)_ZN9mapserver11math_strokeINS_11pod_bvectorINS_10point_baseIdEELj6EEEE8calc_capERS4_RKNS_11vertex_distES9_d at Base 7.6.1
(optional=templinst)_ZN9mapserver11math_strokeINS_11pod_bvectorINS_10point_baseIdEELj6EEEE9calc_joinERS4_RKNS_11vertex_distES9_S9_dd at Base 6.2.1
@@ -464,7 +463,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_11scanline_u8ENS_26renderer_scanline_aa_solidINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEEEEEEvRT_RT0_RT1_ at Base 6.2.1
(optional=templinst)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_12scanline_binENS_20scanline_storage_binEEEvRT_RT0_RT1_ at Base 6.2.1
(optional=templinst)_ZN9mapserver16render_scanlinesINS_22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEEENS_12scanline_binENS_27renderer_scanline_bin_solidINS_13renderer_baseI10pixfmt_utfI8utfpix32NS_13row_ptr_cacheIjEELj1ELj0EEEEEEEEvRT_RT0_RT1_ at Base 7.0.0
- (optional=templinst)_ZN9mapserver17clip_line_segmentIiEEjPT_S2_S2_S2_RKNS_9rect_baseIS1_EE at Base 6.4.0
(optional=templinst)_ZN9mapserver17comp_op_rgba_plusINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj at Base 7.0.0
_ZN9mapserver17mcs7x12_mono_highE at Base 6.2.1
(optional=templinst)_ZN9mapserver17stack_blur_rgba32INS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEEvRT_jj at Base 7.0.0
@@ -479,6 +477,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9conv_dashINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12null_markersEEENS_12vcgen_strokeES6_E6vertexEPdSA_ at Base 6.2.1
(optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_10vcgen_dashENS_12null_markersEE6vertexEPdS8_ at Base 6.2.1
(optional=templinst)_ZN9mapserver18conv_adaptor_vcgenINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_12vcgen_strokeENS_12null_markersEE6vertexEPdS8_ at Base 6.2.1
+ _ZN9mapserver18line_image_patternINS_28pattern_filter_bilinear_rgbaINS_5rgba8EEEE6createINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preIS2_NS_10order_bgraEEENS_12row_accessorIhEEjEEEEvRKT_ at Base 7.6.4
(optional=templinst)_ZN9mapserver18rasterizer_sl_clipINS_12ras_conv_intEE7line_toINS_19rasterizer_cells_aaINS_7cell_aaEEEEEvRT_ii at Base 6.2.1
(optional=templinst)_ZN9mapserver18render_scanline_aaINS_11scanline_p8ENS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_14span_allocatorIS5_EENS_17span_pattern_rgbaINS_19image_accessor_wrapISA_NS_16wrap_mode_repeatESG_EEEEEEvRKT_RT0_RT1_RT2_ at Base 6.2.1
(optional=templinst|arch=armel armhf i386 mipsel powerpc sh4)_ZN9mapserver18render_scanline_aaINS_11scanline_p8ENS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_14span_allocatorIS5_EENS_36span_image_filter_rgba_bilinear_clipISA_NS_24span_interpolator_linearINS_12trans_affineELj8EEEEEEEvRKT_RT0_RT1_RT2_ at Base 7.6.1
@@ -506,7 +505,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst|arch=!armel !armhf !i386 !powerpc)_ZN9mapserver20path_storage_integerIiLj6EE6curve3Eiiii at Base 7.6.1
(optional=templinst)_ZN9mapserver20path_storage_integerIsLj6EE6curve3Essss at Base 7.6.1
(optional=templinst)_ZN9mapserver20scanline_storage_bin6renderINS_12scanline_binEEEvRKT_ at Base 7.6.1
- (optional=templinst)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE14allocate_blockEj at Base 7.6.1
(optional=templinst)_ZN9mapserver20vertex_block_storageIdLj8ELj256EE8free_allEv at Base 6.2.1
(optional=templinst)_ZN9mapserver21comp_op_rgba_contrastINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj at Base 7.0.0
(optional=templinst)_ZN9mapserver21comp_op_rgba_dst_atopINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj at Base 7.0.0
@@ -524,6 +522,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE14sweep_scanlineINS_11scanline_p8EEEbRT_ at Base 7.6.1
(optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE14sweep_scanlineINS_11scanline_u8EEEbRT_ at Base 7.6.1
(optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE14sweep_scanlineINS_12scanline_binEEEbRT_ at Base 7.6.1
+ _ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_12conv_contourINS_10conv_curveINS_9path_baseINS_20vertex_block_storageIdLj8ELj256EEEEENS_6curve3ENS_6curve4EEEEEEEvRT_j at Base 7.6.4
(optional=templinst)_ZN9mapserver22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS4_EEEEE13line3_no_clipERKNS_15line_parametersEiiii at Base 6.2.1
(optional=templinst)_ZN9mapserver22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS4_EEEEE5line3ERKNS_15line_parametersEiiii at Base 6.2.1
(optional=templinst)_ZN9mapserver23comp_op_rgba_color_burnINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj at Base 7.0.0
@@ -616,8 +615,8 @@ libmapserver.so.2 #PACKAGE# #MINVER#
(optional=templinst|arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE17_M_default_appendEj at Base 7.0.2
(optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE17_M_default_appendEm at Base 7.0.2
(optional=templinst)_ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 7.0.7
+ _ZNSt6vectorIN10ClipperLib9ExPolygonESaIS1_EE7reserveEm at Base 7.6.4
(optional=templinst)_ZNSt6vectorIP10msExprNodeSaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 7.0.7
- (optional=templinst)_ZNSt6vectorIP10msExprNodeSaIS1_EE9push_backERKS1_ at Base 7.0.5
(optional=templinst|arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEj at Base 7.2.0
(optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc !sh4)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEm at Base 7.4.0
(optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_ at Base 7.4.1
=====================================
debian/mapscript-ng.ini deleted
=====================================
@@ -1 +0,0 @@
-extension=php_mapscriptng.so
=====================================
debian/mapscript.ini deleted
=====================================
@@ -1 +0,0 @@
-extension=php_mapscript.so
=====================================
debian/php-mapscript-ng.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib/php/*/php_mapscriptng.*
-usr/lib/php/*/mapscript.php
=====================================
debian/php-mapscript-ng.lintian-overrides deleted
=====================================
@@ -1,4 +0,0 @@
-# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
-# Fortify Source functions: no, only unprotected functions found!
-hardening-no-fortify-functions *
-
=====================================
debian/php-mapscript-ng.php deleted
=====================================
@@ -1 +0,0 @@
-mod debian/mapscript-ng.ini
=====================================
debian/php-mapscript-ng.postinst deleted
=====================================
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-exit 0
=====================================
debian/php-mapscript-ng.postrm deleted
=====================================
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
=====================================
debian/php-mapscript-ng.prerm deleted
=====================================
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
=====================================
debian/php-mapscript.docs deleted
=====================================
@@ -1 +0,0 @@
-mapscript/php/README
=====================================
debian/php-mapscript.examples deleted
=====================================
@@ -1 +0,0 @@
-mapscript/php/examples/*
=====================================
debian/php-mapscript.install deleted
=====================================
@@ -1 +0,0 @@
-usr/lib/php/*/php_mapscript.*
=====================================
debian/php-mapscript.php deleted
=====================================
@@ -1 +0,0 @@
-mod debian/mapscript.ini
=====================================
debian/php-mapscript.postinst deleted
=====================================
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-exit 0
=====================================
debian/php-mapscript.postrm deleted
=====================================
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
=====================================
debian/php-mapscript.prerm deleted
=====================================
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-exit 0
=====================================
debian/python3-mapscript.lintian-overrides
=====================================
@@ -1,6 +1,6 @@
# Not a problem
package-contains-documentation-outside-usr-share-doc *
-duplicate-font-file * also in ttf-bitstream-vera
+duplicate-font-file * also in *ttf-bitstream-vera*
truetype-font-prohibits-installable-embedding *
# Cannot easily be fixed
=====================================
debian/rules
=====================================
@@ -28,7 +28,7 @@ MS_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
BUILD_DATE := $(shell LC_ALL=C date -u "+%d %B %Y" -d "@$(SOURCE_DATE_EPOCH)")
%:
- dh $@ --with php,python3,pkgkde_symbolshelper \
+ dh $@ --with python3,pkgkde_symbolshelper \
--buildsystem cmake
override_dh_auto_clean:
@@ -75,8 +75,8 @@ override_dh_auto_configure:
-DWITH_V8=0 \
-DWITH_PIXMAN=0 \
-DWITH_PYTHON=1 \
- -DWITH_PHP=1 \
- -DWITH_PHPNG=1 \
+ -DWITH_PHP=0 \
+ -DWITH_PHPNG=0 \
-DWITH_PERL=1 \
-DWITH_RUBY=0 \
-DWITH_JAVA=1 \
@@ -106,16 +106,11 @@ override_dh_auto_install:
override_dh_installchangelogs:
dh_installchangelogs HISTORY.TXT
-override_dh_installexamples:
- dh_installexamples
-
- -chmod a-x $(CURDIR)/debian/php-mapscript/usr/share/doc/php-mapscript/examples/*.phtml
-
override_dh_compress:
dh_compress -X.xml -X.xsd -X.xsl
override_dh_makeshlibs:
- dh_makeshlibs -Xphp_mapscript -- -c0 -v$(MS_VERSION)
+ dh_makeshlibs -- -c0 -v$(MS_VERSION)
override_dh_python3:
dh_python3 -ppython3-mapscript
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/87760808e7029adf6006d4d381dcd969256abd2e...c7ae95ff5994a3484c316133b805b5d285404eb0
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/87760808e7029adf6006d4d381dcd969256abd2e...c7ae95ff5994a3484c316133b805b5d285404eb0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211128/65d35daa/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list