From 12fbdf64d4ce55580465a403a8703eadf23f7867 Mon Sep 17 00:00:00 2001
From: Francois Chouinard <fchouinard@gmail.com>
Date: Wed, 14 Oct 2009 15:47:40 +0000
Subject: [PATCH] - Update on the TMF/LTTng feature plugin - Fixed a typo in
 the User Guide

---
 org.eclipse.linuxtools.lttng-feature/.project        |  2 +-
 .../build.properties                                 |  4 +++-
 ...compile.org.eclipse.linuxtools.lttng-feature.xml} |  1 +
 org.eclipse.linuxtools.lttng-feature/feature.xml     | 12 ++++++------
 .../html/concepts/controlFlowView.html               |  2 +-
 org.eclipse.linuxtools.tmf-feature/.project          |  2 +-
 org.eclipse.linuxtools.tmf-feature/build.properties  |  4 +++-
 ...> compile.org.eclipse.linuxtools.tmf-feature.xml} |  0
 org.eclipse.linuxtools.tmf-feature/feature.xml       |  8 ++++----
 9 files changed, 20 insertions(+), 15 deletions(-)
 rename org.eclipse.linuxtools.lttng-feature/{compile.org.eclipse.linuxtools.lttng.feature.xml => compile.org.eclipse.linuxtools.lttng-feature.xml} (78%)
 rename org.eclipse.linuxtools.tmf-feature/{compile.org.eclipse.linuxtools.tmf.feature.xml => compile.org.eclipse.linuxtools.tmf-feature.xml} (100%)

diff --git a/org.eclipse.linuxtools.lttng-feature/.project b/org.eclipse.linuxtools.lttng-feature/.project
index 25e9777bcd..9ff62a9c20 100644
--- a/org.eclipse.linuxtools.lttng-feature/.project
+++ b/org.eclipse.linuxtools.lttng-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.lttng.feature</name>
+	<name>org.eclipse.linuxtools.lttng-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.linuxtools.lttng-feature/build.properties b/org.eclipse.linuxtools.lttng-feature/build.properties
index 64f93a9f0b..5864ee043e 100644
--- a/org.eclipse.linuxtools.lttng-feature/build.properties
+++ b/org.eclipse.linuxtools.lttng-feature/build.properties
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               feature.properties
diff --git a/org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng.feature.xml b/org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng-feature.xml
similarity index 78%
rename from org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng.feature.xml
rename to org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng-feature.xml
index bfc3eb774c..dc361cd9a9 100644
--- a/org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng.feature.xml
+++ b/org.eclipse.linuxtools.lttng-feature/compile.org.eclipse.linuxtools.lttng-feature.xml
@@ -3,5 +3,6 @@
 	<target name="main">
 		<ant antfile="build.xml" dir="../org.eclipse.linuxtools.lttng" target="build.jars"/>
 		<ant antfile="build.xml" dir="../org.eclipse.linuxtools.lttng.ui" target="build.jars"/>
+		<ant antfile="build.xml" dir="../org.eclipse.linuxtools.lttng.help" target="build.jars"/>
 	</target>
 </project>
diff --git a/org.eclipse.linuxtools.lttng-feature/feature.xml b/org.eclipse.linuxtools.lttng-feature/feature.xml
index 17151b614d..ff79dffe1e 100644
--- a/org.eclipse.linuxtools.lttng-feature/feature.xml
+++ b/org.eclipse.linuxtools.lttng-feature/feature.xml
@@ -2,8 +2,8 @@
 <feature
       id="org.eclipse.linuxtools.lttng.feature"
       label="Linux Tracing Toolkit (LTTng)"
-      version="0.1.0.200910131142"
-      provider-name="Ericsson"
+      version="0.1.0.qualifier"
+      provider-name="Eclipse"
       os="linux">
 
    <description>
@@ -19,7 +19,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.linuxtools.tmf.feature" version="0.1.0.qualifier"/>
+      <import feature="org.eclipse.linuxtools.tmf.feature" version="0.1.0.qualifier" match="compatible"/>
    </requires>
 
    <plugin
@@ -27,7 +27,7 @@
          os="linux"
          download-size="0"
          install-size="0"
-         version="0.1.0.200910131142"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
@@ -35,13 +35,13 @@
          os="linux"
          download-size="0"
          install-size="0"
-         version="0.1.0.200910131142"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.linuxtools.lttng.help"
          download-size="0"
          install-size="0"
-         version="0.1.0.200910131142"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/org.eclipse.linuxtools.lttng.help/html/concepts/controlFlowView.html b/org.eclipse.linuxtools.lttng.help/html/concepts/controlFlowView.html
index 561d53e319..6e4e635de0 100644
--- a/org.eclipse.linuxtools.lttng.help/html/concepts/controlFlowView.html
+++ b/org.eclipse.linuxtools.lttng.help/html/concepts/controlFlowView.html
@@ -20,7 +20,7 @@
 <dd>Moves to the next event over the highlighted process</dd>
 <p></p>
 <dt>Previous Event</dt>
-<dd>Moves to the previous event overt the highlighted process</dd>
+<dd>Moves to the previous event over the highlighted process</dd>
 <p></p>
 <dt>Next Process</dt>
 <dd>Moves from the currently highlighted process to the next down in the list</dd>
diff --git a/org.eclipse.linuxtools.tmf-feature/.project b/org.eclipse.linuxtools.tmf-feature/.project
index 370e044857..9e75941856 100644
--- a/org.eclipse.linuxtools.tmf-feature/.project
+++ b/org.eclipse.linuxtools.tmf-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.tmf.feature</name>
+	<name>org.eclipse.linuxtools.tmf-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.linuxtools.tmf-feature/build.properties b/org.eclipse.linuxtools.tmf-feature/build.properties
index 64f93a9f0b..5864ee043e 100644
--- a/org.eclipse.linuxtools.tmf-feature/build.properties
+++ b/org.eclipse.linuxtools.tmf-feature/build.properties
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               epl-v10.html,\
+               feature.properties
diff --git a/org.eclipse.linuxtools.tmf-feature/compile.org.eclipse.linuxtools.tmf.feature.xml b/org.eclipse.linuxtools.tmf-feature/compile.org.eclipse.linuxtools.tmf-feature.xml
similarity index 100%
rename from org.eclipse.linuxtools.tmf-feature/compile.org.eclipse.linuxtools.tmf.feature.xml
rename to org.eclipse.linuxtools.tmf-feature/compile.org.eclipse.linuxtools.tmf-feature.xml
diff --git a/org.eclipse.linuxtools.tmf-feature/feature.xml b/org.eclipse.linuxtools.tmf-feature/feature.xml
index 901318e3b8..81efd50348 100644
--- a/org.eclipse.linuxtools.tmf-feature/feature.xml
+++ b/org.eclipse.linuxtools.tmf-feature/feature.xml
@@ -2,8 +2,8 @@
 <feature
       id="org.eclipse.linuxtools.tmf.feature"
       label="Tracing and Monitoring Framework (TMF)"
-      version="0.1.0.200910131141"
-      provider-name="Ericsson">
+      version="0.1.0.qualifier"
+      provider-name="Eclipse">
 
    <description>
       %description
@@ -21,14 +21,14 @@
          id="org.eclipse.linuxtools.tmf"
          download-size="0"
          install-size="0"
-         version="0.1.0.200910131141"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.linuxtools.tmf.ui"
          download-size="0"
          install-size="0"
-         version="0.1.0.200910131141"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>
-- 
2.34.1