Merge lp:~statik/ubuntu/lucid/oprofile/fix-jit-profiling into lp:ubuntu/lucid/oprofile

[Elliot Murphy]

[Elliot Murphy (statik)]

Now install opjitconv, so that profiling data gathered from JIT systems such as LLVM (used by python unladen swallow, haskell) becomes useful rather than all reported as anon samples.

[Elliot Murphy (statik)]

I've forwarded this patch to debian as well:

Package: oprofile
Version: 0.9.4+cvs20090629-2.1
Severity: important
Tags: patch
User: <email address hidden>
Usertags: origin-ubuntu lucid ubuntu-patch

In Ubuntu, we've applied the attached patch to achieve the following:

 * Need opjitconv to enable profiling of unladen swallow.

We thought you might be interested in doing the same.

-- System Information:
Debian Release: squeeze/sid
 APT prefers lucid-updates
 APT policy: (500, 'lucid-updates'), (500, 'lucid')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-14-generic-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

[James Westby (james-w)]

Uploaded, thanks.

James

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-18 14:40:37 +0000
+++ debian/changelog	2010-02-22 18:34:27 +0000
@@ -1,3 +1,10 @@
+oprofile (0.9.4+cvs20090629-2.1ubuntu4) lucid; urgency=low
+
+  * debian/rules (LP: #525932)
+    - Need opjitconv installed to enable JIT profiling of unladen swallow.
+
+ -- Elliot Murphy <[e-mail]>  Mon, 22 Feb 2010 12:36:20 -0500
+
 oprofile (0.9.4+cvs20090629-2.1ubuntu3) lucid; urgency=low
 
   * Remove debian/patches/unstatic_libbfd.patch.  It caused oprofile to
 
=== modified file 'debian/rules'
--- debian/rules	2009-09-15 21:35:47 +0000
+++ debian/rules	2010-02-22 18:34:27 +0000
@@ -57,9 +57,6 @@
 	cp debian/oprofile/usr/share/man/man1/oprofile.1 \
 	   debian/oprofile-gui/usr/share/man/man1/oprof_start.1
 
-	# Remove the java profile
-	rm debian/oprofile/usr/bin/opjitconv
-
 	#-- clean up some of the mess from
 	# an over-exuberant install command
 	#rm -f debian/oprofile/usr/share/mangled-name