Branches for Edgy

Author: Scott James Remnant (Canonical)
Revision Date: 2006-10-12 14:56:58 UTC

* Merge from debian unstable, to fix #65063. Remaining changes:
  - Build-depend on file,
  - Mono components built with mono-mcs instead of pnet,
  - Java components built with gcj instead of jikes-classpath
  - Set GCJFLAGS to -fjni -findirect-dispatch.
  - Install libintl.jar in /usr/share/java, keep a symlink in
    /usr/share/gettext.
  - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them.

* Build-depend on java-gcj-compat-dev instead of gcj to get around bad
  gcj detection in configure script.