r30189 - /desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Oct 11 21:22:49 UTC 2011 

Author: biebl
Date: Tue Oct 11 21:22:48 2011
New Revision: 30189

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30189
Log:
Refresh 01_battstat_upower.patch

Modified:
    desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch

Modified: desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch?rev=30189&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/patches/01_battstat_upower.patch [utf-8] Tue Oct 11 21:22:48 2011
@@ -19,11 +19,11 @@
  create mode 100644 battstat/battstat-upower.c
  create mode 100644 battstat/battstat-upower.h
 
-Index: gnome-applets-2.91.4/battstat/Makefile.am
+Index: gnome-applets-3.2.0/battstat/Makefile.am
 ===================================================================
---- gnome-applets-2.91.4.orig/battstat/Makefile.am	2011-03-21 20:34:19.739985001 +0100
-+++ gnome-applets-2.91.4/battstat/Makefile.am	2011-03-21 20:34:21.407985000 +0100
-@@ -27,6 +27,7 @@ INCLUDES =					\
+--- gnome-applets-3.2.0.orig/battstat/Makefile.am	2011-05-08 02:18:20.000000000 +0200
++++ gnome-applets-3.2.0/battstat/Makefile.am	2011-10-11 23:16:29.169379320 +0200
+@@ -27,6 +27,7 @@
  	$(GNOME_APPLETS_CFLAGS)			\
  	$(LIBNOTIFY_CFLAGS)			\
  	$(HAL_CFLAGS)				\
@@ -31,7 +31,7 @@
  	$(APMINC)				\
  	$(ACPIINC)				\
  	$(WARN_CFLAGS)				\
-@@ -48,13 +49,16 @@ battstat_applet_2_SOURCES = \
+@@ -48,13 +49,16 @@
  	acpi-freebsd.c \
  	acpi-freebsd.h \
  	battstat-hal.c \
@@ -49,10 +49,10 @@
  		     $(APMLIB)
  
  schemasdir   = @GCONF_SCHEMA_FILE_DIR@
-Index: gnome-applets-2.91.4/battstat/battstat-upower.c
+Index: gnome-applets-3.2.0/battstat/battstat-upower.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-2.91.4/battstat/battstat-upower.c	2011-03-21 21:15:20.259985001 +0100
++++ gnome-applets-3.2.0/battstat/battstat-upower.c	2011-10-11 23:16:29.173379270 +0200
 @@ -0,0 +1,301 @@
 +/*
 + *  Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
@@ -355,10 +355,10 @@
 +}
 +
 +#endif /* HAVE_UPOWER */
-Index: gnome-applets-2.91.4/battstat/battstat-upower.h
+Index: gnome-applets-3.2.0/battstat/battstat-upower.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-applets-2.91.4/battstat/battstat-upower.h	2011-03-21 20:34:21.411985000 +0100
++++ gnome-applets-3.2.0/battstat/battstat-upower.h	2011-10-11 23:16:29.177379220 +0200
 @@ -0,0 +1,33 @@
 +/*
 + * Copyright (C) 2010 by Joachim Breitner <mail at joachim-breitner.de>
@@ -393,11 +393,11 @@
 +void battstat_upower_get_battery_info (BatteryStatus *status);
 +
 +#endif /* _battstat_upower_h_ */
-Index: gnome-applets-2.91.4/battstat/battstat_applet.c
+Index: gnome-applets-3.2.0/battstat/battstat_applet.c
 ===================================================================
