releasing version 2.6~beta2+dfsg-2

diff --git a/debian/changelog b/debian/changelog
index cd1149f..18e6536 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jabref (2.6~beta2+dfsg-2) unstable; urgency=low
+
+  * Add back sun-java6-jre as an alternative runtime dependency.
+  * debian/control: change build dependency from default-jdk-builddep to
+    default-jdk.
+  * Set Standards-Version to 3.8.4 (no changes).
+
+ -- gregor herrmann <gregoa@debian.org>  Mon, 08 Feb 2010 21:37:58 +0100
+
 jabref (2.6~beta2+dfsg-1) unstable; urgency=low
 
   [ gregor herrmann ]

diff --git a/debian/control b/debian/control
index e8417c3..133a24c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,19 +4,19 @@ Priority: optional
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 7.3.7), quilt (>= 0.46-7)
-Build-Depends-Indep: default-jdk-builddep, ant, imagemagick, liblog4j1.2-java,
+Build-Depends-Indep: default-jdk, ant, imagemagick, liblog4j1.2-java,
  antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
  libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0),
  libmysql-java, libcommons-logging-java, libjpf-java, libjpfcodegen-java,
  velocity (>= 1.5)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://jabref.sourceforge.net/
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/jabref/trunk/
 Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/jabref/trunk/
 
 Package: jabref
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre,
+Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre,
  antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
  libglazedlists-java, libmicroba-java, libpdfbox-java,
  libjempbox-java (>= 0.2.0), java-wrappers (>= 0.1.6), libmysql-java,