[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: d/rules: fix ${LDB_PACKAGES} usage

[Michael Tokarev (@mjt)]

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


Commits:
a87d1504 by Michael Tokarev at 2022-05-02T18:18:42+03:00
d/rules: fix ${LDB_PACKAGES} usage

it looks like $(subst  ,|,${LIST}) does not work to substitute " ".

Make d/make_shlibs to accept a more natural list of arguments,
in form pkg1=ver1 pkg2=ver2... instead of initial "ver|pkg1|pkg2|...",
and construct its arguments in d/rules without using the "|" as a
delimiter.

This fixes custom version generation for ldb packages in dh_makeshlibs
in  the previous two uploads.

- - - - -
d382810d by Michael Tokarev at 2022-05-02T18:34:01+03:00
update changelog; upload 4.16.1+dfsg-3 to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/make_shlibs
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+samba (2:4.16.1+dfsg-3) unstable; urgency=medium
+
+  * fix ldb package version generation in d/make_shlibs
+    which was wrong in 2 previous uploads.
+    Will I *ever* make it actually work someday?
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Mon, 02 May 2022 18:32:24 +0300
+
 samba (2:4.16.1+dfsg-2) unstable; urgency=medium
 
   * rethink ldb version *again*, to be 2.5.0+smb4.16.1-2


=====================================
debian/make_shlibs
=====================================
@@ -6,7 +6,7 @@ umask 022
 DEB_VERSION=$(dpkg-parsechangelog -S Version)
 DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# arguments in form custom-version|pkg1|pkg2|pkg3|...
+# arguments in form pkg1=custom-version pkg2=version2...
 custvers="$*"
 
 make_shlibs() {
@@ -20,8 +20,8 @@ make_shlibs() {
 
 	ver=${DEB_VERSION}
 	for v in $custvers; do
-	    case "$v|" in
-		(*"|$pkg|"*) ver="${v%%|*}"; break;;
+	    case "$v" in
+		( $pkg=* ) ver=${v#*=}; break;;
 	    esac
 	done
 	echo $pkg $ver


=====================================
debian/rules
=====================================
@@ -273,7 +273,7 @@ override_dh_makeshlibs:
 
 	# create symbols and shlibs files in separate wrapper script
 	# to deal with private libraries
-	debian/make_shlibs "${LDB_DEB_VERSION}|$(subst  ,|,${LDB_PACKAGES})"
+	debian/make_shlibs $(addsuffix =${LDB_DEB_VERSION},${LDB_PACKAGES})
 
 	rm -f debian/python3-ldb.symbols
 



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/12a16f56ef8c4273bdd3d66fe2bd45c3a8a89a89...d382810d3de557faf3cef3138c38861ffc3062f7

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/12a16f56ef8c4273bdd3d66fe2bd45c3a8a89a89...d382810d3de557faf3cef3138c38861ffc3062f7
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/20220502/777f42a9/attachment-0001.htm>