Merge valgrind 0.6.1v0.6.1

28 files changed, 251 insertions, 20 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind-feature/ChangeLog
index b53efba19a..184ceaa3f2 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	Bug #323049
+	* feature.xml: Regenerate dependencies, bump version to 0.6.1. Ensure
+	org.mozilla.{rhino,javascript} are not listed.
+
 2010-05-18  Andrew Overholt  <overholt@redhat.com>
 
 	* feature.properties: Fix provider name.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
index 29b6d1eca2..3b46d8cb2f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.valgrind"
       label="%featureName"
-      version="0.4.0.qualifier"
+      version="0.6.1.qualifier"
       provider-name="%featureProvider"
       os="linux">
 
@@ -31,6 +31,7 @@
       <import plugin="org.eclipse.cdt.debug.core"/>
       <import plugin="org.eclipse.cdt.launch"/>
       <import plugin="org.eclipse.core.expressions"/>
+      <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.core.variables"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.linuxtools.profiling.launch"/>
@@ -47,12 +48,10 @@
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.linuxtools.profiling.ui"/>
-      <import plugin="org.mozilla.rhino"/>
-      <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.help"/>
-      <import feature="org.eclipse.linuxtools.profiling" version="0.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.linuxtools.profiling" version="0.6.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
index b061461b9d..e82fdf4c60 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2009-12-22  Roland Grunberg  <rgrunber@redhat.com>
 
 	* META-INF/MANIFEST.MF: Make necessary changes for switch from JUnit 3 to JUnit 4.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
index 15f3fd1f28..1971341101 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.cachegrind.tests
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.cachegrind.tests.CachegrindTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/ChangeLog
new file mode 100644
index 0000000000..5b34e48471
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/ChangeLog
@@ -0,0 +1,119 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
+2009-08-11  Elliott Baron  <ebaron@redhat.com>
+
+	* src/org/eclipse/linuxtools/valgrind/cachegrind: Removed.
+	* META-INF/MANIFEST.MF: Bump version to 0.3.0.	
+
+2009-08-07  Andrew Overholt  <overholt@redhat.com>
+
+	Bug #285861
+
+	* plugin.properties: Change Provider to Eclipse.
+
+2009-07-30  Elliott Baron  <ebaron@redhat.com>
+
+	* src/org/eclipse/linuxtools/valgrind/cachegrind: Removed.
+	* src/org/eclipse/linuxtools/valgrind/cachegrind/model: Removed.
+	* src/org/eclipse/linuxtools/internal/valgrind/cachegrind: New package.
+	* src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model: New package.  
+	* .project: Enabled API analysis.
+	* META-INF/MANIFEST.MF: Export internal packages.
+	* plugin.xml: Update class references.
+
+2009-06-23  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindToolPage.java (getD1LineSizeSpinner): Created getter.
+	(getI1SizeSpinner): Likewise.
+	(getBranchButton): Likewise.
+	(getI1AssocSpinner): Likewise.
+	(getD1Button): Likewise.
+	(getD1AssocSpinner): Likewise.
+	(getL2Button): Likewise.
+	(getL2LineSizeSpinner): Likewise.
+	(getL2AssocSpinner): Likewise.
+	(getD1SizeSpinner): Likewise.
+	(getL2SizeSpinner): Likewise.
+	(getI1Button): Likewise.
+	(getCacheButton): Likewise.
+	(getI1LineSizeSpinner): Likewise.
+
+2009-04-30  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindParser.java: Pull up constants.
+
+2009-04-23  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindViewPart.java (.widgetSelected): Default sorting now ascending.
+
+2009-04-21  Elliott Baron  <ebaron@redhat.com>
+
+	* plugin.properties: Add "(Incubation)" to Plugin name. 
+
+2009-04-03  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: 0.2.0 version.
+
+2009-03-31  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindViewPart.java (createPartControl): Added expand/collapse actions.
+
+2009-03-17  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindLaunchDelegate.java (handleLaunch): Bounds checking on number of output files.
+	* CachegrindToolPage.java (checkL2Enablement): Change visibility to protected.
+	(checkD1Enablement): Likewise.
+	(checkI1Enablement): Likewise.
+	* CachegrindViewPart.java (getDoubleClickListener): New getter.
+
+2009-03-16  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindParser.java (parse): Explicitly close file.
+	* CachegrindLine.java (getModel): Return null.
+	* CachegrindOutput.java (getModel): Return null.
+	* ICachegrindElement.java: Added getModel to interface.
+	* CachegrindLabelProvider.java: New file.
+	* CachegrindViewPart.java (getViewer): Getter for TreeViewer.
+	(CachegrindTreeContentProvider): Extracted.
+
+2009-03-13  Andrew Overholt  <overholt@redhat.com>
+
+	* build.properties: Add icons to binary build.
+
+2009-03-11  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindToolPage.java (createControl): Added vertical spacer.
+
+2009-02-25  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindLaunchDelegate.java (handleLaunch): Renamed method.
+
+2009-02-20  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindParser.java (parse): Removed Arrays.copyOf().
+	* model/CachegrindOutput.java (getEvents): Replaced Arrays.copyOfRange().
+	(getParent): Likewise.
+	(getSummary): Likewise.
+
+2009-02-12  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindCommandConstants.java: New file.
+	* CachegrindLaunchConstants.java: New file.
+	* CachegrindLaunchDelegate.java: Better output directory path handling, command line 
+	arguments extracted to CachegrindCommandConstants.
+	* CachegrindToolPage.java: Launch config constants extracted to CachegrindLaunchConstants.
+
+2009-01-22  Elliott Baron  <ebaron@redhat.com>
+
+	* CachegrindViewPart: Added sorting to TreeViewer, full event names
+	to tooltip, improvements to LabelProvider for C++, double-click event
+	spawing editor on file, function or line.
+	* ICachegrindElement: Extend Comparable<T> for sorting by first column.
+	* CachegrindFile: Likewise, added getName().
+	* CachegrindLine: Likewise.
+	* CachegrindOutput: Likewise.
+	* CachegrindFunction: Likewise, vastly improved handling of CModel
+	with C++ classes.
+	* META-INF/MANIFEST.MF: New dependency org.eclipse.cdt.core.model.util.
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
index 0b48c3440d..a903284974 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.cachegrind;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.cachegrind.CachegrindPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
index cd9f33000b..35777382d4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2010-06-06  Elliott Baron  <ebaron@fedoraproject.org>
 
 	Bug #315890
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.core/META-INF/MANIFEST.MF
index 847851b7d7..958d28764f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.core;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.core.ValgrindPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.doc/ChangeLog
index 8a138dda1d..b0b32f2753 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2010-04-19  Elliott Baron  <ebaron@fedoraproject.org>
 
 	* userguide/General-Usage.html: Regenerated to include Mac OSX info.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.doc/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.doc/META-INF/MANIFEST.MF
