[Git][debian-gis-team/mapserver][experimental] 6 commits: New upstream version 8.2.0~beta2

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Sat Jun 8 20:18:48 BST 2024



Bas Couwenberg pushed to branch experimental at Debian GIS Project / mapserver


Commits:
f6304c21 by Bas Couwenberg at 2024-06-08T21:07:48+02:00
New upstream version 8.2.0~beta2
- - - - -
1d327876 by Bas Couwenberg at 2024-06-08T21:08:03+02:00
Update upstream source from tag 'upstream/8.2.0_beta2'

Update to upstream version '8.2.0~beta2'
with Debian dir c81cdc5155899b1093c3799786060001b6c3215a
- - - - -
e23ef73e by Bas Couwenberg at 2024-06-08T21:09:04+02:00
New upstream beta release.

- - - - -
20b9bb67 by Bas Couwenberg at 2024-06-08T21:09:47+02:00
Drop patches applied upstream.

- - - - -
548ca558 by Bas Couwenberg at 2024-06-08T21:10:52+02:00
Update symbols for other architectures.

- - - - -
6f0012d3 by Bas Couwenberg at 2024-06-08T21:11:21+02:00
Set distribution to experimental.

- - - - -


9 changed files:

- CMakeLists.txt
- HISTORY.md
- debian/changelog
- debian/libmapserver2t64.symbols
- − debian/patches/python-mapscript-install.patch
- debian/patches/series
- − debian/patches/spelling-errors.patch
- src/mapogcapi.cpp
- src/mapscript/python/CMakeLists.txt


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 8)
 set (MapServer_VERSION_MINOR 2)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-beta1")
+set (MapServer_VERSION_SUFFIX "-beta2")
 
 # Set C++ version
 # Make CMAKE_CXX_STANDARD available as cache option overridable by user


=====================================
HISTORY.md
=====================================
@@ -13,6 +13,11 @@ https://mapserver.org/development/changelog/
 
 The online Migration Guide can be found at https://mapserver.org/MIGRATION_GUIDE.html
 
