[ecj] 12/37: Imported Debian patch 3.3.0+0728-5

[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 df04cf6551587f8e0d4a2c7762021c5c8a19bebe
Author: Matthias Klose <doko at debian.org>
Date:   Thu Sep 6 19:22:58 2007 +0200

    Imported Debian patch 3.3.0+0728-5
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 debian/rules     | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e402bf7..af7e0e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ecj (3.3.0+0728-5) unstable; urgency=medium
+
+  * Make ecj architecture dependent, dependencies depend on the jvm used.
+  * ecj: Depend on gij-x.y.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 06 Sep 2007 19:22:58 +0200
+
 ecj (3.3.0+0728-4) unstable; urgency=low
 
   * Fix name of renamed jar file (Michael Koch).
diff --git a/debian/control b/debian/control
index bc47862..1ba260d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Conflicts: ecj-bootstrap-gcj (<< 3.2.2)
 Standards-Version: 3.7.2
 
 Package: ecj
-Architecture: all
-Depends: libecj-java (= ${source:Version}), ${pkg:gij}, ${pkglibgcjjar}, java-common (>= 0.23)
+Architecture: any
+Depends: libecj-java (>= ${source:Version}), ${pkg:gij}, ${pkg:libgcjjar}, java-common (>= 0.23)
 Recommends: ecj-gcj
 Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj
 Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj
diff --git a/debian/rules b/debian/rules
index aa45d9c..33466be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel))
   with_rebuild := no
 endif
 
-DEB_DH_GENCONTROL_ARGS_ecj = -- \
-	'-Vpkg:gij=gij-$(GCC_VERSION) (>= $(REQ_VERSION))' \
-	'-Vpkg:libgcjjar=libgcj$(LIBGCJ_EXT)-jar (>= $(REQ_VERSION)'
+DEB_DH_GENCONTROL_ARGS = -- \
+	'-Vpkg:gij=$(GIJ) (>= $(REQ_VERSION))' \
+	'-Vpkg:libgcjjar=libgcj$(LIBGCJ_EXT)-jar (>= $(REQ_VERSION))'
 
 JAR = eclipse-ecj.jar
 

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