[Pkg-cli-apps-commits] [SCM] sysinfo branch, master, updated. debian/0.7-8-1-g924c8ab

[Iain Lane]

The following commit has been merged in the master branch:
commit 924c8aba63c8e3dddbe596a7695a8b7fdc95abdb
Author: Iain Lane <laney at debian.org>
Date:   Fri Jul 6 11:48:40 2012 +0100

    Add new patch to look in the new path for GNOME version
    
    Thanks: Shih-Yuan Lee (FourDollars) <sylee at ubuntu.com>
    LP: #896512

diff --git a/debian/patches/15-fix-the-wrong-path-of-gnome-version.patch b/debian/patches/15-fix-the-wrong-path-of-gnome-version.patch
new file mode 100644
index 0000000..c1dc561
--- /dev/null
+++ b/debian/patches/15-fix-the-wrong-path-of-gnome-version.patch
@@ -0,0 +1,59 @@
+## Description: Fix the wrong path of gnome-version.xml
+## Origin/Author: Shih-Yuan Lee (FourDollars) <sylee at ubuntu.com>
+## 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("</platform>"), 11);
+ 							system_gnomev = temp;
+ 						}
+ 						
+ 						if ( temp.EndsWith("minor>")) {
+ 
+-							temp = temp.Remove(0, 9);
++							temp = temp.Remove(0, 8);
+ 							temp = temp.Remove(temp.IndexOf("</minor>"), 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("</micro>"), 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("</distributor>"), 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("</date>"), 7);
+ 							system_gnomeo = system_gnomeo + " " + temp;
+ 							
diff --git a/debian/patches/series b/debian/patches/series
index 7ff2a41..82bc46f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 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

-- 
sysinfo