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

[Jakub Adam]

The following commit has been merged in the master branch:
commit b27633a82d272cd2d3299711e1aae22de7d4923f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jan 23 19:11:41 2013 +0100

    Fix installation of some orbit dependencies in eclipse-wtp-ws

diff --git a/debian/changelog b/debian/changelog
index 1fe9b5a..1e8bb00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+eclipse-wtp (3.4.1-2) UNRELEASED; urgency=low
+
+  * Fix installation of some orbit dependencies in eclipse-wtp-ws.
+    - Added missing unpack="false" into feature.xml.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 23 Jan 2013 19:08:51 +0100
+
 eclipse-wtp (3.4.1-1) experimental; urgency=low
 
   * Initial release. (Closes: #551866)
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index c0095f7..deba9ab 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -11,7 +11,7 @@ Subject: debian-custom-build
  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          |   11 ++++++-----
+ org.eclipse.wst.ws_core.feature/feature.xml          |   18 +++++++++++-------
  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 +-
@@ -26,7 +26,7 @@ Subject: debian-custom-build
  org.eclipse.wst.xsl.feature/feature.xml              |    8 ++++----
  .../schema/processor.exsd                            |    2 +-
  org.eclipse.wst.xsl.xalan/plugin.xml                 |    2 +-
- 23 files changed, 51 insertions(+), 66 deletions(-)
+ 23 files changed, 56 insertions(+), 68 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
@@ -180,7 +180,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 19031b8..52dd0ea 100644
+index 19031b8..b030b61 100644
 --- a/org.eclipse.wst.ws_core.feature/feature.xml
 +++ b/org.eclipse.wst.ws_core.feature/feature.xml
 @@ -37,12 +37,12 @@
@@ -207,7 +207,7 @@ index 19031b8..52dd0ea 100644
           unpack="false"/>
  
     <plugin
-@@ -111,7 +111,8 @@
+@@ -111,25 +111,29 @@
           id="org.apache.commons.discovery"
           download-size="0"
           install-size="0"
@@ -217,15 +217,30 @@ index 19031b8..52dd0ea 100644
  
     <plugin
           id="javax.xml.rpc"
-@@ -123,7 +124,7 @@
+          download-size="0"
+          install-size="0"
+-         version="0.0.0"/>
++         version="0.0.0"
++         unpack="false"/>
+ 
+    <plugin
           id="javax.xml.soap"
           download-size="0"
           install-size="0"
 -         version="1.2.0.qualifier"/>
-+         version="0.0.0"/>
++         version="0.0.0"
++         unpack="false"/>
  
     <plugin
           id="org.apache.axis"
+          download-size="0"
+          install-size="0"
+-         version="0.0.0"/>
++         version="0.0.0"
++         unpack="false"/>
+ 
+    <plugin
+          id="javax.mail"
 diff --git a/org.eclipse.wst.ws_ui.feature/feature.xml b/org.eclipse.wst.ws_ui.feature/feature.xml
 index a3cad4d..6839293 100644
 --- a/org.eclipse.wst.ws_ui.feature/feature.xml

-- 
eclipse-wtp packaging