index 92e5a06f9b..e396ff6c2c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.doc/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.doc;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.apache.ant;bundle-version="1.7.0";resolution:=optional,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
index 4506107c6d..f9bfd8734a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2010-06-06  Elliott Baron  <ebaron@fedoraproject.org>
 	
 	Bug #315890
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
index 7ceceb21be..6bcaa3dcd1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.launch;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
index 86f3c7ed52..092c46cdfc 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2010-05-26  Elliott Baron  <ebaron@fedoraproject.org>
 
 	Bug #314376
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
index ee3a7ecfd3..f75ca548e1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.massif.tests
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.massif.tests.MassifTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
index 8ed2f5c290..36f3f9ab86 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Remove org.mozilla.javascript import package, bump version to 0.6.1.
+
 2010-05-26  Elliott Baron  <ebaron@fedoraproject.org>
 
 	Bug #314376
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
index c4a63a6934..a7dc9884ae 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.massif;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.massif.MassifPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
@@ -49,7 +49,6 @@ Import-Package: org.eclipse.birt.chart.device,
  org.eclipse.linuxtools.profiling.ui,
  org.eclipse.linuxtools.valgrind.launch,
  org.eclipse.linuxtools.valgrind.ui,
- org.eclipse.ui,
- org.mozilla.javascript
+ org.eclipse.ui
 Export-Package: org.eclipse.linuxtools.internal.valgrind.massif,
  org.eclipse.linuxtools.internal.valgrind.massif.birt;uses:="org.eclipse.swt.events,org.eclipse.swt.widgets,org.eclipse.birt.chart.model"
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
index 9879c7c931..29da52ef13 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2010-06-06  Elliott Baron  <ebaron@fedoraproject.org>
 	
 	Bug #315890
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
index 901cb1c2af..d6416fd44f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.memcheck.tests;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.memcheck.tests.MemcheckTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/ChangeLog
index de01486091..ffdb7b8c04 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2009-09-28  Elliott Baron  <ebaron@fedoraproject.org>
 
 	#290597
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
index 88b3900564..a5e29f8d77 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.memcheck;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.memcheck.MemcheckPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/ChangeLog
index 15be41c941..e8e2bd82ea 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* feature.xml: Bump version to 0.6.1.
+
 2010-05-18  Andrew Overholt  <overholt@redhat.com>
 
 	* feature.properties: Fix provider name.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/feature.xml
