Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Wagiaalla2013-06-10 14:17:44 +0000
committerCamilo Bernal2013-06-10 21:13:44 +0000
commit51068e6f56feecd71bdcf73b19aa19884fb8dae0 (patch)
treeaa7f30142d505947428a91ba6d886907889264fe
parent715268b6732d4694ce503aa027654ce1b6da61a5 (diff)
downloadorg.eclipse.linuxtools-51068e6f56feecd71bdcf73b19aa19884fb8dae0.tar.gz
org.eclipse.linuxtools-51068e6f56feecd71bdcf73b19aa19884fb8dae0.tar.xz
org.eclipse.linuxtools-51068e6f56feecd71bdcf73b19aa19884fb8dae0.zip
systemtap: require a specific version of man.core
This is a cherry pick from master and was reviewed here: https://git.eclipse.org/r/13693 Change-Id: I78fad1448fda79cbeaa2bfabd9b030f82f1d7550 Reviewed-on: https://git.eclipse.org/r/13712 Tested-by: Hudson CI Reviewed-by: Camilo Bernal <cabernal@redhat.com> IP-Clean: Camilo Bernal <cabernal@redhat.com> Tested-by: Camilo Bernal <cabernal@redhat.com>
-rw-r--r--man/org.eclipse.linuxtools.man.core/src/org/eclipse/linuxtools/man/parser/ManPage.java1
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF4
2 files changed, 3 insertions, 2 deletions
diff --git a/man/org.eclipse.linuxtools.man.core/src/org/eclipse/linuxtools/man/parser/ManPage.java b/man/org.eclipse.linuxtools.man.core/src/org/eclipse/linuxtools/man/parser/ManPage.java
index 7fc74bcee7..bf39c54d3f 100644
--- a/man/org.eclipse.linuxtools.man.core/src/org/eclipse/linuxtools/man/parser/ManPage.java
+++ b/man/org.eclipse.linuxtools.man.core/src/org/eclipse/linuxtools/man/parser/ManPage.java
@@ -115,6 +115,7 @@ public class ManPage {
* Removes all HTML markings are returns a text only version.
*
* @return a text only version of the manpage
+ * @since 1.1
*/
public StringBuilder getStrippedTextPage() {
if (this.strippedTextPage == null) {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF
index 245740622c..31a1a5f913 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/META-INF/MANIFEST.MF
@@ -17,12 +17,12 @@ Require-Bundle:
org.eclipse.ui.ide,
org.eclipse.debug.ui;bundle-version="3.8.0",
org.eclipse.core.expressions;bundle-version="3.4.400",
- org.eclipse.linuxtools.systemtap.graphingapi.ui
+ org.eclipse.linuxtools.systemtap.graphingapi.ui,
+ org.eclipse.linuxtools.man.core;bundle-version="1.1"
Bundle-ActivationPolicy: lazy
Import-Package: com.jcraft.jsch;version="0.1.46",
org.eclipse.cdt.core.model,
org.eclipse.core.filesystem,
- org.eclipse.linuxtools.man.parser,
org.eclipse.linuxtools.systemtap.structures,
org.eclipse.linuxtools.systemtap.structures.listeners,
org.eclipse.linuxtools.systemtap.ui.graphing,

Back to the top