[pkg-java] r16151 - trunk/jftp/debian

[Niels Thykier]

Author: nthykier
Date: 2012-06-19 09:08:09 +0000 (Tue, 19 Jun 2012)
New Revision: 16151

Modified:
   trunk/jftp/debian/changelog
   trunk/jftp/debian/control
Log:
Add alternative dependency on openjdk-7-jre

Modified: trunk/jftp/debian/changelog
===================================================================
--- trunk/jftp/debian/changelog	2012-06-19 09:04:00 UTC (rev 16150)
+++ trunk/jftp/debian/changelog	2012-06-19 09:08:09 UTC (rev 16151)
@@ -1,3 +1,9 @@
+jftp (1.52+dfsg-2) UNRELEASED; urgency=low
+
+  * Add openjdk-7-jre as alternative to openjdk-6-jre.
+
+ -- Niels Thykier <niels at thykier.net>  Tue, 19 Jun 2012 11:07:11 +0200
+
 jftp (1.52+dfsg-1) unstable; urgency=low
 
   [ Torsten Werner ]

Modified: trunk/jftp/debian/control
===================================================================
--- trunk/jftp/debian/control	2012-06-19 09:04:00 UTC (rev 16150)
+++ trunk/jftp/debian/control	2012-06-19 09:08:09 UTC (rev 16151)
@@ -16,7 +16,7 @@
 
 Package: jftp
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre,
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | openjdk-7,
  libjcifs-java, libcommons-logging-java, libcommons-httpclient-java,
  liblog4j1.2-java, kunststoff, libyanfs-java, libj2ssh-java,
  libjsch-java, libjlayer-java, java-wrappers