debian/0000755000000000000000000000000011775541476007207 5ustar debian/changelog0000644000000000000000000001037611775541340011056 0ustar sysinfo (0.7-9) experimental; urgency=low * [924c8ab] Add new patch to look in the new path for GNOME version. Thanks to Shih-Yuan Lee (FourDollars) (LP: #896512) -- Iain Lane Fri, 06 Jul 2012 11:49:56 +0100 sysinfo (0.7-8) unstable; urgency=low * Team upload * No change rebuild for CLR 4.0 transition * [b636e7f] Add patch to fix automake error with pkglibdir * [fb5b84b] Drop deprecated cli.make include -- Chow Loong Jin Thu, 19 Jan 2012 03:58:43 +0800 sysinfo (0.7-7) unstable; urgency=low * Team upload * [e37ae5b] Imported Upstream version 0.7 * [c876b70] Update Vcs-* fields to point to git * [1718bf7] Move to 3.0 (quilt) format * [ed26925] Add patch to fix NRE when /proc/cpuinfo has no bogomips. Thanks to Douglas Mencken (Closes: #654210) * [6135b9b] Add patch to remove cpuinfo ordering assumption * [35d4469] Refresh 10-better_xorg_parsing.diff dpkg-source pukes on it otherwise. -- Chow Loong Jin Wed, 11 Jan 2012 02:14:47 +0800 sysinfo (0.7-6) unstable; urgency=low * debian/rules, debian/control: Include cli.make so correct dependencies are generated. * Run wrap-and-sort -- Iain Lane Thu, 16 Jun 2011 11:59:04 +0100 sysinfo (0.7-5) unstable; urgency=low * Upload to unstable * debian/patches/11-typo.diff: Apply patch from Ubuntu to fix typo Multmedia → Multimedia in the interface -- Iain Lane Fri, 03 Jun 2011 14:18:36 +0100 sysinfo (0.7-4) experimental; urgency=low * debian/rules, debian/patches/series{,-ubuntu}: Drop Ubuntu specific patches: patch will have no effect if affected file is not on the system and thus is harmless to have on Debian. * debian/patches/10_better-xorg-parsing.patch: Add new patch to improve Xorg log parsing to work correctly on Debian (and with timestamped logs) and not to crash the program on a malformed/empty input file. (Closes: #626196) * debian/*: Update packaging to DH7 & dh-autoreconf, include README.source * debian/control: + Update Homepage field to sf.net page + Standards-Version → 3.9.3, no changes required * debian/watch: Correctly sort beta versions lower than releases -- Iain Lane Tue, 02 Feb 2010 00:35:30 +0000 sysinfo (0.7-3) unstable; urgency=low [ David Paleino ] * debian/control: + updated my e-mail address [ Jo Shields ] * debian/patches/00-fix_build_system.patch, debian/control: + Use mono-csc from mono-devel 2.4.3 (Closes: #562280) * debian/control: + No-change bump to Standards 3.8.3 + Use GNOME# and GTK# -dev packages + Add a Suggests on nvidia-settings (Closes: #557574) -- Jo Shields Thu, 07 Jan 2010 17:38:05 +0000 sysinfo (0.7-2) unstable; urgency=low [ Iain Lane ] * Import bugfix patches from Ubuntu. * debian/patches/02-fix_sysinfo.desktop.patch: More cleanups, thanks to Pedro Fragoso * debian/patches/07-nvidia_crash.diff: Fix crasher when clicking Nvidia icon, thanks to Koen Beek * debian/patches/06-check_nvidia_settings.patch: Don't show Nvidia options if nvidia-settings is not installed, thanks to Koen Beek * debian/patches/08-correct_url.diff: Show correct upstream URL, old one is dead and has been squatted, thanks to Koen Beek * debian/patches/09-ubuntu_lsb_release.diff: Ubuntu specific - use lsb_release file if it is found to parse distro information, thanks to Koen Beek * debian/patches/04-fix_usb_pci_limit.patch: Allow an arbitrary number of PCI/USB devices to be displayed, thanks to Koen Beek * debian/rules, debian/patches/series-ubuntu: Only apply Ubuntu patches when building on Ubuntu * debian/menu: Alter section to comply with menu sub-policy [ Mirco Bauer ] * Upload to unstable. * debian/control: + Added libmono-cairo1.0-cil to build-deps as that one contains the pkg-config file. -- Iain Lane Fri, 06 Mar 2009 00:53:26 +0100 sysinfo (0.7-1) experimental; urgency=low [ David Paleino ] * Initial release (Closes: #507187) [ Mirco Bauer ] * debian/control: + Enhanced package description. + Added Vcs-* fields. -- David Paleino Thu, 20 Nov 2008 19:29:07 +0100 debian/compat0000644000000000000000000000000211775541340010373 0ustar 7 debian/source/0000755000000000000000000000000011775541340010475 5ustar debian/source/format0000644000000000000000000000001411775541340011703 0ustar 3.0 (quilt) debian/manpage.xml0000644000000000000000000001067611775541340011341 0ustar .
will be generated. You may view the manual page with: nroff -man .
| less'. A typical entry in a Makefile or Makefile.am is: DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ manpages/docbook.xsl XP=xsltproc -''-nonet manpage.1: manpage.dbk $(XP) $(DB2MAN) $< The xsltproc binary is found in the xsltproc package. The XSL files are in docbook-xsl. Please remember that if you create the nroff version in one of the debian/rules file targets (such as build), you will need to include xsltproc and docbook-xsl in your Build-Depends control field. --> FIRSTNAME"> SURNAME"> dicembre 29, 2007"> SECTION"> d.paleino@gmail.com"> SYSINFO"> Debian"> GNU"> GPL"> ]>
&dhemail;
2007 &dhusername; &dhdate; &dhucpackage; &dhsection; &dhpackage; program to do something &dhpackage; DESCRIPTION This manual page documents briefly the &dhpackage; and bar commands. This manual page was written for the &debian; distribution because the original program does not have a manual page. Instead, it has documentation in the &gnu; Info format; see below. &dhpackage; is a program that... OPTIONS These programs follow the usual &gnu; command line syntax, with long options starting with two dashes (`-'). A summary of options is included below. For a complete description, see the Info files. Show summary of options. Show version of program. SEE ALSO bar (1), baz (1). The programs are documented fully by The Rise and Fall of a Fooish Bar available via the Info system. AUTHOR This manual page was written by &dhusername; &dhemail; for the &debian; system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the &gnu; General Public License, Version 2 any later version published by the Free Software Foundation. On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. debian/rules0000755000000000000000000000075511775541340010264 0ustar #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 ) override_dh_install: -rm -rf $(CURDIR)/debian/sysinfo/usr/lib/pkgconfig dh_install %: dh $@ --with autoreconf,cli get-orig-source: [ -d ../tarballs ] || mkdir ../tarballs uscan \ --force-download \ --download-version $(CURVER) \ --rename \ --destdir ../tarballs .PHONY: get-orig-source debian/README.source0000644000000000000000000000353511775541340011362 0ustar This package uses quilt to manage all modifications to the upstream source. Changes are stored in the source package as diffs in debian/patches and applied during the build. To configure quilt to use debian/patches instead of patches, you want either to export QUILT_PATCHES=debian/patches in your environment or use this snippet in your ~/.quiltrc: for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then export QUILT_PATCHES=debian/patches break fi done To get the fully patched source after unpacking the source package, cd to the root level of the source package and run: quilt push -a The last patch listed in debian/patches/series will become the current patch. To add a new set of changes, first run quilt push -a, and then run: quilt new where is a descriptive name for the patch, used as the filename in debian/patches. Then, for every file that will be modified by this patch, run: quilt add before editing those files. You must tell quilt with quilt add what files will be part of the patch before making changes or quilt will not work properly. After editing the files, run: quilt refresh to save the results as a patch. Alternately, if you already have an external patch and you just want to add it to the build system, run quilt push -a and then: quilt import -P /path/to/patch quilt push -a (add -p 0 to quilt import if needed). as above is the filename to use in debian/patches. The last quilt push -a will apply the patch to make sure it works properly. To remove an existing patch from the list of patches that will be applied, run: quilt delete You may need to run quilt pop -a to unapply patches first before running this command. debian/watch0000644000000000000000000000013711775541340010227 0ustar version=3 opts="uversionmangle=s/beta/~beta/" \ http://sf.net/gsysinfo/sysinfo-(.*)\.tar\.gz debian/control0000644000000000000000000000320311775541340010576 0ustar Source: sysinfo Section: utils Priority: optional Maintainer: Debian CLI Applications Team Uploaders: David Paleino Build-Depends: autotools-dev, debhelper (>= 7.0.50~), dh-autoreconf Build-Depends-Indep: autoconf, automake, cli-common-dev (>= 0.5.7~), libgconf2.0-cil-dev, libglade2.0-cil-dev, libglib2.0-cil-dev, libgtk2.0-cil-dev, mono-devel (>= 2.4.3) Standards-Version: 3.9.2 Homepage: https://sourceforge.net/projects/gsysinfo/ Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/sysinfo.git Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/sysinfo.git Package: sysinfo Architecture: all Depends: ${cli:Depends}, ${misc:Depends} Suggests: nvidia-settings Description: display computer and system information sysinfo is a graphical tool that is able to display some hardware and software information about the computer it is run on. . It is able to recognize information about: - System (Linux distribution release, versions of GNOME, kernel, gcc and Xorg and hostname); - CPU (vendor identification, model name, frequency, level2 cache, bogomips, model numbers and flags); - Memory (total system RAM, free memory, swap space total and free, cached, active, inactive memory); - Storage (IDE interface, all IDE devices, SCSI devices); - Hardware (motherboard, graphic card, sound card, network devices); - NVIDIA graphic card: only with NVIDIA display driver installed. debian/copyright0000644000000000000000000000163511775541340011135 0ustar Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat Upstream-Website: http://gsysinfo.sourceforge.net Files: debian/* Copyright: © 2008, David Paleino License: GPL-2+ Files: * Copyright: © 2006, Nil Gradisnik License: GPL-2+ License: GPL-2+ This package 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; either version 2 of the License, or (at your option) any later version. . This package 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. X-Comment: On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. debian/menu0000644000000000000000000000017611775541340010070 0ustar ?package(sysinfo):needs="X11" \ section="Applications/System/Monitoring" \ title="sysinfo" \ command="/usr/bin/sysinfo" debian/patches/0000755000000000000000000000000011775541340010624 5ustar debian/patches/11-typo.diff0000644000000000000000000000153611775541340012675 0ustar Index: sysinfo-0.7/Sysinfo/Main.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/Main.cs 2011-01-10 17:08:42.230922760 +0000 +++ sysinfo-0.7/Sysinfo/Main.cs 2011-01-10 17:08:51.181611955 +0000 @@ -826,7 +826,7 @@ //multimedia audio info - populate treestore if ( hardware_info.multimedia_controller[0] != null ) { - soundcard_iter = soundcard_treestore.AppendValues ("Multmedia audio controller"); + soundcard_iter = soundcard_treestore.AppendValues ("Multimedia audio controller"); soundcard_treestore.AppendValues (soundcard_iter, hardware_info.multimedia_controller[0]); if ( hardware_info.multimedia_controller[1] != null ) soundcard_treestore.AppendValues (soundcard_iter, "Subsystem: " + hardware_info.multimedia_controller[1]); debian/patches/06-check_nvidia_settings.patch0000644000000000000000000001230111775541340016414 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## 04_check_nvidia_settings.dpatch by Koen Beek ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: don't show link to nvidia-settings if it is not installed @DPATCH@ Index: sysinfo-0.7/Sysinfo/gui.glade =================================================================== --- sysinfo-0.7.orig/Sysinfo/gui.glade 2008-12-29 18:26:47.000000000 +0000 +++ sysinfo-0.7/Sysinfo/gui.glade 2008-12-29 18:26:48.000000000 +0000 @@ -2753,7 +2753,24 @@ - + + + True + True + "nvidia-settings" is not installed - install it with a package manager + False + False + • + 2 + + + 1 + 2 + 4 + 5 + + + True Index: sysinfo-0.7/Sysinfo/Main.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/Main.cs 2008-12-29 18:26:47.000000000 +0000 +++ sysinfo-0.7/Sysinfo/Main.cs 2008-12-29 18:26:48.000000000 +0000 @@ -94,7 +94,8 @@ //nvidia [Widget] DrawingArea nvidia_top_drawingarea; [Widget] Image nvidia_image; - [Widget] Entry nvidia_model_entry, nvidia_ctype_entry, nvidia_version_entry, nvidia_videoram_entry, nvidia_gpu_entry; + [Widget] Button nvidia_button; + [Widget] Entry nvidia_model_entry, nvidia_ctype_entry, nvidia_settings_not_installed, nvidia_version_entry, nvidia_videoram_entry, nvidia_gpu_entry; //base directory - not needed now //String base_directory = System.AppDomain.CurrentDomain.BaseDirectory; @@ -888,6 +889,18 @@ nvidia_gpu_entry.Text = nvidia_info.nvidia_gpu; nvidia_version_entry.Text = nvidia_info.nvidia_version; + + if ( ! nvidia_info.nvidiaSettings ) { + nvidia_settings_not_installed.Text = "Please install nvidia-settings for more information"; + nvidia_settings_not_installed.Visible = true; + nvidia_button.Sensitive = false; + nvidia_button.Visible = false; + } else { + nvidia_settings_not_installed.Text = ""; + nvidia_settings_not_installed.Visible = false; + nvidia_button.Sensitive = true; + nvidia_button.Visible = true; + } nvidiaA = false; } Index: sysinfo-0.7/Sysinfo/NvidiaInfo.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/NvidiaInfo.cs 2008-12-29 18:26:26.000000000 +0000 +++ sysinfo-0.7/Sysinfo/NvidiaInfo.cs 2008-12-29 18:27:23.000000000 +0000 @@ -10,6 +10,7 @@ public class NvidiaInfo { public Boolean nvidiaB = false; + public Boolean nvidiaSettings = false; public String nvidia_model = "unknown"; public String nvidia_ctype = "unknown"; @@ -26,6 +27,13 @@ if ( Directory.Exists("/proc/driver/nvidia/") ) nvidiaB = true; } + + //check nvidia-settings is installed + public void NvidiaSettingsInstalled() { + + if ( System.IO.File.Exists("/usr/bin/nvidia-settings") ) + nvidiaSettings = true; + } //read some basic info public void MainInfo(){ @@ -93,6 +101,9 @@ String temp; try { + NvidiaSettingsInstalled(); + + if (nvidiaSettings) { //run command and read output: nvidia-settings --query //video ram @@ -145,6 +156,8 @@ nvidia_gpu = temp.Remove(temp.LastIndexOf(","), 5) + " MHz"; proc3.Close(); + + } // end of nvidiaSettings test } catch (System.ComponentModel.Win32Exception ex) { Console.WriteLine( ex ); } catch (ArgumentOutOfRangeException ex) { Console.WriteLine( ex ); } debian/patches/01-fix_concatenation.patch0000644000000000000000000000105611775541340015560 0ustar Index: sysinfo-0.7/Sysinfo/SystemInfo.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/SystemInfo.cs 2008-12-29 16:42:36.000000000 +0000 +++ sysinfo-0.7/Sysinfo/SystemInfo.cs 2008-12-29 16:42:57.000000000 +0000 @@ -291,7 +291,7 @@ proc2.WaitForExit(); system_gcc = system_gcc + " (" + proc2.StandardOutput.ReadToEnd(); - system_gcc = system_gcc.Remove(system_gcc.Length - 1, 1) + + ")"; + system_gcc = system_gcc.Remove(system_gcc.Length - 1, 1) + ")"; proc2.Close(); } debian/patches/08-correct_url.diff0000644000000000000000000000366711775541340014242 0ustar Index: sysinfo-0.7/Sysinfo/gui.glade =================================================================== --- sysinfo-0.7.orig/Sysinfo/gui.glade 2008-12-29 18:26:48.000000000 +0000 +++ sysinfo-0.7/Sysinfo/gui.glade 2008-12-29 18:28:48.000000000 +0000 @@ -3683,8 +3683,8 @@ 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. False - http://sysinfo.r8.org - sysinfo.r8.org + http://sourceforge.net/projects/gsysinfo + sourceforge.net/projects/gsysinfo Nil Gradisnik <ghaefb@gmail.com> @@ -3698,7 +3698,7 @@ Eva Gostencnik <neivla@gmail.com> Tango icons <http://tango-project.org> -Fedora logo <htp://fedora.redhat.com> +Fedora logo <http://fedora.redhat.com> Ubuntu logo <http://www.ubuntu.com> (Ubuntu is a trademark of Canonical Limited) translator-credits Index: sysinfo-0.7/Sysinfo/SaveToFile.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/SaveToFile.cs 2008-12-29 18:26:47.000000000 +0000 +++ sysinfo-0.7/Sysinfo/SaveToFile.cs 2008-12-29 18:28:48.000000000 +0000 @@ -39,7 +39,7 @@ using (TextWriter textwrite = File.CreateText(filename)) { textwrite.WriteLine("System information report, generated by Sysinfo: " + DateTime.Now); - textwrite.WriteLine("http://sysinfo.r8.org\n"); + textwrite.WriteLine("http://sourceforge.net/projects/gsysinfo\n"); //system textwrite.WriteLine("SYSTEM INFORMATION"); debian/patches/15-fix-the-wrong-path-of-gnome-version.patch0000644000000000000000000000406111775541340020711 0ustar ## Description: Fix the wrong path of gnome-version.xml ## Origin/Author: Shih-Yuan Lee (FourDollars) ## Bug: https://bugs.launchpad.net/ubuntu/+source/sysinfo/+bug/896512 Index: sysinfo-0.7/Sysinfo/SystemInfo.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/SystemInfo.cs 2012-06-28 16:13:09.035959836 +0800 +++ sysinfo-0.7/Sysinfo/SystemInfo.cs 2012-06-28 16:13:34.484086031 +0800 @@ -162,7 +162,7 @@ Boolean gnomeB = false; //Fedora,RedHat,Debian,Ubuntu,... - String gnome_about = "/usr/share/gnome-about/gnome-version.xml"; + String gnome_about = "/usr/share/gnome/gnome-version.xml"; //SuSE if (File.Exists("/opt/gnome/share/gnome-about/gnome-version.xml")) gnome_about = "/opt/gnome/share/gnome-about/gnome-version.xml"; @@ -178,21 +178,21 @@ //get version from xml if ( temp.EndsWith("platform>")) { - temp = temp.Remove(0, 12); + temp = temp.Remove(0, 11); temp = temp.Remove(temp.IndexOf(""), 11); system_gnomev = temp; } if ( temp.EndsWith("minor>")) { - temp = temp.Remove(0, 9); + temp = temp.Remove(0, 8); temp = temp.Remove(temp.IndexOf(""), 8); system_gnomev = system_gnomev + "." + temp; } if ( temp.EndsWith("micro>")) { - temp = temp.Remove(0, 9); + temp = temp.Remove(0, 8); temp = temp.Remove(temp.IndexOf(""), 8); system_gnomev = system_gnomev + "." + temp; } @@ -200,7 +200,7 @@ //get distributor if ( temp.EndsWith("distributor>")) { - temp = temp.Remove(0, 15); + temp = temp.Remove(0, 14); temp = temp.Remove(temp.IndexOf(""), 14); system_gnomeo = temp; } @@ -208,7 +208,7 @@ //get build date if ( temp.EndsWith("date>")) { - temp = temp.Remove(0, 8); + temp = temp.Remove(0, 7); temp = temp.Remove(temp.IndexOf(""), 7); system_gnomeo = system_gnomeo + " " + temp; debian/patches/10-better_xorg_parsing.diff0000644000000000000000000000317611775541340015752 0ustar Decription: Make Xorg.0.log parsing a bit more robust & work with current xorgs Author: Iain Lane Origin: vendor Bug-Upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=3025564&group_id=139177&atid=746610 Index: sysinfo/Sysinfo/SystemInfo.cs =================================================================== --- sysinfo.orig/Sysinfo/SystemInfo.cs 2012-01-11 02:13:26.202725832 +0800 +++ sysinfo/Sysinfo/SystemInfo.cs 2012-01-11 02:13:26.226059257 +0800 @@ -336,6 +336,7 @@ String temp; Boolean xorgB = false; + int index; try { @@ -345,17 +346,40 @@ while ( xorgB == false ) { temp = textread.ReadLine(); + + // EOF + if (temp == null) { + + break; + } + + // Blank line + if (temp.Trim().Length == 0) { + + continue; + } //version - if ( temp.StartsWith("X Window System Version")) { - - system_xorg = temp.Remove(0, 24); + index = temp.IndexOf("X Window System Version"); + + if (index >= 0 && system_xorg == "unknown") { + + system_xorg = temp.Substring(index + 24); + } + + index = temp.IndexOf("X.Org X Server"); + + if (index >= 0 && system_xorg == "unknown") { + + system_xorg = temp.Substring(index + 15); } //build date - if ( temp.StartsWith("Build Date")) { - - system_xorg = system_xorg + " (" + temp.Remove(0, 12) + ")"; + index = temp.IndexOf("Build Date"); + + if (index >= 0) { + + system_xorg = system_xorg + " (" + temp.Substring(index + 12) + ")"; xorgB = true; } debian/patches/13-fix-reordered-cpuinfo.patch0000644000000000000000000000142411775541340016267 0ustar From: Chow Loong Jin 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")) { debian/patches/04-fix_usb_pci_limit.patch0000644000000000000000000001206211775541340015557 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## 02_fix_usb_pci_limit.dpatch by Koen Beek ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Remove the limit of the number of the usb and pci controllers that can be shown by sysinfo @DPATCH@ Index: sysinfo-0.7/Sysinfo/HardwareInfo.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/HardwareInfo.cs 2008-12-29 16:49:35.000000000 +0000 +++ sysinfo-0.7/Sysinfo/HardwareInfo.cs 2008-12-29 16:49:38.000000000 +0000 @@ -4,14 +4,15 @@ using System; using System.IO; using System.Diagnostics; +using System.Collections; namespace Sysinfo { public class HardwareInfo { public String [] host_bridge = {null, null}; - public String [] pci_bridge = {null, null, null, null, null}; - public String [] usb_controller = {null, null, null, null, null}; + public ArrayList pci_bridge = new ArrayList(); + public ArrayList usb_controller = new ArrayList(); public String [] isa_bridge = {null, null}; public String [] ide_interface = {null, null}; @@ -85,16 +86,16 @@ } //pci bridge - if ( temp.Remove(0, temp.IndexOf(" ") + 1).StartsWith("PCI bridge") ) { + if (temp.Remove(0, temp.IndexOf(" ") + 1).StartsWith("PCI bridge")) { - pci_bridge [pci_bridgeI] = temp.Remove(0, temp.IndexOf(" ") + 13); + pci_bridge.Add(temp.Remove(0, temp.IndexOf(" ") + 13)); pci_bridgeI++; } //usb controller - if ( temp.Remove(0, temp.IndexOf(" ") + 1).StartsWith("USB Controller") ) { + if (temp.Remove(0, temp.IndexOf(" ") + 1).StartsWith("USB Controller")) { - usb_controller [usb_controllerI] = temp.Remove(0, temp.IndexOf(" ") + 17); + usb_controller.Add(temp.Remove(0, temp.IndexOf(" ") + 17)); usb_controllerI++; } Index: sysinfo-0.7/Sysinfo/Main.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/Main.cs 2008-12-29 16:49:36.000000000 +0000 +++ sysinfo-0.7/Sysinfo/Main.cs 2008-12-29 16:49:38.000000000 +0000 @@ -1,4 +1,3 @@ -// project created on 10/18/2005 at 2:06 PM - continued 01/27/2006 // // Main.cs: Main source file of Sysinfo. // @@ -766,25 +765,21 @@ motherboard_treestore.AppendValues (motherboard_iter, "Subsystem: " + hardware_info.host_bridge[1]); } //pci brige info - populate treestore - if ( hardware_info.pci_bridge[0] != null ) { + if ( hardware_info.pci_bridge.Count > 0 ) { motherboard_iter = motherboard_treestore.AppendValues ("PCI bridge(s)"); - for ( int i = 0; i < 5; i++) { - - if ( hardware_info.pci_bridge[i] != null ) - motherboard_treestore.AppendValues (motherboard_iter, hardware_info.pci_bridge[i]); + foreach (object pci_brdg in hardware_info.pci_bridge) { + motherboard_treestore.AppendValues (motherboard_iter, pci_brdg); } } //usb controller info - populate treestore - if ( hardware_info.usb_controller[0] != null ) { + if ( hardware_info.usb_controller.Count > 0 ) { motherboard_iter = motherboard_treestore.AppendValues ("USB controller(s)"); - for ( int i = 0; i < 5; i++) { - - if ( hardware_info.usb_controller[i] != null ) - motherboard_treestore.AppendValues (motherboard_iter, hardware_info.usb_controller[i]); + foreach(object usb_ctrlr in hardware_info.usb_controller) { + motherboard_treestore.AppendValues (motherboard_iter, usb_ctrlr); } } //isa brige info - populate treestore Index: sysinfo-0.7/Sysinfo/SaveToFile.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/SaveToFile.cs 2008-12-29 16:49:36.000000000 +0000 +++ sysinfo-0.7/Sysinfo/SaveToFile.cs 2008-12-29 16:49:38.000000000 +0000 @@ -138,20 +138,17 @@ if ( hardware_info.host_bridge[1] != null ) textwrite.WriteLine("\t\tSubsystem: " + hardware_info.host_bridge[1]); } - if ( hardware_info.pci_bridge[0] != null ) { + if ( hardware_info.pci_bridge.Count > 0 ) { textwrite.WriteLine("\tPCI bridge(s)"); - for ( int i = 0; i < 5; i++) { - if ( hardware_info.pci_bridge[i] != null ) - textwrite.WriteLine("\t\t" + hardware_info.pci_bridge[i]); + foreach (object pci_brdg in hardware_info.pci_bridge) { + textwrite.WriteLine("\t\t" + pci_brdg); } } - if ( hardware_info.usb_controller[0] != null ) { - + if ( hardware_info.usb_controller.Count > 0 ) { textwrite.WriteLine("\tUSB controller(s)"); - for ( int i = 0; i < 5; i++) { - if ( hardware_info.usb_controller[i] != null ) - textwrite.WriteLine("\t\t" + hardware_info.usb_controller[i]); + foreach (object usb_ctrlr in hardware_info.usb_controller) { + textwrite.WriteLine("\t\t" + usb_ctrlr); } } if ( hardware_info.isa_bridge[0] != null ) { debian/patches/09-ubuntu_lsb_release.diff0000644000000000000000000000237411775541340015574 0ustar Index: sysinfo-0.7/Sysinfo/SystemInfo.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/SystemInfo.cs 2008-12-29 18:26:47.000000000 +0000 +++ sysinfo-0.7/Sysinfo/SystemInfo.cs 2008-12-29 18:29:58.000000000 +0000 @@ -30,6 +30,8 @@ //read release info public void Release() { + + String temp; try { @@ -125,6 +127,31 @@ } } + if (File.Exists("/etc/lsb-release")) { + using (TextReader textread = File.OpenText("/etc/lsb-release")) { + + while ( (temp = textread.ReadLine()) != null ) { + + // get distro + if ( temp.StartsWith("DISTRIB_ID=") ) { + distro = temp.Substring(11); + } + + // get release + if ( temp.StartsWith("DISTRIB_RELEASE=") ) { + system_release = temp.Substring(16); + } + + // get codename + if ( temp.StartsWith("DISTRIB_CODENAME=") ) { + system_release = String.Concat(system_release, " (", temp.Substring(17), ")"); + } + + } + system_release = String.Concat(distro, " ", system_release); + } + } + } catch (FileNotFoundException ex) { Console.WriteLine( ex ); } } debian/patches/12-fix-nre-no-bogomips.patch0000644000000000000000000000117111775541340015664 0ustar From: Douglas Mencken Reviewed-By: Chow Loong Jin Description: Fix NRE when /proc/cpuinfo has no bogomips Bugs-Debian: http://bugs.debian.org/654210 Index: sysinfo/Sysinfo/CpuInfo.cs =================================================================== --- sysinfo.orig/Sysinfo/CpuInfo.cs 2012-01-11 01:43:58.652934535 +0800 +++ sysinfo/Sysinfo/CpuInfo.cs 2012-01-11 02:01:40.029866402 +0800 @@ -94,6 +94,9 @@ while ( dynamicB ) { temp = textread.ReadLine(); + + if (temp == null) + break; //frequency if ( temp.StartsWith("cpu MHz")) debian/patches/14-fix-pkglibdir-error.patch0000644000000000000000000000221211775541340015746 0ustar From: Chow Loong Jin Description: Fix automake error when using pkglibdir with SCRIPTS and DATA Index: sysinfo/Makefile.am =================================================================== --- sysinfo.orig/Makefile.am 2012-01-19 03:44:53.146955388 +0800 +++ sysinfo/Makefile.am 2012-01-19 03:45:05.593645959 +0800 @@ -11,7 +11,8 @@ sysinfodesktop_DATA = \ sysinfo.desktop -pkglib_DATA = $(DLL_REFERENCES) +moduledir = $(pkglibdir) +module_DATA = $(DLL_REFERENCES) DLL_REFERENCES = EXTRA_DIST = \ $(DLL_REFERENCES)\ Index: sysinfo/Makefile.include =================================================================== --- sysinfo.orig/Makefile.include 2012-01-19 03:44:53.176955443 +0800 +++ sysinfo/Makefile.include 2012-01-19 03:45:45.253727392 +0800 @@ -18,7 +18,8 @@ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(DLL_REFERENCES) DISTCLEANFILES = $(GENERATED_FILES) $(build_datafiles) $(pc_files) -pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles) +moduledir = $(pkglibdir) +module_SCRIPTS = $(ASSEMBLY) $(build_datafiles) bin_SCRIPTS = $(ASSEMBLY_WRAPPER) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(pc_files) debian/patches/03-fix_Process_ambiguity.patch0000644000000000000000000000067111775541340016427 0ustar --- sysinfo-0.7.orig/Sysinfo/Main.cs +++ sysinfo-0.7/Sysinfo/Main.cs @@ -1062,7 +1062,7 @@ //launch nvidia-settings button public void on_nvidia_button_clicked (object o, EventArgs e) { - Process proc1 = new Process(); + System.Diagnostics.Process proc1 = new System.Diagnostics.Process(); proc1.StartInfo.FileName = "nvidia-settings"; //proc1.StartInfo.Arguments = "&"; //proc1.StartInfo.UseShellExecute = false; debian/patches/05-fix_about_close_button.patch0000644000000000000000000000363011775541340016631 0ustar #! /bin/sh /usr/share/dpatch/dpatch-run ## 03_fix_about_close_button.dpatch by Koen Beek ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: close button of about dialog box did not work @DPATCH@ Index: sysinfo-0.7/Sysinfo/Main.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/Main.cs 2008-12-29 16:49:38.000000000 +0000 +++ sysinfo-0.7/Sysinfo/Main.cs 2008-12-29 16:49:43.000000000 +0000 @@ -1130,6 +1130,10 @@ aboutdialog1.Show(); } + + public void on_aboutdialog1_response (object o, ResponseArgs r) { + aboutdialog1.Hide(); + } //menu - preferences dialog public void on_preferences1_activate (object o, EventArgs e) { Index: sysinfo-0.7/Sysinfo/gui.glade =================================================================== --- sysinfo-0.7.orig/Sysinfo/gui.glade 2008-12-29 16:49:35.000000000 +0000 +++ sysinfo-0.7/Sysinfo/gui.glade 2008-12-29 16:49:43.000000000 +0000 @@ -3684,6 +3684,19 @@ Fedora logo <htp://fedora.redhat.com> Ubuntu logo <http://www.ubuntu.com> (Ubuntu is a trademark of Canonical Limited) translator-credits + + + + + + + + False + GTK_PACK_END + + + + debian/patches/07-nvidia_crash.diff0000644000000000000000000000304211775541340014333 0ustar Index: sysinfo-0.7/Sysinfo/NvidiaInfo.cs =================================================================== --- sysinfo-0.7.orig/Sysinfo/NvidiaInfo.cs 2008-12-29 18:27:23.000000000 +0000 +++ sysinfo-0.7/Sysinfo/NvidiaInfo.cs 2008-12-29 18:28:00.000000000 +0000 @@ -118,8 +118,11 @@ temp = proc1.StandardOutput.ReadLine(); temp = proc1.StandardOutput.ReadLine(); - temp = temp.Remove(0, temp.LastIndexOf(":") + 2); - nvidia_videoram = ( Double.Parse(temp) / 1024 ).ToString() + " MB"; + + if (temp != null) { + temp = temp.Remove(0, temp.LastIndexOf(":") + 2); + nvidia_videoram = ( Double.Parse(temp) / 1024 ).ToString() + " MB"; + } proc1.Close(); @@ -135,8 +138,10 @@ temp = proc2.StandardOutput.ReadLine(); temp = proc2.StandardOutput.ReadLine(); - temp = temp.Remove(0, temp.LastIndexOf(":") + 2); - nvidia_busrate = temp.Remove(temp.LastIndexOf("."), 1) + "x"; + if (temp != null) { + temp = temp.Remove(0, temp.LastIndexOf(":") + 2); + nvidia_busrate = temp.Remove(temp.LastIndexOf("."), 1) + "x"; + } proc2.Close(); @@ -151,9 +156,11 @@ temp = proc3.StandardOutput.ReadLine(); temp = proc3.StandardOutput.ReadLine(); - - temp = temp.Remove(0, temp.LastIndexOf(":") + 2); - nvidia_gpu = temp.Remove(temp.LastIndexOf(","), 5) + " MHz"; + + if (temp != null) { + temp = temp.Remove(0, temp.LastIndexOf(":") + 2); + nvidia_gpu = temp.Remove(temp.LastIndexOf(","), 5) + " MHz"; + } proc3.Close(); debian/patches/02-fix_sysinfo.desktop.patch0000644000000000000000000000102211775541340016067 0ustar Index: sysinfo-0.7/sysinfo.desktop =================================================================== --- sysinfo-0.7.orig/sysinfo.desktop 2008-12-29 16:42:36.000000000 +0000 +++ sysinfo-0.7/sysinfo.desktop 2008-12-29 16:43:01.000000000 +0000 @@ -1,10 +1,8 @@ [Desktop Entry] -Encoding=UTF-8 Name=Sysinfo Comment=Display detailed computer/system information Exec=sysinfo -Icon=computer.png +Icon=computer Terminal=false -MultipleArgs=false Type=Application -Categories=Application;System; +Categories=GNOME;Utility;System; debian/patches/series0000644000000000000000000000067611775541340012052 0ustar 00-fix_build_system.patch 01-fix_concatenation.patch 02-fix_sysinfo.desktop.patch 03-fix_Process_ambiguity.patch 04-fix_usb_pci_limit.patch 05-fix_about_close_button.patch 06-check_nvidia_settings.patch 07-nvidia_crash.diff 08-correct_url.diff 09-ubuntu_lsb_release.diff 10-better_xorg_parsing.diff 11-typo.diff 12-fix-nre-no-bogomips.patch 13-fix-reordered-cpuinfo.patch 14-fix-pkglibdir-error.patch 15-fix-the-wrong-path-of-gnome-version.patch debian/patches/00-fix_build_system.patch0000644000000000000000000000267611775541340015446 0ustar Index: sysinfo-0.7/Sysinfo/Makefile.am =================================================================== --- sysinfo-0.7.orig/Sysinfo/Makefile.am 2008-12-29 16:42:36.000000000 +0000 +++ sysinfo-0.7/Sysinfo/Makefile.am 2008-12-29 16:42:51.000000000 +0000 @@ -2,7 +2,7 @@ # Warning: This is an automatically generated file, do not edit! if ENABLE_DEBUG -ASSEMBLY_COMPILER_COMMAND = mcs +ASSEMBLY_COMPILER_COMMAND = mono-csc ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG ASSEMBLY = ../bin/Debug/Sysinfo.exe COMPILE_TARGET = exe @@ -12,7 +12,7 @@ BUILD_DIR = ../bin/Debug endif if ENABLE_RELEASE -ASSEMBLY_COMPILER_COMMAND = mcs +ASSEMBLY_COMPILER_COMMAND = mono-csc ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 ASSEMBLY = ../bin/Release/Sysinfo.exe COMPILE_TARGET = exe @@ -22,6 +22,7 @@ BUILD_DIR = ../bin/Release endif +MONO_CAIRO_LIBS = -r:Mono.Cairo.dll all: $(ASSEMBLY) Index: sysinfo-0.7/configure.ac =================================================================== --- sysinfo-0.7.orig/configure.ac 2008-12-29 16:42:36.000000000 +0000 +++ sysinfo-0.7/configure.ac 2008-12-29 16:42:51.000000000 +0000 @@ -12,9 +12,9 @@ AC_PROG_INSTALL -AC_PATH_PROG(MCS, mcs, no) +AC_PATH_PROG(MCS, mono-csc, no) if test "x$MCS" = "xno"; then - AC_MSG_ERROR([mcs Not found]) + AC_MSG_ERROR([csc Not found]) fi @@ -66,4 +66,4 @@ ]) -AC_OUTPUT \ No newline at end of file +AC_OUTPUT