diff -pruN 1.48-3/debian/changelog 1.48-3ubuntu1/debian/changelog --- 1.48-3/debian/changelog 2025-08-17 11:28:23.000000000 +0000 +++ 1.48-3ubuntu1/debian/changelog 2025-11-24 14:28:07.000000000 +0000 @@ -1,9 +1,43 @@ +sg3-utils (1.48-3ubuntu1) resolute; urgency=medium + + * Merge with Debian unstable (LP: #2125993). Remaining changes: + - d/p/0001-Fix-path-for-udevadm.patch: update to match 1.48 and use /usr/bin + + -- Hector Cao Mon, 24 Nov 2025 15:28:07 +0100 + sg3-utils (1.48-3) unstable; urgency=medium * Add fix for missing output fields in sg_inq (Closes: #1109923) -- Jonathan McDowell Sun, 17 Aug 2025 12:28:23 +0100 +sg3-utils (1.48-2ubuntu1) questing; urgency=medium + + * Merge with Debian unstable (LP: #2110440). Remaining change: + - d/p/0001-Fix-path-for-udevadm.patch: update to match 1.48 and use /usr/bin + * Dropped: + - d/sg3-utils.examples: archive dir is no more shipped + [Included in 1.48-1] + - d/control: fix version in libsgutils2-1.46-2 breaks/replaces to + avoid file conflict when ugprading from jammy and lunar + (LP #2039279) + [libsgutils2-1.48 doesn't ship files from libsgutils2-2 any more] + - d/control,d/libsgutils2-1.46-2.*: change soname to 2-1.48 + [Included in 1.48-1] + - d/control: bump Standards-Version to 4.7.0 + [Included in 1.48-2] + - d/sg3-utils.lintian-overrides: tolerate script-with-language-extension + for rescan-scsi-bus.sh + [Included in 1.48-2] + - d/docs: only install applicable readme files + [Included in 1.48-2] + - d/t/smoke: sg_dd has a new check even when --help is passed + [Included in 1.48-2] + - Add DEP8 packaging/integration tests (LP #1679392) + [Included in 1.48-2] + + -- Jonas Jelten Wed, 09 Jul 2025 20:03:03 +0000 + sg3-utils (1.48-2) unstable; urgency=medium [ Bryce Harrington / Christian Ehrhardt ] @@ -31,6 +65,25 @@ sg3-utils (1.48-1) experimental; urgency -- Jonathan McDowell Tue, 24 Dec 2024 11:22:37 +0000 +sg3-utils (1.48-0ubuntu1) plucky; urgency=medium + + * Merge 1.48 from upstream, full changelog is available at + https://sg.danny.cz/sg/p/sg3_utils.ChangeLog + (LP: #2085291) + * d/sg3-utils.examples: archive dir is no more shipped + * d/control,d/libsgutils2-1.46-2.*: change soname to 2-1.48 + * d/libsgutils2-1.48.symbols: add symbols of 1.48 (no removals) + * d/control: bump Standards-Version to 4.7.0 (no changes needed) + * d/p/0002-Fix-crash-with-rescan-scsi-bus.sh-r.patch: dropped as it + is part of 1.48 + * d/p/0001-Fix-path-for-udevadm.patch: update to match 1.48 and use /usr/bin + * d/sg3-utils.lintian-overrides: tolerate script-with-language-extension + for rescan-scsi-bus.sh + * d/docs: only install applicable readme files + * d/p/t/smoke: sg_dd has a new check even when --help is passed + + -- Christian Ehrhardt Tue, 19 Nov 2024 11:26:38 +0100 + sg3-utils (1.46-3.1) unstable; urgency=medium * Non-maintainer upload. @@ -38,6 +91,44 @@ sg3-utils (1.46-3.1) unstable; urgency=m -- Chris Hofstaedtler Mon, 27 May 2024 01:02:17 +0200 +sg3-utils (1.46-3ubuntu5) plucky; urgency=medium + + * Add DEP8 packaging/integration tests (LP: #1679392): + - smoke: Check expected commands are present and support --help. + - basic-scsi-device: Spot check operation of a few basic commands on a + synthetic SCSI device. + + -- Bryce Harrington Thu, 07 Dec 2023 09:18:47 -0800 + +sg3-utils (1.46-3ubuntu4) noble; urgency=high + + * No change rebuild for 64-bit time_t and frame pointers. + + -- Julian Andres Klode Mon, 08 Apr 2024 18:19:15 +0200 + +sg3-utils (1.46-3ubuntu3) noble; urgency=medium + + * d/control: fix version in libsgutils2-1.46-2 breaks/replaces to + avoid file conflict when ugprading from jammy and lunar + (LP: #2039279) + + -- Andreas Hasenack Wed, 25 Oct 2023 09:49:58 -0300 + +sg3-utils (1.46-3ubuntu2) mantic; urgency=medium + + * d/p/0002-Fix-crash-with-rescan-scsi-bus.sh-r.patch: do not allow + rescan-scsi-bus.sh to remove device (LP: #1976228). + + -- Lucas Kanashiro Tue, 05 Sep 2023 18:22:04 -0300 + +sg3-utils (1.46-3ubuntu1) mantic; urgency=medium + + * Break/Replace 1.46-1build1 instead of 1.46-1, as this is the relevant + version present in Ubuntu. This change can be dropped after 24.04 + release. + + -- Steve Langasek Wed, 03 May 2023 12:09:00 +0000 + sg3-utils (1.46-3) unstable; urgency=medium * Upload to unstable diff -pruN 1.48-3/debian/control 1.48-3ubuntu1/debian/control --- 1.48-3/debian/control 2025-01-02 08:33:15.000000000 +0000 +++ 1.48-3ubuntu1/debian/control 2025-11-24 14:28:07.000000000 +0000 @@ -1,7 +1,8 @@ Source: sg3-utils Section: admin Priority: optional -Maintainer: Ritesh Raj Sarraf +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ritesh Raj Sarraf Uploaders: Jonathan McDowell Build-Depends: debhelper-compat (= 13), libtool, libcam-dev [kfreebsd-any], dpkg-dev (>= 1.16.1~) Standards-Version: 4.7.0 diff -pruN 1.48-3/debian/patches/0001-Fix-path-for-udevadm.patch 1.48-3ubuntu1/debian/patches/0001-Fix-path-for-udevadm.patch --- 1.48-3/debian/patches/0001-Fix-path-for-udevadm.patch 2024-12-24 12:39:21.000000000 +0000 +++ 1.48-3ubuntu1/debian/patches/0001-Fix-path-for-udevadm.patch 2025-11-24 14:28:07.000000000 +0000 @@ -7,31 +7,39 @@ See DBug #852585, for details scripts/rescan-scsi-bus.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh -index 0c25dbb..7ba80ca 100755 --- a/scripts/rescan-scsi-bus.sh +++ b/scripts/rescan-scsi-bus.sh -@@ -463,12 +463,12 @@ getluns() +@@ -463,20 +463,20 @@ getluns() udevadm_settle() { local tmo=60 - if [ -x /sbin/udevadm ] ; then -+ if [ -x /bin/udevadm ] ; then ++ if [ -x /usr/bin/udevadm ] ; then print_and_scroll_back " Calling udevadm settle (can take a while) " # Loop for up to 60 seconds if sd devices still are settling.. # This allows us to continue if udev events are stuck on multipaths in recovery mode while [ $tmo -gt 0 ] ; do - if ! /sbin/udevadm settle --timeout=1 | grep -E -q sd[a-z]+ ; then -+ if ! /bin/udevadm settle --timeout=1 | grep -E -q sd[a-z]+ ; then ++ if ! /usr/bin/udevadm settle --timeout=1 | grep -E -q sd[a-z]+ ; then break; fi let tmo=$tmo-1 + done + white_out +- elif [ -x /sbin/udevsettle ] ; then ++ elif [ -x /usr/bin/udevsettle ] ; then + print_and_scroll_back " Calling udevsettle (can take a while) " +- /sbin/udevsettle ++ /usr/bin/udevsettle + white_out + else + sleep 0.02 @@ -837,7 +837,7 @@ findremapped() # Trigger udev to update the info echo -n "Triggering udev to update device information... " - /sbin/udevadm trigger -+ /bin/udevadm trigger ++ /usr/bin/udevadm trigger udevadm_settle 2>&1 /dev/null echo "Done" @@ -40,7 +48,7 @@ index 0c25dbb..7ba80ca 100755 fi if [ $found -gt 0 ] ; then - /sbin/udevadm trigger --sysname-match=sd* -+ /bin/udevadm trigger --sysname-match=sd* ++ /usr/bin/udevadm trigger --sysname-match=sd* udevadm_settle if [ -x "$MULTIPATH" ] ; then echo "Trying to discover new multipath mappings for newly discovered devices... "