Package: sysprof
Version: 1.0.9-1
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch
*** /tmp/tmpkOv06Q
In Ubuntu, we've applied the attached patch to achieve the following:
* Better help in case the sysprof-module is not loaded/available
(LP: #30160)
Add debian/patches/better_help_for_missing_module.dpatch
We thought you might be interested in doing the same.
diff -u sysprof-1.0.9/debian/patches/00list sysprof-1.0.9/debian/patches/00list
--- sysprof-1.0.9/debian/patches/00list
+++ sysprof-1.0.9/debian/patches/00list
@@ -2,0 +3,2 @@
+better_help_for_missing_module
only in patch2:
unchanged:
--- sysprof-1.0.9.orig/debian/patches/better_help_for_missing_module.dpatch
+++ sysprof-1.0.9/debian/patches/better_help_for_missing_module.dpatch
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## better_help_for_missing_module.dpatch by Daniel Hahler <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Better help in case the sysprof-module is not loaded. (LP: #30160)
+
[EMAIL PROTECTED]@
+diff -urNad sysprof-1.0.9~/debian/patched/foreign_kernel.dpatch
sysprof-1.0.9/debian/patched/foreign_kernel.dpatch
+--- sysprof-1.0.9~/debian/patched/foreign_kernel.dpatch 2008-01-23
23:18:49.003185395 +0100
++++ sysprof-1.0.9/debian/patched/foreign_kernel.dpatch 1970-01-01
01:00:00.000000000 +0100
+@@ -1,3 +0,0 @@
+-patching file module/Makefile
+-Hunk #1 succeeded at 9 (offset -1 lines).
+-Hunk #2 succeeded at 22 (offset -1 lines).
+diff -urNad sysprof-1.0.9~/debian/patched/package_version.dpatch
sysprof-1.0.9/debian/patched/package_version.dpatch
+--- sysprof-1.0.9~/debian/patched/package_version.dpatch 2008-01-23
23:18:49.027185544 +0100
++++ sysprof-1.0.9/debian/patched/package_version.dpatch 1970-01-01
01:00:00.000000000 +0100
+@@ -1 +0,0 @@
+-patching file module/sysprof-module.c
+diff -urNad sysprof-1.0.9~/module/Makefile sysprof-1.0.9/module/Makefile
+--- sysprof-1.0.9~/module/Makefile 2008-01-23 23:18:48.995185346 +0100
++++ sysprof-1.0.9/module/Makefile 2008-01-23 23:21:13.619185510 +0100
+@@ -9,8 +9,7 @@
+ endif
+
+ MODULE := sysprof-module
+-KVERS := $(shell uname -r)
+-KDIR := /lib/modules/$(KVERS)/build
++KDIR := /lib/modules/$(shell uname -r)/build
+ INCLUDE := -isystem $(KDIR)/include
+ MODCFLAGS := -DMODULE -D__KERNEL__ -Wall ${INCLUDE}
+
+@@ -22,7 +21,7 @@
+ modprobe -r sysprof-module
+ modprobe sysprof-module
+
+-ifneq ($(shell ($(KVERS) | grep 2.6) > /dev/null ; echo -n $$?),0)
++ifneq ($(shell (uname -r | grep 2.6) > /dev/null ; echo -n $$?),0)
+ echo A 2.6 kernel is required; exit 1
+ endif
+
+diff -urNad sysprof-1.0.9~/module/sysprof-module.c
sysprof-1.0.9/module/sysprof-module.c
+--- sysprof-1.0.9~/module/sysprof-module.c 2008-01-23 23:18:49.011185165
+0100
++++ sysprof-1.0.9/module/sysprof-module.c 2008-01-23 23:21:13.611185181
+0100
+@@ -19,8 +19,6 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+-#define PACKAGE_VERSION "1.0.7-debian"
+-
+ #ifdef CONFIG_SMP
+ # define __SMP__
+ #endif
+@@ -38,6 +36,8 @@
+
+ #include "sysprof-module.h"
+
++#include "../config.h"
++
+ #include <linux/version.h>
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+diff -urNad sysprof-1.0.9~/sysprof.c sysprof-1.0.9/sysprof.c
+--- sysprof-1.0.9~/sysprof.c 2007-10-21 23:43:43.000000000 +0200
++++ sysprof-1.0.9/sysprof.c 2008-01-23 23:21:09.027183686 +0100
+@@ -560,7 +560,14 @@
+ "\n"
+ " modprobe sysprof-module\n"
+ "\n"
+- "as root.");
++ "as root.\n"
++ "\n"
++ "You may need to build and install this module first:\n"
++ " 1. Install the package sysprof-module-source\n"
++ " 2. Execute \"m-a a-i sysprof-module\"\n"
++ " 3. Load the module as described above\n"
++ " 4. Restart sysprof\n"
++ "See also
/usr/share/doc/sysprof-module-source/README.Debian" );
+
+ update_sensitivity (app);
+ return;
