[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-199-g3de47f5

Andres Mejia ceros-guest at alioth.debian.org
Sun May 8 14:44:24 UTC 2011 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, master-3.6 has been updated
       via  3de47f5fa1f94ea55e81fe6b727ac8e2ce192f42 (commit)
      from  abaa4f42637e7bf0c8bc4604935915c3f23f6f5e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3de47f5fa1f94ea55e81fe6b727ac8e2ce192f42
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 8 10:42:53 2011 -0400

    Numerous changes to eclipse packaging just to get eclipse building using sbuild.
    
    * Changes introduced to eclipse so that it builds with latest ant (1.8.2). This
      required updating eclipse-build-generatedScripts.tar.bz2 inside the debian
      directory and reactivating the eclipse-build-generatedScripts.patch. This also
      requires renaming eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145 to
      eclipse/plugins/org.apache.ant_1.8.2.v20101227-1145 during build time.
    
    * Ensure osgi.services is built. This requires activating the
      osgi-services-symlink-javax.patch.
    
    * In the patch to generate metadata, and extract the swt libraries, the option
      -Declipse.p2.data.area should not be used. Also, the value passed with
      -profile should be SDKProfile.
    
    * All patches refreshed.

-----------------------------------------------------------------------

Summary of changes:
 debian/control                                     |    2 +-
 debian/eclipse-build-generatedScripts.tar.bz2      |  Bin 14324 -> 14413 bytes
 .../patches/eclipse-build-generatedScripts.patch   |   13 ++
 ...nerate-metadata-and-extract-swt-libraries.patch |   23 ++++-
 debian/patches/osgi-services-symlink-javax.patch   |    8 +-
 debian/patches/osgi-services.patch                 |   16 +--
 debian/patches/remove-unnecessary-files.patch      |    2 +-
 debian/patches/series                              |    2 +
 debian/patches/strip-destDir.patch                 |    2 +-
 debian/patches/use-ant-1.8.2.patch                 |  119 ++++++++++++++++++++
 debian/rules                                       |   11 ++
 11 files changed, 180 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 25d3400..501b463 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.deb
 Uploaders: Niels Thykier <niels at thykier.net>,
            Benjamin Drung <bdrung at debian.org>,
            Adnan Hodzic <adnan at foolcontrol.org>
-Build-Depends: ant (>= 1.7.1),
+Build-Depends: ant (>= 1.8.2),
                ant-optional,
                debhelper (>= 7.0.50~),
                default-jdk,
diff --git a/debian/eclipse-build-generatedScripts.tar.bz2 b/debian/eclipse-build-generatedScripts.tar.bz2
index 00ba26c..8b28cfa 100644
Binary files a/debian/eclipse-build-generatedScripts.tar.bz2 and b/debian/eclipse-build-generatedScripts.tar.bz2 differ
diff --git a/debian/patches/eclipse-build-generatedScripts.patch b/debian/patches/eclipse-build-generatedScripts.patch
index 398216a..14cbe48 100644
--- a/debian/patches/eclipse-build-generatedScripts.patch
+++ b/debian/patches/eclipse-build-generatedScripts.patch
@@ -1,4 +1,6 @@
 Description: Use modified eclipse-build-generatedScripts tarball.
+ NOTE: The tarball itself is usually generated by doing 'ant generateBuildXmls'
+ in the top level source directory.
 From: Benjamin Drung <bdrung at ubuntu.com>
 Forwarded: not-needed
 
@@ -22,3 +24,14 @@ Forwarded: not-needed
  		<!--
  		<fail message="Build scripts to bootstrap PDE Build must be generated and present in eclipse-build-generatedScripts.tar.bz2.  See pdebuild.xml for details."/>
  		-->
+--- a/pdebuild.xml
++++ b/pdebuild.xml
+@@ -152,7 +152,7 @@
+ 			<fileset dir="${sdkSource}/plugins/"
+ 			         includes="${generatedBuildXmls}" />
+ 		</copy>
+-		<tar destfile="eclipse-build-generatedScripts.tar.bz2"
++		<tar destfile="debian/eclipse-build-generatedScripts.tar.bz2"
+ 		     compression="bzip2"
+ 		     basedir="generatedScripts"
+ 		     includes="**/*" />
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index b9bdb65..c79de8b 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -1,10 +1,28 @@
 Description: Generate metadata and extract the swt libraries
  This patch moved the calls from debian/rules into the build.xml file.
+ NOTE, -Declipse.p2.data.area should not be used. See
+ https://bugs.eclipse.org/bugs/show_bug.cgi?id=310041
 From: Benjamin Drung <bdrung at ubuntu.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -1003,6 +1003,55 @@
+@@ -919,7 +919,6 @@
+ 			<arg line="-destination ${p2.director.install.path}" />
+ 			<arg line="-bundlepool ${p2.director.install.path}" />
+ 			<arg line="-vmargs" />
+-			<arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
+ 			<arg line="-Declipse.p2.MD5Check=false" />
+ 			<arg line="-Declipse.p2.profile=@none" />
+ 			<arg line="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=" />
+@@ -929,7 +928,6 @@
+ 			<jvmarg value="-Xmx2048M" />
+ 			<jvmarg value="-XX:MaxPermSize=512M" />
+ 			-->
+-			<jvmarg value="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
+ 			<jvmarg value="-Xmx512M" />
+ 		</java>
+ 	</target>
+@@ -1003,6 +1001,54 @@
  
  		<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
  
@@ -49,11 +67,10 @@ From: Benjamin Drung <bdrung at ubuntu.com>
 +			<arg value="-p2.ws" /><arg value="gtk" />
 +			<arg value="-p2.arch" /><arg value="${buildArch}" />
 +			<arg value="-roaming" />
-+			<arg value="-profile" /><arg value="PlatformProfile" />
++			<arg value="-profile" /><arg value="SDKProfile" />
 +			<arg value="-profileProperties" /><arg value="org.eclipse.update.install.features=true" />
 +			<arg value="-destination" /><arg value="${destDir}/${prefix}/${libDir}/eclipse" />
 +			<arg value="-bundlepool" /><arg value="${destDir}/${prefix}/${libDir}/eclipse" />
-+			<jvmarg value="-Declipse.p2.data.area=file:${destDir}/${prefix}/${libDir}/eclipse/p2"/>
 +			<jvmarg value="-Declipse.p2.MD5Check=false"/>
 +		</java>
 +
diff --git a/debian/patches/osgi-services-symlink-javax.patch b/debian/patches/osgi-services-symlink-javax.patch
index e5bbf17..17a1210 100644
--- a/debian/patches/osgi-services-symlink-javax.patch
+++ b/debian/patches/osgi-services-symlink-javax.patch
@@ -1,12 +1,14 @@
-Description: Add javax to org.eclipse.osgi.services
+Description: Add javax to org.eclipse.osgi.services.
+ This is a hack to get org.eclipse.osgi.services building without having to
+ build org.eclipse.equinox.io.
 From: Benjamin Drung <bdrung at ubuntu.com>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304710
 
 --- a/build.xml
 +++ b/build.xml
-@@ -310,6 +310,7 @@
- 		<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
+@@ -311,6 +311,7 @@
  		<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
+ 		<patch patchfile="${basedir}/patches/no-gnome-vfs.patch" dir="${buildDirectory}" strip="0" />
  		<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
 +		<symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
  		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
diff --git a/debian/patches/osgi-services.patch b/debian/patches/osgi-services.patch
index 5d6c689..3efdd39 100644
--- a/debian/patches/osgi-services.patch
+++ b/debian/patches/osgi-services.patch
@@ -1,20 +1,20 @@
-Description: Makes o.e.osgi.services build from source.
+Description: Need to build org.eclipse.osgi.services before
+ org.eclipse.equinox.app.
 From: Niels Thykier <niels at thykier.net>
 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304710
 Applied-Upstream: no
 
 --- a/pdebuild.xml
 +++ b/pdebuild.xml
-@@ -30,6 +30,8 @@
+@@ -30,6 +30,7 @@
  		<file name="org.eclipse.equinox.preferences" />
  		<file name="org.eclipse.core.runtime.compatibility.auth" />
  		<file name="org.eclipse.core.contenttype" />
-+		<file name="org.eclipse.equinox.transforms.hook" />
 +		<file name="org.eclipse.osgi.services" />
  		<file name="org.eclipse.equinox.app" />
  		<file name="org.eclipse.core.runtime" />
  		<file name="org.eclipse.core.variables" />
-@@ -64,7 +66,6 @@
+@@ -64,7 +65,6 @@
  		<file name="org.eclipse.equinox.p2.updatesite" />
  		<file name="org.eclipse.pde.build" />
  		<file name="org.eclipse.equinox.launcher" />
@@ -46,18 +46,16 @@ Applied-Upstream: no
 ++source.. = src/
 + output.. = .
 +-customBuildCallbacks=customBuildCallbacks.xml
-diff --git a/build.xml b/build.xml
-index 8f185fb..d0d83f6 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -309,6 +309,7 @@
- 		<patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" />
+@@ -310,6 +310,7 @@
  		<patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
  		<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
-+		<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
  		<patch patchfile="${basedir}/patches/no-gnome-vfs.patch" dir="${buildDirectory}" strip="0" />
++		<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
  		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
  		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
+ 		<!-- end eclipse-build-only patches -->
 @@ -321,6 +322,8 @@
  		<replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
  		<patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" />
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index 8b49ac1..10ce0f5 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -3,7 +3,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -1138,6 +1138,10 @@
+@@ -1089,6 +1089,10 @@
  			</fileset>
  		</apply>
  		
diff --git a/debian/patches/series b/debian/patches/series
index 84abda2..5f084ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,6 @@ remove-unnecessary-files.patch
 strip-destDir.patch
 clean-source.patch
 osgi-services.patch
+osgi-services-symlink-javax.patch
+use-ant-1.8.2.patch
 eclipse-build-generatedScripts.patch
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index 0047122..df20fff 100644
--- a/debian/patches/strip-destDir.patch
+++ b/debian/patches/strip-destDir.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
 
 --- a/build.xml
 +++ b/build.xml
-@@ -1142,6 +1142,21 @@
+@@ -1093,6 +1093,21 @@
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
diff --git a/debian/patches/use-ant-1.8.2.patch b/debian/patches/use-ant-1.8.2.patch
new file mode 100644
index 0000000..1c125e2
--- /dev/null
+++ b/debian/patches/use-ant-1.8.2.patch
@@ -0,0 +1,119 @@
+Description: Patch to convert to using ant-1.8.2.
+ NOTE: The build.xml files within eclipse-build-generatedScripts.tar.bz2 must
+ also have entries pointing to the old ant version updated to use and-1.8.2.
+ In other words, an 'ant generateBuildXmls' run must be done.
+Author: Andres Mejia <mcitadel at gmail.com>
+
+--- a/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
++++ b/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+@@ -33,7 +33,7 @@
+ -classpath @rt@
+ ;../com.ibm.icu_4.2.1.v20100412.jar
+ ;../org.eclipse.jdt.apt.core/mirrorapi.jar
+-;../org.apache.ant_1.7.1.v20100518-1145/lib/ant.jar
++;../org.apache.ant_1.8.2.v20101227-1145/lib/ant.jar
+ ;../org.eclipse.ant.core/@dot
+ ;../org.eclipse.compare/@dot
+ ;../org.eclipse.compare.core/@dot
+--- a/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt
++++ b/eclipse/plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt
+@@ -30,7 +30,7 @@
+ -classpath ${bootclasspath}
+ ;../com.ibm.icu_4.2.1.v20100412.jar
+ ;../org.eclipse.jdt.apt.core/mirrorapi.jar
+-;../org.apache.ant_1.7.1.v20100518-1145/lib/ant.jar
++;../org.apache.ant_1.8.2.v20101227-1145/lib/ant.jar
+ ;../org.eclipse.ant.core/@dot
+ ;../org.eclipse.compare/@dot
+ ;../org.eclipse.compare.core/@dot
+--- a/nonosgidependencies.properties
++++ b/nonosgidependencies.properties
+@@ -1,23 +1,23 @@
+-org.apache.ant_1.7.1.v20100518-1145/bin/ant=/usr/share/ant/bin/ant
+-org.apache.ant_1.7.1.v20100518-1145/bin/antRun=/usr/share/ant/bin/antRun
+-org.apache.ant_1.7.1.v20100518-1145/bin/antRun.pl=/usr/share/ant/bin/antRun.pl
+-org.apache.ant_1.7.1.v20100518-1145/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl
+-org.apache.ant_1.7.1.v20100518-1145/bin/runant.pl=/usr/share/ant/bin/runant.pl
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar:/usr/share/java/ant-apache-log4j.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar:/usr/share/java/ant-apache-oro.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar:/usr/share/java/ant-apache-regexp.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar:/usr/share/java/ant-apache-resolver.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar:/usr/share/java/ant-commons-logging.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar:/usr/share/java/ant-commons-net.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant.jar=/usr/share/java/ant.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar:/usr/share/java/ant-javamail.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar:/usr/share/java/ant-jdepend.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar:/usr/share/java/ant-jsch.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-nodeps.jar=/usr/share/java/ant/ant-nodeps.jar:/usr/share/java/ant-nodeps.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
+-org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar
++org.apache.ant_1.8.2.v20101227-1145/bin/ant=/usr/share/ant/bin/ant
++org.apache.ant_1.8.2.v20101227-1145/bin/antRun=/usr/share/ant/bin/antRun
++org.apache.ant_1.8.2.v20101227-1145/bin/antRun.pl=/usr/share/ant/bin/antRun.pl
++org.apache.ant_1.8.2.v20101227-1145/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl
++org.apache.ant_1.8.2.v20101227-1145/bin/runant.pl=/usr/share/ant/bin/runant.pl
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-apache-log4j.jar=/usr/share/java/ant/ant-apache-log4j.jar:/usr/share/java/ant-apache-log4j.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-apache-oro.jar=/usr/share/java/ant/ant-apache-oro.jar:/usr/share/java/ant-apache-oro.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-apache-regexp.jar=/usr/share/java/ant/ant-apache-regexp.jar:/usr/share/java/ant-apache-regexp.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-apache-resolver.jar=/usr/share/java/ant/ant-apache-resolver.jar:/usr/share/java/ant-apache-resolver.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-apache-xalan2.jar=/usr/share/java/ant/ant-apache-xalan2.jar:/usr/share/java/ant-apache-xalan2.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-commons-logging.jar=/usr/share/java/ant/ant-commons-logging.jar:/usr/share/java/ant-commons-logging.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-commons-net.jar=/usr/share/java/ant/ant-commons-net.jar:/usr/share/java/ant-commons-net.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant.jar=/usr/share/java/ant.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-javamail.jar=/usr/share/java/ant/ant-javamail.jar:/usr/share/java/ant-javamail.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-jdepend.jar=/usr/share/java/ant/ant-jdepend.jar:/usr/share/java/ant-jdepend.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-jmf.jar=/usr/share/java/ant/ant-jmf.jar:/usr/share/java/ant-jmf.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-jsch.jar=/usr/share/java/ant/ant-jsch.jar:/usr/share/java/ant-jsch.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-junit.jar=/usr/share/java/ant/ant-junit.jar:/usr/share/java/ant-junit.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
++org.apache.ant_1.8.2.v20101227-1145/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
+--- a/build.xml
++++ b/build.xml
+@@ -355,11 +355,11 @@
+ 		<symlinkOSGiJars dependencies="${basedir}/jdtdependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" />
+ 		<symlinkNonOSGiJars dependencies="${basedir}/jdtnonosgidependencies.properties" topLevelDir="${buildDirectory}/plugins" />
+ 		<symlinkOSGiJars dependencies="${basedir}/sdkdependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" />
+-		<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
++		<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.8.2.v20101227-1145/META-INF/MANIFEST.MF" flags="m,g,s">
+ 			<regexp pattern="^Name.*" />
+ 			<substitution expression="" />
+ 		</replaceregexp>
+-		<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
++		<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.8.2.v20101227-1145/META-INF/MANIFEST.MF" flags="m,g,s">
+ 			<regexp pattern="^SHA1-Digest.*" />
+ 			<substitution expression="" />
+ 		</replaceregexp>
+--- a/eclipse/maps/org.eclipse.releng/maps/orbit.map
++++ b/eclipse/maps/org.eclipse.releng/maps/orbit.map
+@@ -15,8 +15,8 @@
+ plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v200806031607,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v20100427-1100,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+-plugin at org.apache.ant,1.7.1=p2IU,id=org.apache.ant,version=1.7.1.v20100518-1145,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+-plugin at org.apache.ant.source,1.7.1=p2IU,id=org.apache.ant.source,version=1.7.1.v20100518-1145,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
++plugin at org.apache.ant,1.8.2=p2IU,id=org.apache.ant,version=1.8.2.v20101227-1145,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
++plugin at org.apache.ant.source,1.8.2=p2IU,id=org.apache.ant.source,version=1.8.2.v20101227-1145,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v20100518-1140,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v20100518-1140,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v201004212143,repository=http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20100519200754/repository
+--- a/eclipse/directory.txt
++++ b/eclipse/directory.txt
+@@ -323,8 +323,8 @@
+ plugin at javax.servlet.jsp.source,2.0.0=p2IU,id=javax.servlet.jsp.source,version=2.0.0.v200806031607,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at net.sourceforge.mx4j,3.0.1=p2IU,id=net.sourceforge.mx4j,version=3.0.1.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at net.sourceforge.mx4j.remote,3.0.1=p2IU,id=net.sourceforge.mx4j.remote,version=3.0.1.v20100427-1100,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+-plugin at org.apache.ant,1.7.1=p2IU,id=org.apache.ant,version=1.7.1.v20100518-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+-plugin at org.apache.ant.source,1.7.1=p2IU,id=org.apache.ant.source,version=1.7.1.v20100518-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
++plugin at org.apache.ant,1.8.2=p2IU,id=org.apache.ant,version=1.8.2.v20101227-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
++plugin at org.apache.ant.source,1.8.2=p2IU,id=org.apache.ant.source,version=1.8.2.v20101227-1145,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at org.apache.commons.codec,1.3.0=p2IU,id=org.apache.commons.codec,version=1.3.0.v20100518-1140,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at org.apache.commons.codec.source,1.3.0=p2IU,id=org.apache.commons.codec.source,version=1.3.0.v20100518-1140,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
+ plugin at org.apache.commons.el,1.0.0=p2IU,id=org.apache.commons.el,version=1.0.0.v201004212143,repository=http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/repository
diff --git a/debian/rules b/debian/rules
index ccb6d61..ed8af6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,20 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 %:
 	dh --with xulrunner $@
 
+# The renaming of org.apache.ant_* directory is done so that eclipse is built
+# using the latest ant version in Debian.
+override_dh_auto_build:
+	test ! -d eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145 || \
+		mv eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145 \
+		eclipse/plugins/org.apache.ant_1.8.2.v20101227-1145
+	ant build
+
 override_dh_auto_clean:
 	ant distclean
 	rm -fr debian/.mh/
+	test ! -d eclipse/plugins/org.apache.ant_1.8.2.v20101227-1145 || \
+		mv eclipse/plugins/org.apache.ant_1.8.2.v20101227-1145 \
+		eclipse/plugins/org.apache.ant_1.7.1.v20100518-1145
 
 override_dh_auto_install:
 	ant install -Dprefix=/usr -DdestDir=$(CURDIR)/debian/tmp


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.

More information about the pkg-java-commits mailing list