+8.2.0-beta2 release (2024-06-08)
+--------------------------------
+
+- fix Python MapScript installation (#7071)
+
 8.2.0-beta1 release (2024-06-06)
 --------------------------------
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mapserver (8.2.0~beta2-1~exp1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Drop patches applied upstream.
+  * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 08 Jun 2024 21:10:54 +0200
+
 mapserver (8.2.0~beta1-1~exp1) experimental; urgency=medium
 
   * New upstream beta release.


=====================================
debian/libmapserver2t64.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 8.2.0~beta1 amd64
+# SymbolsHelper-Confirmed: 8.2.0~beta1 amd64 arm64 armel armhf i386 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64
 libmapserver.so.2 #PACKAGE# #MINVER#
 * Build-Depends-Package: libmapserver-dev
  CompareEllipseRegion at Base 6.2.1
@@ -283,8 +283,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZN10ClipperLib8IsMaximaEPNS_5TEdgeEx at Base 6.2.1
  _ZN10ClipperLib8IsMinimaEPNS_5TEdgeE at Base 6.2.1
  _ZN10ClipperLib8PolySortEPNS_6OutRecES1_ at Base 6.2.1
- (arch=!amd64)_ZN10ClipperLib9ExPolygonD1Ev at Base 8.0.1
- (arch=!amd64)_ZN10ClipperLib9ExPolygonD2Ev at Base 8.0.1
  _ZN10ClipperLib9SwapSidesERNS_5TEdgeES1_ at Base 6.2.1
  _ZN10ClipperLib9TestRangeERKSt6vectorINS_8IntPointESaIS1_EE at Base 6.2.1
  _ZN10ClipperLiblsERSoRNS_8IntPointE at Base 6.2.1
@@ -384,10 +382,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZN11ms_nlohmann6detail10type_errorD0Ev at Base 8.0.0
  _ZN11ms_nlohmann6detail10type_errorD1Ev at Base 8.0.0
  _ZN11ms_nlohmann6detail10type_errorD2Ev at Base 8.0.0
- (arch=!amd64)_ZN11ms_nlohmann6detail11other_errorD0Ev at Base 8.0.1
- (arch=!amd64)_ZN11ms_nlohmann6detail11other_errorD1Ev at Base 8.0.1
- (arch=!amd64)_ZN11ms_nlohmann6detail11other_errorD2Ev at Base 8.0.1
- (arch=!amd64)_ZN11ms_nlohmann6detail11parse_error15position_stringB5cxx11ERKNS0_10position_tE at Base 8.0.1
  _ZN11ms_nlohmann6detail11parse_errorD0Ev at Base 8.0.0
  _ZN11ms_nlohmann6detail11parse_errorD1Ev at Base 8.0.0
  _ZN11ms_nlohmann6detail11parse_errorD2Ev at Base 8.0.0
@@ -410,7 +404,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA4_cLi0EEEvRT_RKT0_ at Base 8.0.0
  (arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA5_cLi0EEEvRT_RKT0_ at Base 8.0.0
  (arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA6_cLi0EEEvRT_RKT0_ at Base 8.0.0
- (arch=amd64 arm64)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEA9_cLi0EEEvRT_RKT0_ at Base 8.0.1
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEEEvRT_ONSI_8string_tE at Base 8.0.0
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES7_IhSaIhEEEEPKcLi0EEEvRT_RKT0_ at Base 8.0.0
  (arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES7_IhSaIhEEEEA10_cLi0EEEvRT_RKT0_ at Base 8.0.0
@@ -425,6 +418,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA17_cLi0EEEvRT_RKT0_ at Base 8.0.1
  (arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA3_cLi0EEEvRT_RKT0_ at Base 8.0.1
  (arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA8_cLi0EEEvRT_RKT0_ at Base 8.0.1
+ (arch=amd64 arm64 armel armhf mips64el ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail20external_constructorILNS0_7value_tE3EE9constructINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES7_IhSaIhEEEEA9_cLi0EEEvRT_RKT0_ at Base 8.2.0~beta1
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20get_arithmetic_valueINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEEdLi0EEEvRKT_RT0_ at Base 8.0.0
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail20get_arithmetic_valueINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEElLi0EEEvRKT_RT0_ at Base 8.0.0
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail20get_arithmetic_valueINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEdLi0EEEvRKT_RT0_ at Base 8.0.0
@@ -456,7 +450,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail28json_sax_dom_callback_parserINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEED1Ev at Base 8.0.0
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail28json_sax_dom_callback_parserINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEED2Ev at Base 8.0.0
  (optional=templinst|arch=!amd64 !arm64 !ia64 !loong64 !mips64el !ppc64el !riscv64 !sparc64|subst)_ZN11ms_nlohmann6detail28json_sax_dom_callback_parserINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEE4nullEv at Base 8.0.0
- (optional=templinst|arch=alpha amd64 arm64 armel armhf ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail28json_sax_dom_callback_parserINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEE9end_arrayEv at Base 8.0.1
+ (optional=templinst|arch=alpha amd64 arm64 armel armhf ia64 loong64 mips64el ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail28json_sax_dom_callback_parserINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEE9end_arrayEv at Base 8.0.1
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail5lexerINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEENS0_22iterator_input_adapterIPKcEEE11scan_numberEv at Base 8.0.0
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail5lexerINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEENS0_22iterator_input_adapterIPKcEEE11scan_stringEv at Base 8.0.0
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmann6detail5lexerINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEENS0_22iterator_input_adapterIPKcEEE13get_codepointEv at Base 8.0.0
@@ -503,6 +497,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (optional=templinst|arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEEC1EPSF_ at Base 8.0.1
  (optional=templinst|arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEEC2EPSF_ at Base 8.0.1
  (optional=templinst)_ZN11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEEE9set_beginEv at Base 8.2.0~beta1
+ (optional=templinst|arch=armel armhf i386 m68k powerpc)_ZN11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEE9set_beginEv at Base 8.2.0~beta1
  (arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmanneqERKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES2_IhSaIhEEEESE_ at Base 8.0.0
  (arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmanneqERKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES2_IhSaIhEEEESE_ at Base 8.0.0
  (arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZN11ms_nlohmannltERKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES2_IhSaIhEEEESE_ at Base 8.0.0
@@ -631,9 +626,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZN4inja9FileErrorD0Ev at Base 8.0.0
  _ZN4inja9FileErrorD1Ev at Base 8.0.0
  _ZN4inja9FileErrorD2Ev at Base 8.0.0
- (arch=!amd64)_ZN4inja9InjaErrorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_ at Base 8.0.1
  _ZN4inja9InjaErrorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_NS_14SourceLocationE at Base 8.0.0
- (arch=!amd64)_ZN4inja9InjaErrorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_ at Base 8.0.1
  _ZN4inja9InjaErrorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_NS_14SourceLocationE at Base 8.0.0
  _ZN4inja9InjaErrorD0Ev at Base 8.0.0
  _ZN4inja9InjaErrorD1Ev at Base 8.0.0
@@ -940,7 +933,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZN9mapserver9verdana18E at Base 6.2.1
  _ZNK10ClipperLib16clipperException4whatEv at Base 6.2.1
  (arch=i386 mipsel sh4 sparc)_ZNK10ClipperLib6Int128dvERKS0_ at Base 8.0.0
- (arch=!amd64)_ZNK10ClipperLib6Int128mlERKS0_ at Base 8.0.1
+ (arch=!amd64 !arm64 !armel !armhf !m68k !mips64el !powerpc !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK10ClipperLib6Int128mlERKS0_ at Base 8.0.1
  _ZNK10ClipperLib7Clipper14IsContributingERKNS_5TEdgeE at Base 6.2.1
  _ZNK10ClipperLib7Clipper17IsEvenOddFillTypeERKNS_5TEdgeE at Base 6.2.1
  _ZNK10ClipperLib7Clipper20IsEvenOddAltFillTypeERKNS_5TEdgeE at Base 6.2.1
@@ -967,7 +960,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZNK11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEEEdeEv at Base 8.0.0
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZNK11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEEdeEv at Base 8.0.0
  (optional=templinst|arch=mipsel)_ZNK11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEEltERKSF_ at Base 8.0.0
- (optional=templinst|arch=amd64 arm64 mipsel|subst)_ZNK11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEEeqISF_LDnEEEbRKT_ at Base 8.0.0
+ (optional=templinst|subst)_ZNK11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEEeqISF_LDnEEEbRKT_ at Base 8.0.0
  (optional=templinst|arch=alpha amd64 arm64 ia64 loong64 mips64el mipsel riscv64 sparc64|subst)_ZNK11ms_nlohmann6detail9iter_implINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES4_IhSaIhEEEEEmiERKSF_ at Base 8.0.0
  _ZNK4inja11LiteralNode6acceptERNS_11NodeVisitorE at Base 8.0.0
  _ZNK4inja12FunctionNode6acceptERNS_11NodeVisitorE at Base 8.0.0
@@ -1385,10 +1378,10 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZNSt6vectorISt4pairIyyESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 8.0.0
  (optional=templinst|arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZNSt6vectorISt4pairI{uint64_t}{uint64_t}ESaIS1_EED1Ev at Base 8.0.1
  (optional=templinst|arch=alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64|subst)_ZNSt6vectorISt4pairI{uint64_t}{uint64_t}ESaIS1_EED2Ev at Base 8.0.1
- (optional=templinst|arch=amd64 armel armhf i386 m68k mipsel powerpc riscv64 s390x)_ZNSt6vectorIbSaIbEE13_M_insert_auxESt13_Bit_iteratorb at Base 8.0.0
+ (optional=templinst)_ZNSt6vectorIbSaIbEE13_M_insert_auxESt13_Bit_iteratorb at Base 8.0.0
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratorjb at Base 8.0.0
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratormb at Base 8.0.0
- (optional=templinst|arch=amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el powerpc ppc64el riscv64 s390x sparc64)_ZNSt6vectorIbSaIbEE9push_backEb at Base 8.0.1
+ (optional=templinst)_ZNSt6vectorIbSaIbEE9push_backEb at Base 8.0.1
  (optional=templinst)_ZNSt6vectorIcSaIcEE17_M_realloc_insertIJcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_ at Base 8.0.0
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZNSt6vectorIhSaIhEE17_M_default_appendEj at Base 8.0.0
  (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZNSt6vectorIhSaIhEE17_M_default_appendEm at Base 8.0.0
@@ -1462,6 +1455,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (optional=templinst|arch=sparc)_ZSt4sortIN9__gnu_cxx17__normal_iteratorIPPN10ClipperLib6OutRecESt6vectorIS4_SaIS4_EEEEPFbS4_S4_EEvT_SC_T0_ at Base 6.4.1
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZSt4swapIN11ms_nlohmann10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS0_14adl_serializerES3_IhSaIhEEE10json_valueEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleISJ_ESt18is_move_assignableISJ_EEE5valueEvE4typeERSJ_ST_ at Base 8.0.0
  (optional=templinst)_ZSt8__searchIPKcS1_N9__gnu_cxx5__ops15_Iter_comp_iterIPFbRS0_S5_EEEET_S9_S9_T0_SA_T1_ at Base 8.0.0
+ (optional=templinst|arch=arm64)_ZSteqIcSt11char_traitsIcESaIcEEbRKNSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_ at Base 8.2.0~beta1
  (arch=!amd64 !i386 !m68k|subst)_ZStmiRKSt15_Deque_iteratorIPKN11ms_nlohmann10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS0_14adl_serializerES3_IhSaIhEEEERSF_PSF_ESK_ at Base 8.0.0
  (optional=templinst|arch=!mipsel)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEOS8_S5_ at Base 8.0.0
  (optional=templinst)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEOS8_S9_ at Base 8.0.0
@@ -1475,7 +1469,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZTIN10ClipperLib16clipperExceptionE at Base 6.2.1
  _ZTIN10ClipperLib7ClipperE at Base 6.2.1
  _ZTIN11ms_nlohmann6detail10type_errorE at Base 8.0.0
- (arch=!amd64)_ZTIN11ms_nlohmann6detail11other_errorE at Base 8.0.1
  _ZTIN11ms_nlohmann6detail11parse_errorE at Base 8.0.0
  _ZTIN11ms_nlohmann6detail12out_of_rangeE at Base 8.0.0
  _ZTIN11ms_nlohmann6detail16invalid_iteratorE at Base 8.0.0
@@ -1550,7 +1543,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZTSN10ClipperLib16clipperExceptionE at Base 6.2.1
  _ZTSN10ClipperLib7ClipperE at Base 6.2.1
  _ZTSN11ms_nlohmann6detail10type_errorE at Base 8.0.0
- (arch=!amd64)_ZTSN11ms_nlohmann6detail11other_errorE at Base 8.0.1
  _ZTSN11ms_nlohmann6detail11parse_errorE at Base 8.0.0
  _ZTSN11ms_nlohmann6detail12out_of_rangeE at Base 8.0.0
  _ZTSN11ms_nlohmann6detail16invalid_iteratorE at Base 8.0.0
@@ -1626,7 +1618,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZTVN10ClipperLib16clipperExceptionE at Base 6.2.1
  _ZTVN10ClipperLib7ClipperE at Base 6.2.1
  _ZTVN11ms_nlohmann6detail10type_errorE at Base 8.0.0
- (arch=!amd64)_ZTVN11ms_nlohmann6detail11other_errorE at Base 8.0.1
  _ZTVN11ms_nlohmann6detail11parse_errorE at Base 8.0.0
  _ZTVN11ms_nlohmann6detail12out_of_rangeE at Base 8.0.0
  _ZTVN11ms_nlohmann6detail16invalid_iteratorE at Base 8.0.0


=====================================
debian/patches/python-mapscript-install.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Description: Fix Python MapScript installation.
- ERROR: You must give at least one requirement to install (see "pip help install")
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/MapServer/MapServer/pull/7071
-Applied-Upstream: https://github.com/MapServer/MapServer/commit/1fa4c57eba2727e3b0391e9ea79032870d8036dc
-
---- a/src/mapscript/python/CMakeLists.txt
-+++ b/src/mapscript/python/CMakeLists.txt
-@@ -122,7 +122,7 @@ install(
-     endif()
- 
-     execute_process(
--      COMMAND ${Python_EXECUTABLE} -m pip install \${PYTHON_ROOT} \${PYTHON_PREFIX}
-+      COMMAND ${Python_EXECUTABLE} -m pip install \${PYTHON_ROOT} \${PYTHON_PREFIX} .
-       WORKING_DIRECTORY ${OUTPUT_FOLDER}
-     )
-   "


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,2 @@
 perl-mapscript-install.patch
 java-hardening.patch
-python-mapscript-install.patch
-spelling-errors.patch


=====================================
debian/patches/spelling-errors.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Description: Fix spelling errors.
- instanciate -> instantiate
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/MapServer/MapServer/pull/7072
-Applied-Upstream: https://github.com/MapServer/MapServer/commit/a7d0fffed672c1a862aa3389dbf6b24635b8a0b0
-
---- a/src/mapogcapi.cpp
-+++ b/src/mapogcapi.cpp
-@@ -1217,7 +1217,7 @@ static int processCollectionItemsRequest
- 
-   msProjectionInheritContextFrom(&reprObjs.proj, &(map->projection));
-   if (msLoadProjectionString(&reprObjs.proj, outputCrs.c_str()) != 0) {
--    outputError(OGCAPI_SERVER_ERROR, "Cannot instanciate output CRS.");
-+    outputError(OGCAPI_SERVER_ERROR, "Cannot instantiate output CRS.");
-     return MS_SUCCESS;
-   }
- 


=====================================
src/mapogcapi.cpp
=====================================
@@ -1217,7 +1217,7 @@ static int processCollectionItemsRequest(mapObj *map, cgiRequestObj *request,
 
   msProjectionInheritContextFrom(&reprObjs.proj, &(map->projection));
   if (msLoadProjectionString(&reprObjs.proj, outputCrs.c_str()) != 0) {
-    outputError(OGCAPI_SERVER_ERROR, "Cannot instanciate output CRS.");
+    outputError(OGCAPI_SERVER_ERROR, "Cannot instantiate output CRS.");
     return MS_SUCCESS;
   }
 


=====================================
src/mapscript/python/CMakeLists.txt
=====================================
@@ -122,7 +122,7 @@ install(
     endif()
 
     execute_process(
-      COMMAND ${Python_EXECUTABLE} -m pip install \${PYTHON_ROOT} \${PYTHON_PREFIX}
+      COMMAND ${Python_EXECUTABLE} -m pip install \${PYTHON_ROOT} \${PYTHON_PREFIX} .
       WORKING_DIRECTORY ${OUTPUT_FOLDER}
     )
   "



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/8b936ea1da864eb35956d3ad76c62b227897d55b...6f0012d30e13f563990dcd13eaf9be3977eb2f59

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/8b936ea1da864eb35956d3ad76c62b227897d55b...6f0012d30e13f563990dcd13eaf9be3977eb2f59
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/20240608/d6f581ac/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list