From: Michael Tremer Date: Tue, 18 May 2021 09:33:05 +0000 (+0000) Subject: Merge branch 'next' X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=504e72e17317e9b153d5dc6c0198c6df7c5f750a Merge branch 'next' --- 504e72e17317e9b153d5dc6c0198c6df7c5f750a diff --cc config/rootfiles/packages/aarch64/samba index a0aab25c00,88b7905ce3..ddc964c5c8 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@@ -688,9 -701,9 +701,13 @@@ usr/lib/samba/libposix-eadb-samba4.s usr/lib/samba/libprinter-driver-samba4.so usr/lib/samba/libprinting-migrate-samba4.so usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2 ++<<<<<<< HEAD +usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.2.1 ++======= + usr/lib/samba/libpyldb-util.cpython-38-aarch64-linux-gnu.so.2.3.0 ++>>>>>>> next usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2 - usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.1 + usr/lib/samba/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.2 usr/lib/samba/libregistry-samba4.so usr/lib/samba/libreplace-samba4.so usr/lib/samba/libroken-samba4.so.19 diff --cc config/rootfiles/packages/i586/samba index b28a4d8949,6b43544f11..d302dd7030 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@@ -688,9 -701,9 +701,13 @@@ usr/lib/samba/libposix-eadb-samba4.s usr/lib/samba/libprinter-driver-samba4.so usr/lib/samba/libprinting-migrate-samba4.so usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2 ++<<<<<<< HEAD +usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.2.1 ++======= + usr/lib/samba/libpyldb-util.cpython-38-i386-linux-gnu.so.2.3.0 ++>>>>>>> next usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2 - usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.1 + usr/lib/samba/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.2 usr/lib/samba/libregistry-samba4.so usr/lib/samba/libreplace-samba4.so usr/lib/samba/libroken-samba4.so.19