[eclipse-linuxtools] 12/17: Refreshed d/patches

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-linuxtools.

commit 7ca027ac854a625706e7e3518dbc0c9ac8e42fa2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Oct 11 11:45:38 2014 +0200

    Refreshed d/patches
---
 debian/patches/libhover-fix-automake-texinfo-parser.patch | 11 ++++++-----
 debian/patches/remove-license-feature.patch               |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/patches/libhover-fix-automake-texinfo-parser.patch b/debian/patches/libhover-fix-automake-texinfo-parser.patch
index 8ba4877..c18181b 100644
--- a/debian/patches/libhover-fix-automake-texinfo-parser.patch
+++ b/debian/patches/libhover-fix-automake-texinfo-parser.patch
@@ -8,21 +8,22 @@ Subject: libhover-fix-automake-texinfo-parser
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 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
-index 75ec686..68532ce 100644
+index 89a8b4f..4c51068 100644
 --- 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
-@@ -559,7 +559,8 @@ public class ParseAutoconfTexinfo {
+@@ -563,8 +563,9 @@ public class ParseAutoconfTexinfo {
                          WriteString(os, "      <prototype>");
                          String[] parms = mp.parms;
                          for (int i = 0; i < parms.length; i++) {
--                            WriteString(os, "        <parameter content=\"" + parms[i] + "\"/>");
 +                            String p = parms[i].replaceAll("\"", """);
-+                            WriteString(os, "        <parameter content=\"" + p + "\"/>");
+                             WriteString(os, "        <parameter content=\""
+-                                    + parms[i] + "\"/>");
++                                    + p + "\"/>");
                          }
                          WriteString(os, "      </prototype>");
                          mp = mp.nextParms;
 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
-index 602ccf3..d446b4c 100644
+index f988605..91cb365 100644
 --- 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
 @@ -39,8 +39,8 @@ public class ParseAutomakeTexinfo {
diff --git a/debian/patches/remove-license-feature.patch b/debian/patches/remove-license-feature.patch
index 42ff78e..ed853c9 100644
--- a/debian/patches/remove-license-feature.patch
+++ b/debian/patches/remove-license-feature.patch
@@ -73,16 +73,16 @@ index e5f1657..b7afc35 100644
     <description>
        %description
 diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml b/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
-index 6b501f5..a3d4cc5 100644
+index 4a516bc..b4ad245 100644
 --- a/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
 +++ b/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
 @@ -13,9 +13,7 @@
        id="org.eclipse.linuxtools.rpm"
        label="%featureName"
-       version="2.0.0.qualifier"
+       version="1.0.0.qualifier"
 -      provider-name="%provider"
--      license-feature="org.eclipse.license"
--      license-feature-version="0.0.0">
+-      license-feature="org.eclipse.linuxtools.license.feature"
+-      license-feature-version="1.0.0.qualifier">
 +      provider-name="%provider">
  
     <description url="http://www.eclipse.org/linuxtools/projectPages/specfile/">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-linuxtools.git