r3119 - packages/trunk/boson/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-06-29 12:15:23 +0000 (Fri, 29 Jun 2007)
New Revision: 3119

Modified:
   packages/trunk/boson/debian/patches/fix_UTS_RELEASE_location.diff
Log:
ignore UTS_RELEASE if its value is not initialised


Modified: packages/trunk/boson/debian/patches/fix_UTS_RELEASE_location.diff
===================================================================
--- packages/trunk/boson/debian/patches/fix_UTS_RELEASE_location.diff	2007-06-29 12:07:12 UTC (rev 3118)
+++ packages/trunk/boson/debian/patches/fix_UTS_RELEASE_location.diff	2007-06-29 12:15:23 UTC (rev 3119)
@@ -1,14 +1,15 @@
 Index: boson-0.13/boson/info/boinfo_linux.cpp
 ===================================================================
---- boson-0.13.orig/boson/info/boinfo_linux.cpp	2007-06-29 09:14:53.000000000 +0000
-+++ boson-0.13/boson/info/boinfo_linux.cpp	2007-06-29 09:15:54.000000000 +0000
-@@ -28,6 +28,9 @@
- #include <qstringlist.h>
+--- boson-0.13.orig/boson/info/boinfo_linux.cpp	2005-07-26 21:53:07.000000000 +0000
++++ boson-0.13/boson/info/boinfo_linux.cpp	2007-06-29 12:19:41.000000000 +0000
+@@ -72,8 +72,10 @@
+ 	insert(OSVersionString, kernelVersion);
+  }
  
- #include <linux/version.h>
-+#ifndef UTS_RELEASE
-+#include <linux/utsrelease.h>
++#ifdef UTS_RELEASE
+  kernelVersion = UTS_RELEASE;
+  insert(BoInfo::OSVersionString + BoInfo::CompileOffset, kernelVersion);
 +#endif
  
- QString readFile(const char* fileName)
- {
+  QString kernelModules = readFile("/proc/modules");
+  if (!kernelModules.isEmpty()) {