[jftp] 26/40: Add alternative dependency on openjdk-7-jre

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jftp.

commit 8644cf5593b4f0512c103a6f85798508012d3437
Author: Niels Thykier <nthykier at debian.org>
Date:   Tue Jun 19 09:08:09 2012 +0000

    Add alternative dependency on openjdk-7-jre
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8486c4d..cb7179f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 ]
diff --git a/debian/control b/debian/control
index dd9d4a9..c9b9a8f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jftp
 
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jftp.git