This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-wtp.
commit cdd86a29f38895fe0b93fa1e413c7c5eb562eabd Author: Jakub Adam <[email protected]> Date: Fri Aug 30 07:28:41 2013 +0200 Refreshed patches --- debian/changelog | 3 ++ debian/patches/debian-custom-build.patch | 42 ++++++++++++------------- debian/patches/regenerate-xpath2-parser.patch | 25 +++++++-------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index c70dbab..46b02e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ eclipse-wtp (3.5.0-1) UNRELEASED; urgency=low * New upstream release. + * Refreshed d/patches: + - debian-custom-build.patch + - regenerate-xpath2-parser.patch. -- Jakub Adam <[email protected]> Fri, 28 Jun 2013 08:42:01 +0200 diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch index 4cb5034..dea51eb 100644 --- a/debian/patches/debian-custom-build.patch +++ b/debian/patches/debian-custom-build.patch @@ -30,7 +30,7 @@ Subject: debian-custom-build 24 files changed, 192 insertions(+), 225 deletions(-) diff --git a/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF b/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF -index 7c72fd4..25bfcf8 100644 +index 90374a2..4712a18 100644 --- a/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.wst.jsdt.debug.rhino.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui, @@ -43,10 +43,10 @@ index 7c72fd4..25bfcf8 100644 org.eclipse.wst.jsdt.ui Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/org.eclipse.wst.jsdt.feature/feature.xml b/org.eclipse.wst.jsdt.feature/feature.xml -index f606cdc..bda3a9b 100644 +index 02045d6..a360ea8 100644 --- a/org.eclipse.wst.jsdt.feature/feature.xml +++ b/org.eclipse.wst.jsdt.feature/feature.xml -@@ -112,7 +112,7 @@ +@@ -109,7 +109,7 @@ id="org.mozilla.javascript" download-size="0" install-size="0" @@ -77,7 +77,7 @@ index 398528b..16e138f 100644 </feature> diff --git a/org.eclipse.wst.server_ui.feature/feature.xml b/org.eclipse.wst.server_ui.feature/feature.xml -index 656afb1..ddca2e4 100644 +index 47c3675..5b80128 100644 --- a/org.eclipse.wst.server_ui.feature/feature.xml +++ b/org.eclipse.wst.server_ui.feature/feature.xml @@ -19,12 +19,12 @@ @@ -98,7 +98,7 @@ index 656afb1..ddca2e4 100644 <plugin diff --git a/org.eclipse.wst.web_core.feature/feature.xml b/org.eclipse.wst.web_core.feature/feature.xml -index b2dfdcd..ab8d816 100644 +index cbbc800..86bfc5c 100644 --- a/org.eclipse.wst.web_core.feature/feature.xml +++ b/org.eclipse.wst.web_core.feature/feature.xml @@ -19,20 +19,14 @@ @@ -129,7 +129,7 @@ index b2dfdcd..ab8d816 100644 <plugin diff --git a/org.eclipse.wst.web_ui.feature/feature.xml b/org.eclipse.wst.web_ui.feature/feature.xml -index f88fcac..84aa26b 100644 +index e0bfe4f..123fd20 100644 --- a/org.eclipse.wst.web_ui.feature/feature.xml +++ b/org.eclipse.wst.web_ui.feature/feature.xml @@ -20,6 +20,11 @@ @@ -163,7 +163,7 @@ index f88fcac..84aa26b 100644 id="org.eclipse.wst.jsdt.web.core" download-size="0" diff --git a/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF -index 2e65603..f651ae7 100644 +index 994da93..dd6af81 100644 --- a/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF +++ b/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", @@ -202,7 +202,7 @@ index 8f5488f..6aae09b 100644 org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)", diff --git a/org.eclipse.wst.ws_core.feature/feature.xml b/org.eclipse.wst.ws_core.feature/feature.xml -index e764d1d..0413532 100644 +index 8112f0c..70449f2 100644 --- a/org.eclipse.wst.ws_core.feature/feature.xml +++ b/org.eclipse.wst.ws_core.feature/feature.xml @@ -1,155 +1,145 @@ @@ -210,7 +210,7 @@ index e764d1d..0413532 100644 -<feature - id="org.eclipse.wst.ws_core.feature" - label="%featureName" -- version="3.4.2.qualifier" +- version="3.5.0.qualifier" - provider-name="%providerName" - license-feature="org.eclipse.license" - license-feature-version="1.0.0.qualifier"> @@ -365,7 +365,7 @@ index e764d1d..0413532 100644 +<feature + id="org.eclipse.wst.ws_core.feature" + label="%featureName" -+ version="3.4.2.qualifier" ++ version="3.5.0.qualifier" + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="1.0.0.qualifier"> @@ -507,7 +507,7 @@ index e764d1d..0413532 100644 + +</feature> diff --git a/org.eclipse.wst.ws_ui.feature/feature.xml b/org.eclipse.wst.ws_ui.feature/feature.xml -index 77d6d10..c527cf7 100644 +index a3099e9..9c363ca 100644 --- a/org.eclipse.wst.ws_ui.feature/feature.xml +++ b/org.eclipse.wst.ws_ui.feature/feature.xml @@ -19,6 +19,10 @@ @@ -546,7 +546,7 @@ index 913ab43..48f28a5 100644 </feature> diff --git a/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF b/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF -index 3ad517f..d6ff5e2 100644 +index 9ab8117..9fcee28 100644 --- a/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF @@ -76,7 +76,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", @@ -611,7 +611,7 @@ index e2475d3..7d003b2 100644 org.apache.axis;bundle-version="[1.3.0,2.0.0)", org.apache.xerces;bundle-version="[2.8.0,3.0.0)", diff --git a/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml b/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml -index 7519b58..683e3e3 100644 +index d803b42..c789c61 100644 --- a/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml +++ b/org.eclipse.wst.xml.xpath2.processor.feature/feature.xml @@ -20,12 +20,12 @@ @@ -630,12 +630,12 @@ index 7519b58..683e3e3 100644 <plugin id="org.apache.xerces" diff --git a/org.eclipse.wst.xml.xpath2.processor/META-INF/MANIFEST.MF b/org.eclipse.wst.xml.xpath2.processor/META-INF/MANIFEST.MF -index d8aa495..6ac703c 100644 +index ef33712..a25bfd2 100644 --- a/org.eclipse.wst.xml.xpath2.processor/META-INF/MANIFEST.MF +++ b/org.eclipse.wst.xml.xpath2.processor/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.xml.xpath2.processor - Bundle-Version: 2.1.2.qualifier + Bundle-Version: 2.1.100.qualifier Require-Bundle: org.apache.xerces;bundle-version="[2.9.0,3.0.0)", - java_cup.runtime;bundle-version="0.10.0", + org.apache.xalan, @@ -643,7 +643,7 @@ index d8aa495..6ac703c 100644 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.wst.xml.xpath2.api, diff --git a/org.eclipse.wst.xml_core.feature/feature.xml b/org.eclipse.wst.xml_core.feature/feature.xml -index ce0c134..d161be6 100644 +index 9560380..b26fe58 100644 --- a/org.eclipse.wst.xml_core.feature/feature.xml +++ b/org.eclipse.wst.xml_core.feature/feature.xml @@ -20,31 +20,17 @@ @@ -681,12 +681,12 @@ index ce0c134..d161be6 100644 <plugin diff --git a/org.eclipse.wst.xml_ui.feature/feature.xml b/org.eclipse.wst.xml_ui.feature/feature.xml -index 32fc2f0..23f0183 100644 +index f556652..22e2c79 100644 --- a/org.eclipse.wst.xml_ui.feature/feature.xml +++ b/org.eclipse.wst.xml_ui.feature/feature.xml -@@ -24,9 +24,9 @@ - <update label="%updateSiteName" url="http://download.eclipse.org/webtools/repository/indigo"/> - </url> +@@ -21,9 +21,9 @@ + </license> + - <includes - id="org.eclipse.wst.common_ui.feature" @@ -698,7 +698,7 @@ index 32fc2f0..23f0183 100644 <includes id="org.eclipse.wst.xml_userdoc.feature" diff --git a/org.eclipse.wst.xsl.feature/feature.xml b/org.eclipse.wst.xsl.feature/feature.xml -index 448b2db..0d7b634 100644 +index fe1f90e..d12931b 100644 --- a/org.eclipse.wst.xsl.feature/feature.xml +++ b/org.eclipse.wst.xsl.feature/feature.xml @@ -81,7 +81,7 @@ diff --git a/debian/patches/regenerate-xpath2-parser.patch b/debian/patches/regenerate-xpath2-parser.patch index 3e0e733..4886560 100644 --- a/debian/patches/regenerate-xpath2-parser.patch +++ b/debian/patches/regenerate-xpath2-parser.patch @@ -3,12 +3,12 @@ Date: Tue, 29 Nov 2011 22:51:15 +0100 Subject: regenerate-xpath2-parser --- - org.eclipse.wst.xml.xpath2.processor/build.xml | 4 ++-- - .../grammars/xpath.lex | 5 +++++ + org.eclipse.wst.xml.xpath2.processor/build.xml | 4 ++-- + org.eclipse.wst.xml.xpath2.processor/grammars/xpath.lex | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/org.eclipse.wst.xml.xpath2.processor/build.xml b/org.eclipse.wst.xml.xpath2.processor/build.xml -index aa70146..c0c53a2 100644 +index e499c3f..9d66f9f 100644 --- a/org.eclipse.wst.xml.xpath2.processor/build.xml +++ b/org.eclipse.wst.xml.xpath2.processor/build.xml @@ -15,7 +15,7 @@ @@ -20,20 +20,18 @@ index aa70146..c0c53a2 100644 <description> Build File for Compiler Project </description> -@@ -23,7 +23,7 @@ - <taskdef classname="JFlex.anttask.JFlexTask" name="jflex" classpath="${basedir}/lib/JFlex.jar" /> +@@ -43,4 +43,4 @@ + <move tofile="${basedir}/src/org/eclipse/wst/xml/xpath2/processor/internal/XpathSym.java" file="XpathSym.java"/> + </target> - <target name="generate_parser"> -- <jflex file="grammars/xpath.lex" destdir="grammars/generated"/> -+ <jflex file="grammars/xpath.lex" destdir="src"/> - <java jar="${cupJar}" input="grammars/xpath.cup" output="${basedir}/JavaCUP-dump.txt" fork="true" failonerror="true"> - <arg value="-parser"/> - <arg value="XPathCup"/> +-</project> +\ No newline at end of file ++</project> diff --git a/org.eclipse.wst.xml.xpath2.processor/grammars/xpath.lex b/org.eclipse.wst.xml.xpath2.processor/grammars/xpath.lex -index b111f2b..47b7357 100644 +index 2301832..90b6c96 100644 --- a/org.eclipse.wst.xml.xpath2.processor/grammars/xpath.lex +++ b/org.eclipse.wst.xml.xpath2.processor/grammars/xpath.lex -@@ -18,10 +18,15 @@ package org.eclipse.wst.xml.xpath2.processor.internal; +@@ -19,10 +19,15 @@ package org.eclipse.wst.xml.xpath2.processor.internal; import java_cup.runtime.*; @@ -49,4 +47,3 @@ index b111f2b..47b7357 100644 %cup %line %column --- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
