[Pkg-samba-maint] [Git][samba-team/samba][master] 3 commits: d/rules: change ldb version string again (#1010100)

[Michael Tokarev (@mjt)]

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


Commits:
b49f1270 by Michael Tokarev at 2022-04-24T16:55:06+03:00
d/rules: change ldb version string again (#1010100)

ldb version string currently is
  2:2.5.0+smb-6+samba4.16.0+dfsg
where "6" comes from the debian revision. When an NMU is uploaded,
this becomes
  2:2.5.0+smb-6+b1+samba4.16.0+dfsg
which sorts *before* the original non-nmu version.
Make it without the "+samba*" suffix for now:
  2:2.5.0+smb-7
or, after an NMU,
  2:2.5.0+smb-7+b1

Possible numbering scheme, if we really want to have the +sambaNN
thing, can be
  2:2.5.1-samba4.16.0+6
with the debian revision coming *after* the "samba4.16" suffix.
Or just go without the suffix entirely like this,
it is the same ldb after all (and we don't DFSG-ify ldb parts).

- - - - -
7130c571 by Michael Tokarev at 2022-04-24T17:01:36+03:00
d/rules: clever version of DEB_REVISION expression

instead of using $(shell) to find the last component of version
after - sign, use make-providing functions. This becomes shorter,
easier to read and faster too.

- - - - -
2f0de6e3 by Michael Tokarev at 2022-04-24T17:02:08+03:00
update changelog, upload 4.16.0+dfsg-7 to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,14 +1,17 @@
-samba (2:4.16.0+dfsg-7) UNRELEASED; urgency=medium
+samba (2:4.16.0+dfsg-7) unstable; urgency=medium
 
   * another bunch of small tweaks to d/rules:
    - set SHELL to /bin/sh -e
    - rework the clean target
    - provide fast replacement of architecture.mk
+   - better expression for DEB_REVISION
    - rearrange configure options
   * do not disable glusterfs on ubuntu-i386 (glusterfs is now in main)
   * mention closing of #1001053 by the 4.16 upload
+  * change the ldb version string again, removing te "+samba*" suffix
+    to allow bin-NMUs +b1 (Closes: #1010100)
 
- -- Michael Tokarev <mjt at tls.msk.ru>  Fri, 15 Apr 2022 16:20:52 +0300
+ -- Michael Tokarev <mjt at tls.msk.ru>  Sun, 24 Apr 2022 16:56:34 +0300
 
 samba (2:4.16.0+dfsg-6) unstable; urgency=medium
 


=====================================
debian/rules
=====================================
@@ -15,7 +15,7 @@ endif
 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##*-}")
+DEB_REVISION = $(lastword $(subst -, ,${DEB_VERSION}))
 
 LDB_EPOCH := 2:
 LDB_VERSION = $(call dpkg_late_eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
@@ -24,7 +24,7 @@ LDB_VERSION = $(call dpkg_late_eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript |
 ifneq (${LDB_VERSION}, 2.5.0)
 $(error update LDB version number expression below:)
 endif
-LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}+smb-${DEB_REVISION}+samba${DEB_VERSION_UPSTREAM}
+LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}+smb-${DEB_REVISION}
 LDB_DEPENDS := libldb2 (= ${LDB_DEB_VERSION})
 
 V = 1



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/fea4620d335f868698de5547be0cecd8c515263e...2f0de6e38aad15b829dd8cf6f5e81b1f036b5b9e

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/fea4620d335f868698de5547be0cecd8c515263e...2f0de6e38aad15b829dd8cf6f5e81b1f036b5b9e
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/20220424/77e2acc7/attachment-0001.htm>