[Pkg-xfce-commits] r6510 - in goodies/trunk/xfce4-power-manager/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Thu Mar 29 05:48:09 UTC 2012
Author: corsac
Date: 2012-03-29 05:48:08 +0000 (Thu, 29 Mar 2012)
New Revision: 6510
Removed:
goodies/trunk/xfce4-power-manager/debian/patches/0001-Solaris-specific-code-for-determining-the-start-time.patch
goodies/trunk/xfce4-power-manager/debian/patches/02_fix-notify-detect.patch
Modified:
goodies/trunk/xfce4-power-manager/debian/changelog
goodies/trunk/xfce4-power-manager/debian/patches/series
Log:
* New upstream release.
* debian/patches:
- 0001-Solaris-specific-code-for-determining-the-start-time dropped,
included upstream.
- 02_fix-notify-detect as well.
Modified: goodies/trunk/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/changelog 2012-03-28 11:11:14 UTC (rev 6509)
+++ goodies/trunk/xfce4-power-manager/debian/changelog 2012-03-29 05:48:08 UTC (rev 6510)
@@ -1,9 +1,17 @@
-xfce4-power-manager (1.0.10-6) UNRELEASED; urgency=low
+xfce4-power-manager (1.0.11-1) UNRELEASED; urgency=low
+ [ Lionel Le Folgoc ]
* debian/patches: add missing DEP3 headers.
- -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 20 Feb 2012 22:35:06 +0100
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * debian/patches:
+ - 0001-Solaris-specific-code-for-determining-the-start-time dropped,
+ included upstream.
+ - 02_fix-notify-detect as well.
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 29 Mar 2012 07:45:19 +0200
+
xfce4-power-manager (1.0.10-5) unstable; urgency=low
[ Lionel Le Folgoc ]
Deleted: goodies/trunk/xfce4-power-manager/debian/patches/0001-Solaris-specific-code-for-determining-the-start-time.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/0001-Solaris-specific-code-for-determining-the-start-time.patch 2012-03-28 11:11:14 UTC (rev 6509)
+++ goodies/trunk/xfce4-power-manager/debian/patches/0001-Solaris-specific-code-for-determining-the-start-time.patch 2012-03-29 05:48:08 UTC (rev 6510)
@@ -1,92 +0,0 @@
-From 47b7e20d7acd2cc64caf379eb6cd385705d3e90d Mon Sep 17 00:00:00 2001
-From: Guido Berhoerster <gber at openindiana.org>
-Date: Mon, 28 Mar 2011 17:19:40 +0200
-Subject: [PATCH] Solaris-specific code for determining the start time of a
- process.
-
-Solaris also allows to obtain this information through procfs,
-however design and implementation differ vastly from Linux.
-
-Origin: upstream, http://git.xfce.org/xfce/xfce4-power-manager/commit/src/xfpm-polkit.c?id=47b7e20d7acd2cc64caf379eb6cd385705d3e90d
----
- src/xfpm-polkit.c | 40 +++++++++++++++++++++++++++++++++++-----
- 1 files changed, 35 insertions(+), 5 deletions(-)
-
-diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
-index a50c2db..29fcf7d 100644
---- a/src/xfpm-polkit.c
-+++ b/src/xfpm-polkit.c
-@@ -32,12 +32,15 @@
-
- #include <sys/types.h>
-
--#if defined(__FreeBSD__)
--#include <sys/stat.h>
--#else
-+#if defined(__linux)
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <sys/user.h>
-+#elif defined(__FreeBSD__)
-+#include <sys/stat.h>
-+#elif defined(__SVR4) || defined(__sun)
-+#include <fcntl.h>
-+#include <procfs.h>
- #endif
-
- #include <errno.h>
-@@ -115,7 +118,7 @@ static guint64
- get_start_time_for_pid (pid_t pid)
- {
- guint64 start_time;
--#if !defined(__FreeBSD__)
-+#if defined(__linux)
- gchar *filename;
- gchar *contents;
- size_t length;
-@@ -172,7 +175,7 @@ get_start_time_for_pid (pid_t pid)
- g_free (filename);
- g_free (contents);
-
--#else /*if !defined(__FreeBSD__)*/
-+#elif defined(__FreeBSD__)
-
- struct kinfo_proc p;
-
-@@ -189,6 +192,33 @@ get_start_time_for_pid (pid_t pid)
- start_time = (guint64) p.ki_start.tv_sec;
-
- out:
-+#elif defined(__SVR4) || defined(__sun)
-+
-+ psinfo_t p;
-+ gchar *filename;
-+ int fd;
-+
-+ start_time = 0;
-+
-+ filename = g_strdup_printf ("/proc/%d/psinfo", (int) pid);
-+ if ((fd = open(filename, O_RDONLY)) < 0)
-+ {
-+ g_warning ("Error opening %s (%s)",
-+ filename,
-+ g_strerror (errno));
-+ goto out;
-+ }
-+ if (read(fd, &p, sizeof (p)) != sizeof (p))
-+ {
-+ g_warning ("Error reading %s",
-+ filename);
-+ close(fd);
-+ goto out;
-+ }
-+ start_time = (guint64) p.pr_start.tv_sec;
-+ close(fd);
-+out:
-+ g_free (filename);
- #endif
-
- return start_time;
---
-1.7.4.4
-
Deleted: goodies/trunk/xfce4-power-manager/debian/patches/02_fix-notify-detect.patch
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/02_fix-notify-detect.patch 2012-03-28 11:11:14 UTC (rev 6509)
+++ goodies/trunk/xfce4-power-manager/debian/patches/02_fix-notify-detect.patch 2012-03-29 05:48:08 UTC (rev 6510)
@@ -1,17 +0,0 @@
-diff --git a/src/xfpm-notify.c b/src/xfpm-notify.c
-index c93a843..3c2651d 100644
---- a/src/xfpm-notify.c
-+++ b/src/xfpm-notify.c
-@@ -233,11 +233,11 @@ xfpm_notify_new_notification_internal (const gchar *title, const gchar *message,
- #if !NOTIFY_CHECK_VERSION (0, 7, 0)
- if ( icon )
- notify_notification_attach_to_status_icon (n, icon);
-+#endif
- #else
- if ( icon )
- notify_notification_attach_to_status_icon (n, icon);
- #endif
--#endif
-
- notify_notification_set_urgency (n, (NotifyUrgency)urgency);
-
Modified: goodies/trunk/xfce4-power-manager/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-power-manager/debian/patches/series 2012-03-28 11:11:14 UTC (rev 6509)
+++ goodies/trunk/xfce4-power-manager/debian/patches/series 2012-03-29 05:48:08 UTC (rev 6510)
@@ -1,5 +1,3 @@
-0001-Solaris-specific-code-for-determining-the-start-time.patch
-02_fix-notify-detect.patch
03_trap-x-errors.patch
04_clear-idles-for-removed-batteries.patch
05_fix-brightness-key-modifiers.patch
More information about the Pkg-xfce-commits
mailing list