[eclipse-wtp] 05/08: Refreshed d/patches/debian-custom-build.patch

Jakub Adam xhaakon-guest at moszumanska.debian.org
Thu Jul 10 17:46:41 UTC 2014 

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 bda486bb5ff1f1215ee573d368ca4b62e56cd844
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jul 10 15:41:29 2014 +0200

    Refreshed d/patches/debian-custom-build.patch
---
 debian/changelog                         |  1 +
 debian/patches/debian-custom-build.patch | 84 ++++++++++++++++----------------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b87bd9c..bad1606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse-wtp (3.6.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refreshed d/patches/debian-custom-build.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 10 Jul 2014 12:54:39 +0200
 
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 075add7..81216f2 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, 56 insertions(+), 89 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 90374a2..4712a18 100644
+index d5662dc..46a777d 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,
@@ -40,10 +40,10 @@ index 90374a2..4712a18 100644
 - org.mozilla.javascript;bundle-version="1.7.2",
 + org.mozilla.javascript,
   org.eclipse.core.expressions,
-  org.eclipse.wst.jsdt.ui
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+  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 1dab9e4..edcca5b 100644
+index 30c89c7..cc2e822 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 1dab9e4..edcca5b 100644
 +         version="0.0.0"
           unpack="false"/>
  
-    <plugin
+    <!-- plugin
 diff --git a/org.eclipse.wst.server_adapters.feature/feature.xml b/org.eclipse.wst.server_adapters.feature/feature.xml
-index 870664d..7e98d0a 100644
+index 467252d..922cf07 100644
 --- a/org.eclipse.wst.server_adapters.feature/feature.xml
 +++ b/org.eclipse.wst.server_adapters.feature/feature.xml
 @@ -51,14 +51,14 @@
@@ -77,28 +77,28 @@ index 870664d..7e98d0a 100644
  
  </feature>
 diff --git a/org.eclipse.wst.server_ui.feature/feature.xml b/org.eclipse.wst.server_ui.feature/feature.xml
-index 7c84875..506c047 100644
+index c84c66f..8619f29 100644
 --- a/org.eclipse.wst.server_ui.feature/feature.xml
 +++ b/org.eclipse.wst.server_ui.feature/feature.xml
 @@ -19,12 +19,12 @@
-       %license
-    </license>
- 
--   <includes
--         id="org.eclipse.wst.server_userdoc.feature"
--         version="0.0.0"/>
-+   <requires>
-+     <import feature="org.eclipse.wst.server_core.feature" version="0.0.0"/>
-+   </requires>
- 
-    <includes
--         id="org.eclipse.wst.server_core.feature"
-+         id="org.eclipse.wst.server_userdoc.feature"
-          version="0.0.0"/>
- 
-    <plugin
+       %license
+    </license>
+ 
+-   <includes
+-         id="org.eclipse.wst.server_userdoc.feature"
+-         version="0.0.0"/>
++   <requires>
++     <import feature="org.eclipse.wst.server_core.feature" version="0.0.0"/>
++   </requires>
+ 
+    <includes
+-         id="org.eclipse.wst.server_core.feature"
++         id="org.eclipse.wst.server_userdoc.feature"
+          version="0.0.0"/>
+ 
+    <plugin
 diff --git a/org.eclipse.wst.web_core.feature/feature.xml b/org.eclipse.wst.web_core.feature/feature.xml
-index 0de2299..33b3c82 100644
+index c09fcd9..02a89f8 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 0de2299..33b3c82 100644
  
     <plugin
 diff --git a/org.eclipse.wst.web_ui.feature/feature.xml b/org.eclipse.wst.web_ui.feature/feature.xml
-index 0139065..ac026de 100644
+index 567d0fc..694ce5f 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 0139065..ac026de 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 994da93..dd6af81 100644
+index 8fe542a..12a262b 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)",
@@ -176,7 +176,7 @@ index 994da93..dd6af81 100644
   org.uddi4j;bundle-version="[2.0.4,2.1.0)",
   org.apache.axis;bundle-version="[1.4.0,2.0.0)",
 diff --git a/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF b/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
-index e662fcd..84cd984 100644
+index 53ee368..c3ec066 100644
 --- a/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
 +++ b/org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF
 @@ -13,7 +13,7 @@ Export-Package: org.eclipse.wst.ws.internal.parser.disco;x-internal:=true,
@@ -189,7 +189,7 @@ index e662fcd..84cd984 100644
   org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
   org.uddi4j;bundle-version="[2.0.4,2.1.0)",
 diff --git a/org.eclipse.wst.ws/META-INF/MANIFEST.MF b/org.eclipse.wst.ws/META-INF/MANIFEST.MF
