[Git][debian-gis-team/mapnik][master] 2 commits: Use <MAJOR>.<MINOR> subdirectory for input plugins to match SONAME.

[Bas Couwenberg (@sebastic)]

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


Commits:
502ea0ee by Bas Couwenberg at 2024-11-04T10:54:28+01:00
Use <MAJOR>.<MINOR> subdirectory for input plugins to match SONAME.

- - - - -
abedfb3c by Bas Couwenberg at 2024-11-04T10:54:28+01:00
Set distribution to unstable.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+mapnik (4.0.3+ds-2) unstable; urgency=medium
+
+  * Use <MAJOR>.<MINOR> subdirectory for input plugins to match SONAME.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 04 Nov 2024 10:44:41 +0100
+
 mapnik (4.0.3+ds-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/rules
=====================================
@@ -8,11 +8,10 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 include /usr/share/dpkg/architecture.mk
-include /usr/share/dpkg/pkg-info.mk
 
-UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
-
-MAPNIK_SO_VERSION = $(shell echo $(UPSTREAM_VERSION) | sed -e 's/~.*//')
+MAPNIK_MAJOR_VERSION = $(shell awk '/^#define MAPNIK_MAJOR_VERSION/ {print $$3}' include/mapnik/version.hpp)
+MAPNIK_MINOR_VERSION = $(shell awk '/^#define MAPNIK_MINOR_VERSION/ {print $$3}' include/mapnik/version.hpp)
+MAPNIK_SO_VERSION = ${MAPNIK_MAJOR_VERSION}.${MAPNIK_MINOR_VERSION}
 
 MAPNIK_LIB_BASE = lib/$(DEB_HOST_MULTIARCH)/mapnik/$(MAPNIK_SO_VERSION)
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/bebe91fa999fb32386fb62e362b08c680e8d1be5...abedfb3c22771320932dbaba7764018df83686c6

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapnik/-/compare/bebe91fa999fb32386fb62e362b08c680e8d1be5...abedfb3c22771320932dbaba7764018df83686c6
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/20241104/b3c24cf4/attachment-0001.htm>