[Pkg-samba-maint] [Git][samba-team/samba][master] 7 commits: d/rules: fix talloc, tevent, tdb subpackages version numbers, add epoch
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Sat Jan 11 20:16:13 GMT 2025
Michael Tokarev pushed to branch master at Debian Samba Team / samba
Commits:
9c7d01bd by Michael Tokarev at 2025-01-11T19:50:31+03:00
d/rules: fix talloc, tevent, tdb subpackages version numbers, add epoch
Due to a mistake, I screwed up sub-packages versions completely,
by using the wrong variable when generating the versions, - so
all mentioned packages had version number of ldb, not their own.
Fix this.
Unfortunately, the wrong version is larger than alll the correct ones.
To compensate, use the same epoch number as is already used by current
samba package (2:).
While at it, use common variable to hold the +samba version suffix.
- - - - -
76318fcc by Michael Tokarev at 2025-01-11T22:14:46+03:00
d/*.symbols: mark most recent version markers with 2: epoch too
- - - - -
4e271b30 by Michael Tokarev at 2025-01-11T22:14:46+03:00
d/control,d/rules: ensure we use the most recent libtalloc/libtevent/libtdb
- - - - -
1bfe277f by Michael Tokarev at 2025-01-11T22:14:46+03:00
d/control: fix before-trixie build profile
- - - - -
00d3f1bb by Michael Tokarev at 2025-01-11T22:38:33+03:00
d/control: add conflicts for libtevent0t64 on mjt repo
- - - - -
17026f46 by Michael Tokarev at 2025-01-11T23:04:00+03:00
d/control: add explicit Provides of non-t64 libs
Apparentlty due to usage of both t64 and pre-t64 packages
(with different build profiles), debhelper is not populating
necessary values for ${t64:Provides}. So libtevent0t64 is
not providing libtevent0 on the relevant architectures.
Ditto for libsmbclient0 providing libsmbclient.
Add explicit arch-specific Provides: for libsmbclient0 and
libtevent0t64.
List only the affected release architectures in there.
This removes the only user of X-Time64-Compat control field
in debian.
- - - - -
3cd8f423 by Michael Tokarev at 2025-01-11T23:12:20+03:00
d/rules: do not install wscript_build in examples
- - - - -
5 changed files:
- debian/control
- debian/libtalloc2.symbols
- debian/libtdb1.symbols
- debian/libtevent0t64.symbols
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -133,6 +133,12 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
# just require libldb version of the same build
# https://lists.samba.org/archive/samba-technical/2023-September/138422.html
libldb2 (= ${ldb:Version}),
+# other libs built from samba sources (it'd be nice to have dpkg-shlibdeps generate these).
+# this helps to overcome the wrong version mishap (4.21.3+dfsg-5), can be dropped for trixie
+ libtalloc2 (>= ${talloc:Version}),
+ libtevent0t64 (>= ${tevent:Version}) <!pkg.samba.before-trixie>,
+ libtevent0 (>= ${tevent:Version}) < pkg.samba.before-trixie>,
+ libtdb1 (>= ${tdb:Version}),
Replaces:
# libsamba-util.so &deps moved from libwbclient0 to samba-libs in 4.16.1+dfsg-7
libwbclient0 (<< 2:4.16.1+dfsg-7~),
@@ -421,8 +427,7 @@ Description: Samba Virtual FileSystem glusterfs modules
vfs_glusterfs_fuse modules.
Package: libsmbclient0
-Provides: ${t64:Provides}
-X-Time64-Compat: libsmbclient
+Provides: libsmbclient (= ${binary:Version}) [amd64 arm64 i386 mips64el ppc64el riscv64 s390x]
Replaces: libsmbclient
Breaks: libsmbclient (<< ${source:Version})
Build-Profiles: <!pkg.samba.before-trixie>
@@ -717,8 +722,8 @@ Description: hierarchical pool based memory allocator - Python3 bindings
###################### tevent packages
Package: libtevent0t64
-Build-Profiles: <!pkg.tevent.before-trixie>
-Provides: ${t64:Provides}
+Build-Profiles: <!pkg.samba.before-trixie>
+Provides: libtevent0 (= ${binary:Version}) [amd64 arm64 i386 mips64el ppc64el riscv64 s390x]
Replaces: libtevent0
Breaks: libtevent0 (<< ${source:Version})
Architecture: any
@@ -738,11 +743,14 @@ Description: talloc-based event loop library - shared library
Package: libtevent0
# the same as libtevent0t64
-Build-Profiles: <pkg.tevent.before-trixie>
+Build-Profiles: <pkg.samba.before-trixie>
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Section: libs
+# libtevent0t64 slipped out into mjt repository (for a short while)
+Replaces: libtevent0t64 (<< 2:0.16.1) <pkg.samba.before-trixie>
+Conflicts: libtevent0t64 (<< 2:0.16.1) <pkg.samba.before-trixie>
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: talloc-based event loop library - shared library
tevent is a simple library that can handle the main event loop for an
@@ -760,8 +768,8 @@ Architecture: any
Multi-Arch: same
Depends: libc6-dev,
libtalloc-dev,
- libtevent0t64 (= ${binary:Version}) <!pkg.tevent.before-trixie>,
- libtevent0 (= ${binary:Version}) < pkg.tevent.before-trixie>,
+ libtevent0t64 (= ${binary:Version}) <!pkg.samba.before-trixie>,
+ libtevent0 (= ${binary:Version}) < pkg.samba.before-trixie>,
${misc:Depends}
Description: talloc-based event loop library - development files
tevent is a simple library that can handle the main event loop for an
=====================================
debian/libtalloc2.symbols
=====================================
@@ -33,7 +33,7 @@ libtalloc.so.2 #PACKAGE# #MINVER#
TALLOC_2.3.5 at TALLOC_2.3.5 2.4.0
TALLOC_2.4.0 at TALLOC_2.4.0 2.4.0
TALLOC_2.4.1 at TALLOC_2.4.1 2.4.1
- TALLOC_2.4.2 at TALLOC_2.4.2 2.4.2
+ TALLOC_2.4.2 at TALLOC_2.4.2 2:2.4.2
_talloc at TALLOC_2.0.2 2.0.4~git20101213
_talloc_array at TALLOC_2.0.2 2.0.4~git20101213
_talloc_free at TALLOC_2.0.2 2.0.4~git20101213
=====================================
debian/libtdb1.symbols
=====================================
@@ -44,7 +44,7 @@ libtdb.so.1 #PACKAGE# #MINVER#
TDB_1.4.9 at TDB_1.4.9 1.4.9
TDB_1.4.10 at TDB_1.4.10 1.4.10
TDB_1.4.11 at TDB_1.4.11 1.4.11
- TDB_1.4.12 at TDB_1.4.12 1.4.12
+ TDB_1.4.12 at TDB_1.4.12 2:1.4.12
tdb_add_flags at TDB_1.2.1 1.2.7+git20101214
tdb_append at TDB_1.2.1 1.2.7+git20101214
tdb_chainlock at TDB_1.2.1 1.2.7+git20101214
=====================================
debian/libtevent0t64.symbols
=====================================
@@ -42,7 +42,7 @@ libtevent.so.0 #PACKAGE# #MINVER#
TEVENT_0.14.1 at TEVENT_0.14.1 0.14.1
TEVENT_0.15.0 at TEVENT_0.15.0 0.15.0
TEVENT_0.16.0 at TEVENT_0.16.0 0.16.0
- TEVENT_0.16.1 at TEVENT_0.16.1 0.16.1
+ TEVENT_0.16.1 at TEVENT_0.16.1 2:0.16.1
__tevent_req_create at TEVENT_0.15.0 0.15.0
_tevent_add_fd at TEVENT_0.9.9 0.9.9
_tevent_add_signal at TEVENT_0.9.9 0.9.9
=====================================
debian/rules
=====================================
@@ -55,29 +55,34 @@ DESTDIR = ${CURDIR}/debian/tmp
before-trixie := $(filter pkg.samba.before-trixie, ${DEB_BUILD_PROFILES})
+subver-suffix := +samba${DEB_VERSION_UPSTREAM_REVISION}
+
# lib/ldb/wscript
ldb-upstream-version := 2.10.0
-ldb-version = 2:${ldb-upstream-version}+samba${DEB_VERSION_UPSTREAM_REVISION}
+ldb-version = 2:${ldb-upstream-version}${subver-suffix}
ldb-packages := libldb2 libldb-dev ldb-tools python3-ldb
# lib/talloc/wscript
talloc-upstream-version := 2.4.2
-talloc-version = ${ldb-upstream-version}+samba${DEB_VERSION_UPSTREAM_REVISION}
+talloc-version = 2:${talloc-upstream-version}${subver-suffix}
talloc-packages := libtalloc2 libtalloc-dev python3-talloc
# lib/tevent/wscript
tevent-upstream-version := 0.16.1
-tevent-version = ${ldb-upstream-version}+samba${DEB_VERSION_UPSTREAM_REVISION}
+tevent-version = 2:${tevent-upstream-version}${subver-suffix}
libtevent := $(if ${before-trixie},libtevent0,libtevent0t64)
tevent-packages := ${libtevent} libtevent-dev
# lib/tdb/wscript
tdb-upstream-version := 1.4.12
-tdb-version = ${ldb-upstream-version}+samba${DEB_VERSION_UPSTREAM_REVISION}
+tdb-version = 2:${tdb-upstream-version}${subver-suffix}
tdb-packages := libtdb1 tdb-tools libtdb-dev python3-tdb
extra-version-vars = \
-Vldb:Version=${ldb-version} \
+ -Vtalloc:Version=${talloc-version} \
+ -Vtevent:Version=${tevent-version} \
+ -Vtdb:Version=${tdb-version} \
omit-pkgs =
@@ -402,6 +407,9 @@ endif
$(call depcheck, ${libtevent}, samba|samba-libs|${libsmbclient}|libwbclient0)
$(call depcheck, libtdb1, samba|samba-libs|${libsmbclient}|libwbclient0)
+override_dh_installexamples:
+ dh_installexamples -Xwscript_build
+
override_dh_gencontrol:
dh_gencontrol $(addprefix -p, ${ldb-packages}) -- -v${ldb-version}
dh_gencontrol $(addprefix -p, ${talloc-packages}) -- -v${talloc-version}
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/ab39c0a5ddb5dd447ee312f7ddac6497dcb49bf5...3cd8f423a969cb247a0ebda9a0c1dd5aebe217b7
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/ab39c0a5ddb5dd447ee312f7ddac6497dcb49bf5...3cd8f423a969cb247a0ebda9a0c1dd5aebe217b7
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/20250111/32585c7e/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list