[Pkg-samba-maint] [Git][samba-team/samba][master] d/rules: redo ldb version number

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch master at Debian Samba Team / samba


Commits:
d8f964af by Michael Tokarev at 2022-04-05T21:16:17+03:00
d/rules: redo ldb version number

it is not ldb_2.5.0+samba4.16.0-1, it is ldb_2.5.0-1+samba4.16.0,
the debian revision number and the +samba suffix are swapped.

Introduce ${DEB_REVISION}, use that one in ${LDB_DEB_VERSION},
and cache all the computed values in $(call dpkg_late_eval).

Unfortunately the incorrect 2.5.0+samba4.16.0-1 is larger than
the correct 2.5.0-1+samba4.16.0, so it is not okay to upload
this without bumping ldb base version.  However, and we're
fortunate here, since 4.16.0-1 were uploaded to experimental
only, there is no huge need to require proper version numbering
in there.

We probably can make LDB_*VERSION* names consistent with the
variables from pkg-info.mk.

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -11,9 +11,12 @@ $(foreach var,DEB_HOST_ARCH DEB_HOST_ARCH_OS DEB_HOST_MULTIARCH,\
 
 export PYTHON = python3
 
+# just the debian revision number from the package version
+DEB_REVISION = $(call dpkg_late_eval,DEB_REVISION,v='${DEB_VERSION}'; echo "$${v##*-}")
+
 LDB_EPOCH := 2:
-LDB_VERSION := $(shell grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
-LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}+samba${DEB_VERSION_UPSTREAM_REVISION}
+LDB_VERSION = $(call dpkg_late_eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
+LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}-${DEB_REVISION}+samba${DEB_VERSION_UPSTREAM}
 LDB_DEPENDS := libldb2 (= ${LDB_DEB_VERSION})
 
 V = 1
@@ -255,7 +258,7 @@ override_dh_makeshlibs:
 	pyext=$$(python3-config --extension-suffix | tr _ -); \
 	pyUP=$$(echo $${pyext%.so} | tr a-z- A-Z_); \
 	{ echo "libpyldb-util$${pyext}.2 python3-ldb #MINVER#"; \
-	  echo " PYLDB_UTIL$${pyUP}_${LDB_VERSION}@PYLDB_UTIL$${pyUP}_${LDB_VERSION} ${LDB_DEB_VERSION}"; \
+	  echo " PYLDB_UTIL$${pyUP}_${LDB_VERSION}@PYLDB_UTIL$${pyUP}_${LDB_VERSION} ${LDB_EPOCH}${LDB_VERSION}"; \
 	  cat debian/python3-ldb.symbols.in; } > debian/python3-ldb.symbols
 
 	# create symbols and shlibs files in separate wrapper script



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/d8f964af7599de6bad53eb2c4b6a325ca628b3db

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/d8f964af7599de6bad53eb2c4b6a325ca628b3db
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-samba-maint/attachments/20220405/0f5d48df/attachment.htm>