[Pkg-samba-maint] [Git][samba-team/samba][master] 4 commits: d/samba-common-bin.lintian-override: fix the typo in the last fix

[Michael Tokarev (@mjt)]

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


Commits:
4f2e35c8 by Michael Tokarev at 2024-07-15T07:37:35+03:00
d/samba-common-bin.lintian-override: fix the typo in the last fix

- - - - -
62cd8701 by Michael Tokarev at 2024-07-15T07:37:58+03:00
d/samba-log-parser: python3-minimal is enough

- - - - -
20796a52 by Michael Tokarev at 2024-07-24T16:53:08+03:00
d/rules: define dpkg_late_eval macro since dpkg 1.22.8 does not define it anymore (#1076920)

- - - - -
c691fc9c by Michael Tokarev at 2024-07-24T16:54:58+03:00
update changelog; upload version 4.20.2+dfsg-8 to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/rules
- debian/samba-common-bin.lintian-override
- debian/samba-log-parser


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+samba (2:4.20.2+dfsg-8) unstable; urgency=medium
+
+  * d/samba-common-bin.lintian-override: fix the typo in the last fix
+  * d/samba-log-parser: python3-minimal is enough
+  * d/rules: define dpkg_late_eval macro since dpkg 1.22.8 does not define
+    it anymore (Closes: #1076920)
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Wed, 24 Jul 2024 16:54:54 +0300
+
 samba (2:4.20.2+dfsg-7) unstable; urgency=medium
 
   * d/samba-common-bin.lintian-override: update samba-log-parser override


=====================================
debian/rules
=====================================
@@ -26,6 +26,8 @@ endif
 
 DESTDIR = ${CURDIR}/debian/tmp
 
+dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
+
 LDB_VERSION = $(call dpkg_late_eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
 LDB_DEB_VERSION = 2:${LDB_VERSION}+samba${DEB_VERSION_UPSTREAM_REVISION}
 LDB_PACKAGES = libldb2 libldb-dev ldb-tools python3-ldb


=====================================
debian/samba-common-bin.lintian-override
=====================================
@@ -1,4 +1,4 @@
 # deliberate, a synonym for misspelled parameter
 samba-common-bin: typo-in-manual-page prefered preferred */man/man5/smb.conf.5*
 # python script run only if python3 is actually installed
-samba-common-bin: bash-term-in-posix-shell *usr/libexec/samba/samba-log-parser"
+samba-common-bin: bash-term-in-posix-shell *usr/libexec/samba/samba-log-parser*


=====================================
debian/samba-log-parser
=====================================
@@ -1,5 +1,5 @@
 #! /bin/sh
 me="${0##*/}"
 command -v python3 >/dev/null && exec /usr/libexec/samba/$me "$@"
-echo "$me: E: This program requires python3.  Please install python3 package to use it." >&2
+echo "$me: E: This program requires python3.  Please install python3-minimal package to use it." >&2
 exit 42



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/d316036855bca6d5c00a26e2e0fe6ec3a513aeca...c691fc9c08dbede958fb19771876d6653348f6ca

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/d316036855bca6d5c00a26e2e0fe6ec3a513aeca...c691fc9c08dbede958fb19771876d6653348f6ca
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/20240724/b5a1dc60/attachment-0001.htm>