Bug#987766: unblock: open-iscsi/2.1.3-2

[Ritesh Raj Sarraf <rrs@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package open-iscsi

[ Reason ]
With version 2.1.x of open-iscsi, a new library was introduced;
libopeniscsiusr. Since we ship a udeb variant of the open-iscsi package,
this library got pulled in into the open-iscsi-udeb package, adding a
depending on package libopeniscsiusr.

[ Impact ]
The open-iscsi-udeb package is not installable in the d-i environment
because of the unavailable respective udeb package for libopeniscsiusr.

The interim workaround is to ship the library into the open-iscsi-udeb
package itself. Nobody else is really making use of it. Post Bullseye,
I'll look into either shipping a new udeb for this library or building
the udeb variant of open-iscsi without support for this library, it is
allows.

[ Risks ]
The changes are trivial. We (Me and Cyril from d-i team) have validated
the effects of the change and do not see any breakage.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

I have not uploaded this revision of the package to Unstable yet. I will
do the upload after you review this change and give me a go ahead.
Thanks.

unblock open-iscsi/2.1.3-2

diff -Nru open-iscsi-2.1.3/debian/changelog open-iscsi-2.1.3/debian/changelog
--- open-iscsi-2.1.3/debian/changelog	2021-02-08 00:53:13.000000000 +0530
+++ open-iscsi-2.1.3/debian/changelog	2021-04-29 13:43:35.000000000 +0530
@@ -1,3 +1,10 @@
+open-iscsi (2.1.3-3) unstable; urgency=medium
+
+  * [47645a5] Make open-iscsi-udeb compatible with d-i.
+    Thanks to Cyril Brulebois (Closes: #987568)
+
+ -- Ritesh Raj Sarraf <rrs@debian.org>  Thu, 29 Apr 2021 13:43:35 +0530
+
 open-iscsi (2.1.3-2) unstable; urgency=medium
 
   * [c3b7109] Fix FTCBFS:
diff -Nru open-iscsi-2.1.3/debian/control open-iscsi-2.1.3/debian/control
--- open-iscsi-2.1.3/debian/control	2021-02-08 00:53:13.000000000 +0530
+++ open-iscsi-2.1.3/debian/control	2021-04-29 13:42:24.000000000 +0530
@@ -144,8 +144,6 @@
 Package-Type: udeb
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libopeniscsiusr,
-         udev,
          scsi-modules
 Description: Configure iSCSI
  The Open-iSCSI project is a high-performance, transport independent,
diff -Nru open-iscsi-2.1.3/debian/rules open-iscsi-2.1.3/debian/rules
--- open-iscsi-2.1.3/debian/rules	2021-02-08 00:53:13.000000000 +0530
+++ open-iscsi-2.1.3/debian/rules	2021-04-29 13:42:24.000000000 +0530
@@ -69,6 +69,9 @@
 	dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.start sbin/iscsi-start
 	dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.finish-install usr/lib/finish-install.d/10open-iscsi
 
+	# Ship shared libraries along with the executable in a single udeb
+	dh_install -p open-iscsi-udeb libopeniscsiusr/libopeniscsiusr*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+
 override_dh_installinit:
 	dh_installinit -p open-iscsi --name=iscsid
 	dh_installinit -p open-iscsi
@@ -96,3 +99,6 @@
 
 override_dh_missing:
 	dh_missing --fail-missing
+
+override_dh_makeshlibs:
+	dh_makeshlibs --add-udeb=open-iscsi-udeb