Author: doko
Date: 2006-09-30 16:22:34 +0000 (Sat, 30 Sep 2006)
New Revision: 2523
Removed:
trunk/eclipse/debian/eclipse-ecj-gcj.install
trunk/eclipse/debian/eclipse-ecj-gcj.manpages
trunk/eclipse/debian/eclipse-ecj-gcj.postinst
trunk/eclipse/debian/eclipse-ecj-gcj.prerm
trunk/eclipse/debian/eclipse-ecj.install
trunk/eclipse/debian/eclipse-ecj.links
trunk/eclipse/debian/eclipse-ecj.manpages
trunk/eclipse/debian/eclipse-ecj.postinst
trunk/eclipse/debian/eclipse-ecj.prerm
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/rules
Log:
* Don't build the eclipse-ecj and eclipse-ecj-gcj packages anymore.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-09-30 16:14:53 UTC (rev 2522)
+++ trunk/eclipse/debian/changelog 2006-09-30 16:22:34 UTC (rev 2523)
@@ -48,6 +48,7 @@
* Build-depend on java-gcj-compat-dev (>> 1.0.65-4), remove explicit build
dependency on ecj-bootstrap-gcj.
* Don't build ecj again, just use the system one.
+ * Don't build the eclipse-ecj and eclipse-ecj-gcj packages anymore.
-- Michael Koch <[EMAIL PROTECTED]> Mon, 18 Sep 2006 05:22:34 +0000
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-09-30 16:14:53 UTC (rev 2522)
+++ trunk/eclipse/debian/control 2006-09-30 16:22:34 UTC (rev 2523)
@@ -232,7 +232,7 @@
Package: eclipse-gcj
Architecture: all
-Depends: java-gcj-compat-dev, eclipse-ecj-gcj, eclipse-jdt-gcj,
eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.2-gtk-gcj
+Depends: java-gcj-compat-dev, ecj-bootstrap-gcj, eclipse-jdt-gcj,
eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.2-gtk-gcj
Description: Native Eclipse run with GCJ
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -278,29 +278,6 @@
This packages includes all jni native libraries used by the gtk2
version of swt.
-Package: eclipse-ecj
-Architecture: all
-Depends: java-gcj-compat | java2-runtime, java-common, eclipse-jdt (>=
${Source-Version}), ant-optional (>= 1.6.5-3)
-Provides: java-compiler, java2-compiler
-Replaces: eclipse-javac
-Conflicts: eclipse-javac
-Description: Eclipse Java compiler and Ant plug-in
- This package provides the JDT Compiler which is the Java compiler derived from
- Eclipse. It passes JCK (Java Compatibility Kit) and is compatible with Java
- 1.3 and 1.4.
- .
- It also includes the Ant plug-in.
-
-Package: eclipse-ecj-gcj
-Architecture: any
-Depends: gij-4.1, ${shlibs:Depends}
-Provides: java-compiler, java2-compiler
-Conflicts: eclipse-javac
-Description: Native version of the Eclipse Java compiler
- This package provides the JDT Compiler which is the Java compiler derived from
- Eclipse. It passes JCK (Java Compatibility Kit) and is compatible with Java
- 1.3 and 1.4.
-
Package: eclipse-efj
Architecture: any
Depends: java-runtime, java-gcj-compat | java-virtual-machine, java-common (>=
0.22), eclipse-jdt (= ${Source-Version})
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2006-09-30 16:14:53 UTC (rev 2522)
+++ trunk/eclipse/debian/control.in 2006-09-30 16:22:34 UTC (rev 2523)
@@ -232,7 +232,7 @@
Package: eclipse-gcj
Architecture: all
-Depends: java-gcj-compat-dev, eclipse-ecj-gcj, eclipse-jdt-gcj,
eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.2-gtk-gcj
+Depends: java-gcj-compat-dev, ecj-bootstrap-gcj, eclipse-jdt-gcj,
eclipse-pde-gcj, eclipse-platform-gcj, eclipse-rcp-gcj, libswt3.2-gtk-gcj
Description: Native Eclipse run with GCJ
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -278,29 +278,6 @@
This packages includes all jni native libraries used by the gtk2
version of swt.
-Package: eclipse-ecj
-Architecture: all
-Depends: java-gcj-compat | java2-runtime, java-common, eclipse-jdt (>=
${Source-Version}), @ANT_DEP@
-Provides: java-compiler, java2-compiler
-Replaces: eclipse-javac
-Conflicts: eclipse-javac
-Description: Eclipse Java compiler and Ant plug-in
- This package provides the JDT Compiler which is the Java compiler derived from
- Eclipse. It passes JCK (Java Compatibility Kit) and is compatible with Java
- 1.3 and 1.4.
- .
- It also includes the Ant plug-in.
-
-Package: eclipse-ecj-gcj
-Architecture: any
-Depends: gij-4.1, ${shlibs:Depends}
-Provides: java-compiler, java2-compiler
-Conflicts: eclipse-javac
-Description: Native version of the Eclipse Java compiler
- This package provides the JDT Compiler which is the Java compiler derived from
- Eclipse. It passes JCK (Java Compatibility Kit) and is compatible with Java
- 1.3 and 1.4.
-
Package: eclipse-efj
Architecture: any
Depends: java-runtime, java-gcj-compat | java-virtual-machine, java-common (>=
0.22), eclipse-jdt (= ${Source-Version})
Deleted: trunk/eclipse/debian/eclipse-ecj-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-ecj-gcj.install 2006-09-30 16:14:53 UTC
(rev 2522)
+++ trunk/eclipse/debian/eclipse-ecj-gcj.install 2006-09-30 16:22:34 UTC
(rev 2523)
@@ -1 +0,0 @@
-debian/tmp/usr/bin/ecj-gcj
Deleted: trunk/eclipse/debian/eclipse-ecj-gcj.manpages
===================================================================
--- trunk/eclipse/debian/eclipse-ecj-gcj.manpages 2006-09-30 16:14:53 UTC
(rev 2522)
+++ trunk/eclipse/debian/eclipse-ecj-gcj.manpages 2006-09-30 16:22:34 UTC
(rev 2523)
@@ -1 +0,0 @@
-debian/extra/ecj-gcj.1
Deleted: trunk/eclipse/debian/eclipse-ecj-gcj.postinst
===================================================================
--- trunk/eclipse/debian/eclipse-ecj-gcj.postinst 2006-09-30 16:14:53 UTC
(rev 2522)
+++ trunk/eclipse/debian/eclipse-ecj-gcj.postinst 2006-09-30 16:22:34 UTC
(rev 2523)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --quiet --install /usr/bin/ecj ecj /usr/bin/ecj-gcj 2 \
- --slave /usr/share/man/man1/ecj.1.gz ecj.1.gz
/usr/share/man/man1/ecj-gcj.1.gz
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/eclipse-ecj-gcj.prerm
===================================================================
--- trunk/eclipse/debian/eclipse-ecj-gcj.prerm 2006-09-30 16:14:53 UTC (rev
2522)
+++ trunk/eclipse/debian/eclipse-ecj-gcj.prerm 2006-09-30 16:22:34 UTC (rev
2523)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --quiet --remove ecj /usr/bin/ecj-gcj
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/eclipse-ecj.install
===================================================================
--- trunk/eclipse/debian/eclipse-ecj.install 2006-09-30 16:14:53 UTC (rev
2522)
+++ trunk/eclipse/debian/eclipse-ecj.install 2006-09-30 16:22:34 UTC (rev
2523)
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/ant/lib/jdtCompilerAdapter.jar
-
-debian/tmp/usr/bin/ecj-java
Deleted: trunk/eclipse/debian/eclipse-ecj.links
===================================================================
--- trunk/eclipse/debian/eclipse-ecj.links 2006-09-30 16:14:53 UTC (rev
2522)
+++ trunk/eclipse/debian/eclipse-ecj.links 2006-09-30 16:22:34 UTC (rev
2523)
@@ -1 +0,0 @@
-usr/share/eclipse/plugins/org.eclipse.jdt.core_3.1.1.jar
usr/share/ant/lib/jdtcore.jar
Deleted: trunk/eclipse/debian/eclipse-ecj.manpages
===================================================================
--- trunk/eclipse/debian/eclipse-ecj.manpages 2006-09-30 16:14:53 UTC (rev
2522)
+++ trunk/eclipse/debian/eclipse-ecj.manpages 2006-09-30 16:22:34 UTC (rev
2523)
@@ -1 +0,0 @@
-debian/extra/ecj-java.1
Deleted: trunk/eclipse/debian/eclipse-ecj.postinst
===================================================================
--- trunk/eclipse/debian/eclipse-ecj.postinst 2006-09-30 16:14:53 UTC (rev
2522)
+++ trunk/eclipse/debian/eclipse-ecj.postinst 2006-09-30 16:22:34 UTC (rev
2523)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --quiet --install /usr/bin/ecj ecj /usr/bin/ecj-java 1 \
- --slave /usr/share/man/man1/ecj.1.gz ecj.1.gz
/usr/share/man/man1/ecj-java.1.gz
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/eclipse-ecj.prerm
===================================================================
--- trunk/eclipse/debian/eclipse-ecj.prerm 2006-09-30 16:14:53 UTC (rev
2522)
+++ trunk/eclipse/debian/eclipse-ecj.prerm 2006-09-30 16:22:34 UTC (rev
2523)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --quiet --remove ecj /usr/bin/ecj-java
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-09-30 16:14:53 UTC (rev 2522)
+++ trunk/eclipse/debian/rules 2006-09-30 16:22:34 UTC (rev 2523)
@@ -372,12 +372,7 @@
# Install the tar file into our destination directory.
install -d $(DEBIAN_TMP)/$(ECLIPSE_HOME)
tar xzvf $(SOURCE_TREE)/result/*.tar.gz -C
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/..
-
- # extract the jdtCompilerAdapter.jar file
- mkdir -p $(DEBIAN_TMP)/usr/share/ant/lib
- cd $(DEBIAN_TMP)/usr/share/ant/lib && \
- jar xf
$(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_$(UPSTREAM_VERSION)*.jar
jdtCompilerAdapter.jar
-
+
# Builds any Debian-specific extra files.
mkdir -p $(BUILD_TREE)
@@ -392,16 +387,7 @@
# included in a source package.
mkdir -p $(DEBIAN_TMP)/usr/share/pixmaps
cp $(SOURCE_TREE)/plugins/org.eclipse.platform/eclipse*.png
$(DEBIAN_TMP)/usr/share/pixmaps/
-
- # A pure native binary. This reduces startup time in the normal case.
-ifeq ($(enable_native),yes)
- $(GCJ_RUN) \
- -Wl,-Bsymbolic -fPIC -fjni -findirect-dispatch \
- --main=org.eclipse.jdt.internal.compiler.batch.Main \
- -o $(BUILD_TREE)/ecj-gcj \
- $(SOURCE_TREE)/eclipse/plugins/org.eclipse.jdt.core_*.jar
-endif
-
+
# Because Java cannot read Unix soft links, it simply copies the data
# of all our previously replaced Jar files. We must now go through the
# process of linking them back to the Debian versions.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
