-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Vogt
-
Date:
2010-11-25 20:03:22 UTC
-
mfrom:
(2.1.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20101125200322-vtvjp9tl6alfh3lb
Tags: 9.32-1ubuntu1
* 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