[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: d/salsa-ci.yml: disable reprotest vary build_path

[Michael Tokarev (@mjt)]

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


Commits:
7f72112a by Michael Tokarev at 2024-09-02T22:19:19+03:00
d/salsa-ci.yml: disable reprotest vary build_path

- - - - -
4a0a32fa by Michael Tokarev at 2024-09-06T11:33:49+03:00
d/control: Build-Depend on python3-setuptools (#1080851)

- - - - -
a14c2905 by Michael Tokarev at 2024-09-06T11:59:43+03:00
d/rules: stop providing compat symlink for old ldb modules location for old sssd

old sssd does not work anymore anyway since we had several libndr
soname bumps already.

- - - - -
51d414a9 by Michael Tokarev at 2024-09-07T08:24:12+03:00
d/changelog: mention closing of #835404 by 4.21.0-1

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ samba (2:4.21.0+dfsg-1) unstable; urgency=medium
 
   * switch to 4.21 branch
   * update to 4.21.0 (new upstream)
+    (Closes: #835404)
   * fix-nfs-service-name-to-nfs-kernel-server.patch: refresh
   * Force-LDB-as-standalone.patch: remove (ldb is always internal now)
   * d/rules: ldb lib is now private by default, expose it as public


=====================================
debian/control
=====================================
@@ -13,6 +13,7 @@ Build-Depends:
 	dh-exec,
 Build-Depends-Arch:
 	dh-sequence-python3,
+        python3-setuptools,
 	dpkg-dev (>= 1.22.5) <!pkg.samba.before-trixie>,
 # tools:
 	bison,


=====================================
debian/rules
=====================================
@@ -257,17 +257,6 @@ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
 	install -p debian/ctdb.README.kfreebsd debian/tmp/ctdb/README.kfreebsd
 endif
 
-# compatibility link. When ldb was built by its own it stored modules in
-# /usr/lib/<triple>/ldb/modules/ldb/. Now as part of samba it stores modules in
-# /usr/lib/<triple>/samba/ldb/.  Keep them together instead of d/*.{links,dirs}.
-# (sssd 2.6.3-3 moved their module to the new location;
-#  samba-dsdb-modules always had their modules in ..../samba/ldb/)
-# This compat symlink should go away after bookworm
-# (needed mostly for bullseye sssd)
-	dh_installdirs -plibldb2 /usr/lib/${DEB_HOST_MULTIARCH}/ldb/modules/ldb
-	dh_link -plibldb2 /usr/lib/${DEB_HOST_MULTIARCH}/ldb/modules/ldb \
-	                  /usr/lib/${DEB_HOST_MULTIARCH}/samba/ldb/compat
-
 execute_after_dh_install:
 # some vfs modules are in separate packages.  Removing them here avoids having
 # explicit list of other modules in d/samba.install


=====================================
debian/salsa-ci.yml
=====================================
@@ -8,3 +8,5 @@ variables:
   SALSA_CI_DISABLE_BLHC: 1
   # cross-building never worked
   SALSA_CI_DISABLE_CROSSBUILD_ARM64: 1
+  # reprotest always fails if build path varies
+  SALSA_CI_REPROTEST_ARGS: --vary=-build_path



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/1f0492de4b0a6282b2ace267755c1606c129b0b8...51d414a95edf97a6871bfb2f1841ffe7aacf80f5

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/1f0492de4b0a6282b2ace267755c1606c129b0b8...51d414a95edf97a6871bfb2f1841ffe7aacf80f5
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/20240924/107e69ef/attachment-0001.htm>