[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: d/rules: override dh_gencontrol for arch build only

[Michael Tokarev (@mjt)]

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


Commits:
d13339fd by Michael Tokarev at 2025-09-12T17:30:11+03:00
d/rules: override dh_gencontrol for arch build only

- - - - -
3bd14b02 by Michael Tokarev at 2025-09-12T17:43:50+03:00
d/samba-libs.install: libquic is linux-specific

- - - - -
51929268 by Michael Tokarev at 2025-09-12T21:42:33+03:00
d/samba-libs.install: ngtcp2 is linux-specific, not non-hurd

- - - - -
086f4fd5 by Michael Tokarev at 2025-09-14T13:33:22+03:00
d/control: build-depend on :native varian of mingw gcc/tools

- - - - -


3 changed files:

- debian/control
- debian/rules
- debian/samba-libs.install


Changes:

=====================================
debian/control
=====================================
@@ -23,7 +23,7 @@ Build-Depends-Arch:
 	libparse-yapp-perl:native | libparse-yapp-perl,
 	rpcsvc-proto  <!pkg.samba.before-trixie>,
 # for winexe. gcc-mingw-w64 brings 4 toolchains, we need only 2
-	gcc-mingw-w64-i686-win32, gcc-mingw-w64-x86-64-win32,
+	gcc-mingw-w64-i686-win32:native, gcc-mingw-w64-x86-64-win32:native,
 # system libraries:
 	pkgconf,
 	libacl1-dev,


=====================================
debian/rules
=====================================
@@ -425,7 +425,7 @@ endif
 override_dh_installexamples:
 	dh_installexamples -Xwscript_build
 
-override_dh_gencontrol:
+override_dh_gencontrol-arch:
 	dh_gencontrol $(addprefix -p, ${ldb-packages})    -- -v${ldb-version}
 	dh_gencontrol $(addprefix -p, ${talloc-packages}) -- -v${talloc-version}
 	dh_gencontrol $(addprefix -p, ${tevent-packages}) -- -v${tevent-version}


=====================================
debian/samba-libs.install
=====================================
@@ -93,8 +93,8 @@ usr/lib/${DEB_HOST_MULTIARCH}/samba/libmessages-dgm-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libmessages-util-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libmsghdr-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libmsrpc3-private-samba.so.0
-[!hurd-any] usr/lib/${DEB_HOST_MULTIARCH}/samba/libngtcp2-crypto-gnutls-private-samba.so.0
-[!hurd-any] usr/lib/${DEB_HOST_MULTIARCH}/samba/libngtcp2-private-samba.so.0
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/samba/libngtcp2-crypto-gnutls-private-samba.so.0
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/samba/libngtcp2-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libndr-samba-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libndr-samba4-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libnetif-private-samba.so.0
@@ -103,7 +103,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/samba/libpac-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libposix-eadb-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libprinting-migrate-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libprocess-model-private-samba.so.0
-usr/lib/${DEB_HOST_MULTIARCH}/samba/libquic-private-samba.so.0
+[linux-any] usr/lib/${DEB_HOST_MULTIARCH}/samba/libquic-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libregistry-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libreplace-private-samba.so.0
 usr/lib/${DEB_HOST_MULTIARCH}/samba/libsamba-cluster-support-private-samba.so.0



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/721e0a548236199c2517698524e3ddc1e1448958...086f4fd5b2d222e7b86c901fec337d4af648a107

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/721e0a548236199c2517698524e3ddc1e1448958...086f4fd5b2d222e7b86c901fec337d4af648a107
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/20250914/cc4e449a/attachment-0001.htm>