From 7252cf16ee0ef58bc89c29e103760b5ca85e995d Mon Sep 17 00:00:00 2001 From: giraffedata Date: Mon, 14 Nov 2022 20:03:06 +0000 Subject: Release 11.00.02 git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4468 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- doc/HISTORY | 7 +++++++ lib/Makefile | 26 ++++++++++++++++++++++++-- version.mk | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/doc/HISTORY b/doc/HISTORY index f320d1c4..a8f36cee 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,13 @@ Netpbm. CHANGE HISTORY -------------- +22.11.14 BJH Release 11.00.02 + + packaging: Fix library minor number to 100 + Netpbm minor number + so it is higher than previous ones in library major 100. + I.e. libnetpbm.so.100.101 instead of libnetpbm.so.100.1. + Introduced in Netpbm 11.00.00. + 22.10.14 BJH Release 11.00.01 fitstopnm: fix invalid memory reference (nonterminated ASCIIZ diff --git a/lib/Makefile b/lib/Makefile index d7dfc993..5040e40f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -99,8 +99,30 @@ libpbm3.o: CFLAGS_TARGET+=$(CFLAGS_SSE) $(LIBOBJECTS): %.o: %.c importinc $(CC) -c $(INCLUDES) $(CFLAGS_ALL) -o $@ $< -MAJ = 11 -MIN = $(NETPBM_MINOR_RELEASE) +# The major number increases when there is a non-backward-compatible change +# to the library at the binary level, meaning any client of the library needs +# to keep using the old library until it has been recompiled for the new +# library. We try very hard never to lose backward compatibility at the +# source level, which would mean the client source code has to be modified +# before it can use the new library. +# +# The major number might seem like it corresponds to the major version number +# of Netpbm, but it does not. It is independent. +# +# Adding functions is backward compatible, so does not require a major number +# change. +# +# The minor number must always increase within a major number. +# +# It is convenient to have the minor number equal to the minor version number +# of Netpbm, but when we changed the Netpbm major version number from 10 to 11 +# just to keep the minor version number 2 digits, we had to continue +# increasing the library minor number, so we went to 100 + minor version +# number. If we ever increase the major number to 12, we can go back to using +# the minor version number for the library minor number. + +MAJ := 11 +$(eval MIN:=$(shell echo $$((100+$(NETPBM_MINOR_RELEASE))))) SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) diff --git a/version.mk b/version.mk index 410b22e7..ef7c3182 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 11 NETPBM_MINOR_RELEASE = 0 -NETPBM_POINT_RELEASE = 1 +NETPBM_POINT_RELEASE = 2 -- cgit 1.4.1