diff --git a/general.ent b/general.ent index 55ea966018..e7f42979f0 100644 --- a/general.ent +++ b/general.ent @@ -319,7 +319,7 @@ $Date$ - + diff --git a/general/sysutils/upower.xml b/general/sysutils/upower.xml index e47289e21d..9d41ee915d 100644 --- a/general/sysutils/upower.xml +++ b/general/sysutils/upower.xml @@ -4,12 +4,12 @@ %general-entities; - + - - - - + + + + ]> @@ -34,7 +34,7 @@ and statistics. Any application or service on the system can access the org.freedesktop.UPower service via the system message bus. - &lfs65_checked; + &lfs70_built; Package Information @@ -61,11 +61,13 @@ UPower Dependencies Required - and + , + , and (with gudev) Optional - + and + User Notes: @@ -105,14 +107,14 @@ make Installed Programs - Installed Libraries + Installed Library Installed Directories upower and upowerd - libdevkit-power-gobject.{so,a} and libupower-glib.{so,a} - /usr/{include/{DeviceKit-power/devkit-power-gobject, - libupower-glib},lib/upower}, /var/lib/upower + libupower-glib.{so,a} + /etc/UPower, /usr/{include/libupower-glib,lib/upower, + share/dbus-1/interfaces}, /var/lib/upower @@ -143,16 +145,6 @@ make - - libdevkit-power-gobject.{so,a} - - contains the old DeviceKit-power API functions. - - libdevkit-power-gobject.{so,a} - - - - libupower-glib.{so,a} diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 6be93b67a6..fa17f4fa95 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,9 @@ [ken] - Add tracker-0.12.3 from Wayne. + + [ken] - Merge upower-0.9.14 from Wayne. +