[Pkg-samba-maint] [Git][samba-team/samba][master] internal-ldb: fix the symbols file generation and exclude python dir in make_shlibs

[Michael Tokarev (@mjt)]

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


Commits:
670cacad by Michael Tokarev at 2022-04-05T20:03:53+03:00
internal-ldb: fix the symbols file generation and exclude python dir in make_shlibs

- - - - -


2 changed files:

- debian/make_shlibs
- debian/rules


Changes:

=====================================
debian/make_shlibs
=====================================
@@ -28,7 +28,7 @@ make_shlibs() {
 	#     the symbols file (dpkg-gensymbols -c4)
 	# - create first part of the shlibs file:
 	#   for public libraries, we want a weak version dependency
-	dh_makeshlibs -p$pkg -V"$pkg (>= ${ver%-*})" -X/usr/lib/${DEB_HOST_MULTIARCH}/samba -- -c4 -v$ver
+	dh_makeshlibs -p$pkg -V"$pkg (>= ${ver%-*})" -X/usr/lib/${DEB_HOST_MULTIARCH}/samba -X/usr/lib/python3 -- -c4 -v$ver
 	[ -e $PKGDIR/shlibs ] && mv $PKGDIR/shlibs $PKGDIR/shlibs.1
 
 	# step 2:


=====================================
debian/rules
=====================================
@@ -253,9 +253,9 @@ endif
 override_dh_makeshlibs:
 	# generate symbols file with correct cpython suffix in there
 	pyext=$$(python3-config --extension-suffix | tr _ -); \
-	pyUP=$$(echo $${pyext%.so} | tr a-z A-Z); \
+	pyUP=$$(echo $${pyext%.so} | tr a-z- A-Z_); \
 	{ echo "libpyldb-util$${pyext}.2 python3-ldb #MINVER#"; \
-	  echo " PYLDB_UTIL$${pyUP}_${LDB_VERSION}@PYLDB_UTIL$${pyUP}_${LDB_VERSION} ${LDB_EPOCH}${LDB_VERSION}"; \
+	  echo " PYLDB_UTIL$${pyUP}_${LDB_VERSION}@PYLDB_UTIL$${pyUP}_${LDB_VERSION} ${LDB_DEB_VERSION}"; \
 	  cat debian/python3-ldb.symbols.in; } > debian/python3-ldb.symbols
 
 	# create symbols and shlibs files in separate wrapper script



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/670cacad84effc0c5d76ceb6557380ed4a799b21

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/commit/670cacad84effc0c5d76ceb6557380ed4a799b21
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/20220405/17867f06/attachment.htm>