[Git][debian-gis-team/mapserver][master] 5 commits: Drop obsolete Breaks/Replaces.

[Bas Couwenberg (@sebastic)]

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


Commits:
22d7012d by Bas Couwenberg at 2022-09-21T15:48:19+02:00
Drop obsolete Breaks/Replaces.

- - - - -
dd06b2d7 by Bas Couwenberg at 2022-09-21T17:00:18+02:00
Move ogcapi templates from libmapserver-dev to mapserver-bin package.

- - - - -
ee7f9cfe by Bas Couwenberg at 2022-09-21T17:00:18+02:00
Update symbols for other architectures.

- - - - -
c5077025 by Bas Couwenberg at 2022-09-21T17:01:45+02:00
Add patch to fix installation with setuptools 65.3.0.

- - - - -
5fff6012 by Bas Couwenberg at 2022-09-21T17:02:10+02:00
Set distribution to unstable.

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/libmapserver-dev.install
- debian/libmapserver2.symbols
- debian/mapserver-bin.install
- debian/libmapserver-dev.lintian-overrides → debian/mapserver-bin.lintian-overrides
- debian/patches/series
- + debian/patches/setuptools.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+mapserver (8.0.0-2) unstable; urgency=medium
+
+  * Drop obsolete Breaks/Replaces.
+  * Move ogcapi templates from libmapserver-dev to mapserver-bin package..
+  * Update symbols for other architectures.
+  * Add patch to fix installation with setuptools 65.3.0.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 21 Sep 2022 17:01:59 +0200
+
 mapserver (8.0.0-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -77,10 +77,6 @@ Suggests: cgi-mapserver,
           mapserver-doc,
           libmapscript-perl,
           python3-mapscript
-Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~),
-        libmapserver1-dev (<< 7.0.0~)
-Replaces: libmapserver-6.2.1-dev (<< 6.4.0-1~),
-          libmapserver1-dev (<< 7.0.0~)
 Description: Shared library development files for MapServer
  This package contains the development files for the shared library.
  .
@@ -117,6 +113,8 @@ Suggests: cgi-mapserver,
           shapelib,
           libmapscript-perl,
           python3-mapscript
+Breaks: libmapserver-dev (<< 8.0.0-2~)
+Replaces: libmapserver-dev (<< 8.0.0-2~)
 Description: MapServer utilities
  This package provides command-line utilities for MapServer.
  .


=====================================
debian/libmapserver-dev.install
=====================================
@@ -1,3 +1,3 @@
 usr/include/mapserver/*
 usr/lib/*/libmapserver.so
-usr/share/mapserver/
+usr/share/mapserver/cmake/


=====================================
debian/libmapserver2.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 8.0.0~rc2 amd64 arm64
+# SymbolsHelper-Confirmed: 8.0.0 arm64
 libmapserver.so.2 #PACKAGE# #MINVER#
 * Build-Depends-Package: libmapserver-dev
  BuildExpressionTree at Base 6.2.1
@@ -487,6 +487,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail9from_jsonINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEEEvRKT_RNSF_9boolean_tE at Base 8.0.0
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail9from_jsonINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEES4_ISE_SaISE_EELi0EEEDTcmcmcl20from_json_array_implfp_fp0_cvNS0_12priority_tagILj3EEEilEEcldtfp_3getINT0_10value_typeEEEcvv_EERKT_RSJ_ at Base 8.0.0
  (optional=templinst|arch=armel armhf i386 m68k mipsel powerpc)_ZN11ms_nlohmann6detail9from_jsonINS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEiLi0EEEvRKT_RT0_ at Base 8.0.0
+ (optional=templinst)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEEE7set_endEv at Base 8.0.0
  (optional=templinst|arch=amd64 arm64)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEblmdSaNS_14adl_serializerES4_IhSaIhEEEEE9set_beginEv at Base 8.0.0
  (optional=templinst|arch=arm64 armel m68k)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEE7set_endEv at Base 8.0.0
  (optional=templinst|arch=armel armhf m68k mipsel)_ZN11ms_nlohmann6detail9iter_implIKNS_10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS_14adl_serializerES4_IhSaIhEEEEE9set_beginEv at Base 8.0.0


=====================================
debian/mapserver-bin.install
=====================================
@@ -9,3 +9,4 @@ usr/bin/shptreetst
 usr/bin/shptreevis
 usr/bin/sortshp
 usr/bin/tile4ms
+usr/share/mapserver/ogcapi/


=====================================
debian/libmapserver-dev.lintian-overrides → debian/mapserver-bin.lintian-overrides
=====================================


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 perl-mapscript-install.patch
 java-hardening.patch
 interpreter-path.path
+setuptools.patch


=====================================
debian/patches/setuptools.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Fix installation with setuptools 65.3.0.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/mapscript/python/CMakeLists.txt
++++ b/mapscript/python/CMakeLists.txt
+@@ -130,7 +130,7 @@ install(
+     endif()
+ 
+     execute_process(
+-      COMMAND ${Python_EXECUTABLE} setup.py install \${PYTHON_ROOT} \${PYTHON_PREFIX}
++      COMMAND ${Python_EXECUTABLE} setup.py install --install-layout=deb \${PYTHON_ROOT} \${PYTHON_PREFIX}
+       WORKING_DIRECTORY ${OUTPUT_FOLDER}
+     )
+   "



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/d8b1208f5531bce1df8a961d6f9c026f093d26c4...5fff60129184ec6545c2c2ba62cab30a5259fa11

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/d8b1208f5531bce1df8a961d6f9c026f093d26c4...5fff60129184ec6545c2c2ba62cab30a5259fa11
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/20220921/cf04ca70/attachment-0001.htm>