---- gnome-applets-2.91.4.orig/battstat/battstat_applet.c	2011-03-21 20:34:19.675985001 +0100
-+++ gnome-applets-2.91.4/battstat/battstat_applet.c	2011-03-21 20:34:21.411985000 +0100
-@@ -1188,9 +1188,12 @@ about_cb( GtkAction *action, ProgressDat
+--- gnome-applets-3.2.0.orig/battstat/battstat_applet.c	2011-04-05 22:45:47.000000000 +0200
++++ gnome-applets-3.2.0/battstat/battstat_applet.c	2011-10-11 23:16:29.181379170 +0200
+@@ -1188,9 +1188,12 @@
  
    char *comments = g_strdup_printf ("%s\n\n%s",
  		  _("This utility shows the status of your laptop battery."),
@@ -412,10 +412,10 @@
  
    gtk_show_about_dialog( NULL,
      "version",             VERSION,
-Index: gnome-applets-2.91.4/battstat/docs/C/battstat.xml
+Index: gnome-applets-3.2.0/battstat/docs/C/battstat.xml
 ===================================================================
---- gnome-applets-2.91.4.orig/battstat/docs/C/battstat.xml	2011-03-21 20:34:19.647985001 +0100
-+++ gnome-applets-2.91.4/battstat/docs/C/battstat.xml	2011-03-21 20:34:21.411985000 +0100
+--- gnome-applets-3.2.0.orig/battstat/docs/C/battstat.xml	2011-09-25 20:55:02.000000000 +0200
++++ gnome-applets-3.2.0/battstat/docs/C/battstat.xml	2011-10-11 23:16:29.181379170 +0200
 @@ -226,10 +226,13 @@
       <title>Power Management Backends</title>
  
@@ -449,10 +449,10 @@
      <figure id="battstat-credits-hal"> 
        <title>Check you're using the HAL backend</title> 
        <screenshot> 
-Index: gnome-applets-2.91.4/battstat/power-management.c
+Index: gnome-applets-3.2.0/battstat/power-management.c
 ===================================================================
---- gnome-applets-2.91.4.orig/battstat/power-management.c	2011-03-21 20:34:19.611985001 +0100
-+++ gnome-applets-2.91.4/battstat/power-management.c	2011-03-21 20:34:21.411985000 +0100
+--- gnome-applets-3.2.0.orig/battstat/power-management.c	2011-04-05 22:45:47.000000000 +0200
++++ gnome-applets-3.2.0/battstat/power-management.c	2011-10-11 23:16:29.185379120 +0200
 @@ -41,6 +41,7 @@
  
  #include "battstat.h"
@@ -461,7 +461,7 @@
  
  #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! "    \
                      "Make sure the ACPI subsystem is working and "           \
-@@ -66,6 +67,9 @@ static int pm_initialised;
+@@ -66,6 +67,9 @@
  #ifdef HAVE_HAL
  static int using_hal;
  #endif
@@ -471,7 +471,7 @@
  
  /*
   * What follows is a series of platform-specific apm_readinfo functions
-@@ -390,6 +394,14 @@ power_management_getinfo( BatteryStatus
+@@ -390,6 +394,14 @@
      return NULL;
    }
  
@@ -486,7 +486,7 @@
  #ifdef HAVE_HAL
    if( using_hal )
    {
-@@ -430,27 +442,36 @@ power_management_getinfo( BatteryStatus
+@@ -430,27 +442,36 @@
  const char *
  power_management_initialise (int no_hal, void (*callback) (void))
  {
@@ -536,7 +536,7 @@
  #endif
      
  #ifdef __linux__
-@@ -498,6 +519,15 @@ power_management_initialise (int no_hal,
+@@ -498,6 +519,15 @@
  void
  power_management_cleanup( void )
  {
@@ -552,7 +552,7 @@
  #ifdef HAVE_HAL
    if( using_hal )
    {
-@@ -525,6 +555,16 @@ power_management_cleanup( void )
+@@ -525,6 +555,16 @@
  }
  
  int
@@ -569,11 +569,11 @@
  power_management_using_hal( void )
  {
  #ifdef HAVE_HAL
-Index: gnome-applets-2.91.4/configure.in
+Index: gnome-applets-3.2.0/configure.in
 ===================================================================
---- gnome-applets-2.91.4.orig/configure.in	2011-03-21 20:34:19.587985001 +0100
-+++ gnome-applets-2.91.4/configure.in	2011-03-21 20:34:21.411985000 +0100
-@@ -23,6 +23,7 @@ LIBXKLAVIER_REQUIRED=4.0
+--- gnome-applets-3.2.0.orig/configure.in	2011-09-19 22:49:01.000000000 +0200
++++ gnome-applets-3.2.0/configure.in	2011-10-11 23:16:29.185379120 +0200
+@@ -23,6 +23,7 @@
  LIBWNCK_REQUIRED=2.91.0
  LIBNOTIFY_REQUIRED=0.7
  HAL_REQUIRED=0.5.3
@@ -581,7 +581,7 @@
  DBUS_REQUIRED=1.1.2
  DBUS_GLIB_REQUIRED=0.74
  PYGOBJECT_REQUIRED=2.26
-@@ -222,6 +223,26 @@ fi
+@@ -223,6 +224,26 @@
  AC_SUBST(HAL_CFLAGS)
  AC_SUBST(HAL_LIBS)
  
@@ -608,7 +608,7 @@
  dnl -- check for gucharmap (optional) -----------------------------------------
  
  PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
-@@ -748,5 +769,6 @@ gnome-applets-$VERSION configure summary
+@@ -742,5 +763,6 @@
  	Using DBUS:			$HAVE_DBUS
  	Using NetworkManager:		$HAVE_NETWORKMANAGER
  	Using HAL:			$HAVE_HAL

More information about the pkg-gnome-commits mailing list