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

[Jakub Adam]

The following commit has been merged in the master branch:
commit 9fc02abe3120f75de7c346bebbcb0eeeca2f0600
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Mar 29 22:35:29 2013 +0100

    Add jetty8-xml.jar and jetty8-webapp.jar to orbitdeps
    
    These are already installed with libjetty8-java so we don't need any
    additional package dependencies.

diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 0943ce7..42f9973 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -3,6 +3,8 @@ commons-discovery
 commons-logging
 gnumail
 jaxrpc
+jetty8-webapp
+jetty8-xml
 js
 log4j-1.2
 serializer
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 19144b0..7de0be3 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -5,6 +5,7 @@ Subject: debian-custom-build
 ---
  .../META-INF/MANIFEST.MF                           |    2 +-
  org.eclipse.wst.jsdt.feature/feature.xml           |    2 +-
+ .../feature.xml                                    |    4 +-
  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 +-
@@ -26,7 +27,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, 189 insertions(+), 222 deletions(-)
+ 24 files changed, 191 insertions(+), 224 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
@@ -54,6 +55,27 @@ index f606cdc..bda3a9b 100644
           unpack="false"/>
  
     <plugin
+diff --git a/org.eclipse.wst.server_adapters.feature/feature.xml b/org.eclipse.wst.server_adapters.feature/feature.xml
+index 398528b..16e138f 100644
+--- a/org.eclipse.wst.server_adapters.feature/feature.xml
++++ b/org.eclipse.wst.server_adapters.feature/feature.xml
+@@ -51,14 +51,14 @@
+ 		 id="org.eclipse.jetty.webapp"
+          download-size="0"
+          install-size="0"
+-         version="8.1.3.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 	
+ 	<plugin
+ 		 id="org.eclipse.jetty.xml"
+          download-size="0"
+          install-size="0"
+-         version="8.1.3.qualifier"
++         version="0.0.0"
+          unpack="false"/>	         
+ 
+ </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
 --- a/org.eclipse.wst.server_ui.feature/feature.xml

-- 
eclipse-wtp packaging