[Pkg-xfce-commits] r4668 - in goodies/branches/experimental/xfce4-systemload-plugin/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Fri Dec 10 06:58:55 UTC 2010


Author: corsac
Date: 2010-12-10 06:58:34 +0000 (Fri, 10 Dec 2010)
New Revision: 4668

Removed:
   goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
Modified:
   goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog
   goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series
Log:
* debian/patches:
  - 01_fix-ftbfs-kfreebsd dropped, included upstream.

Modified: goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog	2010-12-10 06:56:38 UTC (rev 4667)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/changelog	2010-12-10 06:58:34 UTC (rev 4668)
@@ -11,8 +11,10 @@
     - add -O1, -z,defs and --as-needed to LDFLAGS.
     - add hardening flags to {C,LD}FLAGS.
   * debian/watch updated.
+  * debian/patches:
+    - 01_fix-ftbfs-kfreebsd dropped, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 10 Dec 2010 07:55:57 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 10 Dec 2010 07:58:06 +0100
 
 xfce4-systemload-plugin (0.4.2-3) unstable; urgency=low
 

Deleted: goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
===================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2010-12-10 06:56:38 UTC (rev 4667)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2010-12-10 06:58:34 UTC (rev 4668)
@@ -1,33 +0,0 @@
---- xfce4-systemload-plugin-0.4/panel-plugin/cpu.c	2007-03-10 00:02:05.997544000 +0100
-+++ xfce4-systemload-plugin-0.4/panel-plugin/cpu.c	2007-03-10 00:02:27.000000000 +0100
-@@ -37,7 +37,7 @@
- #include <libxfcegui4/dialogs.h>
- #include "cpu.h" 
- 
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
- #define PROC_STAT "/proc/stat"
- 
- /* user, nice, system, interrupt(BSD specific), idle */
---- xfce4-systemload-plugin-0.4/panel-plugin/memswap.c	2007-03-10 00:01:41.904882000 +0100
-+++ xfce4-systemload-plugin-0.4/panel-plugin/memswap.c	2007-03-10 00:01:55.000000000 +0100
-@@ -32,7 +32,7 @@
- #include "memswap.h"
- 
- 
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
---- xfce4-systemload-plugin-0.4/panel-plugin/uptime.c	2007-03-10 00:03:36.023726000 +0100
-+++ xfce4-systemload-plugin-0.4/panel-plugin/uptime.c	2007-03-10 00:03:56.000000000 +0100
-@@ -34,7 +34,7 @@
- 
- #include "uptime.h"
- 
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>

Modified: goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series	2010-12-10 06:56:38 UTC (rev 4667)
+++ goodies/branches/experimental/xfce4-systemload-plugin/debian/patches/series	2010-12-10 06:58:34 UTC (rev 4668)
@@ -1,2 +1 @@
-01_fix-ftbfs-kfreebsd.patch
 02_fix-tooltip-gtk2.12.patch




More information about the Pkg-xfce-commits mailing list