Import Debian changes 0.4.1-6

hardinfo (0.4.1-6) unstable; urgency=low

  * Changed configure script to reconize m68k machines 

5 files changed, 61 insertions, 48 deletions

diff --git a/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h
index fa02ea05..99ccc32f 100644
--- a/arch/linux/alpha/processor.h
+++ b/arch/linux/alpha/processor.h
@@ -35,15 +35,20 @@ computer_get_processor(void)
 	    tmp[0] = g_strstrip(tmp[0]);
 	    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->strmodel);
+	    get_str("platform string", processor->plataform);
 
 	}
 	g_strfreev(tmp);
     }
     
-    gchar *tmp = g_strconcat("Alpha", processor->model_name, NULL);
+    gchar *tmp = g_strconcat(processor->model, processor->model_name, NULL);
+    g_free(processor->model);
     g_free(processor->model_name);
     processor->model_name = tmp;
 
@@ -55,12 +60,18 @@ computer_get_processor(void)
 static gchar *
 processor_get_info(Processor *processor)
 {
-	return g_strdup_printf("[Processor] %s\n"
+	return g_strdup_printf("[Processor]\n"
+	                       "Page Size=%s\n"
 	                       "Plataform String=%s\n"
+	                       "Cycle Frequency=%.2fMHz\n"
+	                       "Timer Frequency=%.2fMHz\n"
 	                       "BogoMips=%.2f"
 	                       "Byte Order=%s\n",
 			       processor->model_name,
-			       processor->strmodel,
+			       processor->page_size,
+			       processor->plataform,
+			       processor->cycle_frequency,
+			       processor->timer_frequency,
 			       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 9cad3b24..9cbc3377 100644
--- a/arch/linux/ia64/processor.h
+++ b/arch/linux/ia64/processor.h
@@ -35,15 +35,23 @@ computer_get_processor(void)
 	    tmp[0] = g_strstrip(tmp[0]);
 	    tmp[1] = g_strstrip(tmp[1]);
 
-	    get_str("vendor", processor->model_name);
-	    get_str("arch", processor->vendor_id);
-	    get_str("family", processor->strmodel);
+	    get_str("vendor", processor->vendor);
+	    get_str("arch", processor->arch);
+	    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_float("BogoMIPS", processor->bogomips);
 
 	}
 	g_strfreev(tmp);
     }
     
+    gchar *tmp = g_strconcat(processor->vendor, processor->arch, NULL);
+    g_free(processor->vendor);
+    g_free(processor->arch);
+    processor->model_name = tmp;
+
     fclose(cpuinfo);
 
     return processor;
@@ -52,14 +60,18 @@ computer_get_processor(void)
 static gchar *
 processor_get_info(Processor *processor)
 {
-	return g_strdup_printf("[Processor] %s\n"
-	                       "Arch=%s\n"
-	                       "Family=%sMHz\n"
-			       "BogoMips=%s\n"
+	return g_strdup_printf("[Processor]\n"
+	                       "Family=%s\n"
+	                       "Features=%.2f\n"
+	                       "CPU Mhz=%.2fMHz\n"
+	                       "ITC MHz=%.2f"
+			       "BogoMips=%.2f"
 	                       "Byte Order=%s\n",
 			       processor->model_name,
-			       processor->vendor_id,
-			       processor->strmodel,
+			       processor->family;
+			       processor->features,
+			       processor->cpu_mhz,
+			       processor->itc_mhz,
 			       processor->bogomips,
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
                                "Little Endian"
diff --git a/config.h b/config.h
index 9cbab190..c546e743 100644
--- a/config.h
+++ b/config.h
@@ -5,8 +5,8 @@
 #define LSPCI "/bin/lspci -v"
 #define ARCH_i386
 #define PLATFORM "Linux"
-#define KERNEL   "2.6.17-2-686"
-#define HOSTNAME "lxmaster.intranet.dasa"
+#define KERNEL   "2.6.18-2-k7"
+#define HOSTNAME "comanche.linuxhome.com.br"
 #define PREFIX "/usr/share/hardinfo/"
 #define LIBPREFIX "/usr/lib/hardinfo/"
 #define DEBUG 1
diff --git a/configure b/configure
index 2b4ad416..dc35332b 100755
--- a/configure
+++ b/configure
@@ -25,21 +25,21 @@
 ## upstream author will put this on package tarball
 
 create_links ( ) {
-ln -sf ../../../arch/linux/common/alsa.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/filesystem.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/inputdevices.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/loadavg.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/memory.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/modules.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/net.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/nfs.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/os.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/pci.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/samba.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/sensors.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/storage.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/uptime.h arch/linux/$1/
-ln -sf ../../../arch/linux/common/usb.h arch/linux/$1/
+ln -sf arch/linux/common/alsa.h arch/linux/$1/
+ln -sf arch/linux/common/filesystem.h arch/linux/$1/
+ln -sf arch/linux/common/inputdevices.h arch/linux/$1/
+ln -sf arch/linux/common/loadavg.h arch/linux/$1/
+ln -sf arch/linux/common/memory.h arch/linux/$1/
+ln -sf arch/linux/common/modules.h arch/linux/$1/
+ln -sf arch/linux/common/net.h arch/linux/$1/
+ln -sf arch/linux/common/nfs.h arch/linux/$1/
+ln -sf arch/linux/common/os.h arch/linux/$1/
+ln -sf arch/linux/common/pci.h arch/linux/$1/
+ln -sf arch/linux/common/samba.h arch/linux/$1/
+ln -sf arch/linux/common/sensors.h arch/linux/$1/
+ln -sf arch/linux/common/storage.h arch/linux/$1/
+ln -sf arch/linux/common/uptime.h arch/linux/$1/
+ln -sf arch/linux/common/usb.h arch/linux/$1/
 }
 
 PACKAGE=`basename ${PWD} | cut -d"-" -f1`;
@@ -101,17 +101,13 @@ case $PROC in
 		create_links s390;
                 ln -sf linux/s390  arch/this
                 ARCH="ARCH_S390" ;;
-	*)
-		# uname -m on m68k doesn't return anything useful :/
-		grep "680?0" /proc/cpuinfo > /dev/null
-		if [ "$?" == "0" ]; then
-			ln -sf linux/m68k arch/this
-			ARCH="ARCH_m68k"
-		else
+	m68k)
+		create_links s390;
+		 ln -sf linux/m68k  arch/this
+		ARCH="ARCH_m68k" ;;
+          *)
 			echo "Architeture \"$ARCH\" not supported." 
 			exit
-		fi
-
 		;;
 esac
 
diff --git a/debian/changelog b/debian/changelog
index c29395d4..c8a7a05b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,8 @@
-hardinfo (0.4.1-5) unstable; urgency=low
+hardinfo (0.4.1-6) unstable; urgency=low
 
-  * Fixed FTBFS on alpha.
+  * Changed configure script to reconize m68k machines 
 
- -- Agney Lopes Roth Ferraz <agney@debian.org>  Fri, 13 Oct 2006 14:41:04 -0300
-
-hardinfo (0.4.1-4) unstable; urgency=low
-
-  * Fixed FTBFS on alphaand ia64.
-
- -- Agney Lopes Roth Ferraz <agney@debian.org>  Fri, 13 Oct 2006 13:24:15 -0300
+ -- Agney Lopes Roth Ferraz <agney@debian.org>  Sun, 10 Dec 2006 18:38:14 -0200
 
 hardinfo (0.4.1-3) unstable; urgency=low