debian/changelog

@@ -12,6 +12,7 @@ samba (2:4.11.0+dfsg-1) UNRELEASED; urgency=medium
     - Drop libparse-pidl-perl package (Closes: #939419)
     - Add new files to d/*.install
     - Move libsamba-util.so.* to libwbclient0, to avoid circular dependencies
+    - Move libsamba-util deps to libwbclient0
   * Add build-Remove-tests-for-getdents-and-getdirentries.patch, to fix FTBFS on
     armel and armhf
 
@@ -20,12 +21,13 @@ samba (2:4.11.0+dfsg-1) UNRELEASED; urgency=medium
     (Closes: #940697)
 
   [ Louis van Belle ]
-  * d/control, d/samba.install: added libtasn1-bin, libtasn1-6-dev to build dumpmscat
+  * d/control, d/samba.install: added libtasn1-bin, libtasn1-6-dev to build
+    dumpmscat
   * d/control, d/rules: Enable spotlight (TimeMachine)
   * d/control: Bump libtdb-dev (>= 2) in samba-dev deps
   * Update libwbclient0.symbols
 
- -- Mathieu Parent <sathieu@debian.org>  Thu, 19 Sep 2019 15:07:43 +0200
+ -- Mathieu Parent <sathieu@debian.org>  Thu, 19 Sep 2019 16:38:38 +0200
 
 samba (2:4.10.8+dfsg-1) unstable; urgency=medium
 

debian/control

@@ -413,6 +413,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libwbclient0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: dpkg (>= 1.15.6~)
+Breaks: samba-libs (<< 2:4.11.0+dfsg-1~)
 Description: Samba winbind client library - development files
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with

debian/libwbclient-dev.install

 usr/include/samba-4.0/wbclient.h
+usr/lib/*/libsamba-util.so
 usr/lib/*/libwbclient.so
+usr/lib/*/pkgconfig/samba-util.pc
 usr/lib/*/pkgconfig/wbclient.pc

debian/libwbclient0.install

+#!/usr/bin/dh-exec --with-scripts=filter-arch
+[any-amd64] usr/lib/*/samba/libaesni-intel.so.0
 usr/lib/*/libsamba-util.so.*
 usr/lib/*/libwbclient.so.0*
+usr/lib/*/samba/libgenrand.so.0
+usr/lib/*/samba/libiov-buf.so.0
 usr/lib/*/samba/libreplace.so.0
+usr/lib/*/samba/libsamba-debug.so.0
+usr/lib/*/samba/libsocket-blocking.so.0
+usr/lib/*/samba/libsys-rw.so.0
+usr/lib/*/samba/libtime-basic.so.0
 usr/lib/*/samba/libwinbind-client.so.*

debian/samba-dev.install

@@ -43,7 +43,6 @@ usr/lib/*/libsamba-errors.so
 usr/lib/*/libsamba-hostconfig.so
 usr/lib/*/libsamba-passdb.so
 usr/lib/*/libsamba-policy.cpython-*.so
-usr/lib/*/libsamba-util.so
 usr/lib/*/libsamdb.so
 usr/lib/*/libsmbconf.so
 usr/lib/*/libsmbldap.so
@@ -59,5 +58,4 @@ usr/lib/*/pkgconfig/netapi.pc
 usr/lib/*/pkgconfig/samba-credentials.pc
 usr/lib/*/pkgconfig/samba-hostconfig.pc
 usr/lib/*/pkgconfig/samba-policy.cpython-*.pc
-usr/lib/*/pkgconfig/samba-util.pc
 usr/lib/*/pkgconfig/samdb.pc

debian/samba-libs.install

-#!/usr/bin/dh-exec --with-scripts=filter-arch
-[any-amd64] usr/lib/*/samba/libaesni-intel.so.0
 usr/lib/*/libdcerpc-binding.so.*
 usr/lib/*/libdcerpc-samr.so.*
 usr/lib/*/libdcerpc-server.so.*
@@ -59,7 +57,6 @@ usr/lib/*/samba/libdsdb-garbage-collect-tombstones.so.0
 usr/lib/*/samba/libdsdb-module.so.*
 usr/lib/*/samba/libevents.so.*
 usr/lib/*/samba/libflag-mapping.so.0
-usr/lib/*/samba/libgenrand.so.0
 usr/lib/*/samba/libgensec.so.0*
 usr/lib/*/samba/libgpext.so.0
 usr/lib/*/samba/libgpo.so.0
@@ -76,7 +73,6 @@ usr/lib/*/samba/libhttp.so.0
 usr/lib/*/samba/libhx509-samba4.so.5
 usr/lib/*/samba/libhx509-samba4.so.5.0.0
 usr/lib/*/samba/libinterfaces.so.*
-usr/lib/*/samba/libiov-buf.so.0
 usr/lib/*/samba/libkrb5-samba4.so.26
 usr/lib/*/samba/libkrb5-samba4.so.26.0.0
 usr/lib/*/samba/libkrb5samba.so.*
@@ -103,7 +99,6 @@ usr/lib/*/samba/libprocess-model.so.0
 usr/lib/*/samba/libregistry.so.*
 usr/lib/*/samba/libroken-samba4.so.19
 usr/lib/*/samba/libroken-samba4.so.19.0.1
-usr/lib/*/samba/libsamba-debug.so.0
 usr/lib/*/samba/libsamba-modules.so.*
 usr/lib/*/samba/libsamba-net.cpython-*.so.*
 usr/lib/*/samba/libsamba-python.cpython-*.so.0
@@ -124,11 +119,8 @@ usr/lib/*/samba/libsmbd-conn.so.0
 usr/lib/*/samba/libsmbd-shim.so.0
 usr/lib/*/samba/libsmbldaphelper.so.*
 usr/lib/*/samba/libsmbpasswdparser.so.*
-usr/lib/*/samba/libsocket-blocking.so.0
-usr/lib/*/samba/libsys-rw.so.0
 usr/lib/*/samba/libtalloc-report.so.0
 usr/lib/*/samba/libtdb-wrap.so.*
-usr/lib/*/samba/libtime-basic.so.0
 usr/lib/*/samba/libtrusts-util.so.0
 usr/lib/*/samba/libutil-cmdline.so.0
 usr/lib/*/samba/libutil-reg.so.0

debian/samba-libs.lintian-overrides

 # the samba-libs package contains a number of libraries
 # it doesn't make sense to have them in separate packages, as this would
 # result in circular dependencies
-samba-libs: package-name-doesnt-match-sonames libdcerpc-binding0 libdcerpc-samr0 libdcerpc-server0 libdcerpc0 libndr-krb5pac0 libndr-nbt0 libndr-standard0 libndr0 libnetapi0 libsamba-credentials0 libsamba-errors1 libsamba-hostconfig0 libsamba-passdb0 libsamba-policy.cpython-* libsamba-util0 libsamdb0 libsmbconf0 libsmbldap2 libtevent-util0
+samba-libs: package-name-doesnt-match-sonames libdcerpc-binding0 libdcerpc-samr0 libdcerpc-server0 libdcerpc0 libndr-krb5pac0 libndr-nbt0 libndr-standard0 libndr0 libnetapi0 libsamba-credentials0 libsamba-errors1 libsamba-hostconfig0 libsamba-passdb0 libsamba-policy.cpython-* libsamdb0 libsmbconf0 libsmbldap2 libtevent-util0
 # Embedded Heimdal is patched
 samba-libs: embedded-library usr/lib/*/samba/libgssapi-samba4.so.*: heimdal
 # False positives, see #896012