[SCM] eclipse-wtp packaging branch, master, updated. debian/3.4.1-1-2-g9bc90e5
Jakub Adam
jakub.adam at ktknet.cz
Wed Jan 23 21:27:07 UTC 2013
The following commit has been merged in the master branch:
commit 9bc90e5f22c39c4212f8f5075acf89ce2d19f2cf
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Wed Jan 23 19:15:32 2013 +0100
Remove unneeded dependencies
Use classes provided by JRE instead.
diff --git a/debian/changelog b/debian/changelog
index 1e8bb00..ee9158f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ 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.
+ * Remove dependency on libjaxp1.3-java, libgnujaf-java packages
+ and axis-saaj.jar.
+ - Use classes provided by JRE instead.
-- Jakub Adam <jakub.adam at ktknet.cz> Wed, 23 Jan 2013 19:08:51 +0100
diff --git a/debian/control b/debian/control
index 2e6df40..90cd2f8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,19 +8,17 @@ Build-Depends: debhelper (>= 8~),
eclipse-pde (>= 3.7.1),
eclipse-gef,
eclipse-xsd,
- libaxis-java (>= 1.4-16),
- libgnujaf-java (>= 1.1.1-7),
+ libaxis-java (>= 1.4-17),
libcommons-discovery-java (>= 0.5-2),
libcommons-logging-java (>= 1.1.1-8),
- libgnumail-java (>= 1.1.2-6),
+ libgnumail-java (>= 1.1.2-7),
librhino-java (>= 1.7R3-4),
liblog4j1.2-java (>= 1.2.16-3),
libxerces2-java (>= 2.11.0-4),
libxalan2-java (>= 2.7.1-7),
libuddi4j-java (>= 2.0.5),
- libwsdl4j-java (>= 1.6.2-4),
+ libwsdl4j-java (>= 1.6.2-5),
libwsil4j-java (>= 1.0.0),
- libjaxp1.3-java (>= 1.3.05-2),
libxml-commons-resolver1.1-java (>= 1.2-7),
javahelper (>= 0.31),
dita-ot,
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index abe2ba9..0943ce7 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1,4 +1,3 @@
-activation
axis
commons-discovery
commons-logging
@@ -6,12 +5,10 @@ gnumail
jaxrpc
js
log4j-1.2
-saaj
serializer
uddi4j
wsdl4j
wsil4j
xalan2
xercesImpl
-xml-apis
xml-resolver
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index deba9ab..440b3b0 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -3,30 +3,30 @@ Date: Sat, 29 Sep 2012 20:14:43 +0200
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.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 | 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 +-
- org.eclipse.wst.wsdl.validation/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 ++--
- .../META-INF/MANIFEST.MF | 2 +-
- org.eclipse.wst.xml_core.feature/feature.xml | 13 +++----------
- 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, 56 insertions(+), 68 deletions(-)
+ .../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.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_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 +--
+ .../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 +++---
+ .../schema/processor.exsd | 2 +-
+ org.eclipse.wst.xsl.xalan/plugin.xml | 2 +-
+ 23 files changed, 52 insertions(+), 85 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..b030b61 100644
+index 19031b8..e9ce9ad 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..b030b61 100644
unpack="false"/>
<plugin
-@@ -111,25 +111,29 @@
+@@ -111,35 +111,25 @@
id="org.apache.commons.discovery"
download-size="0"
install-size="0"
@@ -220,13 +220,11 @@ index 19031b8..b030b61 100644
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"
+-
+- <plugin
+- id="javax.xml.soap"
+- download-size="0"
+- install-size="0"
- version="1.2.0.qualifier"/>
+ version="0.0.0"
+ unpack="false"/>
@@ -236,11 +234,20 @@ index 19031b8..b030b61 100644
download-size="0"
install-size="0"
- version="0.0.0"/>
-+ version="0.0.0"
-+ unpack="false"/>
+-
+- <plugin
+- id="javax.mail"
+- download-size="0"
+- install-size="0"
+ version="0.0.0"
+ unpack="false"/>
<plugin
- id="javax.mail"
+- id="javax.activation"
++ id="javax.mail"
+ download-size="0"
+ 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 a3cad4d..6839293 100644
--- a/org.eclipse.wst.ws_ui.feature/feature.xml
@@ -378,18 +385,20 @@ index bb71d57..0af23b7 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 0b7c456..5af3c54 100644
+index 0b7c456..5115d5d 100644
--- a/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/org.eclipse.wst.xml_core.feature/feature.xml
-@@ -23,28 +23,21 @@
- id="javax.xml"
- download-size="190"
- install-size="190"
-- version="1.3.4.qualifier"
-+ version="0.0.0"
- unpack="false"/>
+@@ -20,31 +20,17 @@
+ </license>
<plugin
+- id="javax.xml"
+- download-size="190"
+- install-size="190"
+- version="1.3.4.qualifier"
+- unpack="false"/>
+-
+- <plugin
id="org.apache.xml.resolver"
download-size="96"
install-size="96"
--
eclipse-wtp packaging
More information about the pkg-java-commits
mailing list