[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: d/rules: rewrite ldb version expression once again to make it 2.5.0+smb4.16.1-1

[Michael Tokarev (@mjt)]

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


Commits:
64792936 by Michael Tokarev at 2022-05-02T16:58:53+03:00
d/rules: rewrite ldb version expression once again to make it 2.5.0+smb4.16.1-1

I'm going in cicrles: this is something similar to what we
initially had, but for some reason dpkg-gensymbols disiked
and I thought it's the wrong way, again, for some reason.
We *must* include samba source version somewhere here or
else new samba version with the same ldb version will not
be ok as with 4.16.1 (with ldb still being at 2.5.0).

*sigh*

- - - - -
12a16f56 by Michael Tokarev at 2022-05-02T17:05:41+03:00
update changelog; upload 4.16.1+dfsg-2 to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+samba (2:4.16.1+dfsg-2) unstable; urgency=medium
+
+  * rethink ldb version *again*, to be 2.5.0+smb4.16.1-2
+    or else 2.5.0+smb-1 from samba-4.16.1-2 sorts before
+    2.5.0+smb-7 from samba-4.16.0-7.
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Mon, 02 May 2022 17:02:16 +0300
+
 samba (2:4.16.1+dfsg-1) unstable; urgency=medium
 
   * new upstream minor release 4.16.1


=====================================
debian/rules
=====================================
@@ -13,9 +13,6 @@ endif
 
 export PYTHON = python3
 
-# just the debian revision number from the package version
-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)
  # For 2.5.0 we uploaded wrongly versioned ldb to experimental (2.5.0+samba should be 2.5.0)
@@ -23,7 +20,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}
+LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}+smb$(subst +dfsg,,${DEB_VERSION_UPSTREAM_REVISION})
 LDB_DEPENDS := libldb2 (= ${LDB_DEB_VERSION})
 LDB_PACKAGES := libldb2 libldb-dev ldb-tools python3-ldb python3-ldb-dev
 



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/1568ae317b66e676a41c206ea98672d7bc68b874...12a16f56ef8c4273bdd3d66fe2bd45c3a8a89a89

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/1568ae317b66e676a41c206ea98672d7bc68b874...12a16f56ef8c4273bdd3d66fe2bd45c3a8a89a89
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/20220502/e2765118/attachment-0001.htm>