← Back to branch summary

~ubuntu-branches/ubuntu/quantal/eclipse-linuxtools/quantal

« back to all changes in this revision

Viewing changes to debian/patches/libhover-fix-automake-texinfo-parser.patch

  • Committer: Package Import Robot
  • Author(s): Jakub Adam
  • Date: 2012-06-29 12:07:30 UTC
  • Revision ID: package-import@ubuntu.com-20120629120730-um7a5gz1w6yzx3hg
Tags: 1.0.0-1
* New upstream release.
* Remove eclipse-cdt-autotools binary package.
  - The code moved to Eclipse CDT.
* Drop d/patches/valgrind-remove-unused-emf-dependency.patch
  - Included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/libhover-fix-automake-texinfo-parser.patch
 
1
From: Jakub Adam <jakub.adam@ktknet.cz>
 
2
Date: Sat, 2 Jun 2012 21:40:50 +0200
 
3
Subject: libhover-fix-automake-texinfo-parser
 
4
 
 
5
---
 
6
 .../cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java          |    3 ++-
 
7
 .../cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java          |    4 ++--
 
8
 2 files changed, 4 insertions(+), 3 deletions(-)
 
9
 
 
10
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
 
11
index 360d494..c944c66 100644
 
12
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
 
13
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java
 
14
@@ -559,7 +559,8 @@ public class ParseAutoconfTexinfo {
 
15
                                                WriteString(os, "      <prototype>");
 
16
                                                String[] parms = mp.parms;
 
17
                                                for (int i = 0; i < parms.length; i++) {
 
18
-                                                       WriteString(os, "        <parameter content=\"" + parms[i] + "\"/>");
 
19
+                                                       String p = parms[i].replaceAll("\"", "&quot;");
 
20
+                                                       WriteString(os, "        <parameter content=\"" + p + "\"/>");
 
21
                                                }
 
22
                                                WriteString(os, "      </prototype>");
 
23
                                                mp = mp.nextParms;
 
24
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
 
25
index c61adc0..123e979 100644
 
26
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
 
27
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java
 
28
@@ -39,8 +39,8 @@ public class ParseAutomakeTexinfo {
 
29
        // Currently in automake docs, the macro section starts with
 
30
        // a subsection as below and a table which contains macros which
 
31
        // are item and itemx entries.
 
32
-       static final String MacrosStart = "@subsection\\sPublic\\smacros";
 
33
-       static final String OldMacrosStart = "@section\\sAutoconf\\smacros.*";
 
34
+       static final String MacrosStart = "@subsection\\sPublic\\sMacros";
 
35
+       static final String OldMacrosStart = "@section\\sAutoconf\\sMacros.*";
 
36
        static final Pattern MacroSection1 = Pattern.compile(MacrosStart);
 
37
        static final Pattern MacroSection2 = Pattern.compile(OldMacrosStart);
 
38
        //                           0