[Pkg-samba-maint] [Git][samba-team/samba][master] 7 commits: d/control: do not use obsolete python3:Provides and python3:Breaks
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Fri Apr 1 22:40:40 BST 2022
Michael Tokarev pushed to branch master at Debian Samba Team / samba
Commits:
3451c26a by Michael Tokarev at 2022-04-01T21:12:04+03:00
d/control: do not use obsolete python3:Provides and python3:Breaks
- - - - -
2ebc275e by Michael Tokarev at 2022-04-01T23:27:14+03:00
debian/libldb2.install: clarify >=64bit requiriment for lmdb module
- - - - -
8e762d22 by Michael Tokarev at 2022-04-02T00:07:56+03:00
debian/liblmdb2.install: run dpkg-architecture if $DEB_HOST_ARCH_BITS if unset
This is only relevant if d/rules is run manually
from the command line, by default dpkg-buildpackage
exports all DEB_HOST_* variables in environment.
But it is annoying when it is not set during a test
build and you end up with a broken package.
(It was being set in d/rules before, but it's easy
to clean it up from there since ARCH_BITS is not
used in d/rules directly)
- - - - -
64c578dd by Michael Tokarev at 2022-04-02T00:08:41+03:00
debian/liblmdb2.install: mdb.so module also depend on >=64bits
- - - - -
55d92e99 by Michael Tokarev at 2022-04-02T00:08:41+03:00
waf-add-support-for-GNU-kFreeBSD.patch: recognize gnukfreebsd system
imported from tdb/ldb and reduced to a one-liner
- - - - -
0d44b3c8 by Michael Tokarev at 2022-04-02T00:39:53+03:00
d/control: libwbclient-dev does not ship executables, no shlib:Depends needed
- - - - -
e5eaefa1 by Michael Tokarev at 2022-04-02T00:39:59+03:00
d/rules: fix LDB_DEPENDS
- - - - -
6 changed files:
- debian/control
- debian/ldb-version.mk
- debian/libldb2.install
- debian/patches/series
- + debian/patches/waf-add-support-for-GNU-kFreeBSD.patch
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -238,7 +238,6 @@ Package: python3-samba
Pre-Depends: ${misc:Pre-Depends}
Architecture: any
Section: python
-Provides: ${python3:Provides}
Depends: python3-ldb,
python3-tdb,
samba-libs (= ${binary:Version}),
@@ -409,7 +408,7 @@ Package: libwbclient-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libwbclient0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libwbclient0 (= ${binary:Version}), ${misc:Depends}
Breaks: samba-libs (<< 2:4.11.0+dfsg-1~), samba-dev (<< 2:4.11)
Replaces: samba-dev (<< 2:4.11)
Description: Samba winbind client library - development files
@@ -534,8 +533,6 @@ Depends: libldb2 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Provides: ${python3:Provides}
-Breaks: ${python3:Breaks}
Description: Python 3 bindings for LDB
ldb is a LDAP-like embedded database built on top of TDB.
.
=====================================
debian/ldb-version.mk
=====================================
@@ -1,3 +1,3 @@
# autogenerated from lib/ldb/wscript
LDB_DEB_VERSION := ${LDB_EPOCH}2.5.0+samba${DEB_VERSION_UPSTREAM_REVISION}
-LDB_DEPENDS := libldb2 (>> ${LDB_EPOCH}2.5.0~), libldb (<< ${LDB_EPOCH}2.5.1~)
+LDB_DEPENDS := libldb2 (>> ${LDB_EPOCH}2.5.0~), libldb2 (<< ${LDB_EPOCH}2.5.1~)
=====================================
debian/libldb2.install
=====================================
@@ -1,8 +1,10 @@
#!/bin/sh
echo 'usr/lib/*/libldb.so.*'
-# FIXME: do we really care about 32 bits here?
-if [ "$DEB_HOST_ARCH_BITS" != 32 ]; then
+# lib/ldb/wscript: (sizeof(size_t) >= 8), >=64bit is required for lmdb
+if [ 64 -le "${DEB_HOST_ARCH_BITS:-$(dpkg-architecture -qDEB_HOST_ARCH_BITS)}" ]
+then
echo 'usr/lib/*/samba/libldb-mdb-int-samba4.so.0'
+ echo 'usr/lib/*/samba/ldb/mdb.so'
fi
echo 'usr/lib/*/samba/libldb-key-value-samba4.so.0'
echo 'usr/lib/*/samba/libldb-tdb-err-map-samba4.so.0'
@@ -11,7 +13,6 @@ echo 'usr/lib/*/samba/libldb-tdb-int-samba4.so.0'
echo 'usr/lib/*/samba/ldb/asq.so'
echo 'usr/lib/*/samba/ldb/ldap.so'
echo 'usr/lib/*/samba/ldb/ldb.so'
-echo 'usr/lib/*/samba/ldb/mdb.so'
echo 'usr/lib/*/samba/ldb/paged_searches.so'
echo 'usr/lib/*/samba/ldb/rdn_name.so'
echo 'usr/lib/*/samba/ldb/sample.so'
=====================================
debian/patches/series
=====================================
@@ -13,3 +13,4 @@ Force-LDB-as-standalone.patch
use-bzero-instead-of-memset_s.diff
weak-crypto-allowed-clarify.diff
spelling.patch
+waf-add-support-for-GNU-kFreeBSD.patch
=====================================
debian/patches/waf-add-support-for-GNU-kFreeBSD.patch
=====================================
@@ -0,0 +1,8 @@
+diff --git a/third_party/waf/waflib/Tools/compiler_cxx.py b/third_party/waf/waflib/Tools/compiler_cxx.py
+index 09fca7e4dc6..6ca9d7266d1 100644
+--- a/third_party/waf/waflib/Tools/compiler_cxx.py
++++ b/third_party/waf/waflib/Tools/compiler_cxx.py
+@@ -50,2 +50,3 @@ cxx_compiler = {
+ 'java': ['g++', 'msvc', 'clang++', 'icpc'],
++'gnukfreebsd': ['g++', 'clang++'],
+ 'default': ['clang++', 'g++']
=====================================
debian/rules
=====================================
@@ -30,7 +30,7 @@ debian/ldb-version.mk: lib/ldb/wscript
v="\$${LDB_EPOCH}$$v"; n="$${v%.*}.$$(($${v##*.}+1))"; exec 3>$@.tmp; \
echo "# autogenerated from $<" >&3; \
echo "LDB_DEB_VERSION := $$v+samba\$${DEB_VERSION_UPSTREAM_REVISION}" >&3; \
- echo "LDB_DEPENDS := libldb2 (>> $$v~), libldb (<< $$n~)" >&3; \
+ echo "LDB_DEPENDS := libldb2 (>> $$v~), libldb2 (<< $$n~)" >&3; \
exec 3>&-; mv -f $@.tmp $@
include debian/ldb-version.mk
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/27633c648641028a0dbc4ff9670d7788d644a721...e5eaefa1775fe841a5e0e81f2c25045d7c95c2bf
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/27633c648641028a0dbc4ff9670d7788d644a721...e5eaefa1775fe841a5e0e81f2c25045d7c95c2bf
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/20220401/b212ad60/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list