[Pkg-cli-apps-commits] [SCM] sysinfo branch, master, updated. upstream/0.7-8-g7824aa4

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 6135b9b1a46f84daabd4b92261efb0cfb12176f9
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Wed Jan 11 02:10:22 2012 +0800

    Add patch to remove cpuinfo ordering assumption

diff --git a/debian/patches/13-fix-reordered-cpuinfo.patch b/debian/patches/13-fix-reordered-cpuinfo.patch
new file mode 100644
index 0000000..76b1deb
--- /dev/null
+++ b/debian/patches/13-fix-reordered-cpuinfo.patch
@@ -0,0 +1,27 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Description: Fix assumption that "cpu MHz" comes before bogomips in
+ /proc/cpuinfo
+Index: sysinfo/Sysinfo/CpuInfo.cs
+===================================================================
+--- sysinfo.orig/Sysinfo/CpuInfo.cs	2012-01-11 02:07:35.631328013 +0800
++++ sysinfo/Sysinfo/CpuInfo.cs	2012-01-11 02:07:57.994751754 +0800
+@@ -85,6 +85,7 @@
+ 			
+ 			String temp;
+ 			Boolean dynamicB = true;
++			Boolean dynamicF = true;
+ 			
+ 			try {
+ 				
+@@ -99,8 +100,10 @@
+ 							break;
+ 						
+ 						//frequency
+-						if ( temp.StartsWith("cpu MHz"))
++						if ( temp.StartsWith("cpu MHz")) {
+ 							cpu_frequency =  temp.Remove(0, 11) + " MHz";
++							dynamicF = false;
++						}
+ 						
+ 						//bogomips
+ 						if ( temp.StartsWith("bogomips")) {
diff --git a/debian/patches/series b/debian/patches/series
index dc9c7ea..48ecb8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 10-better_xorg_parsing.diff
 11-typo.diff
 12-fix-nre-no-bogomips.patch
+13-fix-reordered-cpuinfo.patch

-- 
sysinfo