Import Debian changes 0.4.2.1-1

hardinfo (0.4.2.1-1) unstable; urgency=low

  * New upstream release.
  * Fixed segfault on device entry (Closes: #387955)

18 files changed, 39 insertions, 19 deletions

diff --git a/arch/linux/ia64/alsa.h b/arch/linux/ia64/alsa.h
new file mode 120000
index 00000000..ede8a364
--- /dev/null
+++ b/arch/linux/ia64/alsa.h
@@ -0,0 +1 @@
+../../../arch/linux/common/alsa.h
\ No newline at end of file
diff --git a/arch/linux/ia64/boots.h b/arch/linux/ia64/boots.h
new file mode 120000
index 00000000..97384500
--- /dev/null
+++ b/arch/linux/ia64/boots.h
@@ -0,0 +1 @@
+../../../arch/linux/common/boots.h
\ No newline at end of file
diff --git a/arch/linux/ia64/devmemory.h b/arch/linux/ia64/devmemory.h
new file mode 120000
index 00000000..f8a833e7
--- /dev/null
+++ b/arch/linux/ia64/devmemory.h
@@ -0,0 +1 @@
+../../../arch/linux/common/devmemory.h
\ No newline at end of file
diff --git a/arch/linux/ia64/filesystem.h b/arch/linux/ia64/filesystem.h
new file mode 120000
index 00000000..d884bcd0
--- /dev/null
+++ b/arch/linux/ia64/filesystem.h
@@ -0,0 +1 @@
+../../../arch/linux/common/filesystem.h
\ No newline at end of file
diff --git a/arch/linux/ia64/inputdevices.h b/arch/linux/ia64/inputdevices.h
new file mode 120000
index 00000000..0f594231
--- /dev/null
+++ b/arch/linux/ia64/inputdevices.h
@@ -0,0 +1 @@
+../../../arch/linux/common/inputdevices.h
\ No newline at end of file
diff --git a/arch/linux/ia64/loadavg.h b/arch/linux/ia64/loadavg.h
new file mode 120000
index 00000000..1f64e107
--- /dev/null
+++ b/arch/linux/ia64/loadavg.h
@@ -0,0 +1 @@
+../../../arch/linux/common/loadavg.h
\ No newline at end of file
diff --git a/arch/linux/ia64/memory.h b/arch/linux/ia64/memory.h
new file mode 120000
index 00000000..64c6e0ed
--- /dev/null
+++ b/arch/linux/ia64/memory.h
@@ -0,0 +1 @@
+../../../arch/linux/common/memory.h
\ No newline at end of file
diff --git a/arch/linux/ia64/modules.h b/arch/linux/ia64/modules.h
new file mode 120000
index 00000000..d21c9a20
--- /dev/null
+++ b/arch/linux/ia64/modules.h
@@ -0,0 +1 @@
+../../../arch/linux/common/modules.h
\ No newline at end of file
diff --git a/arch/linux/ia64/net.h b/arch/linux/ia64/net.h
new file mode 120000
index 00000000..488b5ae3
--- /dev/null
+++ b/arch/linux/ia64/net.h
@@ -0,0 +1 @@
+../../../arch/linux/common/net.h
\ No newline at end of file
diff --git a/arch/linux/ia64/nfs.h b/arch/linux/ia64/nfs.h
new file mode 120000
index 00000000..73e0b8c9
--- /dev/null
+++ b/arch/linux/ia64/nfs.h
@@ -0,0 +1 @@
+../../../arch/linux/common/nfs.h
\ No newline at end of file
diff --git a/arch/linux/ia64/os.h b/arch/linux/ia64/os.h
new file mode 120000
index 00000000..44051626
--- /dev/null
+++ b/arch/linux/ia64/os.h
@@ -0,0 +1 @@
+../../../arch/linux/common/os.h
\ No newline at end of file
diff --git a/arch/linux/ia64/pci.h b/arch/linux/ia64/pci.h
new file mode 120000
index 00000000..8df04a0e
--- /dev/null
+++ b/arch/linux/ia64/pci.h
@@ -0,0 +1 @@
+../../../arch/linux/common/pci.h
\ No newline at end of file
diff --git a/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h
index 6359ba36..bc1d7f08 100644
--- a/arch/linux/ia64/processor.h
+++ b/arch/linux/ia64/processor.h
@@ -16,8 +16,15 @@
  *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-static Processor *
-computer_get_processor(void)
+struct _Processor {
+    gchar *model_name;
+    gchar *vendor_id;
+    gfloat bogomips;
+    gchar *strmodel;
+};
+
+static GSList *
+__scan_processors(void)
 {
     Processor *processor;
     FILE *cpuinfo;
@@ -35,38 +42,34 @@ computer_get_processor(void)
 	    tmp[0] = g_strstrip(tmp[0]);
 	    tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("vendor", processor->vendor_id);
-	    get_str("arch", processor->bug_fdiv);
-	    get_str("family", processor->has_fpu);
-	    get_str("features", processor->flags);
-	    get_float("cpu MHz", processor->cpu_mhz);
+	    get_str("vendor", processor->model_name);
+	    get_str("arch", processor->vendor_id);
+	    get_str("family", processor->strmodel);
 	    get_float("BogoMIPS", processor->bogomips);
 
 	}
 	g_strfreev(tmp);
     }
     
