Merge ~rafaeldtinoco/ubuntu/+source/open-iscsi:lp1892228-groovy into ~rafaeldtinoco/ubuntu/+source/open-iscsi:lp1891374-groovy

[Rafael David Tinoco]

[Bryce Harrington (bryce)]

Yep, makes sense on the binary package name.

The fix for the deprecated warning is correct, but I suggest a bit more wording in the changelog entry to explain what's going on:

With that changelog entry fix, LGTM for upload.

review: Approve

[Bryce Harrington (bryce)]

Oh, optional but also prefixing d/control, d/rules might be nice.

[Rafael David Tinoco (rafaeldtinoco)]

Cool, I have accepted your suggestions Bryce. Thanks a lot for reviewing this!

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

$ sudo lintian open-iscsi_2.1.1-1ubuntu2_source.changes
warning: the authors of lintian do not recommend running it with root privileges!
W: open-iscsi source: missing-field-in-dep5-copyright Copyright (paragraph at line 223)
W: open-iscsi source: missing-field-in-dep5-copyright Copyright (paragraph at line 248)
W: open-iscsi source: missing-license-paragraph-in-dep5-copyright bsd-3-clause (line 175)
W: open-iscsi source: missing-license-paragraph-in-dep5-copyright bsd-4-clause (line 88)
W: open-iscsi source: missing-license-paragraph-in-dep5-copyright expat (line 246)
W: open-iscsi source: missing-license-paragraph-in-dep5-copyright ... use --no-tag-display-limit to see all (or pipe to a file/program)
W: open-iscsi source: spelling-error-in-patch-description debian/patches/adapt-chap-auth-algorithms-to-debian.patch accomodate accommodate
W: open-iscsi source: unnecessary-testsuite-autopkgtest-field

[rafaeldtinoco@groovy ubuntu]$ sudo lintian open-iscsi_2.1.1-1ubuntu2_amd64.changes
warning: the authors of lintian do not recommend running it with root privileges!
W: libopeniscsiusr-dev: groff-message usr/share/man/man3/iscsi_ifaces_free.3.gz 16: warning: macro 'iscsi_ifaces_get'.' not defined
W: libopeniscsiusr-dev: groff-message usr/share/man/man3/iscsi_ifaces_get.3.gz 19: warning: macro 'struct' not defined
W: libopeniscsiusr-dev: groff-message usr/share/man/man3/iscsi_nodes_free.3.gz 16: warning: macro 'iscsi_nodes_get'.' not defined
W: libopeniscsiusr-dev: groff-message ... use --no-tag-display-limit to see all (or pipe to a file/program)
W: open-iscsi: maintainer-script-calls-systemctl postinst:124
W: open-iscsi: postinst-uses-db-input
W: open-iscsi: too-long-extended-description-in-templates open-iscsi/remove_even_with_active_sessions
W: iscsiuio: uses-implicit-await-trigger activate update-initramfs (line 1)
W: open-iscsi: uses-implicit-await-trigger activate update-initramfs (line 1)

$ dput ubuntu open-iscsi_2.1.1-1ubuntu2_source.changes
Checking signature on .changes
gpg: /home/rafaeldtinoco/work/sources/ubuntu/open-iscsi_2.1.1-1ubuntu2_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: /home/rafaeldtinoco/work/sources/ubuntu/open-iscsi_2.1.1-1ubuntu2.dsc: Valid signature from A93E0E0AD83C0D0F
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-iscsi_2.1.1-1ubuntu2.dsc: done.
  Uploading open-iscsi_2.1.1-1ubuntu2.debian.tar.xz: done.
  Uploading open-iscsi_2.1.1-1ubuntu2_source.buildinfo: done.
  Uploading open-iscsi_2.1.1-1ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index acaa069..803c189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+open-iscsi (2.1.1-1ubuntu2) groovy; urgency=medium