-index 8f5488f..6aae09b 100644
+index ad0da04..28d3bf1 100644
 --- a/org.eclipse.wst.ws/META-INF/MANIFEST.MF
 +++ b/org.eclipse.wst.ws/META-INF/MANIFEST.MF
 @@ -39,7 +39,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 8112f0c..3b86059 100644
+index 83e2f65..448e9d5 100644
 --- a/org.eclipse.wst.ws_core.feature/feature.xml
 +++ b/org.eclipse.wst.ws_core.feature/feature.xml
 @@ -37,12 +37,12 @@
@@ -279,10 +279,10 @@ index 8112f0c..3b86059 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 fe462f6..9c0a4b6 100644
+index 1c30698..a4ad3e6 100644
 --- a/org.eclipse.wst.ws_ui.feature/feature.xml
 +++ b/org.eclipse.wst.ws_ui.feature/feature.xml
-@@ -21,6 +21,10 @@
+@@ -19,6 +19,10 @@
        %license
     </license>
  
@@ -293,7 +293,7 @@ index fe462f6..9c0a4b6 100644
     <includes
           id="org.eclipse.wst.ws_userdoc.feature"
           version="0.0.0"/>
-@@ -29,10 +33,6 @@
+@@ -27,10 +31,6 @@
           id="org.eclipse.wst.ws_core.feature"
           version="0.0.0"/>
  
@@ -305,7 +305,7 @@ index fe462f6..9c0a4b6 100644
           id="org.eclipse.wst.command.env.ui"
           download-size="0"
 diff --git a/org.eclipse.wst.ws_wsdl15.feature/feature.xml b/org.eclipse.wst.ws_wsdl15.feature/feature.xml
-index 913ab43..48f28a5 100644
+index c73c622..fcbb6f2 100644
 --- a/org.eclipse.wst.ws_wsdl15.feature/feature.xml
 +++ b/org.eclipse.wst.ws_wsdl15.feature/feature.xml
 @@ -24,7 +24,7 @@
@@ -318,7 +318,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 9ab8117..9fcee28 100644
+index 9106885..14c47d8 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)",
@@ -331,7 +331,7 @@ index 9ab8117..9fcee28 100644
   org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)",
   org.eclipse.ltk.ui.refactoring;bundle-version="[3.2.0,4.0.0)",
 diff --git a/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF b/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
-index e9f4ae3..200cac2 100644
+index 0b4fe70..f0b0a4d 100644
 --- a/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
 +++ b/org.eclipse.wst.wsdl.validation/META-INF/MANIFEST.MF
 @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
@@ -344,7 +344,7 @@ index e9f4ae3..200cac2 100644
   org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
   org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
 diff --git a/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF b/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
-index 7fad7d7..c71802b 100644
+index 7cff97e..b590a99 100644
 --- a/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
 +++ b/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
 @@ -28,7 +28,7 @@ Export-Package: org.eclipse.wst.wsdl,
@@ -357,7 +357,7 @@ index 7fad7d7..c71802b 100644
   org.apache.xerces;bundle-version="[2.8.0,3.0.0)"
  Import-Package: com.ibm.icu.util; version="3.8" 
 diff --git a/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF b/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
-index ac91a98..2b12852 100644
+index 4f4f28a..5c72d7b 100644
 --- a/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
 +++ b/org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF
 @@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.core.runtime; bundle-version="[3.2.0,4.0.0)",
@@ -370,7 +370,7 @@ index ac91a98..2b12852 100644
   org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)"
  Bundle-ActivationPolicy: lazy
 diff --git a/org.eclipse.wst.wsi/META-INF/MANIFEST.MF b/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
-index e2475d3..7d003b2 100644
+index 1cd3b04..a367ebe 100644
 --- a/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
 +++ b/org.eclipse.wst.wsi/META-INF/MANIFEST.MF
 @@ -49,7 +49,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
@@ -383,7 +383,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 d803b42..c789c61 100644
+index 1d7129b..c4f3ce9 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 @@
@@ -415,7 +415,7 @@ index ef33712..a25bfd2 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 31f5afb..75fd1de 100644
+index 267dc5f..5d01d93 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 31f5afb..75fd1de 100644
  
     <plugin
 diff --git a/org.eclipse.wst.xml_ui.feature/feature.xml b/org.eclipse.wst.xml_ui.feature/feature.xml
-index 43f90fe..292cdf8 100644
+index 245f0c2..beb8842 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 43f90fe..292cdf8 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 fe1f90e..d12931b 100644
+index 1838eb8..b903c3b 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

More information about the pkg-java-commits mailing list