[Pkg-cli-apps-commits] r4365 - in /packages/sysinfo/trunk/debian: ./ patches/
laney-guest at users.alioth.debian.org
laney-guest at users.alioth.debian.org
Mon Dec 29 21:11:58 UTC 2008
Author: laney-guest
Date: Mon Dec 29 21:11:57 2008
New Revision: 4365
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4365
Log:
* 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
Added:
packages/sysinfo/trunk/debian/patches/04-fix_usb_pci_limit.patch
packages/sysinfo/trunk/debian/patches/05-fix_about_close_button.patch
packages/sysinfo/trunk/debian/patches/06-check_nvidia_settings.patch
packages/sysinfo/trunk/debian/patches/07-nvidia_crash.diff
packages/sysinfo/trunk/debian/patches/08-correct_url.diff
packages/sysinfo/trunk/debian/patches/09-ubuntu_lsb_release.diff
packages/sysinfo/trunk/debian/patches/series-ubuntu
Modified:
packages/sysinfo/trunk/debian/changelog
packages/sysinfo/trunk/debian/menu
packages/sysinfo/trunk/debian/patches/00-fix_build_system.patch
packages/sysinfo/trunk/debian/patches/01-fix_concatenation.patch
packages/sysinfo/trunk/debian/patches/02-fix_sysinfo.desktop.patch
packages/sysinfo/trunk/debian/patches/series
packages/sysinfo/trunk/debian/rules
Modified: packages/sysinfo/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/changelog?rev=4365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/changelog (original)
+++ packages/sysinfo/trunk/debian/changelog Mon Dec 29 21:11:57 2008
@@ -1,3 +1,25 @@
+sysinfo (0.7-2) UNRELEASED; urgency=low
+
+ * 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
+
+ -- Iain Lane <laney at ubuntu.com> Mon, 29 Dec 2008 18:31:04 +0000
+
sysinfo (0.7-1) experimental; urgency=low
[ David Paleino ]
Modified: packages/sysinfo/trunk/debian/menu
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/menu?rev=4365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/menu (original)
+++ packages/sysinfo/trunk/debian/menu Mon Dec 29 21:11:57 2008
@@ -1,4 +1,4 @@
?package(sysinfo):needs="X11" \
- section="Applications/System" \
+ section="Applications/System/Monitoring" \
title="sysinfo" \
command="/usr/bin/sysinfo"
Modified: packages/sysinfo/trunk/debian/patches/00-fix_build_system.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/00-fix_build_system.patch?rev=4365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/patches/00-fix_build_system.patch (original)
+++ packages/sysinfo/trunk/debian/patches/00-fix_build_system.patch Mon Dec 29 21:11:57 2008
@@ -1,5 +1,7 @@
---- sysinfo-0.7.orig/Sysinfo/Makefile.am
-+++ sysinfo-0.7/Sysinfo/Makefile.am
+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!
@@ -26,8 +28,10 @@
all: $(ASSEMBLY)
---- sysinfo-0.7.orig/configure.ac
-+++ sysinfo-0.7/configure.ac
+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
Modified: packages/sysinfo/trunk/debian/patches/01-fix_concatenation.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/01-fix_concatenation.patch?rev=4365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/patches/01-fix_concatenation.patch (original)
+++ packages/sysinfo/trunk/debian/patches/01-fix_concatenation.patch Mon Dec 29 21:11:57 2008
@@ -1,5 +1,7 @@
---- sysinfo-0.7.orig/Sysinfo/SystemInfo.cs
-+++ sysinfo-0.7/Sysinfo/SystemInfo.cs
+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();
Modified: packages/sysinfo/trunk/debian/patches/02-fix_sysinfo.desktop.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/02-fix_sysinfo.desktop.patch?rev=4365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/patches/02-fix_sysinfo.desktop.patch (original)
+++ packages/sysinfo/trunk/debian/patches/02-fix_sysinfo.desktop.patch Mon Dec 29 21:11:57 2008
@@ -1,13 +1,17 @@
---- sysinfo-0.7.orig/sysinfo.desktop
-+++ sysinfo-0.7/sysinfo.desktop
+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.png
++Icon=computer
Terminal=false
-MultipleArgs=false
Type=Application
- Categories=Application;System;
+-Categories=Application;System;
++Categories=GNOME;Utility;System;
Added: packages/sysinfo/trunk/debian/patches/04-fix_usb_pci_limit.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/04-fix_usb_pci_limit.patch?rev=4365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/patches/04-fix_usb_pci_limit.patch (added)
+++ packages/sysinfo/trunk/debian/patches/04-fix_usb_pci_limit.patch Mon Dec 29 21:11:57 2008
@@ -1,0 +1,122 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_usb_pci_limit.dpatch by Koen Beek <koen.beek at gmail.com>
+##
+## 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
+
+ at 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 ) {
Added: packages/sysinfo/trunk/debian/patches/05-fix_about_close_button.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/05-fix_about_close_button.patch?rev=4365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/patches/05-fix_about_close_button.patch (added)
+++ packages/sysinfo/trunk/debian/patches/05-fix_about_close_button.patch Mon Dec 29 21:11:57 2008
@@ -1,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_about_close_button.dpatch by Koen Beek <koen.beek at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: close button of about dialog box did not work
+
+ at 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)</property>
+ <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
++ <signal name="response" handler="on_aboutdialog1_response"/>
++ <child internal-child="vbox">
++ <widget class="GtkVBox" id="dialog-vbox1">
++ <child internal-child="action_area">
++ <widget class="GtkHButtonBox" id="dialog-action_area1">
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="pack_type">GTK_PACK_END</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
+ </widget>
+
+ <widget class="GtkDialog" id="preferences_dialog">
Added: packages/sysinfo/trunk/debian/patches/06-check_nvidia_settings.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/06-check_nvidia_settings.patch?rev=4365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/patches/06-check_nvidia_settings.patch (added)
+++ packages/sysinfo/trunk/debian/patches/06-check_nvidia_settings.patch Mon Dec 29 21:11:57 2008
@@ -1,0 +1,116 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_check_nvidia_settings.dpatch by Koen Beek <koen.beek at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: don't show link to nvidia-settings if it is not installed
+
+ at 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 @@
+ <property name="y_options"></property>
+ </packing>
+ </child>
+-
++ <child>
++ <widget class="GtkEntry" id="nvidia_settings_not_installed">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="tooltip" translatable="yes">"nvidia-settings" is not installed - install it with a package manager</property>
++ <property name="editable">False</property>
++ <property name="has_frame">False</property>
++ <property name="invisible_char">•</property>
++ <property name="width_chars">2</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">4</property>
++ <property name="bottom_attach">5</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
+ <child>
+ <widget class="GtkEntry" id="nvidia_ctype_entry">
+ <property name="visible">True</property>
+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 ); }
Added: packages/sysinfo/trunk/debian/patches/07-nvidia_crash.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/07-nvidia_crash.diff?rev=4365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/patches/07-nvidia_crash.diff (added)
+++ packages/sysinfo/trunk/debian/patches/07-nvidia_crash.diff Mon Dec 29 21:11:57 2008
@@ -1,0 +1,46 @@
+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();
+
Added: packages/sysinfo/trunk/debian/patches/08-correct_url.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/08-correct_url.diff?rev=4365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/patches/08-correct_url.diff (added)
+++ packages/sysinfo/trunk/debian/patches/08-correct_url.diff Mon Dec 29 21:11:57 2008
@@ -1,0 +1,37 @@
+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.</property>
+ <property name="wrap_license">False</property>
+- <property name="website">http://sysinfo.r8.org</property>
+- <property name="website_label" translatable="yes">sysinfo.r8.org</property>
++ <property name="website">http://sourceforge.net/projects/gsysinfo</property>
++ <property name="website_label" translatable="yes">sourceforge.net/projects/gsysinfo</property>
+ <property name="authors">
+ Nil Gradisnik <ghaefb at gmail.com>
+
+@@ -3698,7 +3698,7 @@
+ Eva Gostencnik <neivla at 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)</property>
+ <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
+ <signal name="response" handler="on_aboutdialog1_response"/>
+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");
Added: packages/sysinfo/trunk/debian/patches/09-ubuntu_lsb_release.diff
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/09-ubuntu_lsb_release.diff?rev=4365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/patches/09-ubuntu_lsb_release.diff (added)
+++ packages/sysinfo/trunk/debian/patches/09-ubuntu_lsb_release.diff Mon Dec 29 21:11:57 2008
@@ -1,0 +1,45 @@
+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 ); }
+ }
+
Modified: packages/sysinfo/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/series?rev=4365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/patches/series (original)
+++ packages/sysinfo/trunk/debian/patches/series Mon Dec 29 21:11:57 2008
@@ -2,3 +2,8 @@
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
Added: packages/sysinfo/trunk/debian/patches/series-ubuntu
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/patches/series-ubuntu?rev=4365&op=file
==============================================================================
--- packages/sysinfo/trunk/debian/patches/series-ubuntu (added)
+++ packages/sysinfo/trunk/debian/patches/series-ubuntu Mon Dec 29 21:11:57 2008
@@ -1,0 +1,10 @@
+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
Modified: packages/sysinfo/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/sysinfo/trunk/debian/rules?rev=4365&op=diff
==============================================================================
--- packages/sysinfo/trunk/debian/rules (original)
+++ packages/sysinfo/trunk/debian/rules Mon Dec 29 21:11:57 2008
@@ -10,6 +10,12 @@
CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
include /usr/share/quilt/quilt.make
+
+DISTRO = "$(shell lsb_release -si)"
+
+ifeq ($(DISTRO),"Ubuntu")
+export QUILT_SERIES=$(QUILT_PATCH_DIR)/series-ubuntu
+endif
configure: config-stamp
config-stamp: $(QUILT_STAMPFN)
More information about the Pkg-cli-apps-commits
mailing list