[eclipse-wtp] 04/10: Refresh d/patches/debian-custom-build.patch

[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-wtp.

commit 72b6f93a5aee245cd66f118b832eeeef14b8140d
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon May 4 07:55:56 2015 +0200

    Refresh d/patches/debian-custom-build.patch
---
 debian/changelog                         |  1 +
 debian/patches/debian-custom-build.patch | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f45ffe2..c6edf82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse-wtp (3.6.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh d/patches/debian-custom-build.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 04 May 2015 07:34:40 +0200
 
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 81216f2..7abe289 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -43,7 +43,7 @@ index d5662dc..46a777d 100644
   org.eclipse.wst.jsdt.ui,
   org.eclipse.core.resources
 diff --git a/org.eclipse.wst.jsdt.feature/feature.xml b/org.eclipse.wst.jsdt.feature/feature.xml
-index 30c89c7..cc2e822 100644
+index 88ad2bc..c8f4fda 100644
 --- a/org.eclipse.wst.jsdt.feature/feature.xml
 +++ b/org.eclipse.wst.jsdt.feature/feature.xml
 @@ -108,7 +108,7 @@
@@ -54,9 +54,9 @@ index 30c89c7..cc2e822 100644
 +         version="0.0.0"
           unpack="false"/>
  
-    <!-- plugin
+ </feature>
 diff --git a/org.eclipse.wst.server_adapters.feature/feature.xml b/org.eclipse.wst.server_adapters.feature/feature.xml
-index 467252d..922cf07 100644
+index b6e659a..3356c02 100644
 --- a/org.eclipse.wst.server_adapters.feature/feature.xml
 +++ b/org.eclipse.wst.server_adapters.feature/feature.xml
 @@ -51,14 +51,14 @@
@@ -77,7 +77,7 @@ index 467252d..922cf07 100644
  
  </feature>
 diff --git a/org.eclipse.wst.server_ui.feature/feature.xml b/org.eclipse.wst.server_ui.feature/feature.xml
-index c84c66f..8619f29 100644
+index 67828c6..6fa45c5 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 c84c66f..8619f29 100644
  
     <plugin
 diff --git a/org.eclipse.wst.web_core.feature/feature.xml b/org.eclipse.wst.web_core.feature/feature.xml
-index c09fcd9..02a89f8 100644
+index 1c877e7..4a16c90 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 c09fcd9..02a89f8 100644
  
     <plugin
 diff --git a/org.eclipse.wst.web_ui.feature/feature.xml b/org.eclipse.wst.web_ui.feature/feature.xml
-index 567d0fc..694ce5f 100644
+index 61238ef..2588598 100644
 --- a/org.eclipse.wst.web_ui.feature/feature.xml
 +++ b/org.eclipse.wst.web_ui.feature/feature.xml
 @@ -20,6 +20,11 @@
@@ -279,7 +279,7 @@ index 83e2f65..448e9d5 100644
           install-size="0"
           version="0.0.0"
 diff --git a/org.eclipse.wst.ws_ui.feature/feature.xml b/org.eclipse.wst.ws_ui.feature/feature.xml
-index 1c30698..a4ad3e6 100644
+index efe32e8..b04ebe4 100644
 --- a/org.eclipse.wst.ws_ui.feature/feature.xml
 +++ b/org.eclipse.wst.ws_ui.feature/feature.xml
 @@ -19,6 +19,10 @@
@@ -383,7 +383,7 @@ index 1cd3b04..a367ebe 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 1d7129b..c4f3ce9 100644
+index abd8b80..19f7313 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 @@
@@ -402,20 +402,20 @@ index 1d7129b..c4f3ce9 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 ef33712..a25bfd2 100644
+index 89f34c5..530092f 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.100.qualifier
+ Bundle-Version: 2.1.101.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,
-  com.ibm.icu;bundle-version="3.8.0";resolution:=optional
+- java_cup.runtime;bundle-version="0.10.0"
++ org.apache.xalan
  Bundle-RequiredExecutionEnvironment: J2SE-1.5
  Export-Package: org.eclipse.wst.xml.xpath2.api,
+  org.eclipse.wst.xml.xpath2.api.typesystem,
 diff --git a/org.eclipse.wst.xml_core.feature/feature.xml b/org.eclipse.wst.xml_core.feature/feature.xml
-index 267dc5f..5d01d93 100644
+index 1e745f1..dc8f6bc 100644
 --- a/org.eclipse.wst.xml_core.feature/feature.xml
 +++ b/org.eclipse.wst.xml_core.feature/feature.xml
 @@ -20,31 +20,17 @@
@@ -453,7 +453,7 @@ index 267dc5f..5d01d93 100644
  
     <plugin
 diff --git a/org.eclipse.wst.xml_ui.feature/feature.xml b/org.eclipse.wst.xml_ui.feature/feature.xml
-index 245f0c2..beb8842 100644
+index afa866a..9d57130 100644
 --- a/org.eclipse.wst.xml_ui.feature/feature.xml
 +++ b/org.eclipse.wst.xml_ui.feature/feature.xml
 @@ -21,9 +21,9 @@
@@ -470,7 +470,7 @@ index 245f0c2..beb8842 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 1838eb8..b903c3b 100644
+index fa29512..9b04eb9 100644
 --- a/org.eclipse.wst.xsl.feature/feature.xml
 +++ b/org.eclipse.wst.xsl.feature/feature.xml
 @@ -81,7 +81,7 @@

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