[eclipse-wtp] 06/08: Depend on libmail-java instead of libgnumail-java
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Nov 4 23:54:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository eclipse-wtp.
commit e4298b9869d7fffed7caea298e0832e01d2ed2c2
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Nov 4 19:21:28 2016 +0100
Depend on libmail-java instead of libgnumail-java
---
debian/changelog | 1 +
debian/control | 2 +-
debian/eclipse.orbitdeps | 2 +-
debian/patches/debian-custom-build.patch | 70 +++++---------------------------
4 files changed, 14 insertions(+), 61 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a6e957a..2b7c785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipse-wtp (3.6.3-2) UNRELEASED; urgency=medium
* Team upload.
* Fixed the compatibility with the latest version of JFlex
* Transition to Jetty 9
+ * Depend on libmail-java instead of libgnumail-java
* Standards-Version updated to 3.9.8
* Switch to debhelper level 10
* Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index d382aea..c570965 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ Build-Depends: debhelper (>= 10),
libaxis-java (>= 1.4-17),
libcommons-discovery-java (>= 0.5-2),
libcommons-logging-java (>= 1.1.1-8),
- libgnumail-java (>= 1.1.2-8),
librhino-java (>= 1.7R3-4),
liblog4j1.2-java (>= 1.2.16-3),
+ libmail-java,
libxerces2-java (>= 2.11.0-4),
libxalan2-java (>= 2.7.1-7),
libuddi4j-java (>= 2.0.5),
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 6e497bb..1a5a016 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1,7 +1,7 @@
axis
commons-discovery
commons-logging
-gnumail
+javax.mail
jaxrpc
jetty9-webapp
jetty9-xml
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 7abe289..abea393 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -29,11 +29,9 @@ Subject: debian-custom-build
org.eclipse.wst.xsl.xalan/plugin.xml | 2 +-
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 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,
+@@ -18,7 +18,7 @@
org.eclipse.wst.jsdt.debug.rhino.debugger,
org.eclipse.wst.jsdt.debug.rhino,
org.eclipse.wst.jsdt.debug.core,
@@ -42,8 +40,6 @@ index d5662dc..46a777d 100644
org.eclipse.core.expressions,
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 88ad2bc..c8f4fda 100644
--- a/org.eclipse.wst.jsdt.feature/feature.xml
+++ b/org.eclipse.wst.jsdt.feature/feature.xml
@@ -108,7 +108,7 @@
@@ -55,8 +51,6 @@ index 88ad2bc..c8f4fda 100644
unpack="false"/>
</feature>
-diff --git a/org.eclipse.wst.server_adapters.feature/feature.xml b/org.eclipse.wst.server_adapters.feature/feature.xml
-index b6e659a..3356c02 100644
--- a/org.eclipse.wst.server_adapters.feature/feature.xml
+++ b/org.eclipse.wst.server_adapters.feature/feature.xml
@@ -51,14 +51,14 @@
@@ -76,8 +70,6 @@ index b6e659a..3356c02 100644
unpack="false"/>
</feature>
-diff --git a/org.eclipse.wst.server_ui.feature/feature.xml b/org.eclipse.wst.server_ui.feature/feature.xml
-index 67828c6..6fa45c5 100644
--- a/org.eclipse.wst.server_ui.feature/feature.xml
+++ b/org.eclipse.wst.server_ui.feature/feature.xml
@@ -19,12 +19,12 @@
@@ -97,8 +89,6 @@ index 67828c6..6fa45c5 100644
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 1c877e7..4a16c90 100644
--- a/org.eclipse.wst.web_core.feature/feature.xml
+++ b/org.eclipse.wst.web_core.feature/feature.xml
@@ -19,20 +19,14 @@
@@ -128,8 +118,6 @@ index 1c877e7..4a16c90 100644
version="0.0.0"/>
<plugin
-diff --git a/org.eclipse.wst.web_ui.feature/feature.xml b/org.eclipse.wst.web_ui.feature/feature.xml
-index 61238ef..2588598 100644
--- a/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/org.eclipse.wst.web_ui.feature/feature.xml
@@ -20,6 +20,11 @@
@@ -162,11 +150,9 @@ index 61238ef..2588598 100644
<plugin
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 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)",
+@@ -23,7 +23,7 @@
org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
@@ -175,11 +161,9 @@ index 8fe542a..12a262b 100644
org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
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 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,
+@@ -13,7 +13,7 @@
org.eclipse.wst.ws.internal.parser.wsil;x-internal:=true,
org.eclipse.wst.ws.parser
Require-Bundle: org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
@@ -188,11 +172,9 @@ index 53ee368..c3ec066 100644
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
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 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)",
+@@ -39,7 +39,7 @@
org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
@@ -201,8 +183,6 @@ index ad0da04..28d3bf1 100644
org.apache.wsil4j;bundle-version="[1.0.0,1.1.0)",
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 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 @@
@@ -274,12 +254,10 @@ index 83e2f65..448e9d5 100644
<plugin
- id="javax.activation"
-+ id="javax.mail"
++ id="com.sun.mail.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 efe32e8..b04ebe4 100644
--- a/org.eclipse.wst.ws_ui.feature/feature.xml
+++ b/org.eclipse.wst.ws_ui.feature/feature.xml
@@ -19,6 +19,10 @@
@@ -304,8 +282,6 @@ index efe32e8..b04ebe4 100644
<plugin
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 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 @@
@@ -317,11 +293,9 @@ index c73c622..fcbb6f2 100644
unpack="false"/>
</feature>
-diff --git a/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF b/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF
-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)",
+@@ -76,7 +76,7 @@
org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
org.eclipse.wst.validation;bundle-version="[1.1.0,2.0.0)",
@@ -330,11 +304,9 @@ index 9106885..14c47d8 100644
org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,2.0.0)",
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 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)",
+@@ -24,7 +24,7 @@
org.apache.ant;bundle-version="[1.6.5,2.0.0)";resolution:=optional,
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.3.0)",
org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",
@@ -343,11 +315,9 @@ index 0b4fe70..f0b0a4d 100644
org.apache.xerces;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
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 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,
+@@ -28,7 +28,7 @@
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
@@ -356,11 +326,9 @@ index 7cff97e..b590a99 100644
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
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 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)",
+@@ -32,7 +32,7 @@
org.eclipse.wst.wsi;bundle-version="[1.0.101,1.1.0)",
org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.102,1.1.0)",
org.eclipse.wst.internet.monitor.ui;bundle-version="[1.0.102,1.1.0)",
@@ -369,11 +337,9 @@ index 4f4f28a..5c72d7b 100644
org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.2.0)",
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 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)",
+@@ -49,7 +49,7 @@
org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.ws;bundle-version="[1.0.100,2.0.0)",
@@ -382,8 +348,6 @@ index 1cd3b04..a367ebe 100644
org.uddi4j;bundle-version="[2.0.4,2.1.0)",
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 abd8b80..19f7313 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 @@
@@ -401,11 +365,9 @@ index abd8b80..19f7313 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 89f34c5..530092f 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
+@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.eclipse.wst.xml.xpath2.processor
Bundle-Version: 2.1.101.qualifier
Require-Bundle: org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
@@ -414,8 +376,6 @@ index 89f34c5..530092f 100644
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.wst.xml.xpath2.api,
org.eclipse.wst.xml.xpath2.api.typesystem,
-diff --git a/org.eclipse.wst.xml_core.feature/feature.xml b/org.eclipse.wst.xml_core.feature/feature.xml
-index 1e745f1..dc8f6bc 100644
--- a/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/org.eclipse.wst.xml_core.feature/feature.xml
@@ -20,31 +20,17 @@
@@ -452,8 +412,6 @@ index 1e745f1..dc8f6bc 100644
unpack="false"/>
<plugin
-diff --git a/org.eclipse.wst.xml_ui.feature/feature.xml b/org.eclipse.wst.xml_ui.feature/feature.xml
-index afa866a..9d57130 100644
--- a/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -21,9 +21,9 @@
@@ -469,8 +427,6 @@ index afa866a..9d57130 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 fa29512..9b04eb9 100644
--- a/org.eclipse.wst.xsl.feature/feature.xml
+++ b/org.eclipse.wst.xsl.feature/feature.xml
@@ -81,7 +81,7 @@
@@ -506,8 +462,6 @@ index fa29512..9b04eb9 100644
<plugin
id="org.eclipse.wst.xsl.saxon"
-diff --git a/org.eclipse.wst.xsl.jaxp.launching/schema/processor.exsd b/org.eclipse.wst.xsl.jaxp.launching/schema/processor.exsd
-index e59e08c..71369fc 100644
--- a/org.eclipse.wst.xsl.jaxp.launching/schema/processor.exsd
+++ b/org.eclipse.wst.xsl.jaxp.launching/schema/processor.exsd
@@ -117,7 +117,7 @@
@@ -519,8 +473,6 @@ index e59e08c..71369fc 100644
id="org.eclipse.wst.xsl.launching.xalan.processor"
label="%processor.label.1"
processorTypeId="org.eclipse.wst.xsl.xalan.processorType"
-diff --git a/org.eclipse.wst.xsl.xalan/plugin.xml b/org.eclipse.wst.xsl.xalan/plugin.xml
-index 6a60297..375690c 100644
--- a/org.eclipse.wst.xsl.xalan/plugin.xml
+++ b/org.eclipse.wst.xsl.xalan/plugin.xml
@@ -34,7 +34,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