[ecj] 13/37: Imported Debian patch 3.3.0+0728-6

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit 05abd79d3f7152adb7df3acfd271f5eb258e632e
Author: Matthias Klose <doko at debian.org>
Date:   Mon Jan 14 22:07:01 2008 +0100

    Imported Debian patch 3.3.0+0728-6
---
 debian/changelog |  6 ++++++
 debian/control   |  1 +
 debian/rules     | 18 +++++++++++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af7e0e0..fa3264e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecj (3.3.0+0728-6) unstable; urgency=low
+
+  * Build-depend on libecj-java on arm.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 14 Jan 2008 22:07:01 +0100
+
 ecj (3.3.0+0728-5) unstable; urgency=medium
 
   * Make ecj architecture dependent, dependencies depend on the jvm used.
diff --git a/debian/control b/debian/control
index 1ba260d..704376b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de
 Build-Depends: cdbs (>= 0.4.26), debhelper (>= 5),
  gcj-4.2 (>= 4.2.1-3) [!alpha !m68k], gcj-4.1 (>= 4.1.2) [alpha m68k],
  libgcj-bc (>= 4.2.1-2) [!alpha !m68k], libgcj-bc (>= 4.1.2) [alpha m68k],
+ libecj-java (>= 3.3.0+0728) [arm], unzip [arm],
  fastjar, ant, zip, dpkg (>= 1.13.19), python, time
 Build-Conflicts: ecj-bootstrap-gcj (<< 3.2.2)
 Standards-Version: 3.7.2
diff --git a/debian/rules b/debian/rules
index 33466be..8521789 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,11 +26,16 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 with_native := yes
 with_rebuild := yes
+with_sourcebuild := yes
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel))
+ifneq (,$(filter $(DEB_HOST_ARCH), arm armel))
   with_rebuild := no
 endif
 
+ifneq (,$(filter $(DEB_HOST_ARCH), arm))
+  with_sourcebuild := no
+endif
+
 DEB_DH_GENCONTROL_ARGS = -- \
 	'-Vpkg:gij=$(GIJ) (>= $(REQ_VERSION))' \
 	'-Vpkg:libgcjjar=libgcj$(LIBGCJ_EXT)-jar (>= $(REQ_VERSION))'
@@ -47,6 +52,7 @@ build/stamp-bytecode:
 	rm -rf build/bin
 	mkdir -p build/bin
 
+ifeq ($(with_sourcebuild),yes)
 	cp -r src/org.eclipse.jdt.core/org build/bin/
 	rm -rf build/bin/org/eclipse/jdt/internal/compiler/apt
 	rm -rf build/bin/org/eclipse/jdt/internal/compiler/tool
@@ -77,7 +83,7 @@ build/stamp-bytecode:
 	mkdir -p build/bootstrap
 	fastjar -c -C build/bin . -f build/bootstrap/$(JAR)
 
-ifeq ($(with_rebuild),yes)
+  ifeq ($(with_rebuild),yes)
 	: # rebuild the compiler
 	rm -rf build/bin
 	mkdir -p build/bin
@@ -96,9 +102,15 @@ ifeq ($(with_rebuild),yes)
 
 	mkdir -p build/dist
 	fastjar -c -C build/bin . -f build/dist/$(JAR)
-else
+  else
 	mkdir -p build/dist
 	cp -p build/bootstrap/$(JAR) build/dist/$(JAR)
+  endif
+else
+	mkdir -p build/bin
+	unzip -d build/bin -q /usr/share/java/eclipse-ecj.jar
+	mkdir -p build/dist
+	cp -p /usr/share/java/eclipse-ecj.jar build/dist/$(JAR)
 endif
 	mkdir -p build/exe
 	cp build/dist/$(JAR) build/exe/ecj-standalone.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git