[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. debian/3.8.2-1-3-g33243a4
Jakub Adam
jakub.adam at ktknet.cz
Fri Jan 25 18:25:54 UTC 2013
The following commit has been merged in the master branch:
commit 33243a48fe8781cae3ea31102fb7b13b146e0007
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Wed Jan 23 21:47:25 2013 +0100
Remove unneeded dependencies
Replace with packages provided by JRE instead.
diff --git a/debian/changelog b/debian/changelog
index de7004d..1006d7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ eclipse-mylyn (3.8.2-2) UNRELEASED; urgency=low
install whole JDT and Mylyn Java Context that might be otherwise
useless to them.
* Bump Standards-Version to 3.9.4.
+ * 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> Fri, 18 Jan 2013 21:40:35 +0100
diff --git a/debian/control b/debian/control
index e3786b9..65b3bc3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,20 +10,19 @@ Build-Depends: debhelper (>= 8~),
eclipse-jdt (>= 3.7~exp),
eclipse-pde (>= 3.7~exp),
eclipse-cdt,
- libaxis-java (>= 1.4-16),
+ libaxis-java (>= 1.4-17),
libcommons-discovery-java (>= 0.5-2),
libcommons-lang-java,
- libgnumail-java (>= 1.1.2-6),
+ libgnumail-java (>= 1.1.2-7),
libgoogle-gson-java,
libhttpclient-java (>= 4.1.1-2),
libhttpcore-java (>= 4.1.4-2),
libjaxme-java (>= 0.5.2+dfsg-6),
- libjaxp1.3-java (>= 1.3.05-2),
libjdom1-java (>= 1.1.2+dfsg-2),
libjsoup-java (>= 1.6.2),
librome-java (>= 1.0-3),
- libws-commons-util-java,
- libwsdl4j-java (>= 1.6.2-4),
+ libws-commons-util-java (>= 1.0.1-8),
+ libwsdl4j-java (>= 1.6.2-5),
libxmlrpc3-client-java (>= 3.1.3-4),
libxmlrpc3-common-java (>= 3.1.3-4),
javahelper (>= 0.31),
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 78975c9..d7f7e1d 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1,7 +1,5 @@
-activation
axis
axis-jaxrpc
-axis-saaj
commons-discovery
commons-lang
gnumail
@@ -14,6 +12,5 @@ jsoup
rome
ws-commons-util
wsdl4j
-xml-apis
xmlrpc-common
xmlrpc-client
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
index 696e077..d18d404 100644
--- a/debian/patches/debian-orbit-deps.patch
+++ b/debian/patches/debian-orbit-deps.patch
@@ -13,33 +13,33 @@ Subject: debian-orbit-deps
* remove versions from Import-Package directives so that distribution jars in
/usr/share/java can be used
---
- .../org.eclipse.mylyn.hudson-feature/feature.xml | 32 +++++-
- .../META-INF/MANIFEST.MF | 24 ++--
- .../org.eclipse.mylyn.commons-feature/feature.xml | 119 ++++++++++++++++++++
+ .../org.eclipse.mylyn.hudson-feature/feature.xml | 25 ++++-
+ .../META-INF/MANIFEST.MF | 26 +++---
+ .../org.eclipse.mylyn.commons-feature/feature.xml | 98 ++++++++++++++++++++
.../feature.xml | 2 +-
.../feature.xml | 4 +-
.../feature.xml | 8 +-
- .../META-INF/MANIFEST.MF | 36 +++---
- .../META-INF/MANIFEST.MF | 5 +-
+ .../META-INF/MANIFEST.MF | 36 +++----
+ .../META-INF/MANIFEST.MF | 6 +-
.../META-INF/MANIFEST.MF | 3 +-
.../org.eclipse.mylyn.monitor-feature/feature.xml | 7 ++
.../org.eclipse.mylyn.context-feature/feature.xml | 4 +-
.../org.eclipse.mylyn.wikitext-feature/feature.xml | 7 ++
.../org.eclipse.mylyn.trac-feature/feature.xml | 7 ++
.../META-INF/MANIFEST.MF | 7 +-
- 14 files changed, 215 insertions(+), 50 deletions(-)
+ 14 files changed, 187 insertions(+), 53 deletions(-)
diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
-index fea3621..60d6331 100644
+index fea3621..30afcb3 100644
--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
+++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson-feature/feature.xml
-@@ -29,17 +29,29 @@
+@@ -29,17 +29,20 @@
</license>
<requires>
- <import plugin="com.google.gson" version="2.1.0" match="compatible"/>
<import plugin="com.sun.xml.bind" version="2.2.0" match="compatible"/>
- <import plugin="javax.xml" version="1.3.4" match="compatible"/>
+- <import plugin="javax.xml" version="1.3.4" match="compatible"/>
- <import plugin="javax.xml.bind" version="2.1.0" match="compatible"/>
- <import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
@@ -55,18 +55,10 @@ index fea3621..60d6331 100644
+ unpack="false"/>
+
+ <plugin
-+ id="javax.xml.bind"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+
-+ <plugin
id="org.eclipse.mylyn.hudson.core"
download-size="0"
install-size="0"
-@@ -53,4 +65,18 @@
+@@ -53,4 +56,18 @@
version="0.0.0"
unpack="false"/>
@@ -86,19 +78,20 @@ index fea3621..60d6331 100644
+
</feature>
diff --git a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
-index 6aa0582..30939a5 100644
+index 6aa0582..46ecebb 100644
--- a/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.core/META-INF/MANIFEST.MF
-@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
+@@ -10,25 +10,23 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.mylyn.commons.core;bundle-version="3.8.0",
org.eclipse.mylyn.commons.repositories.core;bundle-version="1.0.0",
org.eclipse.mylyn.commons.repositories.http.core;bundle-version="1.0.0",
- javax.xml.bind;bundle-version="2.1.0",
-+ javax.xml.bind,
com.sun.xml.bind;bundle-version="2.2.0";resolution:=optional
Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
-@@ -20,15 +20,13 @@ Export-Package: org.eclipse.mylyn.hudson.core;x-internal:=true,
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-Localization: plugin
+ Export-Package: org.eclipse.mylyn.hudson.core;x-internal:=true,
+ org.eclipse.mylyn.internal.hudson.core;x-internal:=true,
org.eclipse.mylyn.internal.hudson.core.client;x-internal:=true,
org.eclipse.mylyn.internal.hudson.model;x-internal:=true
Bundle-Activator: org.eclipse.mylyn.internal.hudson.core.HudsonCorePlugin
@@ -123,12 +116,14 @@ index 6aa0582..30939a5 100644
+ org.apache.http.cookie,
+ org.apache.http.message,
+ org.apache.http.protocol,
-+ org.apache.http.util
++ org.apache.http.util,
++ javax.xml.bind,
++ javax.xml.bind.annotation
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
-index b051cf3..f439c10 100644
+index b051cf3..cc86ba0 100644
--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons-feature/feature.xml
-@@ -29,6 +29,104 @@
+@@ -29,6 +29,83 @@
</license>
<plugin
@@ -174,13 +169,6 @@ index b051cf3..f439c10 100644
+ unpack="false"/>
+
+ <plugin
-+ id="javax.activation"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
+ id="javax.mail"
+ download-size="0"
+ install-size="0"
@@ -195,13 +183,6 @@ index b051cf3..f439c10 100644
+ unpack="false"/>
+
+ <plugin
-+ id="javax.xml"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
+ id="javax.xml.rpc"
+ download-size="0"
+ install-size="0"
@@ -209,13 +190,6 @@ index b051cf3..f439c10 100644
+ unpack="false"/>
+
+ <plugin
-+ id="javax.xml.soap"
-+ download-size="0"
-+ install-size="0"
-+ version="0.0.0"
-+ unpack="false"/>
-+
-+ <plugin
+ id="com.sun.syndication"
+ download-size="0"
+ install-size="0"
@@ -233,7 +207,7 @@ index b051cf3..f439c10 100644
id="org.eclipse.mylyn.commons.core"
download-size="0"
install-size="0"
-@@ -56,4 +154,25 @@
+@@ -56,4 +133,25 @@
version="0.0.0"
unpack="false"/>
@@ -364,21 +338,28 @@ index ded6b39..c432f1c 100644
+ org.apache.http.impl.conn.tsccm,
+ org.apache.http.impl.client
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
-index 7a3d542..c7be0be 100644
+index 7a3d542..3947f7d 100644
--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/META-INF/MANIFEST.MF
-@@ -5,9 +5,8 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
+@@ -4,10 +4,7 @@ Bundle-Name: %Bundle-Name
+ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
Bundle-Version: 3.8.2.qualifier
Bundle-Vendor: %Bundle-Vendor
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
+-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
- javax.xml.soap;bundle-version="1.2.0",
- org.apache.axis;bundle-version="1.4.0",
-+Require-Bundle: javax.xml.soap,
-+ org.apache.axis,
++Require-Bundle: org.apache.axis,
org.apache.commons.httpclient;bundle-version="[3.1.0,4.0.0)",
org.eclipse.core.runtime,
org.eclipse.core.net,
+@@ -15,5 +12,6 @@ Require-Bundle: javax.xml.rpc;bundle-version="1.1.0",
+ Bundle-ClassPath: .
+ Export-Package: org.eclipse.mylyn.internal.commons.soap;x-internal:=true,
+ org.eclipse.mylyn.internal.provisional.commons.soap;x-internal:=true
++Import-Package: javax.xml.soap
+ Bundle-Localization: plugin
+ Eclipse-RegisterBuddy: org.apache.axis
diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
index 1d7ecd8..53b7597 100644
--- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF
--
eclipse-mylyn - Plug-in for eclipse - Debian package.
More information about the pkg-java-commits
mailing list