[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: stop shipping python3/dist-packages/samba/tests (#1064512, #1063149)

Michael Tokarev (@mjt) gitlab at salsa.debian.org
Sun Mar 3 12:38:16 GMT 2024



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


Commits:
911e67db by Michael Tokarev at 2024-03-01T20:36:47+03:00
stop shipping python3/dist-packages/samba/tests (#1064512, #1063149)

- - - - -
c63b7d19 by Michael Tokarev at 2024-03-01T22:26:47+03:00
add Debian-Specific tag to debian-specific patches

- - - - -
e2149105 by Michael Tokarev at 2024-03-03T15:27:25+03:00
d/genshlibs: run dh_makeshlibs on libsmbclient0 (#1065349)

Since we don't run dh_makeshlibs, we're missing t64:Provides
information on libsmbclient0 for it after t64 rename.  Since
this package contains just one (public) library file with
.symbols, run dh_makeshlibs on it directly instead of doing
it with dpkg-gensymbols et al.

- - - - -
224e1caa by Michael Tokarev at 2024-03-03T15:37:20+03:00
update changelog; upload version 4.19.5+dfsg-4 to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/genshlibs
- debian/patches/meaningful-error-if-no-python3-markdown.patch
- debian/patches/meaningful-error-if-no-samba-ad-provision.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+samba (2:4.19.5+dfsg-4) unstable; urgency=medium
+
+  * stop shipping python3/dist-packages/samba/tests
+    (Closes: #1064512, #1063149)
+  * add Debian-Specific tag to debian-specific patches
+  * d/genshlibs: run dh_makeshlibs on libsmbclient0
+    (Closes: #1065349)
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Sun, 03 Mar 2024 15:37:16 +0300
+
 samba (2:4.19.5+dfsg-3) unstable; urgency=medium
 
   * d/control: add versioned depends on dpkg-dev to avoid accidental


=====================================
debian/genshlibs
=====================================
@@ -62,6 +62,13 @@ for pkg in $(dh_listpackages); do
   done
   echo "${0##*/}: processing $pkg $ver"
 
+  if [ libsmbclient0 = $pkg ]; then
+     # run dh_makeshlibs to emit t64:Provides properly
+     # it should contain just one (public) library file
+     dh_makeshlibs -p $pkg -- -v$ver || rc=1
+     continue
+  fi
+
   # generate shlibs file: for public libs use >>$ver, for private =$ver
   mkdir -p $pd/DEBIAN
   for x in $libs; do


=====================================
debian/patches/meaningful-error-if-no-python3-markdown.patch
=====================================
@@ -2,6 +2,8 @@ From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Fri, 2 Dec 2022 11:08:27 +0300
 Updated: Thu, 03 Aug 2023 17:10:59 +0300
 Subject: print meaningful error message if python3-markdown is not installed
+Debian-Specific: yes
+Forwarded: not-needed
 
 ---
  python/samba/netcmd/domain/schemaupgrade.py | 4 ++--


=====================================
debian/patches/meaningful-error-if-no-samba-ad-provision.patch
=====================================
@@ -2,6 +2,8 @@ From: Michael Tokarev <mjt at tls.msk.ru>
 Date: Fri, 2 Dec 2022 10:54:31 +0300
 Updated: Thu, 03 Aug 2023 17:06:24 +0300
 Subject: print meaningful error message if samba-ad-provision is not installed
+Debian-Specific: yes
+Forwarded: not-needed
 
 ---
  python/samba/provision/common.py | 5 ++++-


=====================================
debian/rules
=====================================
@@ -237,6 +237,8 @@ override_dh_auto_install-arch:
 	# Included in python-tevent?
 	rm debian/tmp/usr/lib/python*/*-packages/_tevent.*
 	rm debian/tmp/usr/lib/python*/*-packages/tevent.py
+	# selftests: either not needed or should go to -testsuite
+	rm -rf debian/tmp/usr/lib/python3/dist-packages/samba/tests/
 	# pam stuff
 	install -Dp -m0644 debian/winbind.pam-config debian/tmp/usr/share/pam-configs/winbind
 	mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libnss_* debian/tmp/lib/$(DEB_HOST_MULTIARCH)/



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/1096ab1f8270cf41814960926c79b8916b3fe560...224e1caaa7ff2e5168a25c2004abff01787d3a37

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/1096ab1f8270cf41814960926c79b8916b3fe560...224e1caaa7ff2e5168a25c2004abff01787d3a37
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/20240303/53d67d0a/attachment-0001.htm>


More information about the Pkg-samba-maint mailing list