[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.6.2-exp-1-38-g730dc39

Niels Thykier nthykier at alioth.debian.org
Fri Aug 5 15:56:53 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 has been updated
       via  730dc3996601d77ac4efc5f24469e62c3bfe9bf7 (commit)
      from  893b82b64c903270bcadab7528685e3e9e1146f1 (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 730dc3996601d77ac4efc5f24469e62c3bfe9bf7
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Aug 5 17:56:39 2011 +0200

    Refreshed some of the debian patches

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

Summary of changes:
 debian/patches/add-o.e.equinox.concurrent.patch |    2 +-
 debian/patches/clean-source.patch               |    4 +-
 debian/patches/compile-IPluginDescriptor.patch  |    2 +-
 debian/patches/ecj-gccmain-java.patch           |    2 +-
 debian/patches/eclipse-manpage.patch            |   11 +++++----
 debian/patches/pdebuild-script.patch            |    4 +-
 debian/patches/remove-unnecessary-files.patch   |    2 +-
 debian/patches/series                           |    8 +++---
 debian/patches/strip-destDir.patch              |    2 +-
 debian/patches/symlink-system-files.patch       |   25 +++++++++++++++-------
 10 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/debian/patches/add-o.e.equinox.concurrent.patch b/debian/patches/add-o.e.equinox.concurrent.patch
index 3cffcfb..f00cc63 100644
--- a/debian/patches/add-o.e.equinox.concurrent.patch
+++ b/debian/patches/add-o.e.equinox.concurrent.patch
@@ -8,7 +8,7 @@ Forwarded: not needed
 
 --- a/eclipse/features/org.eclipse.platform/feature.xml
 +++ b/eclipse/features/org.eclipse.platform/feature.xml
-@@ -620,4 +620,12 @@
+@@ -616,4 +616,12 @@
           version="0.0.0"
           unpack="false"/>
  
diff --git a/debian/patches/clean-source.patch b/debian/patches/clean-source.patch
index bc7ed0c..69bdf12 100644
--- a/debian/patches/clean-source.patch
+++ b/debian/patches/clean-source.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
 
 --- a/buildSDKSource.sh
 +++ b/buildSDKSource.sh
-@@ -163,21 +163,18 @@
+@@ -164,21 +164,18 @@
  rm -rf ecfBundles orbitRepo
  
  # Remove files from the version control system
@@ -28,7 +28,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=304112
  # Remove fetch logs
  rm fetch_*
  
-@@ -188,6 +185,24 @@
+@@ -189,6 +186,24 @@
  # Remove temporary files
  find -name '*.orig' -delete
  
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index 9c88c66..c548112 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
 
 --- a/build.xml
 +++ b/build.xml
-@@ -372,7 +372,38 @@
+@@ -389,7 +389,38 @@
  		<echo file="symlinks-stamp" />
  	</target>
  
diff --git a/debian/patches/ecj-gccmain-java.patch b/debian/patches/ecj-gccmain-java.patch
index 62b0137..ba99722 100644
--- a/debian/patches/ecj-gccmain-java.patch
+++ b/debian/patches/ecj-gccmain-java.patch
@@ -508,7 +508,7 @@ From: Niels Thykier <niels at thykier.net>
 +}
 --- a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
 +++ b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
-@@ -334,3 +334,8 @@
+@@ -341,3 +341,8 @@
  \      uselessTypeCheck     unnecessary cast/instanceof operation\n\
  \      varargsCast        + varargs argument need explicit cast\n\
  \      warningToken       + unsupported or unnecessary @SuppressWarnings\n
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index c6f8b53..da77a46 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -622,18 +622,19 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
 +
 +</refsect1>
 +</refentry>
+diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml
+index fe87f7c..d92f321 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -952,6 +952,12 @@
+@@ -992,6 +992,11 @@
  		<!-- eclipse binary -->
  		<mkdir dir="${destDir}${prefix}/bin" />
  		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
 +		<!-- eclipse manpage -->
-+		<mkdir dir="${destDir}${prefix}/share/man/man1" />
 +		<exec executable="docbook2x-man" failonerror="true">
 +			<arg value="eclipse.1.xml" />
 +		</exec>
 +		<move file="eclipse.1" tofile="${destDir}${prefix}/share/man/man1/eclipse.1" />
- 		<!-- FIXME:  we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
- 		<!-- Create the "startup.jar" symlink -->
- 		<fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
+ 		<!-- Create the "swt.jar" and friends symlinks  -->
+ 		<fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
+ 		<property name="swtjarpath" refid="swtjar" />
diff --git a/debian/patches/pdebuild-script.patch b/debian/patches/pdebuild-script.patch
index 80eb1cf..55c4a36 100644
--- a/debian/patches/pdebuild-script.patch
+++ b/debian/patches/pdebuild-script.patch
@@ -14,7 +14,7 @@ From: Niels Thykier <niels at thykier.net>
  
  featureId=
  dependencies=
-@@ -273,7 +273,7 @@
+@@ -275,7 +275,7 @@
      -DbaseLocation=$SDK \
      -DsourceDirectory=$sourceDir \
      -DbuildDirectory=$buildDir \
@@ -23,7 +23,7 @@ From: Niels Thykier <niels at thykier.net>
      $orbitDeps \
      -Dtesting="$testing" \
      $additionalArgs \
-@@ -293,7 +293,7 @@
+@@ -295,7 +295,7 @@
      -DbaseLocation=$SDK \
      -DsourceDirectory=$sourceDir \
      -DbuildDirectory=$buildDir \
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index 10ce0f5..fa6967c 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
-@@ -1089,6 +1089,10 @@
+@@ -1143,6 +1143,10 @@
  			</fileset>
  		</apply>
  		
diff --git a/debian/patches/series b/debian/patches/series
index 18a1645..100720c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 eclipse-manpage.patch
 compile-IPluginDescriptor.patch
-use-stable-xulrunner.patch
+#use-stable-xulrunner.patch
 add-o.e.equinox.concurrent.patch
 ecj-gccmain-java.patch
 fix-help-contents.patch
@@ -12,9 +12,9 @@ strip-destDir.patch
 clean-source.patch
 osgi-services.patch
 osgi-services-symlink-javax.patch
-use-ant-1.8.2.patch
-eclipse-build-generatedScripts.patch
+#use-ant-1.8.2.patch
+#eclipse-build-generatedScripts.patch
 generate-metadata-and-extract-swt-libraries.patch
-bp-ant-1.8.2-support.patch
+#bp-ant-1.8.2-support.patch
 debian-load-internal-swt.patch
 gnomeproxy-pkg-config.patch
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index df20fff..4df6fe1 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
-@@ -1093,6 +1093,21 @@
+@@ -1147,6 +1147,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/symlink-system-files.patch b/debian/patches/symlink-system-files.patch
index 18eb14a..fa16697 100644
--- a/debian/patches/symlink-system-files.patch
+++ b/debian/patches/symlink-system-files.patch
@@ -1,14 +1,23 @@
 Description: Symlink system ant files
 From: Benjamin Drung <bdrung at ubuntu.com>
 
+diff --git a/eclipse-build/nonosgidependencies.properties b/eclipse-build/nonosgidependencies.properties
+index b91141d..a47fc48 100644
 --- a/nonosgidependencies.properties
 +++ b/nonosgidependencies.properties
 @@ -1,3 +1,8 @@
-+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.8.2.v20110505-1300/bin/ant=/usr/share/ant/bin/ant
++org.apache.ant_1.8.2.v20110505-1300/bin/antRun=/usr/share/ant/bin/antRun
++org.apache.ant_1.8.2.v20110505-1300/bin/antRun.pl=/usr/share/ant/bin/antRun.pl
++org.apache.ant_1.8.2.v20110505-1300/bin/complete-ant-cmd.pl=/usr/share/ant/bin/complete-ant-cmd.pl
++org.apache.ant_1.8.2.v20110505-1300/bin/runant.pl=/usr/share/ant/bin/runant.pl
+ org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
+ org.apache.ant_1.8.2.v20110505-1300/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.v20110505-1300/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
+@@ -18,5 +23,5 @@ org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit4.jar=/usr/share/java/ant/ant-j
+ org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
+ #org.apache.ant_1.8.2.v20110505-1300/lib/ant-netrexx.jar=/usr/share/java/ant-netrexx.jar:/usr/share/java/ant-netrexx.jar
+ org.apache.ant_1.8.2.v20110505-1300/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
+-org.apache.ant_1.8.2.v20110505-1300/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
++#org.apache.ant_1.8.2.v20110505-1300/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
+ org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar=/usr/share/java/ant.jar


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

More information about the pkg-java-commits mailing list