[eclipse-linuxtools] 04/17: Refreshed d/patches
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Tue Oct 14 18:11:51 BST 2014
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 3bd0b6a9ed701d26307f49af97883b9b2528e01b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Mon Jun 23 18:53:25 2014 +0200
Refreshed d/patches
---
debian/changelog | 1 +
debian/patches/fix-bundle-build-order.patch | 26 -------
.../libhover-fix-automake-texinfo-parser.patch | 46 ++++++------
debian/patches/remove-license-feature.patch | 84 +++++++++-------------
debian/patches/series | 1 -
debian/patches/unversioned-deps.patch | 8 +--
6 files changed, 62 insertions(+), 104 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ccf2fc5..72ffc7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
eclipse-linuxtools (3.0.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refreshed d/patches.
-- Jakub Adam <jakub.adam at ktknet.cz> Mon, 23 Jun 2014 18:21:57 +0200
diff --git a/debian/patches/fix-bundle-build-order.patch b/debian/patches/fix-bundle-build-order.patch
deleted file mode 100644
index a46dc03..0000000
--- a/debian/patches/fix-bundle-build-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 26 Jul 2012 18:23:17 +0200
-Subject: fix-bundle-build-order
-
----
- .../org.eclipse.linuxtools.tools.launch-feature/feature.xml | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml b/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
-index 9535ba5..1b84088 100644
---- a/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
-+++ b/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
-@@ -30,6 +30,13 @@
- </requires>
-
- <plugin
-+ id="org.eclipse.linuxtools.profiling.launch"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
- id="org.eclipse.linuxtools.tools.launch.core"
- download-size="0"
- install-size="0"
diff --git a/debian/patches/libhover-fix-automake-texinfo-parser.patch b/debian/patches/libhover-fix-automake-texinfo-parser.patch
index 583a111..8ba4877 100644
--- a/debian/patches/libhover-fix-automake-texinfo-parser.patch
+++ b/debian/patches/libhover-fix-automake-texinfo-parser.patch
@@ -3,36 +3,36 @@ Date: Sat, 2 Jun 2012 21:40:50 +0200
Subject: libhover-fix-automake-texinfo-parser
---
- .../cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java | 3 ++-
- .../cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java | 4 ++--
+ .../linuxtools/cdt/libhover/texinfoparsers/ParseAutoconfTexinfo.java | 3 ++-
+ .../linuxtools/cdt/libhover/texinfoparsers/ParseAutomakeTexinfo.java | 4 ++--
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 360d494..c944c66 100644
+index 75ec686..68532ce 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 {
- 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, " </prototype>");
- mp = mp.nextParms;
+ 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, " </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 c61adc0..123e979 100644
+index 602ccf3..d446b4c 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 {
- // Currently in automake docs, the macro section starts with
- // a subsection as below and a table which contains macros which
- // are item and itemx entries.
-- static final String MacrosStart = "@subsection\\sPublic\\smacros";
-- static final String OldMacrosStart = "@section\\sAutoconf\\smacros.*";
-+ static final String MacrosStart = "@subsection\\sPublic\\sMacros";
-+ static final String OldMacrosStart = "@section\\sAutoconf\\sMacros.*";
- static final Pattern MacroSection1 = Pattern.compile(MacrosStart);
- static final Pattern MacroSection2 = Pattern.compile(OldMacrosStart);
- // 0
+ // Currently in automake docs, the macro section starts with
+ // a subsection as below and a table which contains macros which
+ // are item and itemx entries.
+- static final String MacrosStart = "@subsection\\sPublic\\smacros";
+- static final String OldMacrosStart = "@section\\sAutoconf\\smacros.*";
++ static final String MacrosStart = "@subsection\\sPublic\\sMacros";
++ static final String OldMacrosStart = "@section\\sAutoconf\\sMacros.*";
+ static final Pattern MacroSection1 = Pattern.compile(MacrosStart);
+ static final Pattern MacroSection2 = Pattern.compile(OldMacrosStart);
+ // 0
diff --git a/debian/patches/remove-license-feature.patch b/debian/patches/remove-license-feature.patch
index 4d59085..42ff78e 100644
--- a/debian/patches/remove-license-feature.patch
+++ b/debian/patches/remove-license-feature.patch
@@ -7,29 +7,28 @@ Subject: remove-license-feature
perf/org.eclipse.linuxtools.perf-feature/feature.xml | 4 +---
profiling/org.eclipse.linuxtools.profiling-feature/feature.xml | 4 +---
profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml | 4 +---
- profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml | 4 +---
rpm/org.eclipse.linuxtools.rpm-feature/feature.xml | 4 +---
valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml | 4 +---
valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml | 4 +---
- 8 files changed, 8 insertions(+), 24 deletions(-)
+ 7 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml b/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml
-index a298b22..7777213 100644
+index 918b672..48ea0af 100644
--- a/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml
+++ b/changelog/org.eclipse.linuxtools.changelog-feature/feature.xml
@@ -3,9 +3,7 @@
id="org.eclipse.linuxtools.changelog"
label="%featureName"
- version="2.8.3.qualifier"
+ version="3.0.0.qualifier"
- provider-name="%featureProvider"
-- license-feature="org.eclipse.linuxtools.license.feature"
-- license-feature-version="1.0.0.qualifier">
+- license-feature="org.eclipse.license"
+- license-feature-version="0.0.0">
+ provider-name="%featureProvider">
<description url="http://www.eclipse.org/linuxtools">
%featureDescription
diff --git a/perf/org.eclipse.linuxtools.perf-feature/feature.xml b/perf/org.eclipse.linuxtools.perf-feature/feature.xml
-index d4e512a..ec498aa 100644
+index dc15358..ec498aa 100644
--- a/perf/org.eclipse.linuxtools.perf-feature/feature.xml
+++ b/perf/org.eclipse.linuxtools.perf-feature/feature.xml
@@ -4,9 +4,7 @@
@@ -37,29 +36,29 @@ index d4e512a..ec498aa 100644
version="1.2.0.qualifier"
provider-name="%provider"
- os="linux"
-- license-feature="org.eclipse.linuxtools.license.feature"
-- license-feature-version="1.0.0.qualifier">
+- license-feature="org.eclipse.license"
+- license-feature-version="0.0.0">
+ os="linux">
<description url="http://www.eclipse.org/linuxtools/">
%description
diff --git a/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml
-index e91ebd0..2a656a2 100644
+index 8dfc1ce..80a3353 100644
--- a/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml
+++ b/profiling/org.eclipse.linuxtools.profiling-feature/feature.xml
@@ -3,9 +3,7 @@
id="org.eclipse.linuxtools.profiling"
label="%featureName"
- version="2.2.0.qualifier"
+ version="2.0.0.qualifier"
- provider-name="%featureProvider"
-- license-feature="org.eclipse.linuxtools.license.feature"
-- license-feature-version="1.0.0.qualifier">
+- license-feature="org.eclipse.license"
+- license-feature-version="0.0.0">
+ provider-name="%featureProvider">
<description>
%description
diff --git a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
-index 57186a4..b7afc35 100644
+index e5f1657..b7afc35 100644
--- a/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
+++ b/profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
@@ -3,9 +3,7 @@
@@ -67,69 +66,54 @@ index 57186a4..b7afc35 100644
label="%featureName"
version="1.0.0.qualifier"
- provider-name="%featureProvider"
-- license-feature="org.eclipse.linuxtools.license.feature"
-- license-feature-version="1.0.0.qualifier">
+- license-feature="org.eclipse.license"
+- license-feature-version="0.0.0">
+ provider-name="%featureProvider">
<description>
%description
-diff --git a/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml b/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
-index 9d3cb6e..1b84088 100644
---- a/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
-+++ b/profiling/org.eclipse.linuxtools.tools.launch-feature/feature.xml
-@@ -4,9 +4,7 @@
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%featureProvider"
-- os="linux"
-- license-feature="org.eclipse.linuxtools.license.feature"
-- license-feature-version="1.0.0.qualifier">
-+ os="linux">
-
- <description>
- %description
diff --git a/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml b/rpm/org.eclipse.linuxtools.rpm-feature/feature.xml
-index 4a516bc..b4ad245 100644
+index 6b501f5..a3d4cc5 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="1.0.0.qualifier"
+ version="2.0.0.qualifier"
- provider-name="%provider"
-- license-feature="org.eclipse.linuxtools.license.feature"
-- license-feature-version="1.0.0.qualifier">
+- license-feature="org.eclipse.license"
+- license-feature-version="0.0.0">
+ provider-name="%provider">
<description url="http://www.eclipse.org/linuxtools/projectPages/specfile/">
%description
diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
-index 3121ca6..fc02295 100644
+index da5de12..4e39216 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
-@@ -4,9 +4,7 @@
+@@ -3,9 +3,7 @@
+ id="org.eclipse.linuxtools.valgrind"
label="%featureName"
- version="2.0.0.qualifier"
- provider-name="%featureProvider"
-- os="linux,macosx"
-- license-feature="org.eclipse.linuxtools.license.feature"
-- license-feature-version="1.0.0.qualifier">
-+ os="linux,macosx">
+ version="3.0.0.qualifier"
+- provider-name="%featureProvider"
+- license-feature="org.eclipse.license"
+- license-feature-version="0.0.0">
++ provider-name="%featureProvider">
<description>
%description
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
-index 5d1709a..9b49224 100644
+index 97d044e..9bbd8de 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
+++ b/valgrind/org.eclipse.linuxtools.valgrind.remote-feature/feature.xml
-@@ -4,9 +4,7 @@
+@@ -3,9 +3,7 @@
+ id="org.eclipse.linuxtools.valgrind.remote"
label="%featureName"
version="2.0.0.qualifier"
- provider-name="%featureProvider"
-- os="linux,macosx"
-- license-feature="org.eclipse.linuxtools.license.feature"
-- license-feature-version="1.0.0.qualifier">
-+ os="linux,macosx">
+- provider-name="%featureProvider"
+- license-feature="org.eclipse.license"
+- license-feature-version="0.0.0">
++ provider-name="%featureProvider">
<description>
%description
diff --git a/debian/patches/series b/debian/patches/series
index 3413fe7..14b086d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
valgrind-add-swtchart.patch
libhover-fix-automake-texinfo-parser.patch
-fix-bundle-build-order.patch
unversioned-deps.patch
remove-license-feature.patch
rpm-feature-reorder-bundles.patch
diff --git a/debian/patches/unversioned-deps.patch b/debian/patches/unversioned-deps.patch
index b7ca856..5dada35 100644
--- a/debian/patches/unversioned-deps.patch
+++ b/debian/patches/unversioned-deps.patch
@@ -8,7 +8,7 @@ Subject: unversioned-deps
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF b/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
-index c97c035..ee6c18f 100644
+index 1d3a362..fbd7b92 100644
--- a/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
+++ b/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui,
@@ -17,11 +17,11 @@ index c97c035..ee6c18f 100644
org.eclipse.ui.ide,
- org.eclipse.team.ui;bundle-version="3.7.1"
+ org.eclipse.team.ui
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.compare,
diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
-index 2a92ba7..51332d9 100644
+index 70a5305..3d642ab 100644
--- a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
+++ b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
@@ -31,5 +31,5 @@ index 2a92ba7..51332d9 100644
- com.jcraft.jsch;bundle-version="0.1.44"
+ com.jcraft.jsch
Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Localization: plugin
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-linuxtools.git
More information about the pkg-java-commits
mailing list