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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-12-08 10:54:43 +0000 (Wed, 08 Dec 2010)
New Revision: 4644

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

Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/changelog	2010-12-08 10:53:47 UTC (rev 4643)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/changelog	2010-12-08 10:54:43 UTC (rev 4644)
@@ -7,6 +7,7 @@
     - add build-dep on xfce4-dev-tools, libtool, autoconf and intltool.
     - update standards version to 3.9.1.
   * debian/patches:
+    - 01_fix-ftbfs-kfreebsd dropped, included upstream.
     - 03_link-against-libxfcegui4 added, link against libxfcegui4 explicitly.
   * debian/rules:
     - run xdt-autogen after applying patches.
@@ -15,7 +16,7 @@
     - add hardening flags to {C,LD}FLAGS.
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 14:24:11 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 08 Dec 2010 11:54:24 +0100
 
 xfce4-netload-plugin (0.4.0-4) unstable; urgency=low
 

Deleted: goodies/branches/experimental/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2010-12-08 10:53:47 UTC (rev 4643)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2010-12-08 10:54:43 UTC (rev 4644)
@@ -1,50 +0,0 @@
-diff --git a/panel-plugin/net.c b/panel-plugin/net.c
-index e49390d..2e835c8 100644
---- a/panel-plugin/net.c
-+++ b/panel-plugin/net.c
-@@ -46,7 +46,7 @@
- #elif __APPLE__
- # include "src/macos.h"
- # include "src/macos.c"
--#elif __FreeBSD__
-+#elif __FreeBSD__ || __FreeBSD_kernel__
- # include "wormulon/freebsd.h"
- # include "wormulon/freebsd.c"
- #elif __linux__
-diff --git a/panel-plugin/net.h b/panel-plugin/net.h
-index ad0c262..4bd20cb 100644
---- a/panel-plugin/net.h
-+++ b/panel-plugin/net.h
-@@ -62,7 +62,7 @@ typedef struct
- #ifdef __HPUX__
-     int             wait_pcks_counter;
-     nmapi_logstat*  if_ptr;
--#elif __FreeBSD__
-+#elif __FreeBSD__ || __FreeBSD_kernel__
-     int             watchif;
-     int             dev_opened;
- #elif __NetBSD__
-diff --git a/panel-plugin/os.h b/panel-plugin/os.h
-index 524fefb..e49a356 100644
---- a/panel-plugin/os.h
-+++ b/panel-plugin/os.h
-@@ -72,7 +72,7 @@
- #include <net/if_media.h>
- #include <net/if_mib.h>
- #include <arpa/inet.h>
--#elif __FreeBSD__           /* F R E E B S D */
-+#elif __FreeBSD__ || __FreeBSD_kernel__          /* F R E E B S D */
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -94,8 +94,10 @@
- #include <net/if_media.h>
- #include <net/if_mib.h>
- #include <arpa/inet.h>
-+#if (__FreeBSD_kernel__ < 8) && (__FreeBSD__ < 8)
- #include <net/ppp_defs.h>
- #include <net/if_ppp.h>
-+#endif
- #elif __NetBSD__            /* N E T B S D */
- #include <stdio.h>
- #include <sys/param.h>

Modified: goodies/branches/experimental/xfce4-netload-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-netload-plugin/debian/patches/series	2010-12-08 10:53:47 UTC (rev 4643)
+++ goodies/branches/experimental/xfce4-netload-plugin/debian/patches/series	2010-12-08 10:54:43 UTC (rev 4644)
@@ -1,3 +1,2 @@
-01_fix-ftbfs-kfreebsd.patch
 02_fix-tooltips-gtk2.16.patch
 03_link-against-libxfcegui4.patch