From: Ian Jackson Date: Wed, 6 Jun 2012 00:45:46 +0000 (+0100) Subject: Merge branch 'master' into newacpi X-Git-Tag: debian/4.1.31~19 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5eaaad7328acab8842aa56bc35564926485fb380;p=chiark-utils.git Merge branch 'master' into newacpi --- 5eaaad7328acab8842aa56bc35564926485fb380 diff --cc debian/changelog index a3aff07,46a4bb8..94cb30c --- a/debian/changelog +++ b/debian/changelog @@@ -1,23 -1,11 +1,27 @@@ chiark-utils (4.1.31~~iwj) unstable; urgency=low + * watershed now installs its head doc comment in + /usr/share/doc/chiark-utils-bin/watershed.txt. + This is apropos of #659989 but is of course not a proper fix. + * chiark-backup Suggests chiark-utils-bin, not the nonexistent chiark-cprogs (for `summer'). + + * xacpi-simple updated: + - Now works with recent kernels by reading /sys/class/power_supply + (so is now misnamed, since that may or may not come from acpi). + - Copes both with batteries which report charge/current and ones which + report energy/power. + - Copes with batteries which are not full, charging or discharging + (eg, if the system is on a/c but battery charging is suppressed). + - Shows red when time remaining is less than 5 minutes (configurable) + rather than trying to use "alarm" value from /sys/class/power_supply + (which is not very predictable or reliable). + - Option -debug produces some debugging output. + - In the code, rename pix_... variables to be named after the meaning + rather than the default colour. + - Get rid of some signed/unsigned warnings. + * Fix the build-depends to refer to nettle-dev not libnettle-dev. * Add ${misc:Depends} to Depends: lines. Causes no change to the .debs. * Switch to git. Move .cvsignores to .gitignore, etc.