This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit 3deb5cde102c9c66df2149f91c14f0a7fabd7eef Author: Matthias Klose <d...@debian.org> Date: Thu Aug 30 23:33:08 2007 +0200 Import Debian changes 3.3.0+0728-3 ecj (3.3.0+0728-3) unstable; urgency=medium * Use ecj-standalone.jar to build the ecj-gcj and ecj1 binaries. * ecj-gcj: Depend on ecj. Closes: #440259. --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 14 ++++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc62559..9173cb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ecj (3.3.0+0728-3) unstable; urgency=medium + + * Use ecj-standalone.jar to build the ecj-gcj and ecj1 binaries. + * ecj-gcj: Depend on ecj. Closes: #440259. + + -- Matthias Klose <d...@debian.org> Thu, 30 Aug 2007 23:33:08 +0200 + ecj (3.3.0+0728-2) unstable; urgency=low * Tighten build-dependency on libgcj-bc. diff --git a/debian/control b/debian/control index e14a1af..bc47862 100644 --- a/debian/control +++ b/debian/control @@ -57,7 +57,7 @@ Description: java byte code compiler used by gcj Package: ecj-gcj Architecture: any -Depends: libecj-java-gcj (>= ${source:Version}), ${shlibs:Depends} +Depends: ecj (>= ${source:Version}), libecj-java-gcj (>= ${source:Version}), ${shlibs:Depends} Recommends: java-gcj-compat (>= 1.0.69) Replaces: ecj-bootstrap-gcj (<< 3.2.2), eclipse-ecj-gcj Conflicts: eclipse-ecj-gcj diff --git a/debian/rules b/debian/rules index e691cdb..aa45d9c 100755 --- a/debian/rules +++ b/debian/rules @@ -117,13 +117,19 @@ ifeq ($(with_native),yes) $(GCJ) \ -c -O2 -g -fPIC -fjni -findirect-dispatch \ -o build/dist/resources.o build/resources.jar + cp -p build/dist/resources.o build/exe/ PYTHONPATH=$(CURDIR)/debian \ RPATH=-Wl,-rpath,$(GCJSUBDIR) \ time python debian/aot-compile \ --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \ -L /usr/lib/gcj build/dist build/dist - mv build/dist/$(JAR).db build/dist/eclipse-ecj.db + + PYTHONPATH=$(CURDIR)/debian \ + RPATH=-Wl,-rpath,$(GCJSUBDIR) \ + time python debian/aot-compile \ + --gcj=$(GCJ) --dbtool=$(GCJDBTOOL) \ + -L /usr/lib/gcj build/exe build/exe ifeq (0,1) : # ecj-gcj @@ -157,20 +163,20 @@ ifeq ($(with_native),yes) install -m 644 build/dist/$(JAR).so debian/tmp/usr/lib/gcj mkdir -p debian/tmp/usr/share/gcj/classmap.d - install -m 644 build/dist/eclipse-ecj.db \ + install -m 644 build/dist/*.db \ debian/tmp/usr/share/gcj/classmap.d/ endif install/ecj1:: ifeq ($(with_native),yes) mkdir -p debian/ecj1/usr/lib/gcc - install -m 755 build/dist/ecj1 debian/ecj1/usr/lib/gcc/ + install -m 755 build/exe/ecj1 debian/ecj1/usr/lib/gcc/ endif install/ecj-gcj:: ifeq ($(with_native),yes) mkdir -p debian/tmp/usr/bin - install -m 755 build/dist/ecj-gcj debian/tmp/usr/bin/ + install -m 755 build/exe/ecj-gcj debian/tmp/usr/bin/ endif mkdir -p debian/ecj-gcj/usr/bin -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits