diff -u hdparm-9.43/debian/changelog hdparm-9.43/debian/changelog
--- hdparm-9.43/debian/changelog
+++ hdparm-9.43/debian/changelog
@@ -1,3 +1,24 @@
+hdparm (9.43-2ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    + debian/control:
+      - Do not depend on lsb-base (we no longer use init script).
+    + debian/hdparm.udev:
+      - Don't trigger the udev rule on sd[a-z]*; yes, this means we aren't
+        handling /dev/sdaa, but it also means we avoid spurious triggers on
+        /dev/sda{1,2,...}.
+    + hdparm.c, identify.c, sgio.h: import patch from
+      http://sourceforge.net/p/hdparm/patches/35/ to add support to 'hdparm -I'
+      for reporting DevSleep information.  LP 1031173.
+    + FIXME (still applies?): debian/rules:
+      - Install a suspend.d symlink to also call the pm-utils hook on
+        resuming.
+    + FIXME (undocumented): debian/rules: Add --noscripts --onlyscripts to DEB_DH_INSTALLINIT_ARGS.
+    + FIXME (undocumented): debian/rules: Don't set DEB_RCD_PARAMS.
+  * debian/95hdparm-apm: Drop comment diff.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Jan 2016 12:14:56 +0100
+
 hdparm (9.43-2) unstable; urgency=medium
 
   * Synced from Ubuntu: (Closes: #725284)
@@ -16,12 +37,104 @@
 
  -- Colin Watson <cjwatson@debian.org>  Thu, 14 Nov 2013 12:15:41 +0000
 
+hdparm (9.43-1ubuntu3) trusty; urgency=low
+
+  * debian/95hdparm-apm: reset apm_opt variable thanks to Ivan Lucchese for
+    the patch (LP: #1248012)
+
+ -- Brian Murray <brian@ubuntu.com>  Fri, 15 Nov 2013 13:46:16 -0800
+
+hdparm (9.43-1ubuntu2) saucy; urgency=low
+
+  * hdparm.c, identify.c, sgio.h: import patch from
+    http://sourceforge.net/p/hdparm/patches/35/ to add support to 'hdparm -I'
+    for reporting DevSleep information.  LP: #1031173.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 30 Apr 2013 08:58:10 -0700
+
+hdparm (9.43-1ubuntu1) raring; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    + debian/control:
+      - Do not depend on lsb-base (we no longer use init script).
+    + debian/hdparm.dirs:
+      - Drop unused /etc/udev/rules.d.
+    + debian/rules, debian/hdparm.udev-script:
+      - Install udev-script, drop init file stuff.
+    + debian/rules:
+      - Install a suspend.d symlink to also call the pm-utils hook on
+        resuming.
+    + debian/hdparm.udev:
+      - Don't trigger the udev rule on sd[a-z]*; yes, this means we aren't
+        handling /dev/sdaa, but it also means we avoid spurious triggers on
+        /dev/sda{1,2,...}.
+  * Dropped changes:
+    + debian/control:
+      - Add Breaks on old udev: no longer needed for upgrades, since the
+        udev version in question dates from Ubuntu 9.04.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 03 Dec 2012 17:00:23 +0000
+
 hdparm (9.43-1) unstable; urgency=low
 
   * New upstream version
 
  -- Michael Meskes <meskes@debian.org>  Wed, 21 Nov 2012 11:34:15 +0100
 
+hdparm (9.42-1ubuntu2) raring; urgency=low
+
+  * Set DEB_MAKE_ENVVARS differently in order to take advantage of
+    cross-building support in cdbs.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 01 Dec 2012 02:18:26 +0000
+
+hdparm (9.42-1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable:
+    + Adds support to the udev script for hdparm.conf stanzas that point at
+      a symlink of the device rather than the device itself.  LP: #222458.
+  * Remaining changes:
+    + debian/control:
+      - Add Breaks on old udev
+      - Do not depend on lsb-base (we no longer use init script)
+    + debian/hpdarm.dirs:
+      - Drop unused /etc/udev/rules.d
+    + debian/rules, debian/hdparm.udev-script:
+      - Install udev-script, drop init file stuff
+    + debian/rules:
+      - Install a suspend.d symlink to also call the pm-utils hook on
+        resuming.
+  * Dropped changes, included in Debian:
+    + debian/control:
+      - Add Homepage
+      - cdbs build-dependency bump
+      - Recommend powermgmt-base
+    + debian/rules:
+      - Pass --priority=85 to dh_installudev
+    + debian/hdparm.postinst, debian/rules: move udev rules to /lib/udev
+    + Addition of debian/95hdparm-apm and debian/hdparm-functions
+    + Add a new option to hdparm.conf, apm_battery, which is used in place of
+      apm when we detect that we're on battery power.
+    + debian/hdparm.udev-script, debian/hdparm.init:
+      - only use the 'apm' setting when we're not on battery; when we are on
+        battery, apply the separate 'apm_battery' setting.
+      - Don't call hdparm -f for every drive
+      - don't call sync
+    + debian/hdparm.install:
+      - Use hpdarm.udev instead of .rules
+    + debian/hdparm.conf, debian/hdparm.conf.5: drop 'command_line' example
+  * Dropped changes:
+    - pm-utils Breaks/Replaces: Ubuntu-specific and no longer needed for
+      upgrades.
+    - adding lib/udev for our udev-script: dh_installudev takes care of this
+      for us.
+    - Remove broken symlink on upgrade: pre-lucid upgrades, no longer needed.
+  * Don't trigger the udev rule on sd[a-z]*; yes, this means we aren't
+    handling /dev/sdaa, but it also means we avoid spurious triggers on
+    /dev/sda{1,2,...}
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 24 Oct 2012 21:41:35 -0700
+
 hdparm (9.42-1) unstable; urgency=low
 
   * New upstream release
@@ -73,6 +186,115 @@
 
  -- Michael Meskes <meskes@debian.org>  Tue, 27 Mar 2012 12:10:19 +0200
 
+hdparm (9.37-0ubuntu4) quantal; urgency=low
+
+  * debian/hdparm-functions, debian/95hdparm-apm: set our spindown policy
+    back to -B128 instead of -B127.  Too many drives misbehave too badly
+    with this setting, possibly leading to drive failure.  We should revisit
+    this once we understand why people's drives are spinning back *up* so
+    frequently.  LP: #952556.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 30 Apr 2012 23:04:05 -0700
+
+hdparm (9.37-0ubuntu3) precise; urgency=low
+
+  * debian/hdparm-functions: if we're going to set -B127 on battery, we
+    should also set a sane (not too low) spindown time, to avoid wearing out
+    disks.  LP: #952556.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Mar 2012 03:06:35 -0700
+
+hdparm (9.37-0ubuntu2) precise; urgency=low
+
+  * debian/hdparm-functions, debian/95hdparm-apm, debian/hdparm.conf.5: if we
+    really want disk policy to allow spinning down on battery, we need to set
+    -B *127*, not -B 128.  The comments in the historical pm-utils script
+    make it clear that this was the intent all along.  Thanks to Anmar Oueja
+    for catching this!
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 04 Jan 2012 13:57:57 -0800
+
+hdparm (9.37-0ubuntu1) oneiric; urgency=low
+
+  * New upstream version (LP: #793660)
+    - Really fix -B flag / IDENTIFY cdb
+
+ -- Roland Dreier <roland@digitalvampire.org>  Mon, 06 Jun 2011 13:34:41 -0700
+
+hdparm (9.32-1ubuntu3) natty; urgency=low
+
+  * debian/95hdparm-apm: Handle powersaving and suspend separately, and only
+    apply -S settings on resuming, not on powersaving events. Thanks heckheck!
+    (LP: #738757)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 31 Mar 2011 18:03:03 +0200
+
+hdparm (9.32-1ubuntu2) natty; urgency=low
+
+  * debian/95hdparm-apm: Also handle -S option from /etc/hdparm.conf. (side
+    issue in LP #738757).
+  * debian/rules: Install a suspend.d symlink to also call the pm-utils hook
+    on resuming. (LP: #738757)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 24 Mar 2011 22:49:48 +0100
+
+hdparm (9.32-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    + debian/control:
+      - Do not depend on lsb-base (we no longer use init script)
+      - Add Homepage
+      - Add Breaks on old udev
+      - Bump debhelper depends for dh_installudev changes
+      - Recommend powermgmt-base, so we can use on_ac_power to detect if we're
+        on battery.
+      - declare a Breaks: on pm-utils (<< 1.2.5-2ubuntu8), due to the change of
+        the hdparm-functions API.
+      - Replace pm-utils versions which shipped that script.
+    + debian/hdparm.install:
+      - Use hpdarm.udev instead of .rules
+      - move hdparm-functions to /lib/hdparm.
+    + debian/hpdarm.udev:
+      - refactor to use the above functions instead of embedding a parser.
+    + debian/hpdarm.dirs:
+      - Drop unused /etc/udev/rules.d, add lib/udev for our udev-script
+    + debian/rules, debian/hdparm.udev-script:
+      - Install udev-script, drop init file stuff
+      - Pass --priority=85 to dh_installudev
+    + debian/hdparm.postinst: The transitional code to create
+      /etc/udev/rules.d/z60_hdparm.rules also got wrongly executed on new
+      installs, leaving a broken symlink behind. However, we do not need this
+      in the first place, so just throw away the code completely.
+    + debian/hdparm.preinst: Remove broken symlink on upgrade.
+    + Add a new option to hdparm.conf, apm_battery, which is used in place of
+      apm when we detect that we're on battery power.
+    + debian/hdparm.udev-script, debian/hdparm.init:
+      - only use the 'apm' setting when we're not on battery; when we are on
+        battery, apply the separate 'apm_battery' setting.
+      - Don't call hdparm -f for every drive; no clear rationale was ever given
+        for doing this, and doing so slows down hard drive access at boot time.
+      - also don't call sync...
+    + debian/hdparm-functions:
+      - break out a barebones parser for /etc/hdparm.conf and install it to
+        /usr/lib/pm-utils, for use in /usr/lib/pm-utils/sleep.d/95hdparm-apm.
+      - refactor so that it can be used by the udev script as well
+      - drop handling of "command_line" here - we shouldn't be running this
+        for every hard drive and every power event, this should be supported
+        only by an init script (if at all)
+      - Don't apply default APM policy to Firewire or USB devices when running
+        from udev (LP: #515023, #548513).
+      - Fetch ID_PATH from 'udevadm info' if it isn't already set in the
+        environment (LP: #567182).
+      - Factor Firewire/USB check out into a new hdparm_try_apm function.
+    + Add debian/95hdparm-apm:
+      - pm-utils script to adjust hard drive APM settings
+        after resuming. This was previously shipped in pm-utils, but is more
+        appropriate here (see /usr/share/doc/pm-utils/README.distributions).
+      - Skip Firewire and USB devices.
+    + debian/hdparm.conf, debian/hdparm.conf.5: drop 'command_line' example
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 25 Nov 2010 20:03:22 +0100
+
 hdparm (9.32-1) unstable; urgency=low
 
   * New upstream version (closes: #574897)
@@ -96,6 +318,70 @@
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 01 Aug 2010 23:44:20 +0100
 
+hdparm (9.27-2ubuntu2) maverick; urgency=low
+
+  * debian/hdparm.conf, debian/hdparm.conf.5: drop 'command_line' example
+    from the default hdparm.conf since it's no longer supported, and update
+    the manpage to match.  LP: #568120.    
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 14 Jun 2010 14:47:50 -0700
+
+hdparm (9.27-2ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable (LP: #516249); remaining changes:
+    + debian/control:
+      - Do not depend on lsb-base (we no longer use init script)
+      - Add Homepage
+      - Add Breaks on old udev
+      - Bump debhelper depends for dh_installudev changes
+      - Recommend powermgmt-base, so we can use on_ac_power to detect if we're
+        on battery.
+      - declare a Breaks: on pm-utils (<< 1.2.5-2ubuntu8), due to the change of
+        the hdparm-functions API.
+      - Replace pm-utils versions which shipped that script.
+    + debian/hdparm.install:
+      - Use hpdarm.udev instead of .rules
+      - move hdparm-functions to /lib/hdparm.
+    + debian/hpdarm.udev:
+      - refactor to use the above functions instead of embedding a parser.
+    + debian/hpdarm.dirs:
+      - Drop unused /etc/udev/rules.d, add lib/udev for our udev-script
+    + debian/rules, debian/hdparm.udev-script:
+      - Install udev-script, drop init file stuff
+      - Pass --priority=85 to dh_installudev
+    + debian/hdparm.postinst: The transitional code to create
+      /etc/udev/rules.d/z60_hdparm.rules also got wrongly executed on new
+      installs, leaving a broken symlink behind. However, we do not need this
+      in the first place, so just throw away the code completely.
+    + debian/hdparm.preinst: Remove broken symlink on upgrade.
+    + Add a new option to hdparm.conf, apm_battery, which is used in place of
+      apm when we detect that we're on battery power.
+    + debian/hdparm.udev-script, debian/hdparm.init:
+      - only use the 'apm' setting when we're not on battery; when we are on
+        battery, apply the separate 'apm_battery' setting.
+      - Don't call hdparm -f for every drive; no clear rationale was ever given
+        for doing this, and doing so slows down hard drive access at boot time.
+      - also don't call sync...
+    + debian/hdparm-functions:
+      - break out a barebones parser for /etc/hdparm.conf and install it to
+        /usr/lib/pm-utils, for use in /usr/lib/pm-utils/sleep.d/95hdparm-apm.
+      - refactor so that it can be used by the udev script as well
+      - drop handling of "command_line" here - we shouldn't be running this
+        for every hard drive and every power event, this should be supported
+        only by an init script (if at all)
+      - Don't apply default APM policy to Firewire or USB devices when running
+        from udev (LP: #515023, #548513).
+      - Fetch ID_PATH from 'udevadm info' if it isn't already set in the
+        environment (LP: #567182).
+      - Factor Firewire/USB check out into a new hdparm_try_apm function.
+    + Add debian/95hdparm-apm:
+      - pm-utils script to adjust hard drive APM settings
+        after resuming. This was previously shipped in pm-utils, but is more
+        appropriate here (see /usr/share/doc/pm-utils/README.distributions).
+      - Skip Firewire and USB devices.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Fri, 07 May 2010 11:39:54 +0200
+
 hdparm (9.27-2) unstable; urgency=low
 
   * Stop unconditionally stripping hdparm during build (closes: #568774)
@@ -108,6 +394,104 @@
 
  -- Stephen Gran <sgran@debian.org>  Sun, 17 Jan 2010 18:02:44 +0000
 
+hdparm (9.15-1ubuntu9) lucid; urgency=low
+
+  * Fetch ID_PATH from 'udevadm info' if it isn't already set in the
+    environment (LP: #567182).
+  * Factor Firewire/USB check out into a new hdparm_try_apm function.
+  * debian/95hdparm-apm: Skip Firewire and USB devices.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 22 Apr 2010 17:35:22 +0100
+
+hdparm (9.15-1ubuntu8) lucid; urgency=low
+
+  * Don't apply default APM policy to Firewire or USB devices when running
+    from udev (LP: #515023, #548513).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 16 Apr 2010 16:19:29 +0100
+
+hdparm (9.15-1ubuntu7) lucid; urgency=low
+
+  * Add debian/95hdparm-apm: pm-utils script to adjust hard drive APM settings
+    after resuming. This was previously shipped in pm-utils, but is more
+    appropriate here (see /usr/share/doc/pm-utils/README.distributions).
+  * debian/control: Replace pm-utils versions which shipped that script.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 25 Nov 2009 11:54:19 +0100
+
+hdparm (9.15-1ubuntu6) lucid; urgency=low
+
+  * debian/hdparm.init, debian/hdparm.udev-script: also don't call sync...
+  * debian/hdparm-functions: refactor so that it can be used by the udev
+    script as well
+    - drop handling of "command_line" here - we shouldn't be running this
+      for every hard drive and every power event, this should be supported
+      only by an init script (if at all)
+  * debian/hdparm.install: move hdparm-functions to /lib/hdparm.
+  * debian/hdparm.udev-script: refactor to use the above functions instead of
+    embedding a parser.  LP: #321219.
+  * debian/control: declare a Breaks: on pm-utils (<< 1.2.5-2ubuntu8), due to
+    the change of the hdparm-functions API.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 13 Nov 2009 09:38:52 +0000
+
+hdparm (9.15-1ubuntu5) lucid; urgency=low
+
+  * debian/hdparm.init, debian/hdparm.udev-script: Don't call hdparm -f for
+    every drive; no clear rationale was ever given for doing this, and doing
+    so slows down hard drive access at boot time.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 12 Nov 2009 13:08:24 +0000
+
+hdparm (9.15-1ubuntu4) karmic; urgency=low
+
+  * Recommend powermgmt-base, so we can use on_ac_power to detect if we're on
+    battery.
+  * Add a new option to hdparm.conf, apm_battery, which is used in place of
+    apm when we detect that we're on battery power.
+  * debian/hdparm.udev-script, debian/hdparm.init: only use the 'apm' setting
+    when we're not on battery; when we are on battery, apply the separate
+    'apm_battery' setting.
+  * debian/hdparm-functions: break out a barebones parser for
+    /etc/hdparm.conf and install it to /usr/lib/pm-utils, for use in
+    /usr/lib/pm-utils/sleep.d/95hdparm-apm.  LP: #238555.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 05 Oct 2009 22:57:20 +0000
+
+hdparm (9.15-1ubuntu3) karmic; urgency=low
+
+  * debian/hdparm.postinst: The transitional code to create
+    /etc/udev/rules.d/z60_hdparm.rules also got wrongly executed on new
+    installs, leaving a broken symlink behind. However, we do not need this in
+    the first place, so just throw away the code completely.
+  * debian/hdparm.preinst: Remove broken symlink on upgrade.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 18 Sep 2009 12:49:04 +0200
+
+hdparm (9.15-1ubuntu2) karmic; urgency=low
+
+  * Fix crash with -B when HDIO_DRIVE_CMD(identify) fails (LP: #396837).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 14 Jul 2009 14:04:15 +0100
+
+hdparm (9.15-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #311451), remaining changes:
+    + debian/control:
+      - Do not depend on lsb-base (we no longer use init script)
+      - Add Homepage
+      - Add Breaks on old udev
+      - Bump debhelper depends for dh_installudev changes
+    + debian/hdparm.install, debian/hpdarm.udev:
+      - Use hpdarm.udev instead of .rules
+    + debian/hpdarm.dirs:
+      - Drop unused /etc/udev/rules.d, add lib/udev for our udev-script
+    + debian/rules, debian/hdparm.udev-script:
+      - Install udev-script, drop init file stuff
+      - Pass --priority=85 to dh_installudev
+
+ -- Michael Terry <michael.terry@canonical.com>  Mon, 15 Jun 2009 09:44:02 -0400
+
 hdparm (9.15-1) unstable; urgency=low
 
   * New upstream version (closes: #505284)
@@ -115,6 +499,32 @@
 
  -- Stephen Gran <sgran@debian.org>  Sat, 13 Jun 2009 00:45:36 +0100
 
+hdparm (8.9-3ubuntu3) jaunty; urgency=low
+
+  * Add Breaks to ensure the right version of udev is used.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Fri, 09 Jan 2009 11:49:03 +0000
+
+hdparm (8.9-3ubuntu2) jaunty; urgency=low
+
+  * Update for new udev rules location.
+  * debian/hdparm.rules: Rename to debian/hdparm.udev so dh_installudev
+    can pick it up.
+  * debian/rules: pass --priority=85 to dh_installudev, remove hand-install.
+  * debian/hdparm.dirs: no need for /etc/udev/rules.d
+  * debian/control: bump dependencies on debhelper and cdbs
+
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 07 Jan 2009 10:15:55 +0000
+
+hdparm (8.9-3ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #313451
+    - remove init script, install udev rules instead
+    - debian/control: Do not depend on lsb-base
+  * Add Homepage field LP: #311453
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 03 Jan 2009 17:58:22 +0530
+
 hdparm (8.9-3) unstable; urgency=low
 
   * Fix output formatting for drives configured from /etc/default/hdparm
@@ -123,12 +533,28 @@
 
  -- Stephen Gran <sgran@debian.org>  Wed, 17 Dec 2008 22:45:28 +0000
 
+hdparm (8.9-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove init script, install udev rules instead
+    - debian/control: Do not depend on lsb-base
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 10 Nov 2008 14:02:31 +0100
+
 hdparm (8.9-2) unstable; urgency=low
 
   * Remove stale stop links (closes: #497903)
 
  -- Stephen Gran <sgran@debian.org>  Fri, 05 Sep 2008 11:23:20 +0100
 
+hdparm (8.9-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove init script, install udev rules instead
+    - debian/control: Do not depend on lsb-base
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 19 Jun 2008 10:40:06 +0200
+
 hdparm (8.9-1) unstable; urgency=low
 
   * New upstream version
@@ -150,6 +576,20 @@
 
  -- Stephen Gran <sgran@debian.org>  Tue, 03 Jun 2008 00:36:06 +0100
 
+hdparm (8.6-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #203736). Remaining Ubuntu changes:
+    - remove init script, install udev rules instead
+    - set Ubuntu maintainer address.
+    - debian/control: Do not depend on lsb-base
+  * Fixes "udev rules only for hd[a-z], not sd[a-z]" (LP: #156893)
+  * Remove hdparm init script and make it not re-appear in next merges
+    - debian/rules: add "--onlyscripts" to DEB_DH_INSTALLINIT_ARGS, so that the
+      init script does not get installed
+    - debian/preinst: bump version in rm_conffile call
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Fri, 28 Mar 2008 21:44:38 +0100
+
 hdparm (8.6-1) unstable; urgency=low
 
   * New upstream version
@@ -165,6 +605,14 @@
 
  -- Stephen Gran <sgran@debian.org>  Tue, 19 Feb 2008 22:39:32 +0000
 
+hdparm (7.7-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove init script, install udev rules instead
+    - set Ubuntu maintainer address.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Nov 2007 12:39:58 +0100
+
 hdparm (7.7-1) unstable; urgency=low
 
   * New upstream version
@@ -178,6 +626,14 @@
 
  -- Stephen Gran <sgran@debian.org>  Sun, 15 Jul 2007 15:50:24 +0100
 
+hdparm (7.5-1ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove init script, install udev rules instead
+    - set Ubuntu maintainer address.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jun 2007 09:54:59 +0200
+
 hdparm (7.5-1) unstable; urgency=low
 
   * New upstream version
@@ -192,6 +648,14 @@
 
  -- Stephen Gran <sgran@debian.org>  Thu, 31 May 2007 02:34:11 +0100
 
+hdparm (7.1-2ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove init script, install udev rules instead
+    - set Ubuntu maintainer address.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 21 May 2007 08:47:38 +0200
+
 hdparm (7.1-2) unstable; urgency=low
 
   * Don't ship a binary in contrib/ (even though upstream puts it in the
@@ -214,6 +678,22 @@
 
  -- Stephen Gran <sgran@debian.org>  Sat, 17 Feb 2007 03:30:06 +0000
 
+hdparm (6.9-1ubuntu2) feisty; urgency=low
+
+  * Rebuild for changes in the amd64 toolchain.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:18:04 +0000
+
+hdparm (6.9-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - remove init script, install udev rules instead
+
+  * Update udev script from init script
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 27 Nov 2006 14:14:39 +0000
+
 hdparm (6.9-1) unstable; urgency=low
 
   * New upstream version
@@ -265,6 +745,29 @@
 
  -- Stephen Gran <sgran@debian.org>  Thu, 18 May 2006 23:59:56 +0100
 
+hdparm (6.6-1ubuntu3) edgy; urgency=low
+
+  * Remove the init script again.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 20 Jul 2006 23:33:21 +0100
+
+hdparm (6.6-1ubuntu2) edgy; urgency=low
+
+  * Repair CDBS damage ... silently enabling features depending on the
+    filename of files that may have existed before is BAD, OKAY?
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon,  3 Jul 2006 23:03:13 +0100
+
+hdparm (6.6-1ubuntu1) edgy; urgency=low
+
+  [ Ongoing Merge Process ]
+  * Merge from debian unstable.
+
+  [ Scott James Remnant ]
+  * Drop conffile move now dapper is released.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 28 Jun 2006 23:44:49 +0100
+
 hdparm (6.6-1) unstable; urgency=low
 
   * New upstream release
@@ -276,6 +779,14 @@
 
  -- Stephen Gran <sgran@debian.org>  Tue, 18 Apr 2006 13:28:33 +0100
 
+hdparm (6.3-3ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+  * Drop init script completely, udev will run the right magic for each
+    new block device anyway.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 15 Dec 2005 01:56:46 +0000
+
 hdparm (6.3-3) unstable; urgency=low
 
   * Init script fixup: s/_/-/ (closes: #340685)
@@ -297,6 +808,31 @@
 
  -- Stephen Gran <sgran@debian.org>  Mon, 21 Nov 2005 23:44:43 +0000
 
+hdparm (6.1-7ubuntu2) dapper; urgency=low
+
+  * Fix incorrect syntax in hdparm.rules file.
+  * Install hdparm.rules as /etc/udev/rules.d/85-hdparm.rules to match
+    new udev packages; move file if customised in ubuntu1.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Fri, 18 Nov 2005 10:03:15 +0000
+
+hdparm (6.1-7ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+    (Yes, really, me; not any of those imposters!)
+    - Kept versioned-dep on lsb-base.
+    - Kept include of /etc/default/rcS in hdparm.init as we check VERBOSE,
+      I'm not sure why Debian don't do that.
+    - Merge both sets of init script changes to roughly produce the same
+      effect, less logging than Debian but with combined init and hotplug
+      script.
+  * Dropped postrm and postinst, instead install hdparm.rules directly into
+    /etc/udev/rules.d, we have no need to mess about with symlinks.
+  * Dropped support for /etc/default/hdparm as it doesn't really work with
+    udev anyway, and there should only be one way to do things, damnit.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Tue, 08 Nov 2005 07:20:28 +0000
+
 hdparm (6.1-7) unstable; urgency=low
 
   * Make eval_value fail if unknown value passed to it (closes: #329443)
@@ -342,6 +878,20 @@
 
  -- Stephen Gran <sgran@debian.org>  Tue, 24 May 2005 10:08:42 -0400
 
+hdparm (6.1-1ubuntu2) breezy; urgency=low
+
+  * Fix the hdparm.dev script to only execute hdparm for the block device
+    being created, rather than for every block device configured in the file.
+    This prevents an hdparm storm bringing down the machine.  (Ubuntu: #16433)
+
+ -- Scott James Remnant <scott@ubuntu.com>  Tue, 27 Sep 2005 21:00:19 +0100
+
+hdparm (6.1-1ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian, resolving merge conflicts.
+
+ -- Adam Conrad <adconrad@0c3.net>  Thu, 21 Apr 2005 09:33:45 +0000
+
 hdparm (6.1-1) unstable; urgency=low
 
   * New upstream version
@@ -357,6 +907,12 @@
 
  -- Stephen Gran <sgran@debian.org>  Sat, 16 Apr 2005 12:36:14 -0400
 
+hdparm (5.9-4ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Apr 2005 15:30:28 +0200
+
 hdparm (5.9-4) unstable; urgency=low
 
   * Allow overriding of (rather simple minded) built-in safety checks
@@ -397,6 +953,32 @@
 
  -- Stephen Gran <sgran@debian.org>  Fri,  4 Feb 2005 08:56:57 -0500
 
+hdparm (5.8-1ubuntu4) hoary; urgency=low
+
+  * Force the /etc/dev.d/block/hdparm.dev script to be executable
+    if upgrading from a version older than this one.  dpkg won't
+    touch the mode on this file.
+
+ -- Jeff Bailey <jbailey@ubuntu.com>  Mon, 21 Mar 2005 07:15:54 -0500
+
+hdparm (5.8-1ubuntu3) hoary; urgency=low
+
+  * ensure that the hdparm dev script is +x (Ubuntu: #7829)
+
+ -- Thom May <thom@planetarytramp.net>  Sat, 19 Mar 2005 22:46:43 +0000
+
+hdparm (5.8-1ubuntu2) hoary; urgency=low
+
+  * Add udev script to run hdparm on newly created devices. (Ubuntu: #4356)
+
+ -- Thom May <thom@ubuntu.com>  Mon,  7 Feb 2005 12:50:01 +0000
+
+hdparm (5.8-1ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Scott James Remnant <scott@canonical.com>  Sat, 27 Nov 2004 12:47:14 +0000
+
 hdparm (5.8-1) unstable; urgency=low
 
   * New Upstream version
@@ -406,6 +988,12 @@
 
  -- Stephen Gran <sgran@debian.org>  Fri, 26 Nov 2004 11:57:13 -0500
 
+hdparm (5.7-1ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Thom May <thom@canonical.com>  Wed, 27 Oct 2004 21:40:43 +0100
+
 hdparm (5.7-1) unstable; urgency=low
 
   * New upstream release
@@ -449,6 +1037,25 @@
 
  -- Stephen Gran <sgran@debian.org>  Sun, 15 Aug 2004 22:48:29 -0400
 
+hdparm (5.5-4ubuntu3) warty; urgency=low
+
+  * Added versioned depend on lsb-base
+
+ -- Nathaniel McCallum <npmccallum@canonical.com>  Fri,  3 Sep 2004 14:54:30 -0400
+
+hdparm (5.5-4ubuntu2) warty; urgency=low
+
+  * debian/hdparm.init: pretty initscript
+
+ -- Nathaniel McCallum <npmccallum@canonical.com>  Fri,  3 Sep 2004 10:46:32 -0400
+
+hdparm (5.5-4ubuntu1) warty; urgency=low
+
+  * Create a udeb so that we can tune disk (especially CD-ROM) parameters in
+    d-i.
+
+ -- Colin Watson <cjwatson@flatline.org.uk>  Mon, 16 Aug 2004 00:21:30 +0100
+
 hdparm (5.5-4) unstable; urgency=low
 
   * Patch from "Mario 'BitKoenig' Holbe" <Mario.Holbe@RZ.TU-Ilmenau.DE> for
diff -u hdparm-9.43/debian/control hdparm-9.43/debian/control
--- hdparm-9.43/debian/control
+++ hdparm-9.43/debian/control
@@ -1,7 +1,8 @@
 Source: hdparm
 Section: admin
 Priority: optional
-Maintainer: Stephen Gran <sgran@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Stephen Gran <sgran@debian.org>
 Uploaders: Michael Meskes <meskes@debian.org>
 Build-Depends: cdbs (>> 0.4.37), debhelper (>= 7.3.15), dpkg-dev (>= 1.13.19)
 Standards-Version: 3.9.3
@@ -9,7 +10,7 @@
 
 Package: hdparm
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: apmd
 Replaces: apmd (<= 3.0.2-1.15)
 Recommends: powermgmt-base
diff -u hdparm-9.43/debian/hdparm.udev hdparm-9.43/debian/hdparm.udev
--- hdparm-9.43/debian/hdparm.udev
+++ hdparm-9.43/debian/hdparm.udev
@@ -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+="/lib/udev/hdparm"
 
diff -u hdparm-9.43/debian/rules hdparm-9.43/debian/rules
--- hdparm-9.43/debian/rules
+++ hdparm-9.43/debian/rules
@@ -17,9 +17,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307 USA.
 
-DEB_DH_INSTALLINIT_ARGS := '--no-start'
+DEB_DH_INSTALLINIT_ARGS := --no-start --noscripts --onlyscripts
 #DEB_DH_LINK_ARGS := ../init.d/hdparm /etc/rcS.d/S07hdparm.first
-DEB_UPDATE_RCD_PARAMS := 'start 07 S . '
 DEB_FIXPERMS_EXCLUDE := 20hdparm
 DEB_DH_INSTALLUDEV_ARGS := --priority=85
 
only in patch2:
unchanged:
--- hdparm-9.43.orig/hdparm.c
+++ hdparm-9.43/hdparm.c
@@ -887,6 +887,28 @@
 		__le16_to_cpus(&id[i]);
 }
 
+static int get_id_log_page_data (int fd, __u8 pagenr, __u8 *buf)
+{
+	struct hdio_taskfile *r;
+	int err = 0;
+
+	r = malloc(sizeof(struct hdio_taskfile) + 512);
+	if (!r) {
+		err = errno;
+		perror("malloc()");
+		return err;
+	}
+
+	init_hdio_taskfile(r, ATA_OP_READ_LOG_EXT, RW_READ, LBA48_FORCE, 0x30 + (pagenr << 8), 1, 512);
+	if (do_taskfile_cmd(fd, r, timeout_15secs)) {
+		err = errno;
+	} else {
+		memcpy(buf, r->data, 512);
+	}
+	free(r);
+	return err;
+}
+
 static void confirm_i_know_what_i_am_doing (const char *opt, const char *explanation)
 {
 	if (!i_know_what_i_am_doing) {
@@ -2175,6 +2197,26 @@
 				dump_sectors(id, 1);
 			else
 				identify((void *)id);
+
+			/* Print DEVSLP information */
+			if (id[78] & 0x0100) {
+				__u8 buf[512];
+				int deto = 0;
+				int mdat = 0;
+
+				memset(buf, 0, 512);
+				if (!get_id_log_page_data(fd, 8, buf) &&
+				    (buf[0x37] & 0x80)) {
+					mdat = buf[0x30] & 0x1f;
+					deto = buf[0x31];
+				}
+				printf("Device Sleep:\n");
+				printf("\tDEVSLP Exit Timeout (DETO): %d ms (%s)\n",
+				       deto?deto:20, deto?"drive":"default");
+
+				printf("\tMinimum DEVSLP Assertion Time (MDAT): %d ms (%s)\n",
+				       mdat?mdat:10, deto?"drive":"default");
+			}
 		}
 	}
 	if (get_lookahead) {
only in patch2:
unchanged:
--- hdparm-9.43.orig/identify.c
+++ hdparm-9.43/identify.c
@@ -421,9 +421,9 @@
 	"Disable Data Transfer After Error Detection"	/* word 119 bit  0 (ref: 2014DT)*/
 };
 static const char *cap_sata0_str[16] = { 
-	"unknown 76[15]",				/* word 76 bit 15 */
-	"unknown 76[14]",				/* word 76 bit 14 */
-	"unknown 76[13]",				/* word 76 bit 13 */
+	"READ_LOG_DMA_EXT equivalent to READ_LOG_EXT",	/* word 76 bit 15 */
+	"Device automatic Partial to Slumber transitions",/* word 76 bit 14 */
+	"Host automatic Partial to Slumber transitions",/* word 76 bit 13 */
 	"NCQ priority information",			/* word 76 bit 12 */
 	"Idle-Unload when NCQ is active",		/* word 76 bit 11 */
 	"Phy event counters",				/* word 76 bit 10 */
@@ -446,7 +446,7 @@
 	"unknown 78[11]",				/* word 78 bit 11 */
 	"unknown 78[10]",				/* word 78 bit 10 */
 	"unknown 78[9]",				/* word 78 bit  9 */
-	"unknown 78[8]",				/* word 78 bit  8 */
+	"Device Sleep (DEVSLP)",			/* word 78 bit  8 */
 	"unknown 78[7]",				/* word 78 bit  7 */
 	"Software settings preservation",		/* word 78 bit  6 */
 	"Asynchronous notification (eg. media change)",	/* word 78 bit  5 */
only in patch2:
unchanged:
--- hdparm-9.43.orig/sgio.h
+++ hdparm-9.43/sgio.h
@@ -10,6 +10,7 @@
 	ATA_OP_READ_LONG_ONCE		= 0x23,
 	ATA_OP_READ_PIO_EXT		= 0x24,
 	ATA_OP_READ_DMA_EXT		= 0x25,
+	ATA_OP_READ_LOG_EXT		= 0x2f,
 	ATA_OP_READ_FPDMA		= 0x60,	// NCQ
 	ATA_OP_WRITE_PIO		= 0x30,
 	ATA_OP_WRITE_LONG		= 0x32,