merge r1359:1364 from trunk

diff --git a/debian/changelog b/debian/changelog
index 67bcc1c..718db08 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,20 @@
 jabref (2.4~beta1-1) UNRELEASED; urgency=low
 
+ -- gregor herrmann <gregoa@debian.org>  Wed, 16 Jul 2008 22:24:25 +0200
+
+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.
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 16 Jul 2008 22:24:25 +0200
+
+jabref (2.3.1-4) unstable; urgency=low
+
   * New upstream release.
   * Install the new upstream CHANGELOG instead of the removed
     changelog_highlights.txt.

diff --git a/debian/control b/debian/control
index 5d6ffd1..172f04d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,10 @@ Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/jabref/tr
 
 Package: jabref
 Architecture: all
-Depends: sun-java6-jre | sun-java5-jre
+Depends: openjdk-6-jre | sun-java6-jre | sun-java5-jre, antlr, antlr3,
+ libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
+ libglazedlists-java, libmicroba-java, libpdfbox-java,
+ libjempbox-java (>= 0.2.0)
 Suggests: gv | postscript-viewer, xpdf | pdf-viewer
 Description: graphical frontend to manage BibTeX databases
  JabRef is a GUI to manage BibTeX databases, the standard LaTeX bibliography

diff --git a/debian/copyright b/debian/copyright
index 0a44ff1..6d06026 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,8 @@ box for details.
 From the About box:
 
 (c) 2008
-JabRef is freely distributable under the terms of the GNU Public License, version 2.
+JabRef is freely distributable under the terms of the GNU Public License,
+version 2.
 
 Developers:
 Morten O. Alver