[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. 2d8614f05f18a43f201ac9b9a8c1f7fae41e193f
Jakub Adam
jakub.adam at ktknet.cz
Sun Nov 6 21:40:08 UTC 2011
The following commit has been merged in the master branch:
commit 699ab4f9da9d04d846c4af2078c4fd08280a72ac
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Fri Nov 4 22:22:43 2011 +0100
Debian specific customizations of Orbit dependencies
* add unpack="false" where missing, otherwise eclipse-helper copies
orbit bundle to deb package instead of symlinking
* disable unused orbit bundles
* org.apache.xmlrpc is splitted in Debian, add org.apache.xmlrpc.client
to required plugins
* add com.sun.syndication
* remove versions from Import-Package directives so that distribution
jars in /usr/share/java can be used
diff --git a/debian/patches/debian-orbit-deps.patch b/debian/patches/debian-orbit-deps.patch
new file mode 100644
index 0000000..ce49e0e
--- /dev/null
+++ b/debian/patches/debian-orbit-deps.patch
@@ -0,0 +1,236 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Fri, 4 Nov 2011 22:16:39 +0100
+Subject: debian-orbit-deps
+
+ Debian specific customizations of Orbit dependencies
+
+ * add unpack="false" where missing, otherwise eclipse-helper copies orbit bundle
+ to deb package instead of symlinking
+ * disable unused orbit bundles
+ * org.apache.xmlrpc is splitted in Debian, add org.apache.xmlrpc.client to
+ required plugins
+ * add com.sun.syndication
+ * remove versions from Import-Package directives so that distribution jars in
+ /usr/share/java can be used
+
+---
+ .../org.eclipse.mylyn.commons-feature/feature.xml | 62 +++++++++++++-------
+ .../META-INF/MANIFEST.MF | 7 +-
+ .../META-INF/MANIFEST.MF | 3 +-
+ .../META-INF/MANIFEST.MF | 10 ++--
+ .../META-INF/MANIFEST.MF | 3 +-
+ 5 files changed, 52 insertions(+), 33 deletions(-)
+
+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 312741f..eae1f27 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
+@@ -78,84 +78,95 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.apache.ws.commons.util"
++ id="org.apache.xmlrpc.client"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+- id="javax.xml.bind"
++ id="org.apache.ws.commons.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
++ <!--plugin
++ id="javax.xml.bind"
++ download-size="0"
++ install-size="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
++ <!--plugin
+ id="javax.wsdl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+- <plugin
++ <!--plugin
+ id="javax.xml.rpc"
+ 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="0.0.0"/>
++ version="0.0.0"
++ unpack="false"/>
+
+- <plugin
++ <!--plugin
+ id="org.apache.commons.discovery"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"/>
++ version="0.0.0"
++ unpack="false"/-->
+
+- <plugin
++ <!--plugin
+ id="org.apache.commons.logging"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+- <plugin
++ <!--plugin
+ id="javax.activation"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+- <plugin
++ <!--plugin
+ id="javax.mail"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+- <plugin
++ <!--plugin
+ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+- <plugin
++ <!--plugin
+ id="org.apache.commons.httpclient"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+ <plugin
+ id="org.apache.commons.lang"
+@@ -199,12 +210,12 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
++ <!--plugin
+ id="org.apache.commons.io"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
++ unpack="false"/-->
+
+ <plugin
+ id="org.jdom"
+@@ -213,4 +224,11 @@
+ version="0.0.0"
+ unpack="false"/>
+
++ <plugin
++ id="com.sun.syndication"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ unpack="false"/>
++
+ </feature>
+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 4752377..ef2c4b1 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,10 +5,9 @@ Bundle-SymbolicName: org.eclipse.mylyn.commons.soap;singleton:=true
+ Bundle-Version: 3.6.0.v20110608-1400
+ Bundle-Vendor: %Bundle-Vendor
+ 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",
+- org.apache.commons.httpclient;bundle-version="3.1.0",
++Require-Bundle: javax.xml.soap,
++ org.apache.axis,
++ org.apache.commons.httpclient,
+ org.eclipse.core.runtime,
+ org.eclipse.core.net,
+ org.eclipse.mylyn.commons.net;bundle-version="[3.1.0,4.0.0)"
+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 be13572..35ab073 100644
+--- 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
+@@ -7,7 +7,8 @@ Bundle-Vendor: %Bundle-Vendor
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
+- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
++ org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)",
++ org.apache.xmlrpc.client;bundle-version="[3.0.0,4.0.0)"
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+diff --git a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+index c795c68..fffc132 100644
+--- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
++++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+@@ -19,9 +19,9 @@ Export-Package: org.eclipse.mylyn.internal.provisional.tasks.core;x-internal:=tr
+ org.eclipse.mylyn.tasks.core,
+ org.eclipse.mylyn.tasks.core.data,
+ org.eclipse.mylyn.tasks.core.sync
+-Import-Package: com.sun.syndication.feed;version="0.9.0";resolution:=optional,
+- com.sun.syndication.feed.module;version="0.9.0";resolution:=optional,
+- com.sun.syndication.feed.synd;version="0.9.0";resolution:=optional,
+- com.sun.syndication.io;version="0.9.0";resolution:=optional,
+- org.jdom;version="1.0.0";resolution:=optional
++Import-Package: com.sun.syndication.feed;resolution:=optional,
++ com.sun.syndication.feed.module;resolution:=optional,
++ com.sun.syndication.feed.synd;resolution:=optional,
++ com.sun.syndication.io;resolution:=optional,
++ org.jdom;resolution:=optional
+ Bundle-Localization: plugin
+diff --git a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
+index f27e33a..565d68b 100644
+--- a/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
++++ b/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
+@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.xmlrpc;bundle-version="[3.0.0,4.0.0)",
+- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
++ org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)",
++ org.apache.xmlrpc.client;bundle-version="[3.0.0,4.0.0)"
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
+ org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui",
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ffdd738
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-orbit-deps.patch
--
eclipse-mylyn - Plug-in for eclipse - Debian package.
More information about the pkg-java-commits
mailing list