[Pkg-xfce-commits] r1545 - in goodies/xfce4-battery-plugin/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-01-24 21:48:57 +0000 (Thu, 24 Jan 2008)
New Revision: 1545

Removed:
   goodies/xfce4-battery-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
Modified:
   goodies/xfce4-battery-plugin/debian/changelog
   goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch
Log:
remove patch 01 as it's superseeded by 05


Modified: goodies/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/xfce4-battery-plugin/debian/changelog	2008-01-24 18:40:22 UTC (rev 1544)
+++ goodies/xfce4-battery-plugin/debian/changelog	2008-01-24 21:48:57 UTC (rev 1545)
@@ -1,10 +1,11 @@
 xfce4-battery-plugin (0.5.0-4) UNRELEASED; urgency=low
 
   * debian/patches:
+    - 01_fix-ftbfs-kfreebsd removed.
     - 05_fix-apm-kfreebsd-amd64 added: fix ftbfs on kfreebsd-amd64 where apm
       doesn't exist. (Xfce 3811)
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 21 Jan 2008 13:39:27 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 24 Jan 2008 22:27:47 +0100
 
 xfce4-battery-plugin (0.5.0-3) unstable; urgency=low
 

Deleted: goodies/xfce4-battery-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2008-01-24 18:40:22 UTC (rev 1544)
+++ goodies/xfce4-battery-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch	2008-01-24 21:48:57 UTC (rev 1545)
@@ -1,11 +0,0 @@
---- xfce4-battery-plugin-0.4.90.3/panel-plugin/battery.c	2007-03-21 06:24:11.989735000 +0100
-+++ xfce4-battery-plugin-0.4.90.3/panel-plugin/battery.c	2007-03-21 06:24:41.000000000 +0100
-@@ -25,7 +25,7 @@
- #include <config.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #include <machine/apm_bios.h>
- #elif __OpenBSD__
- #include <sys/param.h>

Modified: goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch
===================================================================
--- goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch	2008-01-24 18:40:22 UTC (rev 1544)
+++ goodies/xfce4-battery-plugin/debian/patches/05_fix-apm-kfreebsd-amd64.patch	2008-01-24 21:48:57 UTC (rev 1545)
@@ -15,7 +15,7 @@
       except that is does not work on FreeBSD
  
    */
-+#ifdef APMDEVICE
++#ifdef __linux__ || APMDEVICE
      struct apm_info apm;
 +#endif
        int fd;
@@ -25,7 +25,7 @@
        acline = apm.ac_state ? TRUE : FALSE;
  
  #else
-+#ifdef APMDEVICE
++#ifdef __linux__ || APMDEVICE
      struct apm_info apm;
 +#endif
      DBG ("Updating battery status...");