Import Debian changes 0.4.1-7

hardinfo (0.4.1-7) unstable; urgency=low

  * Fixed FTBFS on s390, ia64 and alpha. 

4 files changed, 33 insertions, 34 deletions

diff --git a/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h
index 99ccc32f..9a8a08ea 100644
--- a/arch/linux/alpha/processor.h
+++ b/arch/linux/alpha/processor.h
@@ -36,18 +36,15 @@ computer_get_processor(void)
 	    tmp[1] = g_strstrip(tmp[1]);
 
 	    get_str("cpu", processor->model);
-	    get_str("cpu model", processor->model_name);
-	    get_str("page size [bytes]", processor->page_size);
-	    get_srt("cycle frequency [Hz]", processor->cycle_frequency);
-	    get_str("timer frequency [Hz]", processor->timer_frequency);
-	    get_float("BogoMIPS", processor->bogomips);
-	    get_str("platform string", processor->plataform);
-
+	    get_str("cpu model", processor-vendor_id);   
+	    get_srt("system type", processor->flags);
+	    get_str("system variation", processor->has_fpu);
+	    get_float("BogoMIPS", processor->bogomips);   
 	}
 	g_strfreev(tmp);
     }
     
-    gchar *tmp = g_strconcat(processor->model, processor->model_name, NULL);
+    gchar *tmp = g_strconcat(processor->model, processor->vendor_id, NULL);
     g_free(processor->model);
     g_free(processor->model_name);
     processor->model_name = tmp;
@@ -61,17 +58,18 @@ static gchar *
 processor_get_info(Processor *processor)
 {
 	return g_strdup_printf("[Processor]\n"
-	                       "Page Size=%s\n"
-	                       "Plataform String=%s\n"
-	                       "Cycle Frequency=%.2fMHz\n"
-	                       "Timer Frequency=%.2fMHz\n"
+	                       "Name=%s\n"
+	                       "Model=%s\n"
+	                       "Model Name=%s\n"	
+	                       "System Type=%s\n"
+	                       "System Variation=%s\n"
 	                       "BogoMips=%.2f"
 	                       "Byte Order=%s\n",
 			       processor->model_name,
-			       processor->page_size,
-			       processor->plataform,
-			       processor->cycle_frequency,
-			       processor->timer_frequency,
+			       processor->model,
+			       processor->vendor_id,
+			       processor->flags,
+			       processor->has_fpu,	
 			       processor->bogomips,
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
                                "Little Endian"
diff --git a/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h
index 9cbc3377..3ce679ce 100644
--- a/arch/linux/ia64/processor.h
+++ b/arch/linux/ia64/processor.h
@@ -35,19 +35,18 @@ computer_get_processor(void)
 	    tmp[0] = g_strstrip(tmp[0]);
 	    tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("vendor", processor->vendor);
-	    get_str("arch", processor->arch);
+	    get_str("vendor", processor->vendor_id);
+	    get_str("arch", processor->model);
 	    get_str("family", processor->family);
-	    get_str("features", processor->features);
-	    get_str("cpu MHz", processor->cpu_mhz);
-	    get_str("itc MHz", processor->itc_mhz);
+	    get_str("features", processor->flags);
+	    get_float("cpu MHz", processor->cpu_mhz);
 	    get_float("BogoMIPS", processor->bogomips);
 
 	}
 	g_strfreev(tmp);
     }
     
-    gchar *tmp = g_strconcat(processor->vendor, processor->arch, NULL);
+    gchar *tmp = g_strconcat(processor->vendor_id, processor->model, NULL);
     g_free(processor->vendor);
     g_free(processor->arch);
     processor->model_name = tmp;
@@ -61,17 +60,16 @@ static gchar *
 processor_get_info(Processor *processor)
 {
 	return g_strdup_printf("[Processor]\n"
+						   "Name=%s\n"
 	                       "Family=%s\n"
 	                       "Features=%.2f\n"
 	                       "CPU Mhz=%.2fMHz\n"
-	                       "ITC MHz=%.2f"
-			       "BogoMips=%.2f"
+			               "BogoMips=%.2f"
 	                       "Byte Order=%s\n",
 			       processor->model_name,
-			       processor->family;
-			       processor->features,
+			       processor->family,
+			       processor->flags,
 			       processor->cpu_mhz,
-			       processor->itc_mhz,
 			       processor->bogomips,
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
                                "Little Endian"
diff --git a/arch/linux/s390/processor.h b/arch/linux/s390/processor.h
index 604b3514..1648b917 100644
--- a/arch/linux/s390/processor.h
+++ b/arch/linux/s390/processor.h
@@ -36,8 +36,8 @@ computer_get_processor(void)
 	    tmp[1] = g_strstrip(tmp[1]);
 
 	    get_str("vendor_id", processor->vendor_id);
-	    get_float("# processors", processor->processors);
-	    get_int("bogomips per cpu", processor->bogomips);
+	    get_int("# processors", processor->model);
+	    get_float("bogomips per cpu", processor->bogomips);
 
 	}
 	g_strfreev(tmp);
@@ -55,12 +55,15 @@ static gchar *
 processor_get_info(Processor *processor)
 {
 	return g_strdup_printf("[Processor]\n"
-	                       "Processors=%d\n"
+	                       "Name=%s\n"
+						   "Vendor=%s\n"
 	                       "BogoMips per CPU=%.2f"
+						   "Processors=%d\n"
 	                       "Byte Order=%s\n",
 			       processor->model_name,
-			       processor->processors,
+				   processor->vendor_id,	
 			       processor->bogomips,
+				   processor->model,
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
                                "Little Endian"
 #else
diff --git a/arch/linux/x86/processor.h b/arch/linux/x86/processor.h
index aba623bf..b8642f1f 100644
--- a/arch/linux/x86/processor.h
+++ b/arch/linux/x86/processor.h
@@ -263,9 +263,9 @@ processor_get_info(Processor *processor)
 	gchar *tmp = processor_get_capabilities_from_flags(processor->
 						  flags);
 	gchar *ret = g_strdup_printf("[Processor]\n"
-	                       "Name=%s\n"
-	                       "Specification=%s\n"
-                               "Family, model, stepping=%d, %d, %d\n"
+	               "Name=%s\n"
+	               "Specification=%s\n"
+                   "Family, model, stepping=%d, %d, %d\n"
 			       "Vendor=%s\n"
 			       "Cache Size=%dkb\n"
 			       "Frequency=%.2fMHz\n"