[SCM] project-x packaging repository branch, master, updated. debian/0.90.4+cvs20091114.1925.dfsg-1-9-gac79e3c

[etobi]

The following commit has been merged in the master branch:
commit e4e785d147f6eebd7967df79b55f20a1e7d7c807
Author: etobi <git at e-tobi.net>
Date:   Thu May 24 21:18:09 2012 +0200

    Depend on default-jre | java6-runtime

diff --git a/debian/changelog b/debian/changelog
index e8577f8..d63c51a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ project-x (0.91.0-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Use source format 3.0 (quilt) now
+  * Depend on default-jre | java6-runtime
 
  -- Tobias Grimm <etobi at debian.org>  Thu, 24 May 2012 20:49:29 +0200
 
diff --git a/debian/control b/debian/control
index a711132..2b9fc89 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.3
 
 Package: project-x
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime, libcommons-net-java, liboro-java
+Depends: ${misc:Depends}, default-jre | java6-runtime, libcommons-net-java, liboro-java
 Provides: projectx
 Replaces: projectx (<< 0.90.4+cvs2008-05-13-2)
 Conflicts: projectx (<< 0.90.4+cvs2008-05-13-2)

-- 
project-x packaging repository