[Pkg-xfce-commits] r5251 - in goodies/trunk/xfce4-battery-plugin: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Apr 2 02:59:41 UTC 2011
Author: corsac
Date: 2011-04-02 14:59:40 +0000 (Sat, 02 Apr 2011)
New Revision: 5251
Added:
goodies/trunk/xfce4-battery-plugin/debian/source/
Removed:
goodies/trunk/xfce4-battery-plugin/debian/patches/06_fix-ftbfs-2.6.24.patch
goodies/trunk/xfce4-battery-plugin/debian/patches/07_use-sysfs-fixed.patch
goodies/trunk/xfce4-battery-plugin/debian/patches/08_no-battery-display.patch
Modified:
goodies/trunk/xfce4-battery-plugin/
goodies/trunk/xfce4-battery-plugin/debian/changelog
goodies/trunk/xfce4-battery-plugin/debian/compat
goodies/trunk/xfce4-battery-plugin/debian/control
goodies/trunk/xfce4-battery-plugin/debian/rules
Log:
merge experimental change into trunk
Property changes on: goodies/trunk/xfce4-battery-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-battery-plugin:4419-5250
Modified: goodies/trunk/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/changelog 2011-04-02 14:55:35 UTC (rev 5250)
+++ goodies/trunk/xfce4-battery-plugin/debian/changelog 2011-04-02 14:59:40 UTC (rev 5251)
@@ -1,16 +1,29 @@
-xfce4-battery-plugin (0.5.1-2) UNRELEASED; urgency=low
+xfce4-battery-plugin (1.0.0-1) experimental; urgency=low
[ Evgeni Golov ]
* Fix Vcs-* fields, they were missing 'trunk' in the path.
[ Yves-Alexis Perez ]
+ * New upstream release.
* debian/watch edited to track Xfce archive reorganisation.
* debian/control:
- switch to xfce section.
- - update standards version to 3.9.0.
+ - update standards version to 3.9.1.
- use linux-any and kfreebsd-i386 architecture.
+ - add build-dep on intltool.
+ - update debhelper build-dep to 7.
+ - add build-dep on hardening-includes.
+ * Switch to 3.0 (quilt) source format.
+ * debian/compat bumped to 7.0.50~ for overrides.
+ * debian/patches: 06_fix-ftbfs-2.6.24, 07_use-sysfs-fixed,
+ 08_no-battery-display dropped, included upstream.
+ * debian/rules:
+ - switch to tiny rules from dh 7.
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add hardening flags to {C,LD}FLAGS.
+ - add -z,defs, -O1 and --as-needed to LDFLAGS.
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 30 Jun 2010 07:54:00 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 27 Feb 2011 01:31:26 +0100
xfce4-battery-plugin (0.5.1-1) unstable; urgency=low
Modified: goodies/trunk/xfce4-battery-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/compat 2011-04-02 14:55:35 UTC (rev 5250)
+++ goodies/trunk/xfce4-battery-plugin/debian/compat 2011-04-02 14:59:40 UTC (rev 5251)
@@ -1 +1 @@
-4
+7
Modified: goodies/trunk/xfce4-battery-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/control 2011-04-02 14:55:35 UTC (rev 5250)
+++ goodies/trunk/xfce4-battery-plugin/debian/control 2011-04-02 14:59:40 UTC (rev 5251)
@@ -3,10 +3,10 @@
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>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 4.1), libgtk2.0-dev,
+Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~), libgtk2.0-dev,
xfce4-panel-dev (>= 4.4.1), libxml2-dev, libxml-parser-perl,
- libxfce4util-dev, libxfcegui4-dev
-Standards-Version: 3.9.0
+ libxfce4util-dev, libxfcegui4-dev, intltool, hardening-includes
+Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-battery-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-battery-plugin/
Deleted: goodies/trunk/xfce4-battery-plugin/debian/patches/06_fix-ftbfs-2.6.24.patch
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/06_fix-ftbfs-2.6.24.patch 2011-04-02 14:55:35 UTC (rev 5250)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/06_fix-ftbfs-2.6.24.patch 2011-04-02 14:59:40 UTC (rev 5251)
@@ -1,12 +0,0 @@
---- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig 2008-03-18 20:10:58.000000000 +0100
-+++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h 2008-03-18 20:14:45.000000000 +0100
-@@ -17,8 +17,8 @@
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
--#include <linux/apm_bios.h>
- #include <sys/types.h>
-+#include <linux/apm_bios.h>
-
- #define APM_PROC "/proc/apm"
- #define APM_DEVICE "/dev/apm_bios"
Deleted: goodies/trunk/xfce4-battery-plugin/debian/patches/07_use-sysfs-fixed.patch
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/07_use-sysfs-fixed.patch 2011-04-02 14:55:35 UTC (rev 5250)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/07_use-sysfs-fixed.patch 2011-04-02 14:59:40 UTC (rev 5251)
@@ -1,356 +0,0 @@
-diff -ru xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0-fixed/panel-plugin/libacpi.c
---- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c 2008-04-06 02:56:10.502679698 +0200
-+++ xfce4-battery-plugin-0.5.0-fixed/panel-plugin/libacpi.c 2008-04-06 03:15:11.306678469 +0200
-@@ -54,6 +54,10 @@
-
- static char batteries[MAXBATT][128];
- static char battinfo[MAXBATT][128];
-+/* path to AC adapter because not all AC adapter are listed
-+in /sys/class/power_supply/AC/ this obviously only supports one AC adapter. */
-+static char sysfsacdir[128];
-+
- #ifndef __linux__
- #if HAVE_SYSCTL
- static int
-@@ -181,9 +185,76 @@
- #endif
- #endif
-
-+int check_acpi_sysfs(void)
-+{
-+ DIR *sysfs;
-+ struct dirent *batt;
-+ char *name;
-+ FILE *typefile;
-+ char typepath[128];
-+ char tmptype[8];
-+
-+ sysfs = opendir("/sys/class/power_supply");
-+ if (sysfs == 0)
-+ {
-+ #ifdef DEBUG
-+ printf("DBG:No acpi support for sysfs. Trying procfs...\n");
-+ #endif
-+ return 2;
-+ }
-+
-+ while ((batt = readdir(sysfs)))
-+ {
-+ name = batt->d_name;
-+ if (!strncmp(".", name, 1)) continue;
-+ /* check whether /sys/class/power_supply/$name/type exists and
-+ contains "Battery" or "Mains" */
-+ sprintf(typepath, "/sys/class/power_supply/%s/type",name);
-+ if(!(typefile = fopen(typepath, "r"))) continue;
-+ fgets(tmptype, 8, typefile);
-+ fclose(typefile);
-+ if(strncmp("Battery", tmptype, 7)==0)
-+ {
-+ sprintf(batteries[batt_count], "/sys/class/power_supply/%s", name);
-+ #ifdef DEBUG
-+ printf("DBG:battery number %d at:\n",batt_count);
-+ printf("DBG:sysfs dir->%s\n",batteries[batt_count]);
-+ printf("DBG:------------------------\n");
-+ #endif
-+ batt_count++;
-+ }
-+ /* I guess that the type of the AC adapter is always "Mains" (?) */
-+ else if(strncmp("Mains", tmptype, 5)==0){
-+ sprintf(sysfsacdir, "/sys/class/power_supply/%s", name);
-+ #ifdef DEBUG
-+ printf("DBG:sysfs AC dir->%s\n",sysfsacdir);
-+ printf("DBG:------------------------\n");
-+ #endif
-+ }
-+ }
-+ closedir(sysfs);
-+ if ( batt_count == 0 )
-+ {
-+#ifdef DEBUG
-+ printf("DBG:No acpi support for sysfs. Trying procfs...\n");
-+#endif
-+ acpi_sysfs = 0;
-+ return 2;
-+ }
-+ else
-+ {
-+ acpi_sysfs = 1;
-+ return 0;
-+ }
-+}
-+
- /* see if we have ACPI support */
- int check_acpi(void)
- {
-+#ifdef __linux__
-+ if ( check_acpi_sysfs() == 0 )
-+ return 0;
-+#endif
- DIR *battdir;
- struct dirent *batt;
- char *name;
-@@ -262,9 +333,82 @@
- #endif
- }
-
-+int read_sysfs_int(char* filename)
-+{
-+ FILE* f;
-+ f = fopen(filename,"r");
-+ if ( !f )
-+ {
-+#ifdef DEBUG
-+ printf("DBG:Could not open %s\n",filename);
-+#endif
-+ return 0;
-+ }
-+ int out;
-+ fscanf(f,"%d",&out);
-+ fclose(f);
-+ return out;
-+}
-+
-+char* read_sysfs_string(char* filename)
-+{
-+ FILE* f;
-+ f = fopen(filename,"r");
-+ if ( !f )
-+ {
-+#ifdef DEBUG
-+ printf("DBG:Could not open %s\n",filename);
-+#endif
-+ return NULL;
-+ }
-+ fscanf(f,"%s",buf2);
-+ fclose(f);
-+ return buf2;
-+}
-+
-+int read_acad_state_sysfs(void)
-+{
-+ DIR *sysfs;
-+ struct dirent *propety;
-+ char *name;
-+ char onlinefilepath[128];
-+
-+ sysfs = opendir(sysfsacdir);
-+ if (sysfs == 0)
-+ {
-+ #ifdef DEBUG
-+ printf("DBG:Can't open %s",sysfsacdir);
-+ #endif
-+ return 0;
-+ }
-+ closedir(sysfs);
-+
-+ if (!acadstate) acadstate=(ACADstate *)malloc(sizeof(ACADstate));
-+ /* this code doesn't make much sense.. why look at the whole directory?!
-+ while ((propety = readdir(sysfs)))
-+ {
-+ name = propety->d_name;
-+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue;
-+
-+ if (strcmp(name,"online") == 0)
-+ {
-+ acadstate->state = ( read_sysfs_int("/sys/class/power_supply/AC/online") == 1 ) ;
-+ }
-+ }
-+ */
-+ sprintf(onlinefilepath, "%s/online", sysfsacdir);
-+ /* if onlinefilepath doesn't exist read_sysfs_int() will return 0
-+ so acadstate->state will be 0, that should be ok */
-+ acadstate->state = ( read_sysfs_int(onlinefilepath) == 1 );
-+
-+ return acadstate->state;
-+}
-+
- int read_acad_state(void)
- {
- #ifdef __linux__
-+ if (acpi_sysfs)
-+ return read_acad_state_sysfs();
- FILE *acpi;
- char *ptr;
- char stat;
-@@ -354,20 +498,83 @@
- #endif
- }
-
-+int read_acpi_info_sysfs(int battery)
-+{
-+ DIR *sysfs;
-+ struct dirent *propety;
-+ char *name;
-+
-+ sysfs = opendir(batteries[battery]);
-+ if (sysfs == 0)
-+ {
-+ #ifdef DEBUG
-+ printf("DBG:Can't open %s!\n", batteries[battery]);
-+ #endif
-+ return 0;
-+ }
-+ /* malloc.. might explain the random battery level values on 2.6.24
-+ systems (energe_full is called charge_full so the value isn't initialised
-+ and some random data from the heap is displayed..)
-+ if (!acpiinfo) acpiinfo=(ACPIinfo *)malloc(sizeof(ACPIinfo));
-+ */
-+ if (!acpiinfo) acpiinfo=(ACPIinfo *)calloc(1, sizeof(ACPIinfo));
-+
-+ while ((propety = readdir(sysfs)))
-+ {
-+ name = propety->d_name;
-+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue;
-+ /* at least on my system this is called charge_full */
-+ if ((strcmp(name,"energy_full") == 0) || (strcmp(name,"charge_full") == 0))
-+ {
-+ sprintf(buf,"%s/%s",batteries[battery], name);
-+ acpiinfo->last_full_capacity = read_sysfs_int(buf);
-+ }
-+ if ((strcmp(name,"energy_full_design") == 0) || (strcmp(name,"charge_full_design") == 0))
-+ {
-+ sprintf(buf,"%s/%s",batteries[battery], name);
-+ acpiinfo->design_capacity = read_sysfs_int(buf);
-+ }
-+ if (strcmp(name,"technology") == 0)
-+ {
-+ char *tmp;
-+ sprintf(buf,"%s/%s",batteries[battery], name);
-+ tmp = read_sysfs_string(buf);
-+ if (tmp != NULL)
-+ {
-+ if (strcmp(tmp,"Li-ion") == 0)
-+ acpiinfo->battery_technology = 1;
-+ else
-+ acpiinfo->battery_technology = 0;
-+ }
-+ }
-+ if (strcmp(name,"present") == 0)
-+ {
-+ sprintf(buf,"%s/%s",batteries[battery], name);
-+ acpiinfo->present = read_sysfs_int(buf);
-+ }
-+ }
-+ closedir(sysfs);
-+ return acpiinfo->present;
-+}
-+
- int read_acpi_info(int battery)
- {
- #ifdef __linux__
-- FILE *acpi;
-- char *ptr;
-- char stat;
-- int temp;
--
- if (battery > MAXBATT) {
- #ifdef DEBUG
- printf("DBG: error, battery > MAXBATT (%d)\n",MAXBATT);
- #endif
- return 0;
- }
-+
-+ if (acpi_sysfs)
-+ return read_acpi_info_sysfs(battery);
-+
-+ FILE *acpi;
-+ char *ptr;
-+ char stat;
-+ int temp;
-+
- if (!(acpi = fopen (battinfo[battery], "r"))) {
- #ifdef DEBUG
- printf("DBG:cannot open %s for read!\n",battinfo[battery]);
-@@ -514,9 +721,80 @@
-
- }
-
-+int read_acpi_state_sysfs(int battery)
-+{
-+ DIR *sysfs;
-+ struct dirent *propety;
-+ char *name;
-+
-+ sysfs = opendir(batteries[battery]);
-+ if (sysfs == 0)
-+ {
-+ #ifdef DEBUG
-+ printf("DBG:Can't open %s!\n", batteries[battery]);
-+ #endif
-+ return 0;
-+ }
-+
-+ /* again it might be better to use calloc
-+ if (!acpistate) acpistate=(ACPIstate *)malloc(sizeof(ACPIstate));
-+ */
-+ if (!acpistate) acpistate=(ACPIstate *)calloc(1, sizeof(ACPIstate));
-+
-+ while ((propety = readdir(sysfs)))
-+ {
-+ name = propety->d_name;
-+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue;
-+
-+ if (strcmp(name,"status") == 0)
-+ {
-+ char *tmp;
-+ sprintf(buf,"%s/%s",batteries[battery], name);
-+ tmp = read_sysfs_string(buf);
-+ if ( tmp != NULL )
-+ {
-+ if (strcmp(tmp,"Charging") == 0)
-+ acpistate->state = CHARGING;
-+ else if (strcmp(tmp,"Discharging") == 0)
-+ acpistate->state = DISCHARGING;
-+ else if (strcmp(tmp,"Full") == 0)
-+ acpistate->state = POWER;
-+ else
-+ acpistate->state = UNKNOW;
-+ }
-+ }
-+ /* on my system this is called charge_now */
-+ if ((strcmp(name,"energy_now") == 0) || (strcmp(name,"charge_now") == 0))
-+ {
-+ sprintf(buf,"%s/%s",batteries[battery], name);
-+ acpistate->rcapacity = read_sysfs_int(buf);
-+ acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100;
-+ }
-+ if (strcmp(name,"current_now") == 0)
-+ {
-+ sprintf(buf,"%s/%s",batteries[battery], name);
-+ acpistate->prate = read_sysfs_int(buf);
-+ if ( acpistate->prate < 0 )
-+ acpistate->prate = 0;
-+ if ( acpistate->prate > 0 )
-+ acpistate->rtime = (((float) acpistate->rcapacity) / acpistate->prate) * 60;
-+ }
-+ if (strcmp(name,"voltage_now") == 0)
-+ {
-+ sprintf(buf,"%s/%s",batteries[battery], name);
-+ acpistate->pvoltage = read_sysfs_int(buf);
-+ }
-+ }
-+ closedir(sysfs);
-+ return acpiinfo->present;
-+}
-+
- int read_acpi_state(int battery)
- {
- #ifdef __linux__
-+ if (acpi_sysfs)
-+ return read_acpi_state_sysfs(battery);
-+
- FILE *acpi;
- char *ptr;
- char stat;
-diff -ru xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.h xfce4-battery-plugin-0.5.0-fixed/panel-plugin/libacpi.h
---- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.h 2007-01-17 18:56:51.000000000 +0100
-+++ xfce4-battery-plugin-0.5.0-fixed/panel-plugin/libacpi.h 2008-04-05 22:13:55.522679792 +0200
-@@ -80,6 +80,8 @@
- int batt_count;
- /* temp buffer */
- char buf[512];
-+char buf2[512];
-+int acpi_sysfs;
- #else
- extern int batt_count;
- extern ACPIstate *acpistate;
Deleted: goodies/trunk/xfce4-battery-plugin/debian/patches/08_no-battery-display.patch
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/08_no-battery-display.patch 2011-04-02 14:55:35 UTC (rev 5250)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/08_no-battery-display.patch 2011-04-02 14:59:40 UTC (rev 5251)
@@ -1,21 +0,0 @@
---- panel-plugin/battery.c.old 2007-09-14 23:40:34.282880732 +0100
-+++ panel-plugin/battery.c 2007-09-15 00:31:27.768941875 +0100
-@@ -502,8 +502,16 @@ battmon.c:241: for each function it appe
-
-
- if(acline) {
-- char *t=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)");
-- if(battmon->options.tooltip_display_percentage) {
-+ char *t1=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)");
-+ char *t2=_("(No battery, AC on-line)");
-+ char *t;
-+
-+ if((battmon->method == BM_USE_ACPI) && (acpiinfo->present == 0))
-+ t=t2;
-+ else
-+ t=t1;
-+
-+ if(battmon->options.tooltip_display_percentage) {
- g_snprintf(buffer, sizeof(buffer), "%d%% %s", charge,t);
- }
- else
Modified: goodies/trunk/xfce4-battery-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/rules 2011-04-02 14:55:35 UTC (rev 5250)
+++ goodies/trunk/xfce4-battery-plugin/debian/rules 2011-04-02 14:59:40 UTC (rev 5251)
@@ -1,8 +1,17 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
-binary-post-install/xfce4-battery-plugin::
- -rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.a
- -rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.la
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+override_dh_install:
+ rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.a
+ rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.la
+ dh_install
+
+%:
+ dh $@
More information about the Pkg-xfce-commits
mailing list