-    gchar *tmp = g_strconcat(processor->vendor_id, processor->bug_fdiv, NULL);
-    processor->model_name = tmp;
     fclose(cpuinfo);
 
-    return processor;
+    return g_slist_append(NULL, processor);
 }
 
 static gchar *
-processor_get_info(Processor *processor)
+processor_get_info(GSList *processors)
 {
+        Processor *processor = (Processor *)processors->data;
+        
 	return g_strdup_printf("[Processor]\n"
-						   "Name=%s\n"
-	                       "Family=%s\n"
-	                       "Features=%s\n"
-	                       "CPU Mhz=%.2fMHz\n"
-			               "BogoMips=%.2f"
+                               "Model=%s\n"
+	                       "Architecture=%s\n"
+	                       "Family=%sMHz\n"
+			       "BogoMIPS=%s\n"
 	                       "Byte Order=%s\n",
 			       processor->model_name,
-			       processor->has_fpu,
-			       processor->flags,
-			       processor->cpu_mhz,
+			       processor->vendor_id,
+			       processor->strmodel,
 			       processor->bogomips,
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
                                "Little Endian"
diff --git a/arch/linux/ia64/samba.h b/arch/linux/ia64/samba.h
new file mode 120000
index 00000000..ebab9b11
--- /dev/null
+++ b/arch/linux/ia64/samba.h
@@ -0,0 +1 @@
+../../../arch/linux/common/samba.h
\ No newline at end of file
diff --git a/arch/linux/ia64/sensors.h b/arch/linux/ia64/sensors.h
new file mode 120000
index 00000000..3b799377
--- /dev/null
+++ b/arch/linux/ia64/sensors.h
@@ -0,0 +1 @@
+../../../arch/linux/common/sensors.h
\ No newline at end of file
diff --git a/arch/linux/ia64/storage.h b/arch/linux/ia64/storage.h
new file mode 120000
index 00000000..3ea886ce
--- /dev/null
+++ b/arch/linux/ia64/storage.h
@@ -0,0 +1 @@
+../../../arch/linux/common/storage.h
\ No newline at end of file
diff --git a/arch/linux/ia64/uptime.h b/arch/linux/ia64/uptime.h
new file mode 120000
index 00000000..a5bac980
--- /dev/null
+++ b/arch/linux/ia64/uptime.h
@@ -0,0 +1 @@
+../../../arch/linux/common/uptime.h
\ No newline at end of file
diff --git a/arch/linux/ia64/usb.h b/arch/linux/ia64/usb.h
new file mode 120000
index 00000000..aee3046c
--- /dev/null
+++ b/arch/linux/ia64/usb.h
@@ -0,0 +1 @@
+../../../arch/linux/common/usb.h
\ No newline at end of file