+
+  * debian/control, debian/rules: Fix libopeniscsiusr binary package
+    name (LP: #1892228).
+  * debian/rules: Fix deprecated warning for dh_installinit that
+    --no-restart-on-upgrade has been replaced by --no-stop-on-upgrade,
+    which is equivalent in functionality (ref deb #837528).
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 19 Aug 2020 19:08:47 +0000
+
 open-iscsi (2.1.1-1ubuntu1) groovy; urgency=medium
 
   * New upstream version 2.1.1
diff --git a/debian/control b/debian/control
index 70565f2..f7d4967 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Package: open-iscsi
 Architecture: linux-any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libopeniscsiusr,
+         libopeniscsiusr0.2.0,
          udev
 Recommends: ${busybox:Recommends}, finalrd (>= 3)
 Pre-Depends: debconf | debconf-2.0
@@ -54,7 +54,7 @@ Description: iSCSI initiator tools
  This package includes a daemon, iscsid, and a management utility,
  iscsiadm.
 
-Package: libopeniscsiusr
+Package: libopeniscsiusr0.2.0
 Architecture: linux-any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -83,7 +83,7 @@ Description: iSCSI userspace library
 Package: libopeniscsiusr-dev
 Architecture: linux-any
 Depends: ${misc:Depends},
-         libopeniscsiusr
+         libopeniscsiusr0.2.0 (= ${binary:Version})
 Enhances: open-iscsi
 Description: iSCSI userspace library headers
  The Open-iSCSI project is a high-performance, transport independent,
@@ -110,7 +110,7 @@ Package: iscsiuio
 Architecture: linux-any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libopeniscsiusr,
+         libopeniscsiusr0.2.0,
          udev
 Enhances: open-iscsi
 Description: iSCSI offloading daemon for QLogic devices
@@ -143,7 +143,7 @@ Section: debian-installer
 Package-Type: udeb
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libopeniscsiusr,
+         libopeniscsiusr0.2.0,
          udev,
          scsi-modules
 Description: Configure iSCSI
diff --git a/debian/rules b/debian/rules
index c4f553c..fdbff04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,10 @@ override_dh_auto_build:
 override_dh_auto_install:
 
 	@# libopeniscsiusr
-	dh_install -p libopeniscsiusr libopeniscsiusr/libopeniscsiusr*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+	dh_install -p libopeniscsiusr0.2.0 libopeniscsiusr/libopeniscsiusr.so.* usr/lib/${DEB_HOST_MULTIARCH}
 
 	@# libopeniscsi-dev
+	dh_install -p libopeniscsiusr-dev libopeniscsiusr/libopeniscsiusr.so usr/lib/${DEB_HOST_MULTIARCH}
 	dh_install -p libopeniscsiusr-dev libopeniscsiusr/libopeniscsiusr/ usr/include/
 
 	@# open-iscsi
@@ -74,9 +75,9 @@ override_dh_auto_install:
 	dh_install -p open-iscsi-udeb debian/open-iscsi-udeb.finish-install usr/lib/finish-install.d/10open-iscsi
 
 override_dh_installinit:
-	dh_installinit -p open-iscsi --no-start --no-enable --no-restart-on-upgrade --name=iscsid
-	dh_installinit -p open-iscsi --no-start --no-enable --no-restart-on-upgrade
-	dh_installinit -p iscsiuio --no-start --no-enable --no-restart-on-upgrade
+	dh_installinit -p open-iscsi --no-start --no-enable --no-stop-on-upgrade --name=iscsid
+	dh_installinit -p open-iscsi --no-start --no-enable --no-stop-on-upgrade
+	dh_installinit -p iscsiuio --no-start --no-enable --no-stop-on-upgrade
 
 override_dh_systemd_enable:
 	dh_systemd_enable -p open-iscsi --name=iscsid --no-enable iscsid.service
@@ -97,7 +98,7 @@ override_dh_installman:
 override_dh_installdocs:
 	dh_installdocs -p open-iscsi README sysfs-documentation THANKS
 	dh_installdocs -p iscsiuio iscsiuio/RELEASE.TXT iscsiuio/README
-	dh_installdocs -p libopeniscsiusr ./libopeniscsiusr/docs/doc-preclean.pl ./libopeniscsiusr/docs/kernel-doc ./libopeniscsiusr/docs/libopeniscsiusr.h.3 ./libopeniscsiusr/docs/split-man.pl
+	dh_installdocs -p libopeniscsiusr0.2.0 ./libopeniscsiusr/docs/doc-preclean.pl ./libopeniscsiusr/docs/kernel-doc ./libopeniscsiusr/docs/libopeniscsiusr.h.3 ./libopeniscsiusr/docs/split-man.pl
 	dh_installdocs -p libopeniscsiusr-dev
 
 override_dh_missing: