Author: tashiro-guest
Date: 2006-10-28 16:48:09 +0200 (Sat, 28 Oct 2006)
New Revision: 2664
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/patches/eclipse-build.dpatch
trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch
trunk/eclipse/debian/rules
Log:
* debian/patches/eclipse-build.dpatch: Updated patch from FC
* debian/patches/eclipse-disable-motif.dpatch: Converted patch
to Eclipse 3.2.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-10-27 14:34:50 UTC (rev 2663)
+++ trunk/eclipse/debian/changelog 2006-10-28 14:48:09 UTC (rev 2664)
@@ -4,6 +4,11 @@
* debian/control.in: eclipse-gcj: Depend on eclipse.
* debian/rules: Reenable 64bit build patches.
+ [ Stephan Michels ]
+ * debian/patches/eclipse-build.dpatch: Updated patch from FC
+ * debian/patches/eclipse-disable-motif.dpatch: Converted patch
+ to Eclipse 3.2.
+
-- Matthias Klose <[EMAIL PROTECTED]> Mon, 23 Oct 2006 05:05:15 +0200
eclipse (3.2.1-0) experimental; urgency=low
Modified: trunk/eclipse/debian/patches/eclipse-build.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-build.dpatch 2006-10-27 14:34:50 UTC
(rev 2663)
+++ trunk/eclipse/debian/patches/eclipse-build.dpatch 2006-10-28 14:48:09 UTC
(rev 2664)
@@ -21,17 +21,24 @@
exit 0
@DPATCH@
---- source-tree/build.xml.orig 2005-06-08 06:48:16.000000000 +0000
-+++ source-tree/build.xml 2005-06-08 06:49:20.000000000 +0000
-@@ -72,6 +72,15 @@
+diff -r -u source-tree.orig/build.xml source-tree/build.xml
+--- source-tree.orig/build.xml 2006-10-28 11:34:45.000000000 +0200
++++ source-tree/build.xml 2006-10-28 12:11:13.000000000 +0200
+@@ -95,6 +95,21 @@
<arg line="build.sh" />
</exec>
<move file="${launcherlibs}/library/${installWs}/eclipse"
todir="${launcherlibs}/" />
+
++ <delete dir="${launcherlibs}/library"/>
++
++ <!-- Copy icon for un-supported platforms -->
++ <copy
file="features/org.eclipse.platform.launchers/bin/gtk/linux/x86/icon.xpm"
todir="${launcherlibs}/"/>
++
+ <!-- Build JNI libs -->
-+ <!-- libcore -->
-+ <exec dir="plugins/org.eclipse.core.resources.linux/src"
executable="make" failonerror="true"/>
-+ <move
file="plugins/org.eclipse.core.resources.linux/src/libcore_3_1_0.so"
todir="plugins/org.eclipse.core.resources.linux/os/linux/${installArch}">
++ <!-- liblocalfile -->
++ <exec
dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make"
failonerror="true"/>
++ <move
file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so"
++
todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}">
+ </move>
+ <!-- and libupdate -->
+ <ant dir="plugins/org.eclipse.update.core.linux/src"
antfile="build.xml" />
@@ -39,3 +46,14 @@
</target>
+@@ -265,8 +280,8 @@
+ <os family="mac" />
+ </condition>
+ <property name="bootclasspath" refid="default.bootclasspath" />
+- <property name="J2SE-1.5" refid="java5.bootclasspath" />
+- <property name="javadoc1.5" value="${java5.home}/bin/javadoc" />
++ <!-- <property name="J2SE-1.5" refid="java5.bootclasspath" />
++ <property name="javadoc1.5" value="${java5.home}/bin/javadoc"
/> -->
+
+ <!--set the compiler and compiler arguments-->
+ <!--the default compiler is set to the one used by eclipse rel.
eng. -->
Modified: trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch 2006-10-27
14:34:50 UTC (rev 2663)
+++ trunk/eclipse/debian/patches/eclipse-disable-motif.dpatch 2006-10-28
14:48:09 UTC (rev 2664)
@@ -21,9 +21,10 @@
exit 0
@DPATCH@
---- source-tree/features/org.eclipse.platform/build.xml.orig 2006-01-11
18:45:41.000000000 +0000
-+++ source-tree/features/org.eclipse.platform/build.xml 2006-01-11
18:46:45.000000000 +0000
-@@ -12,11 +12,6 @@
+diff -r -u source-tree.orig/features/org.eclipse.platform/build.xml
source-tree/features/org.eclipse.platform/build.xml
+--- source-tree.orig/features/org.eclipse.platform/build.xml 2006-10-28
11:34:46.000000000 +0200
++++ source-tree/features/org.eclipse.platform/build.xml 2006-10-28
12:36:05.000000000 +0200
+@@ -17,11 +17,6 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
@@ -35,7 +36,7 @@
<ant antfile="build.xml"
dir="../../plugins/org.eclipse.update.core.linux" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="linux"/>
-@@ -112,11 +107,6 @@
+@@ -122,11 +117,6 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
@@ -47,7 +48,7 @@
<ant antfile="build.xml"
dir="../../plugins/org.eclipse.ui.forms" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
-@@ -177,11 +167,6 @@
+@@ -192,11 +182,6 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
@@ -59,8 +60,10 @@
<ant antfile="build.xml"
dir="../../plugins/org.eclipse.ui.navigator.resources" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
---- source-tree/features/org.eclipse.platform.source/build.xml.orig
2006-01-11 19:01:27.000000000 +0000
-+++ source-tree/features/org.eclipse.platform.source/build.xml 2006-01-11
19:03:56.000000000 +0000
+Nur in source-tree/features/org.eclipse.platform: build.xml.orig.
+diff -r -u source-tree.orig/features/org.eclipse.platform.source/build.xml
source-tree/features/org.eclipse.platform.source/build.xml
+--- source-tree.orig/features/org.eclipse.platform.source/build.xml
2006-10-28 11:34:46.000000000 +0200
++++ source-tree/features/org.eclipse.platform.source/build.xml 2006-10-28
12:39:49.000000000 +0200
@@ -12,26 +12,11 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
@@ -88,15 +91,10 @@
<ant antfile="build.xml"
dir="../../plugins/org.eclipse.platform.source.linux.gtk.ppc64"
target="${target}">
<property name="arch" value="ppc64"/>
<property name="os" value="linux"/>
-@@ -42,36 +27,16 @@
+@@ -42,31 +27,16 @@
<property name="os" value="linux"/>
<property name="ws" value="gtk"/>
</ant>
-- <ant antfile="build.xml"
dir="../../plugins/org.eclipse.platform.source.hpux.motif.ia64"
target="${target}">
-- <property name="arch" value="ia64"/>
-- <property name="os" value="hpux"/>
-- <property name="ws" value="motif"/>
-- </ant>
- <ant antfile="build.xml"
dir="../../plugins/org.eclipse.platform.source.hpux.motif.PA_RISC"
target="${target}">
- <property name="arch" value="PA_RISC"/>
- <property name="os" value="hpux"/>
@@ -125,9 +123,11 @@
<ant antfile="build.xml"
dir="../../plugins/org.eclipse.platform.doc.isv" target="${target}">
<property name="arch" value="x86"/>
<property name="os" value="win32"/>
---- source-tree/features/org.eclipse.rcp/build.xml.orig 2006-01-11
19:05:28.000000000 +0000
-+++ source-tree/features/org.eclipse.rcp/build.xml 2006-01-11
19:06:56.000000000 +0000
-@@ -17,46 +17,11 @@
+Nur in source-tree/features/org.eclipse.platform.source: build.xml.orig.
+diff -r -u source-tree.orig/features/org.eclipse.rcp/build.xml
source-tree/features/org.eclipse.rcp/build.xml
+--- source-tree.orig/features/org.eclipse.rcp/build.xml 2006-10-28
11:34:46.000000000 +0200
++++ source-tree/features/org.eclipse.rcp/build.xml 2006-10-28
12:45:04.000000000 +0200
+@@ -17,41 +17,11 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
@@ -166,15 +166,10 @@
- <property name="os" value="aix"/>
- <property name="ws" value="motif"/>
- </ant>
-- <ant antfile="build.xml"
dir="../../plugins/org.eclipse.swt.carbon.macosx.ppc" target="${target}">
-- <property name="arch" value="ppc"/>
-- <property name="os" value="macosx"/>
-- <property name="ws" value="carbon"/>
-- </ant>
- <ant antfile="build.xml"
dir="../../plugins/org.eclipse.swt.gtk.linux.ppc" target="${target}">
+ <ant antfile="build.xml"
dir="../../plugins/org.eclipse.swt.carbon.macosx" target="${target}">
<property name="arch" value="ppc"/>
- <property name="os" value="linux"/>
-@@ -147,11 +112,6 @@
+ <property name="os" value="macosx"/>
+@@ -157,11 +127,6 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
@@ -186,9 +181,11 @@
<ant antfile="build.xml"
dir="../../plugins/org.eclipse.swt.gtk.linux.x86_64" target="${target}">
<property name="arch" value="x86_64"/>
<property name="os" value="linux"/>
---- source-tree/features/org.eclipse.rcp.source/build.xml.orig 2006-01-11
19:08:13.000000000 +0000
-+++ source-tree/features/org.eclipse.rcp.source/build.xml 2006-01-11
19:09:40.000000000 +0000
-@@ -12,71 +12,26 @@
+Nur in source-tree/features/org.eclipse.rcp: build.xml.orig.
+diff -r -u source-tree.orig/features/org.eclipse.rcp.source/build.xml
source-tree/features/org.eclipse.rcp.source/build.xml
+--- source-tree.orig/features/org.eclipse.rcp.source/build.xml 2006-10-28
11:34:46.000000000 +0200
++++ source-tree/features/org.eclipse.rcp.source/build.xml 2006-10-28
12:49:32.000000000 +0200
+@@ -12,41 +12,11 @@
<property name="os" value="win32"/>
<property name="ws" value="win32"/>
</ant>
@@ -227,8 +224,10 @@
- <property name="os" value="solaris"/>
- <property name="ws" value="gtk"/>
- </ant>
- <ant antfile="build.xml"
dir="../../plugins/org.eclipse.rcp.source.linux.gtk.x86_64" target="${target}">
- <property name="arch" value="x86_64"/>
+ <ant antfile="build.xml"
dir="../../plugins/org.eclipse.rcp.source.solaris.gtk.x86" target="${target}">
+ <property name="arch" value="x86"/>
+ <property name="os" value="solaris"/>
+@@ -57,31 +27,16 @@
<property name="os" value="linux"/>
<property name="ws" value="gtk"/>
</ant>
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-10-27 14:34:50 UTC (rev 2663)
+++ trunk/eclipse/debian/rules 2006-10-28 14:48:09 UTC (rev 2664)
@@ -138,10 +138,10 @@
eclipse-updatehomedir \
eclipse-swttools \
eclipse-swt-x11 \
+ eclipse-build \
+ eclipse-disable-motif \
-# eclipse-build \
# eclipse-icon \
-# eclipse-disable-motif \
# eclipse-efj \
# eclipse-disable-filelog \
# eclipse-libswt-mozilla-classic \
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
