[Pkg-cli-apps-commits] [SCM] sysinfo branch, master, updated. upstream/0.7-8-g7824aa4
Chow Loong Jin
hyperair at debian.org
Tue Jan 10 18:46:11 UTC 2012
The following commit has been merged in the master branch:
commit 35d446922d390c6e0255ead4ed5b1675ee2eb4f2
Author: Chow Loong Jin <hyperair at debian.org>
Date: Wed Jan 11 02:13:51 2012 +0800
Refresh 10-better_xorg_parsing.diff
dpkg-source pukes on it otherwise.
diff --git a/debian/patches/10-better_xorg_parsing.diff b/debian/patches/10-better_xorg_parsing.diff
index 8a2d42e..3cd02a6 100644
--- a/debian/patches/10-better_xorg_parsing.diff
+++ b/debian/patches/10-better_xorg_parsing.diff
@@ -3,10 +3,10 @@ Author: Iain Lane <laney at ubuntu.com>
Origin: vendor
Bug-Upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=3025564&group_id=139177&atid=746610
-Index: sysinfo-0.7/Sysinfo/SystemInfo.cs
+Index: sysinfo/Sysinfo/SystemInfo.cs
===================================================================
---- sysinfo-0.7.orig/Sysinfo/SystemInfo.cs 2011-01-05 22:34:54.044153395 +0000
-+++ sysinfo-0.7/Sysinfo/SystemInfo.cs 2011-01-05 22:34:46.323557614 +0000
+--- 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;
@@ -15,11 +15,9 @@ Index: sysinfo-0.7/Sysinfo/SystemInfo.cs
try {
-@@ -343,19 +344,42 @@
- using (TextReader textread = File.OpenText("/var/log/Xorg.0.log")) {
-
+@@ -345,17 +346,40 @@
while ( xorgB == false ) {
-
+
temp = textread.ReadLine();
+
+ // EOF
--
sysinfo
More information about the Pkg-cli-apps-commits
mailing list