--- xfce4-power-manager-0.8.5.orig/debian/rules +++ xfce4-power-manager-0.8.5/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +LDFLAGS+=-Wl,-z,defs -Wl,--as-needed +override_dh_install: + dh_install --list-missing + +%: + dh --with quilt $@ --- xfce4-power-manager-0.8.5.orig/debian/README.source +++ xfce4-power-manager-0.8.5/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt patch system to apply patch at build-time. More +information can be found in /usr/share/doc/quilt/README.source. --- xfce4-power-manager-0.8.5.orig/debian/changelog +++ xfce4-power-manager-0.8.5/debian/changelog @@ -0,0 +1,234 @@ +xfce4-power-manager (0.8.5-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining Ubuntu changes: + - debian/patches: + + xubuntu-use-notification-icons.patch: use our notification-* icons + for notification bubbles instead of the normal ones LP: #437374 + + xubuntu-assume-hal-is-available.patch: do not check for hal presence + on the bus, it'll be spawned automatically on demand. lp: #507097 + + 10_pc.patch: added patched files to POTFILES.skip + + series: created, with these two patches + - debian/rules: add --with quilt + - debian/control: build-depends on quilt (>= 0.46-7~) + - debian/README.source: added. + + * debian/patches/01_check-brightness-array-icon-index.patch, + 02_handle-weird-negative-brightness-level.patch: dropped, included + upstream. + + -- Lionel Le Folgoc Sun, 09 May 2010 18:26:53 +0200 + +xfce4-power-manager (0.8.5-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - update standards version to 3.8.4. + - update obsolete relation form < to <<. + + -- Yves-Alexis Perez Tue, 02 Mar 2010 23:19:53 +0100 + +xfce4-power-manager (0.8.4.2-1ubuntu5) lucid; urgency=low + + * debian/patches/02_handle-weird-negative-brightness-level.patch: fixes + another possible crash when hal reports a negative brightness level, + cherry-pick from upstream git '0.8-hal-based' branch. lp: #454175 + * debian/patch/series: enable it. + + -- Lionel Le Folgoc Sat, 06 Mar 2010 18:31:51 +0100 + +xfce4-power-manager (0.8.4.2-1ubuntu4) lucid; urgency=low + + * debian/patches/01_check-brightness-array-icon-index.patch: fixes a + possible crash when a weird brightness level is reported by the + backend. lp: #517235 + * debian/patch/series: enable it. + + -- Lionel Le Folgoc Fri, 12 Feb 2010 22:32:58 +0100 + +xfce4-power-manager (0.8.4.2-1ubuntu3) lucid; urgency=low + + * debian/patches/xubuntu-assume-hal-is-available.patch: do not check for hal + presence on the bus, it'll be spawned automatically on demand. lp: #507097 + * debian/patches/series: refreshed. + + -- Lionel Le Folgoc Wed, 20 Jan 2010 21:41:48 +0100 + +xfce4-power-manager (0.8.4.2-1ubuntu2) lucid; urgency=low + + * debian/patches/xubuntu-use-notification-icons.patch: updated to fix + missing icons with notify-osd… + + -- Lionel Le Folgoc Mon, 07 Dec 2009 16:57:43 +0100 + +xfce4-power-manager (0.8.4.2-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining Ubuntu changes: + - debian/patches: + + xubuntu-use-notification-icons.patch: use our notification-* icons for + notification bubbles instead of the normal ones LP: #437374 + + 10_pc.patch: added patched files to POTFILES.skip + + series: created, with these two patches + - debian/rules: add --with quilt + - debian/control: build-depends on quilt (>= 0.46-7~) + - debian/README.source: added. + + -- Lionel Le Folgoc Fri, 04 Dec 2009 16:13:45 +0100 + +xfce4-power-manager (0.8.4.2-1) unstable; urgency=low + + * New upstream release. + + -- Yves-Alexis Perez Sat, 21 Nov 2009 14:37:32 +0100 + +xfce4-power-manager (0.8.4.1-1) unstable; urgency=low + + * New upstream release. + - fix xfpm crashing when closing LID. closes: #552692 + - allow setting lower value in battery warnings. closes: #549207 + - fix FTBFS when building twice in a row. closes: #549650 + * debian/xfce4-power-manager.xml: ship a default config to ask user when + pressing the power button. closes: #544858 + + -- Yves-Alexis Perez Mon, 02 Nov 2009 22:20:58 +0100 + +xfce4-power-manager (0.8.4-1ubuntu1) karmic; urgency=low + + * New upstream bugfix release (LP: #438754), merge from Debian unstable, + remaining Ubuntu changes: + - debian/patches: + + xubuntu-use-notification-icons.patch: use our notification-* icons for + notification bubbles instead of the normal ones LP: #437374 + + 10_pc.patch: added patched files to POTFILES.skip + + series: created, with these two patches + - debian/rules: add --with quilt + - debian/control: build-depends on quilt (>= 0.46-7). + + -- Lionel Le Folgoc Fri, 02 Oct 2009 20:15:41 +0200 + +xfce4-power-manager (0.8.4-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - add Recommends on librsvg2-common, all icons are svg. + - update standards version to 3.8.3. + + -- Yves-Alexis Perez Tue, 29 Sep 2009 11:33:13 +0200 + +xfce4-power-manager (0.8.3.1-1ubuntu2) UNRELEASED; urgency=low + + * debian/patches: + - xubuntu-use-notification-icons.patch: use our notification-* icons for + notification bubbles instead of the normal ones LP: #437374 + - 10_pc.patch: refreshed, fix FTBFS + - series: refreshed. + + -- Lionel Le Folgoc Sun, 27 Sep 2009 00:24:03 +0200 + +xfce4-power-manager (0.8.3.1-1ubuntu1) karmic; urgency=low + + * debian/patches: + - 01_fix-segfault-in-xfpm_session_set_client_id.patch: added, taken from + + - debian/patches/10_pc.patch: add above patch to POTFILES.skip. + - series: reference above patches. + * debian/rules: add --with quilt. + * debian/control: build-depends on quilt (>= 0.46-7). + + -- Lionel Le Folgoc Sun, 06 Sep 2009 12:42:38 +0200 + +xfce4-power-manager (0.8.3.1-1) unstable; urgency=low + + * New upstream bugfix release. + * debian/watch edited to track Xfce archive reorganisation. + + -- Yves-Alexis Perez Mon, 10 Aug 2009 08:25:55 +0200 + +xfce4-power-manager (0.8.3-1) unstable; urgency=low + + * New upstream release. + + -- Yves-Alexis Perez Mon, 03 Aug 2009 15:20:09 +0200 + +xfce4-power-manager (0.8.2-1) unstable; urgency=low + + * New upstream release. + + -- Yves-Alexis Perez Thu, 09 Jul 2009 23:41:28 +0200 + +xfce4-power-manager (0.8.1.1-1) unstable; urgency=low + + [ Evgeni Golov ] + * Fix Vcs-* fields, they were missing 'trunk' in the path. + + [ Yves-Alexis Perez ] + * New upstream release. + * debian/control: + - drop build-dep on libglade. + - update standards version to 3.8.2. + + -- Yves-Alexis Perez Tue, 07 Jul 2009 00:29:41 +0200 + +xfce4-power-manager (0.8.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - update long description, thanks to Gerfried Fuchs. closes: #531812 + + -- Yves-Alexis Perez Tue, 09 Jun 2009 23:25:26 +0200 + +xfce4-power-manager (0.8.0~rc2-4) unstable; urgency=low + + * debian/rules: + - don't use --fail-missing in dh_install since we have an arch:all + package. Fixes FTBFS on all arches. closes: #530399 + + -- Yves-Alexis Perez Sun, 24 May 2009 18:37:32 +0200 + +xfce4-power-manager (0.8.0~rc2-3) unstable; urgency=low + + * *really* upload to unstable this time. + + -- Yves-Alexis Perez Thu, 21 May 2009 12:10:21 +0200 + +xfce4-power-manager (0.8.0~rc2-2) experimental; urgency=low + + * Upload to unstable. + * debian/control: + - update -plugins description now that inhibit was moved to the main + program. + + -- Yves-Alexis Perez Thu, 21 May 2009 01:22:31 +0200 + +xfce4-power-manager (0.8.0~rc2-1) experimental; urgency=low + + [ Yves-Alexis Perez ] + * New upstream beta release. + * debian/control: + - update standards version to 3.8.1. + - add build-dep on libglade2-dev. + - add build-dep on xfce4-panel-dev for panel plugins. + - add a new package for the panel plugins. + - add a new package for arch-indep files. + - move to xfce section. + - drop libhal-dev build-dep, now useless. + - add dep on hal. + * debian/rules: + - run dh_install with --fail-missing. + - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS. + * debian/copyright: update dates and copyright holders. + * debian/xfce4-power-manager.install: + - install manpages in xfpm package. + * debian/xfce4-power-manager.1 dropped, included upstream. + * debian/xfce4-power-manager.manpages dropped, useless. + + [ Evgeni Golov ] + * debian/control: + - fix depends of -plugins + + -- Yves-Alexis Perez Tue, 19 May 2009 23:49:06 +0200 + +xfce4-power-manager (0.6.2-1) experimental; urgency=low + + * Initial release. closes: #503636 + + -- Yves-Alexis Perez Sat, 28 Feb 2009 23:59:10 +0100 --- xfce4-power-manager-0.8.5.orig/debian/watch +++ xfce4-power-manager-0.8.5/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://archive.xfce.org/src/apps/xfce4-power-manager/([\d\.]+)/ \ + xfce4-power-manager-([\d\.]+)\.tar\.(?:gz|bz2) --- xfce4-power-manager-0.8.5.orig/debian/xfce4-power-manager-plugins.install +++ xfce4-power-manager-0.8.5/debian/xfce4-power-manager-plugins.install @@ -0,0 +1,2 @@ +usr/lib +usr/share/xfce4/panel-plugins --- xfce4-power-manager-0.8.5.orig/debian/copyright +++ xfce4-power-manager-0.8.5/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Yves-Alexis Perez on +Mon, 27 Oct 2008 07:32:27 +0100 + +It was downloaded from +http://goodies.xfce.org/projects/applications/xfce4-power-manager + +Copyright Holders: + +© 2008-2009 Ali + +src/xfpm-button-xf86.c: + © 2008-2009 Ali with some code from gnome-power-manager + which is: + © 2006-2007 Richard Hughes +src/xfpm-idle.c: + © 2008-2009 Ali and some code from GDM 2.24.2 which is: + © 2007 Richard Hughes + +brightness/brightness-button.c: + © 2009 Ali + with some code taken from GtkScaleButton (GTK), which is: + © 2005 Ronald S. Bultje + © 2006, 2007 Christian Persch + © 2006 Jan Arne Petersen + © 2005-2007 Red Hat, Inc. + + +License: + +You are free to distribute this software under the terms of +the GNU General Public License (version 2 or later). +On Debian systems, the complete text of the GNU General Public +License can be found in the file `/usr/share/common-licenses/GPL' --- xfce4-power-manager-0.8.5.orig/debian/control +++ xfce4-power-manager-0.8.5/debian/control @@ -0,0 +1,61 @@ +Source: xfce4-power-manager +Section: xfce +Priority: optional +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers +Uploaders: Yves-Alexis Perez , Emanuele Rocca , Simon Huggins +Build-Depends: debhelper (>= 7.0.50), intltool, pkg-config, libgtk2.0-dev, + libdbus-1-dev, libdbus-glib-1-dev, libxfconf-0-dev (>= 4.6.0), + libxfcegui4-dev (>= 4.6.0), libnotify-dev, xfce4-panel-dev (>= 4.6.0), + quilt (>= 0.46-7~) +Standards-Version: 3.8.4 +Vcs-Bzr: lp:~xubuntu-dev/xfce4-power-manager/maverick +Vcs-Browser: http://bazaar.launchpad.net/~xubuntu-dev/xfce4-power-manager/maverick/files +Homepage: http://goodies.xfce.org/projects/applications/xfce4-power-manager + +Package: xfce4-power-manager +Section: xfce +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, hal, + xfce4-power-manager-data (=${source:Version}) +Suggests: xfce4-power-manager-plugins +Description: power manager for Xfce desktop + This power manager for the Xfce desktop enables laptop users to set up + a power profile for two different modes "on battery power" and "on ac + power" while still allowing desktop users to at least change the DPMS + settings and CPU frequency using the settings dialogue.. + . + It features: + * battery monitoring + * cpu frequency settings + * monitor DPMS settings + * suspend/Hibernate + * LCD brightness control + * Lid, sleep and power switches control + +Package: xfce4-power-manager-data +Section: xfce +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: xfce4-power-manager, librsvg2-common +Replaces: xfce4-power-manager (<< 0.8.0~beta2-1) +Description: power manager for Xfce desktop, arch-indep files + This power manager for the Xfce desktop enables laptop users to set up + a power profile for two different modes "on battery power" and "on ac + power" while still allowing desktop users to at least change the DPMS + settings and CPU frequency using the settings dialogue.. + . + This package contains architecture-independant files. + +Package: xfce4-power-manager-plugins +Section: xfce +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, + xfce4-power-manager (>= 0.8.0~) +Description: power manager plugins for Xfce panel + This power manager for the Xfce desktop enables laptop users to set up + a power profile for two different modes "on battery power" and "on ac + power" while still allowing desktop users to at least change the DPMS + settings and CPU frequency using the settings dialogue.. + . + This package contains the brightness plugin. --- xfce4-power-manager-0.8.5.orig/debian/xfce4-power-manager.xml +++ xfce4-power-manager-0.8.5/debian/xfce4-power-manager.xml @@ -0,0 +1,7 @@ + + + + + + + --- xfce4-power-manager-0.8.5.orig/debian/xfce4-power-manager-data.install +++ xfce4-power-manager-0.8.5/debian/xfce4-power-manager-data.install @@ -0,0 +1,4 @@ +usr/share/locale +usr/share/xfce4/doc +usr/share/icons +usr/share/man --- xfce4-power-manager-0.8.5.orig/debian/compat +++ xfce4-power-manager-0.8.5/debian/compat @@ -0,0 +1 @@ +7 --- xfce4-power-manager-0.8.5.orig/debian/xfce4-power-manager.install +++ xfce4-power-manager-0.8.5/debian/xfce4-power-manager.install @@ -0,0 +1,4 @@ +etc/ +usr/bin +usr/share/applications +debian/xfce4-power-manager.xml /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/ --- xfce4-power-manager-0.8.5.orig/debian/patches/xubuntu-use-notification-icons.patch +++ xfce4-power-manager-0.8.5/debian/patches/xubuntu-use-notification-icons.patch @@ -0,0 +1,214 @@ +=== modified file 'libxfpm/xfpm-notify.c' +--- a/libxfpm/xfpm-notify.c 2009-09-29 11:33:13 +0000 ++++ b/libxfpm/xfpm-notify.c 2009-12-07 15:31:52 +0000 +@@ -125,7 +125,7 @@ + n = notify_notification_new (title, message, NULL, NULL); + + if ( icon_name ) +- xfpm_notify_set_notification_icon (n, icon_name); ++ notify_notification_update (n, title, message, icon_name); + + if ( icon ) + notify_notification_attach_to_status_icon (n, icon); + +=== modified file 'src/xfpm-battery.c' +--- a/src/xfpm-battery.c 2009-09-24 09:10:34 +0000 ++++ b/src/xfpm-battery.c 2009-09-26 20:41:29 +0000 +@@ -160,10 +160,12 @@ + XfpmBatteryState state, + guint percentage) + { +- gchar *icon; ++ gchar *icon = NULL, *notify_icon = NULL; + + if ( state == BATTERY_NOT_PRESENT ) + { ++ //FIXME what icon is most appropriate for this case? When does it happen? ++ xfpm_tray_icon_set_notify_icon (battery->priv->icon, "notification-battery-100-plugged"); + xfpm_tray_icon_set_icon (battery->priv->icon, + battery->priv->type == HAL_DEVICE_TYPE_UPS ? + XFPM_UPS_ICON_PREFIX "missing" : +@@ -175,10 +177,13 @@ + if ( state == BATTERY_FULLY_CHARGED ) + { + if ( battery->priv->type == HAL_DEVICE_TYPE_PRIMARY) ++ { ++ xfpm_tray_icon_set_notify_icon (battery->priv->icon, battery->priv->adapter_present ? "notification-battery-100-plugged" : "notification-battery-100"); + xfpm_tray_icon_set_icon (battery->priv->icon, + battery->priv->adapter_present ? + XFPM_PRIMARY_ICON_PREFIX "charged" : + XFPM_PRIMARY_ICON_PREFIX "100"); ++ } + else + { + icon = g_strdup_printf("%s%s", +@@ -186,6 +191,11 @@ + xfpm_battery_get_icon_index (battery->priv->type, percentage)); + xfpm_tray_icon_set_icon (battery->priv->icon, icon); + g_free(icon); ++ ++ notify_icon = g_strdup_printf("%s%s", "notification-battery-", ++ xfpm_battery_get_icon_index (battery->priv->type, percentage)); ++ xfpm_tray_icon_set_notify_icon (battery->priv->icon, notify_icon); ++ g_free(notify_icon); + } + } + else if ( state == BATTERY_NOT_FULLY_CHARGED ) +@@ -196,16 +206,26 @@ + battery->priv->icon_prefix, + xfpm_battery_get_icon_index (battery->priv->type, percentage), + "charging"); ++ notify_icon = g_strdup_printf("%s%s-%s", ++ "notification-battery-", ++ xfpm_battery_get_icon_index (battery->priv->type, percentage), ++ "plugged"); + } + else + { + icon = g_strdup_printf("%s%s", + battery->priv->icon_prefix, + xfpm_battery_get_icon_index (battery->priv->type, percentage)); ++ notify_icon = g_strdup_printf("%s%s", ++ "notification-battery-", ++ xfpm_battery_get_icon_index (battery->priv->type, percentage)); + } + xfpm_tray_icon_set_icon (battery->priv->icon, icon); + g_free(icon); + ++ xfpm_tray_icon_set_notify_icon (battery->priv->icon, notify_icon); ++ g_free(notify_icon); ++ + } + else if ( state == BATTERY_IS_CHARGING ) + { +@@ -213,9 +233,16 @@ + battery->priv->icon_prefix, + xfpm_battery_get_icon_index (battery->priv->type, percentage), + "charging"); ++ notify_icon = g_strdup_printf("%s%s-%s", ++ "notification-battery-", ++ xfpm_battery_get_icon_index (battery->priv->type, percentage), ++ "plugged"); + + xfpm_tray_icon_set_icon (battery->priv->icon, icon); + g_free(icon); ++ ++ xfpm_tray_icon_set_notify_icon (battery->priv->icon, notify_icon); ++ g_free(notify_icon); + } + else if ( state == BATTERY_IS_DISCHARGING || state == BATTERY_CHARGE_CRITICAL || + state == BATTERY_CHARGE_LOW ) +@@ -223,10 +250,15 @@ + icon = g_strdup_printf("%s%s", + battery->priv->icon_prefix, + xfpm_battery_get_icon_index (battery->priv->type, percentage)); ++ notify_icon = g_strdup_printf("%s%s", ++ "notification-battery-", ++ xfpm_battery_get_icon_index (battery->priv->type, percentage)); + + xfpm_tray_icon_set_icon (battery->priv->icon, icon); + g_free(icon); + ++ xfpm_tray_icon_set_notify_icon (battery->priv->icon, notify_icon); ++ g_free(notify_icon); + } + } + +@@ -245,7 +277,7 @@ + xfpm_notify_show_notification (battery->priv->notify, + _("Xfce power manager"), + message, +- xfpm_tray_icon_get_icon_name (battery->priv->icon), ++ xfpm_tray_icon_get_notify_icon_name (battery->priv->icon), + 8000, + battery->priv->type == HAL_DEVICE_TYPE_PRIMARY ? FALSE : TRUE, + XFPM_NOTIFY_NORMAL, + +=== modified file 'src/xfpm-tray-icon.c' +--- a/src/xfpm-tray-icon.c 2009-09-24 09:10:34 +0000 ++++ b/src/xfpm-tray-icon.c 2009-09-26 20:52:17 +0000 +@@ -61,6 +61,7 @@ + + GtkStatusIcon *icon; + GQuark icon_quark; ++ GQuark notify_icon_quark; + gboolean info_menu; + gboolean inhibited; + gboolean data_available; +@@ -119,7 +120,7 @@ + xfpm_notify_show_notification (tray->priv->notify, + _("Xfce power manager"), + error->message, +- xfpm_tray_icon_get_icon_name (tray), ++ xfpm_tray_icon_get_notify_icon_name (tray), + 10000, + FALSE, + XFPM_NOTIFY_CRITICAL, +@@ -142,7 +143,7 @@ + xfpm_notify_show_notification (tray->priv->notify, + _("Xfce power manager"), + error->message, +- xfpm_tray_icon_get_icon_name (tray), ++ xfpm_tray_icon_get_notify_icon_name (tray), + 10000, + FALSE, + XFPM_NOTIFY_CRITICAL, +@@ -433,6 +434,7 @@ + + tray->priv->info_menu = TRUE; + tray->priv->icon_quark = 0; ++ tray->priv->notify_icon_quark = 0; + + g_signal_connect (tray->priv->icon, "size-changed", + G_CALLBACK (xfpm_tray_icon_size_changed_cb), tray); +@@ -507,6 +509,13 @@ + icon); + } + ++void xfpm_tray_icon_set_notify_icon (XfpmTrayIcon *icon, const gchar *icon_name) ++{ ++ g_return_if_fail(XFPM_IS_TRAY_ICON(icon)); ++ ++ icon->priv->notify_icon_quark = g_quark_from_string(icon_name); ++} ++ + void xfpm_tray_icon_set_tooltip (XfpmTrayIcon *icon, const gchar *tooltip) + { + g_return_if_fail (XFPM_IS_TRAY_ICON (icon)); +@@ -551,3 +560,12 @@ + + return g_quark_to_string (icon->priv->icon_quark); + } ++ ++const gchar *xfpm_tray_icon_get_notify_icon_name (XfpmTrayIcon *icon) ++{ ++ g_return_val_if_fail(XFPM_IS_TRAY_ICON(icon), NULL); ++ ++ if ( icon->priv->notify_icon_quark == 0 ) return NULL; ++ ++ return g_quark_to_string (icon->priv->notify_icon_quark); ++} + +=== modified file 'src/xfpm-tray-icon.h' +--- a/src/xfpm-tray-icon.h 2009-09-24 09:10:34 +0000 ++++ b/src/xfpm-tray-icon.h 2009-09-26 20:50:38 +0000 +@@ -55,6 +55,9 @@ + + void xfpm_tray_icon_set_icon (XfpmTrayIcon *icon, + const gchar *icon_name); ++ ++void xfpm_tray_icon_set_notify_icon (XfpmTrayIcon *icon, ++ const gchar *icon_name); + + void xfpm_tray_icon_set_tooltip (XfpmTrayIcon *icon, + const gchar *tooltip); +@@ -68,6 +71,8 @@ + + const gchar *xfpm_tray_icon_get_icon_name (XfpmTrayIcon *icon) G_GNUC_PURE; + ++const gchar *xfpm_tray_icon_get_notify_icon_name (XfpmTrayIcon *icon) G_GNUC_PURE; ++ + G_END_DECLS + + #endif /* __XFPM_TRAY_ICON_H */ + --- xfce4-power-manager-0.8.5.orig/debian/patches/10_pc.patch +++ xfce4-power-manager-0.8.5/debian/patches/10_pc.patch @@ -0,0 +1,8 @@ +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +new file mode 100644 +index 0000000..7d4b0ca +--- /dev/null ++++ b/po/POTFILES.skip +@@ -0,0 +1,2 @@ ++.pc/xubuntu-use-notification-icons.patch/src/xfpm-battery.c ++.pc/xubuntu-use-notification-icons.patch/src/xfpm-tray-icon.c --- xfce4-power-manager-0.8.5.orig/debian/patches/series +++ xfce4-power-manager-0.8.5/debian/patches/series @@ -0,0 +1,3 @@ +xubuntu-assume-hal-is-available.patch +xubuntu-use-notification-icons.patch +10_pc.patch --- xfce4-power-manager-0.8.5.orig/debian/patches/xubuntu-assume-hal-is-available.patch +++ xfce4-power-manager-0.8.5/debian/patches/xubuntu-assume-hal-is-available.patch @@ -0,0 +1,26 @@ +From 71207ec4de6ee7fabe06c21f02bbf0785bc308a9 Mon Sep 17 00:00:00 2001 +From: Lionel Le Folgoc +Date: Wed, 20 Jan 2010 20:10:29 +0100 +Subject: [PATCH] Assume Hal is always available (it'll be spawned by dbus on demand anyway). + +--- + src/xfpm-dbus-monitor.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/src/xfpm-dbus-monitor.c b/src/xfpm-dbus-monitor.c +index b77b21d..95b66f7 100644 +--- a/src/xfpm-dbus-monitor.c ++++ b/src/xfpm-dbus-monitor.c +@@ -349,8 +349,7 @@ xfpm_dbus_monitor_init (XfpmDBusMonitor *monitor) + monitor, + NULL); + +- monitor->priv->hal_connected = xfpm_dbus_name_has_owner (dbus_g_connection_get_connection (monitor->priv->system_bus), +- "org.freedesktop.Hal"); ++ monitor->priv->hal_connected = TRUE; + + xfpm_dbus_monitor_add_service (monitor, DBUS_BUS_SESSION, "org.freedesktop.Hal"); + } +-- +1.6.3.3 +