Please merge jabref 2.3.1-3 (universe) from Debian unstable (contrib)

Please find attached debdiff for merge.

Uploaded. Thanks for the merge.

This bug was fixed in the package jabref - 2.3.1-5ubuntu1

---------------
jabref (2.3.1-5ubuntu1) intrepid; urgency=low

  * Merge from debian unstable. (LP: #225450, #227125)
  * Remaining changes:
    - debian/control
      * Change build dependency default-jdk-builddep to default-jdk.
      * Change run time dependency to default-jre | java2-runtime.
        There is no evidence that it does not run with latest Free JVMs.
        (LP: #164216, #194509)
      * Modify Maintainer value to match the DebianMaintainerField
        specification.
    - debian/rules
      * Change JAVA_HOME for default-jdk.

jabref (2.3.1-5) unstable; urgency=low

  * Change runtime dependency from "sun-java6-jre | sun-java5-jre" to
    "openjdk-6-jre | sun-java6-jre | sun-java5-jre" (closes: #383006).
    [Jabref stays in contrib because it (build) depends on libspin-java and
    libpdfbox-java which are in contrib because they build depend on packages
    in contrib/non-free.]
  * debian/copyright: wrap long line.

jabref (2.3.1-4) unstable; urgency=low

  * Replace /usr/lib/jvm/java-7-icedtea with /usr/lib/jvm/java-6-openjdk in
    wrapper script. Doesn't work on Debian yet but helps Ubuntu users (cf.
    LP: #225450 and LP: #203636).
  * debian/watch: use sourceforge URL directly instead of the redirector
    at qa.debian.org.
  * Switch patch system from dpatch to quilt.
  * debian/rules: remove configure{,-stamp} targets.
  * Set Standards-Version to 3.8.0; add debian/README.source to document the
    patch system.
  * Add patch 06_forms_groups.patch to fix an exception in the groups
    interface; thanks to Monkey D. Luffy for the bug report and to Philipp
    Spitzer for helping me to produce a patch (closes: #487481).

jabref (2.3.1-3) unstable; urgency=low

  * Build against Debian libraries instead of pre-packaged ones
    (closes: #389068):
    - adapt and reactivate patch 02_libs.dpatch: use libraries in
      /usr/share/java for building and don't include them in jabref.jar
    - add needed jars to Classpath in the wrapper script
    - add patch 05_antlr.dpatch: antlr3 in Debian is newer than the
      pre-packaged jar
    - add necessary packages to Build-Depends-Indep and Depends
    These changes are either taken directly from Gerardo Curiel's patch or
    based on them -- thanks a lot!
  * debian/watch: add uversionmangle to cope with upstream b(eta) releases.
  * Move wrapper script in source package to debian/jabref-wrapper and
    install it from debian/rules.
  * Remove debian docs and install upstream README directly from
    debian/rules.
  * debian/control:
    - change my email address
    - replace java-gcj-compat-dev with default-jdk-builddep in
      Build-Depends-Indep

jabref (2.3.1-2) unstable; urgency=low

  * Change pdfviewer to pdf-viewer in Suggests:.
  * Set Standards-Version to 3.7.3 (no changes required).
  * debian/rules: explicitly set JAVA_HOME.
  * Only set JAVA to $JAVA_HOME/jre/bin/java if JAVA_HOME is not empty;
    thanks to Michael Piefel for the hint.
  * Set debhelper compatibility level to 6.

 -- Onkar Shinde <email address hidden> Sat, 09 Aug 2008 14:51:41 +0530