[Pkg-xfce-commits] r2488 - in goodies/xfce4-sensors-plugin/debian: . patches

corsac at alioth.debian.org corsac at alioth.debian.org
Tue Nov 4 07:15:34 UTC 2008 

Author: corsac
Date: 2008-11-04 07:15:34 +0000 (Tue, 04 Nov 2008)
New Revision: 2488

Removed:
   goodies/xfce4-sensors-plugin/debian/patches/01_fix-acpi-fan-infos.patch
   goodies/xfce4-sensors-plugin/debian/patches/02_fix-acpi-battery-path.patch
Modified:
   goodies/xfce4-sensors-plugin/debian/changelog
   goodies/xfce4-sensors-plugin/debian/control
   goodies/xfce4-sensors-plugin/debian/rules
Log:
* New upstream release.
* debian/patches: 
  - 01_fix-acpi-fan-infos dropped.
* debian/control:
  - add build dep on libtool.
* debian/rules:
  - remove {.a,.la} files in /usr/lib/xfce4/modules too.

Modified: goodies/xfce4-sensors-plugin/debian/changelog
===================================================================
--- goodies/xfce4-sensors-plugin/debian/changelog	2008-11-04 07:15:25 UTC (rev 2487)
+++ goodies/xfce4-sensors-plugin/debian/changelog	2008-11-04 07:15:34 UTC (rev 2488)
@@ -1,9 +1,14 @@
-xfce4-sensors-plugin (0.10.99.5~svn-r4998-3) UNRELEASED; urgency=low
+xfce4-sensors-plugin (0.10.99.6-1) UNRELEASED; urgency=low
 
-  * debian/patches: 02_fix-acpi-battery-path fixed to correctly free the state
-    variable.
+  * New upstream release.
+  * debian/patches: 
+    - 01_fix-acpi-fan-infos dropped.
+  * debian/control:
+    - add build dep on libtool.
+  * debian/rules:
+    - remove {.a,.la} files in /usr/lib/xfce4/modules too.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 08 Aug 2008 06:58:56 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 04 Nov 2008 08:02:53 +0100
 
 xfce4-sensors-plugin (0.10.99.5~svn-r4998-2) unstable; urgency=low
 

Modified: goodies/xfce4-sensors-plugin/debian/control
===================================================================
--- goodies/xfce4-sensors-plugin/debian/control	2008-11-04 07:15:25 UTC (rev 2487)
+++ goodies/xfce4-sensors-plugin/debian/control	2008-11-04 07:15:34 UTC (rev 2488)
@@ -3,7 +3,9 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Yves-Alexis Perez <corsac at debian.org>, Stefan Ott <stefan at ott.net>
-Build-Depends: cdbs, debhelper (>= 4.1), libgtk2.0-dev, xfce4-panel-dev (>= 4.4.1), libxml2-dev, libsensors4-dev, libxml-parser-perl, hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
+Build-Depends: cdbs, debhelper (>= 4.1), libgtk2.0-dev, 
+ xfce4-panel-dev (>= 4.4.1), libxml2-dev, libsensors4-dev, libxml-parser-perl, 
+ hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], intltool
 Standards-Version: 3.8.0
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/xfce4-sensors-plugin/

Deleted: goodies/xfce4-sensors-plugin/debian/patches/01_fix-acpi-fan-infos.patch
===================================================================
--- goodies/xfce4-sensors-plugin/debian/patches/01_fix-acpi-fan-infos.patch	2008-11-04 07:15:25 UTC (rev 2487)
+++ goodies/xfce4-sensors-plugin/debian/patches/01_fix-acpi-fan-infos.patch	2008-11-04 07:15:34 UTC (rev 2488)
@@ -1,37 +0,0 @@
-Index: xfce4-sensors-plugin-0.10.99.5~svn-r4998/panel-plugin/acpi.c
-===================================================================
---- xfce4-sensors-plugin-0.10.99.5~svn-r4998.orig/panel-plugin/acpi.c	2008-08-08 06:51:51.000000000 +0200
-+++ xfce4-sensors-plugin-0.10.99.5~svn-r4998/panel-plugin/acpi.c	2008-08-08 06:55:09.000000000 +0200
-@@ -445,7 +445,7 @@
- void
- refresh_acpi (gpointer chip_feature, gpointer data)
- {
--    char *file, *zone;
-+    char *file, *zone, *state;
-     t_chipfeature *cf;
- 
-     TRACE ("enters refresh_acpi");
-@@ -470,8 +470,21 @@
-             break;
- 
-         case STATE:
--            file = g_strdup_printf ("%s/%s/state", ACPI_DIR_FAN, cf->devicename);
--            cf->raw_value = strcmp(get_acpi_value(file), "on")==0 ? 1.0 : 0.0;
-+            // get_acpi_value() expects a _full_ path (unlike get_acpi_zone_value() etc)!
-+            file = g_strdup_printf ("%s/%s/%s/state", ACPI_PATH, ACPI_DIR_FAN, cf->devicename);
-+            state = get_acpi_value(file);
-+            // if get_acpi_value has returned NULL (=> the file hasn't been found)
-+            // we display the fan as "off"
-+            if(state==NULL){
-+                DBG("get_acpi_value has returned NULL!");
-+                cf->raw_value = 0.0;
-+            }
-+            else 
-+            {
-+                cf->raw_value = strncmp(state, "on", 2)==0 ? 1.0 : 0.0;
-+                g_free(state);
-+            }
-+                
-             g_free (file);
-             /* g_free (cf->formatted_value);
-             cf->formatted_value = g_strdup_printf (_("%.0f"), cf->raw_value); */

Deleted: goodies/xfce4-sensors-plugin/debian/patches/02_fix-acpi-battery-path.patch
===================================================================
--- goodies/xfce4-sensors-plugin/debian/patches/02_fix-acpi-battery-path.patch	2008-11-04 07:15:25 UTC (rev 2487)
+++ goodies/xfce4-sensors-plugin/debian/patches/02_fix-acpi-battery-path.patch	2008-11-04 07:15:34 UTC (rev 2488)
@@ -1,15 +0,0 @@
-diff --git a/panel-plugin/acpi.c b/panel-plugin/acpi.c
-index 5f3ab4a..49b20bc 100644
---- a/panel-plugin/acpi.c
-+++ b/panel-plugin/acpi.c
-@@ -464,9 +464,7 @@ refresh_acpi (gpointer chip_feature, gpointer data)
-             break;
- 
-         case ENERGY:
--            zone = g_strdup_printf ("%s/%s", ACPI_DIR_BATTERY, cf->devicename);
--            cf->raw_value = get_battery_zone_value (zone);
--            g_free (zone);
-+            cf->raw_value = get_battery_zone_value (cf->devicename);
-             /*  g_free (cf->formatted_value);
-             cf->formatted_value = g_strdup_printf (_("%.0f mWh"), cf->raw_value); */
-             break;

Modified: goodies/xfce4-sensors-plugin/debian/rules
===================================================================
--- goodies/xfce4-sensors-plugin/debian/rules	2008-11-04 07:15:25 UTC (rev 2487)
+++ goodies/xfce4-sensors-plugin/debian/rules	2008-11-04 07:15:34 UTC (rev 2488)
@@ -9,4 +9,5 @@
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
 	rmdir debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins
-	rmdir debian/`dh_listpackages`/usr/lib/xfce4
+	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/modules/*.a
+	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/modules/*.la

More information about the Pkg-xfce-commits mailing list