[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: d/rules: use the same epoch number for libldb as for samba itself

[Michael Tokarev (@mjt)]

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


Commits:
f47ff9bb by Michael Tokarev at 2024-08-02T12:27:59+03:00
d/rules: use the same epoch number for libldb as for samba itself

- - - - -
717035db by Michael Tokarev at 2024-08-02T12:28:06+03:00
update changelog; upload version 4.20.2+dfsg-12 to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+samba (3:4.20.2+dfsg-12) unstable; urgency=medium
+
+  * bump the epoch to work around mistakenly uploaded 4.21.0-rc1
+    to unstable instead of experimental and a mess resulting from that.
+    Use the same epoch number for libldb.
+    Closes: #1077749
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Fri, 02 Aug 2024 12:13:59 +0300
+
 samba (2:4.20.2+dfsg-11) unstable; urgency=medium
 
   * d/control: remove Andrew Bartlett email from Uploaders per his request


=====================================
debian/rules
=====================================
@@ -55,9 +55,10 @@ DESTDIR = ${CURDIR}/debian/tmp
 
 # used to be dpkg_late_eval
 late-eval = $(or $(value cache-$1),$(eval cache-$1 := $(shell $2))$(value cache-$1))
+DEB_VERSION_EPOCH = $(firstword $(subst :, ,${DEB_VERSION})):
 
 LDB_VERSION = $(call late-eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
-LDB_DEB_VERSION = 2:${LDB_VERSION}+samba${DEB_VERSION_UPSTREAM_REVISION}
+LDB_DEB_VERSION = ${DEB_VERSION_EPOCH}${LDB_VERSION}+samba${DEB_VERSION_UPSTREAM_REVISION}
 LDB_PACKAGES = libldb2 libldb-dev ldb-tools python3-ldb
 
 before-trixie := $(filter pkg.samba.before-trixie, ${DEB_BUILD_PROFILES})



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/2c2f1884b705ee757ab7d31b257db056134ae119...717035db1eefb711d698aeb9bc0a1c9f134c06ce

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/2c2f1884b705ee757ab7d31b257db056134ae119...717035db1eefb711d698aeb9bc0a1c9f134c06ce
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/20240802/77f83cee/attachment-0001.htm>