This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit bdf9b22dad8cbfc7a38b6c4a2b28fbf512402d68 Author: Michael Koch <[email protected]> Date: Sun May 20 09:57:58 2007 -0100 Imported Debian patch 3.3~M7-2 --- debian/changelog | 7 +++++++ debian/control | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1101165..33c5c65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ecj (3.3~M7-2) unstable; urgency=low + + * debian/control: Make ecj and ecj-gcj conflict and replace their + eclipse-ecj and eclipse-ecj-gcj counterparts. Closes: #421302. + + -- Michael Koch <[email protected]> Sun, 20 May 2007 09:57:58 -0100 + ecj (3.3~M7-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 381de6c..61be297 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ Package: ecj Architecture: all Depends: gij-4.1 (>= 4.1.1-20), libgcj7-jar (>= 4.1.1-20), java-common (>= 0.23) Recommends: ecj-gcj -Conflicts: ecj-bootstrap (<< 3.2.2) -Replaces: ecj-bootstrap (<< 3.2.2) +Conflicts: ecj-bootstrap (<< 3.2.2), eclipse-ecj +Replaces: ecj-bootstrap (<< 3.2.2), eclipse-ecj Suggests: ant Description: standalone version of the Eclipse Java compiler This package provides a standalone version of the Eclipse JDT compiler which @@ -23,7 +23,8 @@ Package: ecj-gcj Architecture: any Depends: ecj (>= ${source:Version}), ${shlibs:Depends} Recommends: java-gcj-compat (>= 1.0.69) -Replaces: ecj-bootstrap-gcj (<< 3.2.2) +Replaces: ecj-bootstrap-gcj (<< 3.2.2), eclipse-ecj-gcj +Conflicts: eclipse-ecj-gcj Description: standalone version of the Eclipse Java compiler (native version) This package provides a standalone version of the Eclipse JDT compiler which is distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
