Branches for Raring

Author: James Page
Revision Date: 2012-05-28 17:18:46 UTC

* Merge from Debian testing. Remaining changes:
  - d/control: Switch Build-Deps from maven to ant, fix Depends on
    binary packages.
  - d/rules: Switch from maven to ant cdbs build and ensure that junit4
    is used to execute unit tests.
  - d/ant.properties: Specify build overrides for upstream build.xml
    to support use of system Java libraries.
  - d/libcommons-discovery-java-doc.install: install API docs from ant
    build output.
  - d/patches/fix_junit4_tests.diff: fix build process to execute
    tests using the junit ant task rather than executing junit directly
    in order to support use of JUnit4 annotations.