Control: tags 1057779 + patch Control: tags 1057779 + pending
Dear maintainer, I've prepared an NMU for hdparm (versioned as 9.65+ds-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Chris
diff -Nru hdparm-9.65+ds/debian/95hdparm-apm hdparm-9.65+ds/debian/95hdparm-apm --- hdparm-9.65+ds/debian/95hdparm-apm 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/95hdparm-apm 2024-04-16 09:54:44.000000000 +0200 @@ -29,7 +29,7 @@ fi fi -. /lib/hdparm/hdparm-functions +. /usr/lib/hdparm/hdparm-functions resume_hdparm_apm() { diff -Nru hdparm-9.65+ds/debian/changelog hdparm-9.65+ds/debian/changelog --- hdparm-9.65+ds/debian/changelog 2022-10-06 15:33:00.000000000 +0200 +++ hdparm-9.65+ds/debian/changelog 2024-04-16 09:54:44.000000000 +0200 @@ -1,3 +1,14 @@ +hdparm (9.65+ds-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Move all files below /usr (Closes: #1057779) + * Drop Build-Depends: lsb-base (obsolete). + + [ Debian Janitor ] + * Set upstream metadata fields: Archive, Bug-Database. + + -- Chris Hofstaedtler <z...@debian.org> Tue, 16 Apr 2024 09:54:44 +0200 + hdparm (9.65+ds-1) unstable; urgency=medium * New upstream release (Closes: #1018078). diff -Nru hdparm-9.65+ds/debian/control hdparm-9.65+ds/debian/control --- hdparm-9.65+ds/debian/control 2022-10-06 15:20:31.000000000 +0200 +++ hdparm-9.65+ds/debian/control 2024-04-16 09:54:44.000000000 +0200 @@ -13,8 +13,7 @@ Package: hdparm Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, - lsb-base + ${misc:Depends} Recommends: powermgmt-base Description: tune hard disk parameters for high performance Get/set device parameters for Linux SATA/IDE drives. diff -Nru hdparm-9.65+ds/debian/hdparm.conf hdparm-9.65+ds/debian/hdparm.conf --- hdparm-9.65+ds/debian/hdparm.conf 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/hdparm.conf 2024-04-16 09:54:44.000000000 +0200 @@ -5,7 +5,7 @@ ## ignored, so you can space control fields as you like. ANYTHING ELSE ## IS PARSED!! This means that lines with stray characters or lines that ## use non # comment characters will be interpreted by the helper scripts ( -## /lib/udev/hdparm, /usr/lib/pm-utils/power.d/95hdparm-apm ). +## /usr/lib/udev/hdparm, /usr/lib/pm-utils/power.d/95hdparm-apm ). ## This has probably minor, but potentially serious, side effects for your ## hard drives, so please follow the guidelines. Patches to improve ## flexibilty welcome. Please read /usr/share/doc/hdparm/README.Debian for @@ -19,13 +19,13 @@ ## ## If an option is listed twice, the second instance replaces the first. ## -## /sbin/hdparm parses blocks of the form: +## /usr/sbin/hdparm parses blocks of the form: ## DEV { ## option ## option ## ... ## } -## This blocks will cause /sbin/hdparm OPTIONS DEV to be run. +## This blocks will cause /usr/sbin/hdparm OPTIONS DEV to be run. ## Where OPTIONS is the concatenation of all options previously defined ## outside of a block and all options defined with in the block. diff -Nru hdparm-9.65+ds/debian/hdparm.conf.5 hdparm-9.65+ds/debian/hdparm.conf.5 --- hdparm-9.65+ds/debian/hdparm.conf.5 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/hdparm.conf.5 2024-04-16 09:54:44.000000000 +0200 @@ -18,7 +18,7 @@ .LP or by calling .LP -.B DEVNAME=/dev/<disk> /lib/udev/hdparm +.B DEVNAME=/dev/<disk> /usr/lib/udev/hdparm .LP Note that an in\-line comment is not supported. If a line consists of whitespace only (tabs, spaces, carriage return), it will be diff -Nru hdparm-9.65+ds/debian/hdparm.install hdparm-9.65+ds/debian/hdparm.install --- hdparm-9.65+ds/debian/hdparm.install 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/hdparm.install 2024-04-16 09:54:44.000000000 +0200 @@ -1,9 +1,9 @@ debian/hdparm.conf etc/ -debian/hdparm-functions lib/hdparm/ +debian/hdparm-functions usr/lib/hdparm/ debian/95hdparm-apm usr/lib/pm-utils/power.d/ -debian/tmp/sbin/hdparm -debian/udev-scripts/hdparm lib/udev/ -debian/systemd-sleep/hdparm lib/systemd/system-sleep/ +debian/tmp/usr/sbin/hdparm +debian/udev-scripts/hdparm usr/lib/udev/ +debian/systemd-sleep/hdparm usr/lib/systemd/system-sleep/ wiper/wiper.sh usr/share/doc/hdparm/wiper wiper/README.txt usr/share/doc/hdparm/wiper diff -Nru hdparm-9.65+ds/debian/hdparm-udeb.install hdparm-9.65+ds/debian/hdparm-udeb.install --- hdparm-9.65+ds/debian/hdparm-udeb.install 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/hdparm-udeb.install 2024-04-16 09:54:44.000000000 +0200 @@ -1 +1 @@ -debian/tmp/sbin/hdparm +debian/tmp/usr/sbin/hdparm diff -Nru hdparm-9.65+ds/debian/hdparm.udev hdparm-9.65+ds/debian/hdparm.udev --- hdparm-9.65+ds/debian/hdparm.udev 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/hdparm.udev 2024-04-16 09:54:44.000000000 +0200 @@ -1,2 +1,2 @@ -ACTION=="add", SUBSYSTEM=="block", KERNEL=="[sh]d[a-z]", RUN+="/lib/udev/hdparm" +ACTION=="add", SUBSYSTEM=="block", KERNEL=="[sh]d[a-z]", RUN+="/usr/lib/udev/hdparm" diff -Nru hdparm-9.65+ds/debian/patches/Makefile-install-into-usr.patch hdparm-9.65+ds/debian/patches/Makefile-install-into-usr.patch --- hdparm-9.65+ds/debian/patches/Makefile-install-into-usr.patch 1970-01-01 01:00:00.000000000 +0100 +++ hdparm-9.65+ds/debian/patches/Makefile-install-into-usr.patch 2024-04-16 09:54:44.000000000 +0200 @@ -0,0 +1,13 @@ +Index: hdparm/Makefile +=================================================================== +--- hdparm.orig/Makefile ++++ hdparm/Makefile +@@ -3,7 +3,7 @@ + # DESTDIR is for non root installs (eg packages, NFS) only! + DESTDIR = + +-binprefix = ++binprefix = /usr + manprefix = /usr + exec_prefix = $(binprefix)/ + sbindir = $(exec_prefix)sbin diff -Nru hdparm-9.65+ds/debian/patches/series hdparm-9.65+ds/debian/patches/series --- hdparm-9.65+ds/debian/patches/series 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/patches/series 2024-04-16 09:54:44.000000000 +0200 @@ -1,3 +1,4 @@ 0001-Fix-faults-in-Makefile.patch makefile.patch hdparm.8.patch +Makefile-install-into-usr.patch diff -Nru hdparm-9.65+ds/debian/README.Debian hdparm-9.65+ds/debian/README.Debian --- hdparm-9.65+ds/debian/README.Debian 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/README.Debian 2024-04-16 09:54:44.000000000 +0200 @@ -13,7 +13,7 @@ If disk config is present in /etc/hdparm.conf: * disk supports APM - - on boot, udev will call /lib/udev/hdparm, which in turn will call + - on boot, udev will call /usr/lib/udev/hdparm, which in turn will call /usr/lib/pm-utils/power.d/95hdparm-apm for apm options and hdparm for other options. - on power, /usr/lib/pm-utils/power.d/95hdparm-apm diff -Nru hdparm-9.65+ds/debian/udev-scripts/hdparm hdparm-9.65+ds/debian/udev-scripts/hdparm --- hdparm-9.65+ds/debian/udev-scripts/hdparm 2022-10-06 14:47:47.000000000 +0200 +++ hdparm-9.65+ds/debian/udev-scripts/hdparm 2024-04-16 09:54:44.000000000 +0200 @@ -4,7 +4,7 @@ [ -n "$DEVNAME" ] || exit 1 -. /lib/hdparm/hdparm-functions +. /usr/lib/hdparm/hdparm-functions if [ -e /proc/cmdline ]; then #linux only - future proofing against BSD and Hurd :) if grep -wq nohdparm /proc/cmdline ; then @@ -43,7 +43,7 @@ # apm options are handled by /usr/lib/pm-utils/power.d/95hdparm-apm OPTIONS=$(echo $OPTIONS | perl -pe 's/((-S|-B|force_spindown_time)[\d]{1,3})|(-q\s?)//g') if [ -n "$OPTIONS" ]; then - /sbin/hdparm -q $OPTIONS $DEVNAME 2>/dev/null + /usr/sbin/hdparm -q $OPTIONS $DEVNAME 2>/dev/null fi fi diff -Nru hdparm-9.65+ds/debian/upstream/metadata hdparm-9.65+ds/debian/upstream/metadata --- hdparm-9.65+ds/debian/upstream/metadata 1970-01-01 01:00:00.000000000 +0100 +++ hdparm-9.65+ds/debian/upstream/metadata 2024-04-16 09:54:44.000000000 +0200 @@ -0,0 +1,3 @@ +--- +Archive: SourceForge +Bug-Database: http://sourceforge.net/project/memberlist.php?group_id=136732