Consider xosview 1.8.2-4 for Sarge
Hi,
I uploaded xosview 1.8.2-3 and 1.8.2-4 when the freeze was announced -
They fix four bugs (one minor, three normal): #130633, #183695,
#281565, #306715. The patches are very simple and localized, I am sure
they carry no ill side-efects - I am attaching a diff between the
version currently in Sarge and the latest one.
Thanks,
--
Gunnar Wolf - gwolf@gwolf.org - (+52-55)1451-2244 / 5623-0154
PGP key 1024D/8BB527AF 2001-10-23
Fingerprint: 0C79 D2D1 2C4E 9CE4 5973 F800 D80E F35A 8BB5 27AF
diff -ur xosview-sarge/config/autom4te.cache/requests xosview-1.8.2/config/autom4te.cache/requests
--- xosview-sarge/config/autom4te.cache/requests 2005-05-16 09:15:51.864951936 -0500
+++ xosview-1.8.2/config/autom4te.cache/requests 2005-05-16 09:17:20.391493856 -0500
@@ -1,4 +1,4 @@
-# This file was generated by Autom4te Mon Sep 13 19:52:04 PDT 2004.
+# This file was generated by Autom4te Sat Jan 8 16:59:54 PST 2005.
# It contains the lists of macros which have been traced.
# It can be safely removed.
diff -ur xosview-sarge/debian/changelog xosview-1.8.2/debian/changelog
--- xosview-sarge/debian/changelog 2005-05-16 09:15:51.876950112 -0500
+++ xosview-1.8.2/debian/changelog 2005-05-16 09:17:20.404491880 -0500
@@ -1,3 +1,24 @@
+xosview (1.8.2-4) unstable; urgency=low
+
+ * Fixed: lmstemp didn't show the right information - Thanks to Robert
+ Schueler for the (obvious) patch, excuse me for not dealing with it
+ earlier! (Closes: #183695)
+ * Fixed: Now properly deals with the absence of a battery without
+ spitting out loads of errors. Attila Kinali's hint was in the right
+ direction, only I prefered to do something about the errors.
+ (Closes: #281565)
+
+ -- Gunnar Wolf <gwolf@debian.org> Tue, 3 May 2005 13:47:31 -0500
+
+xosview (1.8.2-3) unstable; urgency=low
+
+ * Disabled transparency as its result is definitively less than
+ satsifactory (Closes: #130633)
+ * Fixed some typos in the man page - Thanks to A. Costa for pointing
+ it out (Closes: #306715)
+
+ -- Gunnar Wolf <gwolf@debian.org> Tue, 3 May 2005 10:31:35 -0500
+
xosview (1.8.2-2) unstable; urgency=low
* Added a 'xosview*netIface' Xresource to allow to monitor a specific
diff -ur xosview-sarge/linux/btrymeter.cc xosview-1.8.2/linux/btrymeter.cc
--- xosview-sarge/linux/btrymeter.cc 2004-06-08 12:52:21.000000000 -0500
+++ xosview-1.8.2/linux/btrymeter.cc 2005-05-16 09:17:20.400492488 -0500
@@ -44,10 +44,16 @@
if (getapminfo() || getacpiinfo())
return;
- std::cerr <<"Cannot get battery information" << std::endl;
- std::cerr <<"If using APM, have you loaded the `apm' module?" << std::endl;
- std::cerr <<"If using ACPI, have you loaded the `battery' module?" << std::endl;
- parent_->done(1);
+ // We can hit this spot in any of two cases:
+ // - We have an ACPI system and the battery is removed
+ // - We have neither ACPI nor APM in the system
+ // We report an empty battery (i.e., we are running off AC power) instead of
+ // original behavior of just exiting the program.
+ // (Refer to Debian bug report #281565)
+ total_ = 100;
+ fields_[0] = 0;
+ fields_[1] = 100;
+ setUsed(fields_[0], total_);
}
@@ -62,6 +68,12 @@
char buff[256];
loadinfo >> buff >> buff >> buff >> buff >> buff >> buff >> fields_[0];
+ // If the battery status is reported as a negative number, it means we are
+ // running on AC power and no battery status is available - Report it as
+ // completely empty (0). (Refer to Debian bug report #281565)
+ if (fields_[0] < 0)
+ fields_[0] = 0;
+
total_ = 100;
fields_[1] = total_ - fields_[0];
diff -ur xosview-sarge/linux/lmstemp.cc xosview-1.8.2/linux/lmstemp.cc
--- xosview-sarge/linux/lmstemp.cc 2003-10-19 20:37:36.000000000 -0500
+++ xosview-1.8.2/linux/lmstemp.cc 2005-05-16 09:17:20.400492488 -0500
@@ -145,7 +145,9 @@
return;
}
- int dummy, high;
+ // dummy, high changed from integer to double to allow it to display
+ // the full value, unfit for an int. (See Debian bug #183695)
+ double dummy, high;
total_ = _highest; // Max temp
file >> high >> dummy >> fields_[0];
fields_[1] = high - fields_[0];
diff -ur xosview-sarge/linux/swapmeter.cc xosview-1.8.2/linux/swapmeter.cc
--- xosview-sarge/linux/swapmeter.cc 2005-05-16 09:15:51.873950568 -0500
+++ xosview-1.8.2/linux/swapmeter.cc 2005-05-16 09:17:20.401492336 -0500
@@ -76,6 +76,7 @@
if (total_)
setUsed (fields_[0], total_);
+
}
#else
void SwapMeter::getswapinfo( void ){
diff -ur xosview-sarge/Xdefaults xosview-1.8.2/Xdefaults
--- xosview-sarge/Xdefaults 2005-05-16 09:15:51.876950112 -0500
+++ xosview-1.8.2/Xdefaults 2005-05-16 09:17:20.404491880 -0500
@@ -21,7 +21,8 @@
!xosview*display:
xosview*captions: True
xosview*labels: True
-xosview*transparent: False
+! Transparency disabled in Debian builds - See bug #130633
+! xosview*transparent: False
xosview*meterLabelColor: wheat
xosview*usedlabels: True
xosview*usedLabelColor: wheat
diff -ur xosview-sarge/Xdefaults.in xosview-1.8.2/Xdefaults.in
--- xosview-sarge/Xdefaults.in 2005-05-16 09:15:51.873950568 -0500
+++ xosview-1.8.2/Xdefaults.in 2005-05-16 09:17:20.401492336 -0500
@@ -21,7 +21,8 @@
!xosview*display:
xosview*captions: True
xosview*labels: True
-xosview*transparent: False
+! Transparency disabled in Debian builds - See bug #130633
+! xosview*transparent: False
xosview*meterLabelColor: wheat
xosview*usedlabels: True
xosview*usedLabelColor: wheat
diff -ur xosview-sarge/xosview.1 xosview-1.8.2/xosview.1
--- xosview-sarge/xosview.1 2005-05-16 09:15:51.873950568 -0500
+++ xosview-1.8.2/xosview.1 2005-05-16 09:17:20.401492336 -0500
@@ -494,7 +494,7 @@
xosview*cpu: (True or False)
.RS
If True then xosview will display a cpu meter. On linux SMP machines this
-will cause a seperate meter to be displayed for each cpu if Jerome Forissier's
+will cause a separate meter to be displayed for each cpu if Jerome Forissier's
kernel patch has been applied. See the 'README.linux' file for more
details. On IRIX 6.5, the resource cpuFormat decides which meters are
created for multiple CPUs.
@@ -665,7 +665,7 @@
This number is used to specify the expected maximum bandwidth
(in bytes / sec) for the meter. When the expected maximum bandwidth
(\fImaxBytes\fP) is exceeded then the network meter will display the
-relative percentage of network usage (25% incomming, 75% outgoing).
+relative percentage of network usage (25% incoming, 75% outgoing).
.RE
xosview*netIface: \fIinterface\fP
@@ -833,7 +833,7 @@
Name of temperature file from /proc/sys/dev/sensors/*/*, N=1..
.br
Note if more files with same name exists, only the first is found. There is
-currently no possiblity to configure equal named files on different busses
+currently no possibility to configure equal named files on different busses
(which would be rarely necessary, I hope).
.br
eg.
diff -ur xosview-sarge/xwin.cc xosview-1.8.2/xwin.cc
--- xosview-sarge/xwin.cc 2005-05-16 09:15:51.874950416 -0500
+++ xosview-1.8.2/xwin.cc 2005-05-16 09:17:20.402492184 -0500
@@ -125,11 +125,13 @@
XSetWindowBackgroundPixmap(display_,window_,background_pixmap);
}
- // Do transparency if requested
- if(isResourceTrue("transparent"))
- {
- XSetWindowBackgroundPixmap(display_,window_,ParentRelative);
- }
+ // Transparency disabled for Debian builds as it just gets garbled up
+ // (see Debian bug #130633)
+// // Do transparency if requested
+// if(isResourceTrue("transparent"))
+// {
+// XSetWindowBackgroundPixmap(display_,window_,ParentRelative);
+// }
// add the events
Event *tmp = events_;
Reply to: