[SCM] eclipse-wtp packaging branch, master, updated. debian/3.4.1-2-6-g9fc02ab

Jakub Adam jakub.adam at ktknet.cz
Fri Mar 29 22:14:12 UTC 2013


The following commit has been merged in the master branch:
commit b1a808985183d25ca4d5218e2458663247d378e9
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Mar 29 21:49:38 2013 +0100

    Refreshed d/patches/debian-custom-build.patch

diff --git a/debian/changelog b/debian/changelog
index 410e5b7..2d068a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ eclipse-wtp (3.4.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Added d/get-orig-source.
+  * Refreshed d/patches/debian-custom-build.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 29 Mar 2013 21:37:32 +0100
 
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 440b3b0..19144b0 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -5,31 +5,31 @@ Subject: debian-custom-build
 ---
  .../META-INF/MANIFEST.MF                           |    2 +-
  org.eclipse.wst.jsdt.feature/feature.xml           |    2 +-
- org.eclipse.wst.server_ui.feature/feature.xml      |    8 +++---
- org.eclipse.wst.web_core.feature/feature.xml       |   18 +++++---------
- org.eclipse.wst.web_ui.feature/feature.xml         |   13 ++++------
+ org.eclipse.wst.server_ui.feature/feature.xml      |    8 +-
+ org.eclipse.wst.web_core.feature/feature.xml       |   18 +-
+ org.eclipse.wst.web_ui.feature/feature.xml         |   13 +-
  org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF   |    2 +-
  org.eclipse.wst.ws.parser/META-INF/MANIFEST.MF     |    2 +-
  org.eclipse.wst.ws/META-INF/MANIFEST.MF            |    2 +-
- org.eclipse.wst.ws_core.feature/feature.xml        |   26 ++++++--------------
- org.eclipse.wst.ws_ui.feature/feature.xml          |    8 +++---
+ org.eclipse.wst.ws_core.feature/feature.xml        |  300 ++++++++++----------
+ org.eclipse.wst.ws_ui.feature/feature.xml          |    8 +-
  org.eclipse.wst.ws_wsdl15.feature/feature.xml      |    2 +-
  org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF       |    2 +-
  .../META-INF/MANIFEST.MF                           |    2 +-
  org.eclipse.wst.wsdl/META-INF/MANIFEST.MF          |    2 +-
  org.eclipse.wst.wsi.ui/META-INF/MANIFEST.MF        |    2 +-
  org.eclipse.wst.wsi/META-INF/MANIFEST.MF           |    2 +-
- .../feature.xml                                    |    4 +--
+ .../feature.xml                                    |    4 +-
  .../META-INF/MANIFEST.MF                           |    2 +-
- org.eclipse.wst.xml_core.feature/feature.xml       |   18 ++------------
- org.eclipse.wst.xml_ui.feature/feature.xml         |    6 ++---
- org.eclipse.wst.xsl.feature/feature.xml            |    8 +++---
+ org.eclipse.wst.xml_core.feature/feature.xml       |   18 +-
+ org.eclipse.wst.xml_ui.feature/feature.xml         |    6 +-
+ org.eclipse.wst.xsl.feature/feature.xml            |    8 +-
  .../schema/processor.exsd                          |    2 +-
  org.eclipse.wst.xsl.xalan/plugin.xml               |    2 +-
- 23 files changed, 52 insertions(+), 85 deletions(-)
+ 23 files changed, 189 insertions(+), 222 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 27412d8..70dad0d 100644
+index 7c72fd4..25bfcf8 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,
@@ -55,7 +55,7 @@ index f606cdc..bda3a9b 100644
  
     <plugin
 diff --git a/org.eclipse.wst.server_ui.feature/feature.xml b/org.eclipse.wst.server_ui.feature/feature.xml
-index f426f9c..0b68484 100644
+index 656afb1..ddca2e4 100644
 --- a/org.eclipse.wst.server_ui.feature/feature.xml
 +++ b/org.eclipse.wst.server_ui.feature/feature.xml
 @@ -19,12 +19,12 @@
@@ -76,7 +76,7 @@ index f426f9c..0b68484 100644
  
     <plugin
 diff --git a/org.eclipse.wst.web_core.feature/feature.xml b/org.eclipse.wst.web_core.feature/feature.xml
-index 3eb6270..b953ab7 100644
+index b2dfdcd..ab8d816 100644
 --- a/org.eclipse.wst.web_core.feature/feature.xml
 +++ b/org.eclipse.wst.web_core.feature/feature.xml
 @@ -19,20 +19,14 @@
@@ -107,7 +107,7 @@ index 3eb6270..b953ab7 100644
  
     <plugin
 diff --git a/org.eclipse.wst.web_ui.feature/feature.xml b/org.eclipse.wst.web_ui.feature/feature.xml
-index df70478..37fd15e 100644
+index f88fcac..84aa26b 100644
 --- a/org.eclipse.wst.web_ui.feature/feature.xml
 +++ b/org.eclipse.wst.web_ui.feature/feature.xml
 @@ -20,6 +20,11 @@
@@ -154,7 +154,7 @@ index 2e65603..f651ae7 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 4f30eea..0e5bbae 100644
+index e662fcd..84cd984 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,
@@ -180,76 +180,312 @@ 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 19031b8..e9ce9ad 100644
+index e764d1d..163dcbc 100644
 --- a/org.eclipse.wst.ws_core.feature/feature.xml
 +++ b/org.eclipse.wst.ws_core.feature/feature.xml
-@@ -37,12 +37,12 @@
-          version="0.0.0"
-          unpack="false"/>
- 
--   <plugin
+@@ -1,155 +1,145 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<feature
+-      id="org.eclipse.wst.ws_core.feature"
+-      label="%featureName"
+-      version="3.4.2.qualifier"
+-      provider-name="%providerName"
+-      license-feature="org.eclipse.license"
+-      license-feature-version="1.0.0.qualifier">
+-
+-   <description>
+-      %description
+-   </description>
+-
+-   <copyright>
+-      %copyright
+-   </copyright>
+-
+-   <license url="%licenseURL">
+-      %license
+-   </license>
+-
+-   <includes
+-         id="org.eclipse.wst.ws_wsdl15.feature"
+-         version="0.0.0"/>
+-
+-   <plugin
+-         id="org.eclipse.wst.command.env"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.wst.command.env.core"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.commons.codec"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.wst.ws"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.wst.ws.parser"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.wst.wsdl"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.wst.wsdl.validation"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.wst.wsi"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.commons.logging"
+-         download-size="0"
+-         install-size="0"
+-         version="1.0.4.qualifier"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.log4j"
+-         download-size="0"
+-         install-size="0"
+-         version="1.2.15.qualifier"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.wsil4j"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.uddi4j"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.commons.discovery"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"/>
+-
+-   <plugin
+-         id="javax.xml.rpc"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"/>
+-
+-   <plugin
+-         id="javax.xml.soap"
+-         download-size="0"
+-         install-size="0"
+-         version="1.2.0.qualifier"/>
+-
+-   <plugin
+-         id="org.apache.axis"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"/>
+-
+-   <plugin
+-         id="javax.mail"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.activation"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.wst.ws.service.policy"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-</feature>
++<?xml version="1.0" encoding="UTF-8"?>
++<feature
++      id="org.eclipse.wst.ws_core.feature"
++      label="%featureName"
++      version="3.4.2.qualifier"
++      provider-name="%providerName"
++      license-feature="org.eclipse.license"
++      license-feature-version="1.0.0.qualifier">
++
++   <description>
++      %description
++   </description>
++
++   <copyright>
++      %copyright
++   </copyright>
++
++   <license url="%licenseURL">
++      %license
++   </license>
++
++   <includes
++         id="org.eclipse.wst.ws_wsdl15.feature"
++         version="0.0.0"/>
++
++   <plugin
++         id="org.eclipse.wst.command.env"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.wst.command.env.core"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
 +   <!--plugin
-          id="org.apache.commons.codec"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>
++         id="org.apache.commons.codec"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
 +         unpack="false"/-->
- 
-    <plugin
-          id="org.eclipse.wst.ws"
-@@ -90,7 +90,7 @@
-          id="org.apache.log4j"
-          download-size="0"
-          install-size="0"
--         version="1.2.15.qualifier"
++
++   <plugin
++         id="org.eclipse.wst.ws"
++         download-size="0"
++         install-size="0"
 +         version="0.0.0"
-          unpack="false"/>
- 
-    <plugin
-@@ -111,35 +111,25 @@
-          id="org.apache.commons.discovery"
-          download-size="0"
-          install-size="0"
--         version="0.0.0"/>
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.wst.ws.parser"
++         download-size="0"
++         install-size="0"
 +         version="0.0.0"
 +         unpack="false"/>
- 
-    <plugin
-          id="javax.xml.rpc"
-          download-size="0"
-          install-size="0"
--         version="0.0.0"/>
--
--   <plugin
--         id="javax.xml.soap"
--         download-size="0"
--         install-size="0"
--         version="1.2.0.qualifier"/>
++
++   <plugin
++         id="org.eclipse.wst.wsdl"
++         download-size="0"
++         install-size="0"
 +         version="0.0.0"
 +         unpack="false"/>
- 
-    <plugin
-          id="org.apache.axis"
-          download-size="0"
-          install-size="0"
--         version="0.0.0"/>
--
--   <plugin
--         id="javax.mail"
--         download-size="0"
--         install-size="0"
-          version="0.0.0"
-          unpack="false"/>
- 
-    <plugin
--         id="javax.activation"
++
++   <plugin
++         id="org.eclipse.wst.wsdl.validation"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.wst.wsi"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="org.apache.commons.logging"
++         download-size="0"
++         install-size="0"
++         version="1.0.4.qualifier"
++         unpack="false"/>
++
++   <plugin
++         id="org.apache.log4j"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="org.apache.wsil4j"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="org.uddi4j"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="org.apache.commons.discovery"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="javax.xml.rpc"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="org.apache.axis"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
 +         id="javax.mail"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.wst.ws.service.policy"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++</feature>
 diff --git a/org.eclipse.wst.ws_ui.feature/feature.xml b/org.eclipse.wst.ws_ui.feature/feature.xml
-index a3cad4d..6839293 100644
+index 77d6d10..c527cf7 100644
 --- a/org.eclipse.wst.ws_ui.feature/feature.xml
 +++ b/org.eclipse.wst.ws_ui.feature/feature.xml
 @@ -19,6 +19,10 @@
@@ -353,7 +589,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 c508a43..83872ce 100644
+index 7519b58..683e3e3 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 @@
@@ -372,20 +608,20 @@ index c508a43..83872ce 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 bb71d57..0af23b7 100644
+index d8aa495..6ac703c 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.1.qualifier
+ Bundle-Version: 2.1.2.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,5.0.0)";resolution:=optional
+  com.ibm.icu;bundle-version="3.8.0";resolution:=optional
  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 0b7c456..5115d5d 100644
+index ce0c134..d161be6 100644
 --- a/org.eclipse.wst.xml_core.feature/feature.xml
 +++ b/org.eclipse.wst.xml_core.feature/feature.xml
 @@ -20,31 +20,17 @@
@@ -423,11 +659,11 @@ index 0b7c456..5115d5d 100644
  
     <plugin
 diff --git a/org.eclipse.wst.xml_ui.feature/feature.xml b/org.eclipse.wst.xml_ui.feature/feature.xml
-index 182e0f1..a7ab3a6 100644
+index 32fc2f0..23f0183 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/juno"/>
+       <update label="%updateSiteName" url="http://download.eclipse.org/webtools/repository/indigo"/>
     </url>
  
 -   <includes
@@ -440,7 +676,7 @@ index 182e0f1..a7ab3a6 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 fd7d908..919284f 100644
+index 448b2db..74fa092 100644
 --- a/org.eclipse.wst.xsl.feature/feature.xml
 +++ b/org.eclipse.wst.xsl.feature/feature.xml
 @@ -105,19 +105,19 @@

-- 
eclipse-wtp packaging



More information about the pkg-java-commits mailing list