Import Debian changes 0.4.1-3

hardinfo (0.4.1-3) unstable; urgency=low

  * Changed libz path (Closes: #391963)
  * added support to alpha arm ia64 m68k s390

10 files changed, 280 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index f9fdd8b4..9cbadcda 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
+GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12  
 GLADE_LIBS = 
 GLADE_CFLAGS = 
 PACKAGE = hardinfo-0.4.1
diff --git a/arch/common/zlib.h b/arch/common/zlib.h
index 2a1007ed..db77551b 100644
--- a/arch/common/zlib.h
+++ b/arch/common/zlib.h
@@ -27,7 +27,7 @@ benchmark_zlib(void)
     if (!(compress && compressBound)) {
 	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
 	if (!libz) {
-            libz = g_module_open("/lib/libz.so", G_MODULE_BIND_LAZY);
+            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
             if (!libz) {
                 g_warning("Cannot load ZLib: %s", g_module_error());
                 return g_strdup("[Error]\n"
diff --git a/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h
new file mode 100644
index 00000000..ef73c922
--- /dev/null
+++ b/arch/linux/alpha/processor.h
@@ -0,0 +1,82 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    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_int("page size [bytes]", processor->page_size);
+	    get_int("cycle frequency [Hz]", processor->cycle_frequency);
+	    get_int("timer frequency [Hz]", processor->timer_frequency);
+	    get_float("BogoMIPS", processor->bogomips);
+	    get_float("platform string", processor->plataform);
+
+	}
+	g_strfreev(tmp);
+    }
+    
+    gchar *tmp = g_strconcat(processor->model, processor->model_name, NULL);
+    g_free(processor->model);
+    g_free(processor->model_name);
+    processor->model_name = tmp;
+
+    fclose(cpuinfo);
+
+    return processor;
+}
+
+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"
+	                       "BogoMips=%.2f"
+	                       "Byte Order=%s\n",
+			       processor->model_name,
+			       processor->page_size,
+			       processor->plataform,
+			       processor->cycle_frequency,
+			       processor->timer_frequency,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h
new file mode 100644
index 00000000..9cbc3377
--- /dev/null
+++ b/arch/linux/ia64/processor.h
@@ -0,0 +1,82 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    tmp[0] = g_strstrip(tmp[0]);
+	    tmp[1] = g_strstrip(tmp[1]);
+
+	    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;
+}
+
+static gchar *
+processor_get_info(Processor *processor)
+{
+	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->family;
+			       processor->features,
+			       processor->cpu_mhz,
+			       processor->itc_mhz,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/arch/linux/s390/processor.h b/arch/linux/s390/processor.h
new file mode 100644
index 00000000..604b3514
--- /dev/null
+++ b/arch/linux/s390/processor.h
@@ -0,0 +1,70 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    tmp[0] = g_strstrip(tmp[0]);
+	    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);
+
+	}
+	g_strfreev(tmp);
+    }
+    
+    gchar *tmp = g_strconcat("S390 ", processor->vendor_id, NULL);
+    processor->model_name = tmp;
+
+    fclose(cpuinfo);
+
+    return processor;
+}
+
+static gchar *
+processor_get_info(Processor *processor)
+{
+	return g_strdup_printf("[Processor]\n"
+	                       "Processors=%d\n"
+	                       "BogoMips per CPU=%.2f"
+	                       "Byte Order=%s\n",
+			       processor->model_name,
+			       processor->processors,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/arch/linux/sparc/processor.h b/arch/linux/sparc/processor.h
index 211ea56b..3aaff41d 100644
--- a/arch/linux/sparc/processor.h
+++ b/arch/linux/sparc/processor.h
@@ -41,8 +41,6 @@ computer_get_processor(void)
 	g_strfreev(tmp);
     }
 
-    get_processor_strfamily(processor);
-
     fclose(cpuinfo);
 
     return processor;
diff --git a/config.h b/config.h
index 58e89d9a..6a0131b5 100644
--- a/config.h
+++ b/config.h
@@ -5,7 +5,7 @@
 #define LSPCI "/bin/lspci -v"
 #define ARCH_i386
 #define PLATFORM "Linux"
-#define KERNEL   "2.6.16-1-686"
+#define KERNEL   "2.6.17-1-k7"
 #define HOSTNAME "comanche.linuxhome.com.br"
 #define PREFIX "/usr/share/hardinfo/"
 #define LIBPREFIX "/usr/lib/hardinfo/"
diff --git a/configure b/configure
index f254de5a..92b3f005 100755
--- a/configure
+++ b/configure
@@ -20,6 +20,28 @@
 #
 # ---------------------------------------------------------------------------
 
+## hack created to avoid dpkg-source error
+## I did not put this on rules because if everything works fine
+## 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/
+}
+
 PACKAGE=`basename ${PWD} | cut -d"-" -f1`;
 VERSION=`basename ${PWD} | cut -d"-" -f2`;
 
@@ -64,9 +86,21 @@ case $PROC in
 	sparc*)
 		ln -sf linux/sparc arch/this
 		ARCH="ARCH_SPARC" ;;
-	armv4l)
+	armv*)
 		ln -sf linux/armv4l arch/this
 		ARCH="ARCH_ARMV4L" ;;
+        ia64)
+		create_links ia64;
+                ln -sf linux/ia64  arch/this
+                ARCH="ARCH_IA64" ;;
+        alpha)
+		create_links alpha;
+                ln -sf linux/alpha  arch/this
+                ARCH="ARCH_ALPHA" ;;
+        s390)
+		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
diff --git a/debian/changelog b/debian/changelog
index cbe7da38..3db87314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hardinfo (0.4.1-3) unstable; urgency=low
+
+  * Changed libz path (Closes: #391963)
+  * added support to alpha arm ia64 m68k s390
+
+ -- Agney Lopes Roth Ferraz <agney@debian.org>  Wed, 11 Oct 2006 23:56:11 -0300
+
 hardinfo (0.4.1-2) unstable; urgency=low
 
   * fixed debian/watch file.
diff --git a/debian/control b/debian/control
index 43f79a74..36aced4b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, pciutils (>=1:2.1.11-10)
 Standards-Version: 3.7.2.0
 
 Package: hardinfo
-Architecture: i386 mips powerpc mipsel hppa sparc amd64
+Architecture: any 
 Depends: ${shlibs:Depends}, pciutils (>=1:2.1.11-10)
 Description: Displays system information
  HardInfo is a small application that displays information about your