[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: d/rules: remove ldb-upstream-checked (not needed)

[Michael Tokarev (@mjt)]

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


Commits:
5d8b6633 by Michael Tokarev at 2024-11-26T17:03:48+03:00
d/rules: remove ldb-upstream-checked (not needed)

- - - - -
4f059f98 by Michael Tokarev at 2024-11-26T17:05:20+03:00
d/rules: s/execute_after_dh_install/execute_after_dh_install-arch/ since it is arch-specific

- - - - -
601b645b by Michael Tokarev at 2024-11-26T18:53:49+03:00
resurrect python3-ldb (removed in previous release)

The removal of python3-ldb were unwarranted, since
it just contains python bindings for libldb which
is a stand-alone library.

But keep removal of python3-ldb-dev.

- - - - -
21bc852b by Michael Tokarev at 2024-11-26T18:56:22+03:00
update changelog; upload version 4.21.2+dfsg-2 to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/python3-ldb.install
- debian/python3-samba.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+samba (2:4.21.2+dfsg-2) unstable; urgency=medium
+
+  * resurrect python3-ldb (removed in previous release)
+    The removal of python3-ldb were unwarranted, as long as libldb
+    itself is stand-alone, lets keep its python bindings stand-alone
+    too.
+  * d/rules: s/execute_after_dh_install/execute_after_dh_install-arch/
+    since it is arch-specific
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Tue, 26 Nov 2024 18:56:17 +0300
+
 samba (2:4.21.2+dfsg-1) unstable; urgency=medium
 
   * new upstream stable/bugfix release:


=====================================
debian/control
=====================================
@@ -325,8 +325,8 @@ Package: python3-samba
 Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
 Section: python
-Depends: samba-libs (= ${binary:Version}),
-         libldb2 (= ${ldb:Version}),
+Depends: python3-ldb (= ${ldb:Version}),
+         samba-libs (= ${binary:Version}),
          python3-tdb,
          python3-cryptography,
          ${misc:Depends},
@@ -335,11 +335,8 @@ Depends: samba-libs (= ${binary:Version}),
 Breaks:
 # samba-tool & samba-gpupdate moved from samba-common-bin & samba in 4.20.1-2:
           samba-common-bin (<< 2:4.20.1+dfsg-2~), samba (<< 2:4.20.1+dfsg-2~),
-# python3-samba swallowed python3-ldb in 4.21.2-1
-          python3-ldb, python3-ldb-dev,
 Replaces:
           samba-common-bin (<< 2:4.20.1+dfsg-2~), samba (<< 2:4.20.1+dfsg-2~),
-          python3-ldb, python3-ldb-dev,
 # libsamba-policy & helpers and dckeytab python libs moved to python3-samba
           samba-libs (<< 2:4.16.0+dfsg-1~),
 Recommends: tdb-tools,
@@ -665,3 +662,18 @@ Description: LDAP-like embedded database - development files
  database.
  .
  This package contains the development files.
+
+Package: python3-ldb
+Pre-Depends: ${misc:Pre-Depends}
+Section: python
+Architecture: any
+Depends: libldb2 (= ${binary:Version}),
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Replaces: python3-samba (=2:4.21.2+dfsg-1), python3-ldb-dev
+Breaks: python3-ldb-dev
+Description: Python 3 bindings for LDB
+ ldb is a LDAP-like embedded database built on top of TDB.
+ .
+ This package contains the Python 3 bindings for ldb.


=====================================
debian/python3-ldb.install
=====================================
@@ -0,0 +1,3 @@
+usr/lib/*/samba/libpyldb-util.cpython-*.so.0
+usr/lib/python3/dist-packages/_ldb_text.py
+usr/lib/python3/dist-packages/ldb.cpython-*.so


=====================================
debian/python3-samba.install
=====================================
@@ -6,8 +6,3 @@ usr/bin/samba-tool
 usr/share/man/man8/samba-tool.8
 usr/sbin/samba-gpupdate
 usr/share/man/man8/samba-gpupdate.8
-
-# former python3-ldb package:
-usr/lib/*/samba/libpyldb-util.cpython-*.so.0
-usr/lib/python3/dist-packages/_ldb_text.py
-usr/lib/python3/dist-packages/ldb.cpython-*.so


=====================================
debian/rules
=====================================
@@ -59,9 +59,8 @@ before-trixie := $(filter pkg.samba.before-trixie, ${DEB_BUILD_PROFILES})
 late-eval = $(or $(value cache-$1),$(eval cache-$1 := $(shell $2))$(value cache-$1))
 
 ldb-upstream-version = $(call late-eval,LDB_VERSION,grep ^LDB_VERSION lib/ldb/wscript | cut -d\' -f2)
-ldb-upstream-checked = 2.10.0
 ldb-version = 2:${ldb-upstream-version}+samba${DEB_VERSION_UPSTREAM_REVISION}
-ldb-packages = libldb2 libldb-dev ldb-tools
+ldb-packages = libldb2 libldb-dev ldb-tools python3-ldb
 
 extra-version-vars = \
 	-Vldb:Version=${ldb-version} \
@@ -260,7 +259,7 @@ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
 	install -p debian/ctdb.README.kfreebsd debian/tmp/ctdb/README.kfreebsd
 endif
 
-execute_after_dh_install:
+execute_after_dh_install-arch:
 # some vfs modules are in separate packages.  Removing them here avoids having
 # explicit list of other modules in d/samba.install
 	rm -f \



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/f460569d957d0563f7f893cd3617f152d2905bf0...21bc852b61798d99a9f8028e2de20cdb0afda8f9

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/f460569d957d0563f7f893cd3617f152d2905bf0...21bc852b61798d99a9f8028e2de20cdb0afda8f9
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/20241126/c41cc5d1/attachment-0001.htm>