index 472e9f6d3a..fc43ac4b5e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.test-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.test-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.linuxtools.valgrind.test"
       label="%featureName"
-      version="0.4.0.qualifier"
+      version="0.6.1.qualifier"
       provider-name="%featureProvider">
 
    <description>
@@ -20,7 +20,6 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.junit" version="0.0.0"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.cdt.core.tests"/>
       <import plugin="org.eclipse.cdt.debug.core"/>
@@ -46,6 +45,7 @@
       <import plugin="org.eclipse.linuxtools.valgrind.massif"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.linuxtools.valgrind.cachegrind"/>
+      <import plugin="org.junit" version="4.7.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
index 409ed3e61b..ae5ec4d061 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2009-12-22  Roland Grunberg  <rgrunber@redhat.com>
 
 	* META-INF/MANIFEST.MF: Make necessary changes for switch from JUnit 3 to JUnit 4.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
index 51b6fbf27b..2dd908eb05 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.tests;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/ChangeLog
new file mode 100644
index 0000000000..1e877697f1
--- /dev/null
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/ChangeLog
@@ -0,0 +1,64 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
+2009-08-11  Elliott Baron  <ebaron@redhat.com>
+
+	* src/org/eclipse/linuxtools/valgrind: Removed.
+	* META-INF/MANIFEST.MF: Export wizards package.
+	* src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/Messages.java: Fix header. 
+	* src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/NewSuppressionWizard.java: Likewise. 
+
+2009-08-10  Elliott Baron  <ebaron@redhat.com>
+	
+	#285919, #285920
+	* icons/newsupp_wiz.png: New file.
+	* src/org/eclipse/linuxtools/valgrind/ui: Removed.
+	* src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/Messages.java: New file.
+	* src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/messages.properties: New file.
+	* src/org/eclipse/linuxtools/internal/valgrind/ui/editor/wizards/NewSuppressionWizard.java: New file.
+	* META-INF/MANIFEST.MF: New dependencies.
+	* OSGI-INF/l10n/bundle.properties: New keys.
+	* plugin.xml: Extension for new file wizard.
+	* src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsContentAssistProcessor.java (completionWord): Fixed
+	off-by-one #285920. 
+	(getCompletionStrings): Don't show "Memcheck:" after "Memcheck:". 
+	(getToolName): Fixed off-by-one #285920.
+
+2009-08-05  Elliott Baron  <ebaron@redhat.com>
+
+	* META-INF/MANIFEST.MF: Properly spell "qualifier".
+
+2009-07-30  Elliott Baron  <ebaron@redhat.com>
+
+	* src/org/eclipse/linuxtools/valgrind/ui/editor: Removed.
+	* src/org/eclipse/linuxtools/internal/valgrind/ui/editor: New package. 
+	* .project: Added API analysis.
+	* META-INF/MANIFEST.MF: Export internal package.
+	* plugin.xml: Update class references.
+
+2009-07-13  Elliott Baron  <ebaron@redhat.com>
+
+	* .classpath: New file.
+	* .project: New file.
+	* .settings/org.eclipse.jdt.core.prefs: New file.
+	* build.properties: New file.
+	* icons/valgrind-supp-icon.png: New file.
+	* META-INF/MANIFEST.MF: New file.
+	* OSGI-INF/l10n/bundle.properties: New file.
+	* plugin.xml: New file.
+	* ColorManager.java: New file.
+	* ISuppressionsColorConstants.java: New file.
+	* Messages.java: New file.
+	* messages.properties: New file.
+	* SuppressionKindRule.java: New file.
+	* SuppressionsConfiguration.java: New file.
+	* SuppressionsContentAssistProcessor.java: New file.
+	* SuppressionsDocumentProvider.java: New file.
+	* SuppressionsEditor.java: New file.
+	* SuppressionsElementScanner.java: New file.
+	* SuppressionsPartitionScanner.java: New file.
+	* SuppressionsReconcilingStrategy.java: New file.
+	* SuppressionToolRule.java: New file.
+	* ValgrindEditorPlugin.java: New file.
+	
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/META-INF/MANIFEST.MF
index 159b73455a..1edce55cfb 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.ui.editor;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.ui.editor.ValgrindEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.ui/ChangeLog
index 0805d8736c..ce59a37119 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-25  Elliott Baron  <ebaron@fedoraproject.org>
+
+	* META-INF/MANIFEST.MF: Bump version to 0.6.1.
+
 2010-05-26  Elliott Baron  <ebaron@fedoraproject.org>
 
 	Bug #314376
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF
index 3f4950a9f9..9796a127c1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.6.1.qualifier
 Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,