Control: retitle -1 unblock: open-iscsi/2.1.3-4 Hello Paul, On Fri, 2021-04-30 at 22:00 +0200, Paul Gevers wrote: > Hi, > > On 30-04-2021 17:03, Ritesh Raj Sarraf wrote: > > I will go ahead with the upload now and will untag this bug report > > of > > `moreinfo`. > > That's not what I meant. I'll try to be more clear next time. > > You're debdiff showed only the content of the open-iscsi binary > package > (which wasn't affected by your changes). My request was intended for > *all* binary packages. You can get that by running debdiff on the > changes files IIRC. Attached are the diffs you requested. This time, I have not yet uploaded the proposed package to Unstable. I will have for an affirmation from the Release Team. -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rw-r--r-- root/root /usr/lib/debug/.build-id/1c/1d6be98cf8c560bc6460b875d465d58d6c4ced.debug
Files in first .changes but not in second
-----------------------------------------
-rw-r--r-- root/root /usr/lib/debug/.build-id/6f/976fbb6002dc58eb3d0a5ea09d3e802e513a7d.debug
Control files of package iscsiuio: lines which differ (wdiff format)
--------------------------------------------------------------------
Version: [-2.1.3-2-] {+2.1.3-4+}
Control files of package iscsiuio-dbgsym: lines which differ (wdiff format)
---------------------------------------------------------------------------
Build-Ids: [-6f976fbb6002dc58eb3d0a5ea09d3e802e513a7d-] {+1c1d6be98cf8c560bc6460b875d465d58d6c4ced+}
Depends: iscsiuio (= [-2.1.3-2)-] {+2.1.3-4)+}
Version: [-2.1.3-2-] {+2.1.3-4+}
Control files of package libopeniscsiusr: lines which differ (wdiff format)
---------------------------------------------------------------------------
Version: [-2.1.3-2-] {+2.1.3-4+}
Control files of package libopeniscsiusr-dbgsym: lines which differ (wdiff format)
----------------------------------------------------------------------------------
Depends: libopeniscsiusr (= [-2.1.3-2)-] {+2.1.3-4)+}
Version: [-2.1.3-2-] {+2.1.3-4+}
Control files of package libopeniscsiusr-dev: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Version: [-2.1.3-2-] {+2.1.3-4+}
Control files of package open-iscsi: lines which differ (wdiff format)
----------------------------------------------------------------------
Version: [-2.1.3-2-] {+2.1.3-4+}
Control files of package open-iscsi-dbgsym: lines which differ (wdiff format)
-----------------------------------------------------------------------------
Depends: open-iscsi (= [-2.1.3-2)-] {+2.1.3-4)+}
Version: [-2.1.3-2-] {+2.1.3-4+}
Control files of package open-iscsi-udeb: lines which differ (wdiff format)
---------------------------------------------------------------------------
Depends: libc6-udeb (>= 2.31), libcrypto1.1-udeb (>= 1.1.1k), libisns-udeb, libkmod2-udeb (>= 28), libmount1-udeb (>= 2.33), [-libopeniscsiusr,-] libsystemd0 (>= 247.3), [-udev,-] scsi-modules
Installed-Size: [-1220-] {+1341+}
Version: [-2.1.3-2-] {+2.1.3-4+}
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-05-04 21:45:56.000000000 +0530
@@ -1,3 +1,18 @@
+open-iscsi (2.1.3-4) unstable; urgency=medium
+
+ * [8142984] Set architecture for build to linux-any. This ensures that the
+ library is built on the right set of architectures and dh_makeshlibs is
+ invoked appropriately. (Closes: #987858)
+
+ -- Ritesh Raj Sarraf <rrs@debian.org> Tue, 04 May 2021 21:45:56 +0530
+
+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-05-04 21:00:04.000000000 +0530
@@ -139,13 +139,11 @@
# linux kernel udebs) must exist for these architectures - so
# check that before adding them to this list; the other
# scsi-(core|common|...)-modules are NOT sufficient!
-Architecture: amd64 arm64 armhf i386 ia64 mips mipsel powerpc ppc64 ppc64el s390x
+Architecture: linux-any
Section: debian-installer
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-05-04 21:45:33.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
Attachment:
signature.asc
Description: This is a digitally signed message part