[Pkg-samba-maint] [Git][samba-team/samba][experimental] 4 commits: implement pkg.samba.before-trixie build profile (undo t64 changhes and drop a build-dep)
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Sun Apr 7 14:31:21 BST 2024
Michael Tokarev pushed to branch experimental at Debian Samba Team / samba
Commits:
089ef0eb by Michael Tokarev at 2024-04-07T16:21:24+03:00
implement pkg.samba.before-trixie build profile (undo t64 changhes and drop a build-dep)
- - - - -
602e4464 by Michael Tokarev at 2024-04-07T16:21:31+03:00
d/rules: remove Debian/Ubuntu "branding", no need in that
- - - - -
9bed251f by Michael Tokarev at 2024-04-07T16:21:41+03:00
d/control: samba-dsdb-modules: drop hardcoded dependency on libgpgme11 (#1068526)
- - - - -
f411e8f1 by Michael Tokarev at 2024-04-07T16:22:47+03:00
update changelog; upload version 4.20.0+dfsg-1~exp2 to experimental
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/libsmbclient.install
- + debian/libsmbclient.symbols
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+samba (2:4.20.0+dfsg-1~exp2) experimental; urgency=medium
+
+ * implement pkg.samba.before-trixie build profile
+ (undo t64 changhes and drop build-dep)
+ * d/rules: remove Debian/Ubuntu "branding", no need in that
+ * d/control: samba-dsdb-modules: drop hardcoded dependency on libgpgme11
+ (Closes: #1068526)
+
+ -- Michael Tokarev <mjt at tls.msk.ru> Sun, 07 Apr 2024 16:04:30 +0300
+
samba (2:4.20.0+dfsg-1~exp1) experimental; urgency=medium
* new upstream release (4.20.0)
=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Uploaders: Steve Langasek <vorlon at debian.org>,
Homepage: https://www.samba.org
Standards-Version: 4.6.2
Build-Depends:
- dpkg-dev (>= 1.22.5),
+ dpkg-dev (>= 1.22.5) <!pkg.samba.before-trixie>,
debhelper-compat (= 13),
dh-exec,
Build-Depends-Arch:
@@ -21,7 +21,7 @@ Build-Depends-Arch:
flex,
perl:any,
po-debconf,
- rpcsvc-proto,
+ rpcsvc-proto <!pkg.samba.before-trixie>,
# libraries which we embed but use system versions of:
libtalloc-dev (>= 2.4.2~),
python3-talloc-dev (>= 2.4.2~),
@@ -195,7 +195,7 @@ Description: Samba common files used by both the server and the client
.
This package contains the common files that are used by both the server
(provided in the samba package) and the client (provided in the smbclient
- libsmbclient0 packages).
+ package).
Package: samba-ad-dc
Architecture: all
@@ -333,8 +333,7 @@ Package: samba-dsdb-modules
Architecture: any
Multi-Arch: same
Section: libs
-Depends: libgpgme11,
- samba-libs (= ${binary:Version}),
+Depends: samba-libs (= ${binary:Version}),
${ldb:Depends},
${misc:Depends},
${shlibs:Depends}
@@ -380,6 +379,20 @@ Provides: ${t64:Provides}
X-Time64-Compat: libsmbclient
Replaces: libsmbclient
Breaks: libsmbclient (<< ${source:Version})
+Build-Profiles: <!pkg.samba.before-trixie>
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: samba-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: shared library for communication with SMB/CIFS servers
+ This package provides a shared library that enables client applications
+ to talk to Microsoft Windows and Samba servers using the SMB/CIFS
+ protocol.
+
+Package: libsmbclient
+# exactly the same as libsmbclient but for older systems before t64 transition
+Build-Profiles: <pkg.samba.before-trixie>
Section: libs
Architecture: any
Multi-Arch: same
@@ -394,8 +407,11 @@ Package: libsmbclient-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libsmbclient0 (= ${binary:Version}), ${misc:Depends}
-Description: development files for libsmbclient0
+Depends: ${misc:Depends},
+ libsmbclient0 (= ${binary:Version}) <!pkg.samba.before-trixie>,
+ libsmbclient (= ${binary:Version}) < pkg.samba.before-trixie>,
+# the library name is libsmbclient0 on trixie and up
+Description: development files for libsmbclient
This package provides the development files (static library and headers)
required for building applications against libsmbclient, a library that
enables client applications to talk to Microsoft Windows and Samba servers
=====================================
debian/libsmbclient.install
=====================================
@@ -0,0 +1 @@
+libsmbclient0.install
\ No newline at end of file
=====================================
debian/libsmbclient.symbols
=====================================
@@ -0,0 +1 @@
+libsmbclient0.symbols
\ No newline at end of file
=====================================
debian/rules
=====================================
@@ -119,6 +119,13 @@ config-args += $(if ${with-ceph},\
--enable-cephfs --enable-ceph-reclock,\
--disable-cephfs)
+# we had t64 transition (libsmbclient => libsmbclient0) before trixie
+ifneq (,$(filter pkg.samba.before-trixie, ${DEB_BUILD_PROFILES}))
+libsmbclient := libsmbclient
+else
+libsmbclient := libsmbclient0
+endif
+
with_mitkrb5 = $(filter pkg.samba.mitkrb5, ${DEB_BUILD_PROFILES})
ifneq (,${with_mitkrb5})
config-args += \
@@ -130,7 +137,7 @@ mitkrb5-samba-ver = ${DEB_VERSION}mitkrb5
mitkrb5-dep-pkgs = samba-libs samba-dev
mitkrb5-dep-pkgs += samba samba-common-bin python3-samba
mitkrb5-dep-pkgs += samba-dsdb-modules samba-vfs-modules
-mitkrb5-dep-pkgs += libsmbclient0 smbclient
+mitkrb5-dep-pkgs += ${libsmbclient} smbclient
mitkrb5-dep-pkgs += libnss-winbind libpam-winbind
mitkrb5-dep-pkgs += winbind libwbclient0
mitkrb5-dep-pkgs += samba-testsuite
@@ -152,12 +159,6 @@ install install-arch install-indep: %:
configure: bin/configured.stamp
.PHONY: configure
bin/configured.stamp:
-# branding
- if [ ! -f VERSION.orig ]; then \
- mv VERSION VERSION.orig; \
- sed -r -e 's/^(SAMBA_VERSION_VENDOR_SUFFIX).*/\1=${DEB_VENDOR}/' \
- VERSION.orig > VERSION; \
- fi
CC="${CC}" CPP="${CPP}" LD="${LD}" PKGCONFIG="${PKG_CONFIG}" \
CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
PYTHON=python3 PYTHON_CONFIG=${DEB_HOST_MULTIARCH}-python3-config \
@@ -375,7 +376,7 @@ endif
$(call depcheck, libldb2, samba|samba-libs|winbind|libwbclient0) # use-bzero-instead-of-memset_s.diff
$(call depcheck, python3-samba, samba|winbind|ctdb)
$(call depcheck, libwbclient0, samba|samba-libs|winbind|smbclient|ctdb)
- $(call depcheck, libsmbclient0, samba|winbind|smbclient|ctdb)
+ $(call depcheck, ${libsmbclient}, samba|winbind|smbclient|ctdb)
override_dh_gencontrol:
dh_gencontrol $(addprefix -p, ${LDB_PACKAGES}) -- -v${LDB_DEB_VERSION}
@@ -389,7 +390,6 @@ endif
clean:
# see also debian/clean
dh_clean bin/ testbuild/
- [ ! -f VERSION.orig ] || mv -f VERSION.orig VERSION
ifneq (,${with_mitkrb5})
[ ! -d third_party/heimdal-build-with-mitkrb5 ] || \
mv third_party/heimdal-build-with-mitkrb5 third_party/heimdal
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/cf39f9cf2b8164d7cef8426fa834294247427393...f411e8f131edacd0c28e826a7fb9c13e512875c5
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/cf39f9cf2b8164d7cef8426fa834294247427393...f411e8f131edacd0c28e826a7fb9c13e512875c5
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/20240407/4d34fcc7/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list