Merge branch 'upstream' into debian

[debian/openrocket] / debian / control

diff --git a/debian/control b/debian/control
index 53ba78d2fb8cdbb23bbfcb6dd71b4d4f38f161a3..15ce77a18d8c271d24e8bca61f2c07fa07227923 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,20 @@ Source: openrocket
 Section: science
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
-Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), openjdk-6-jdk, ant, ant-optional, libjcommon-java, libjfreechart-java, libmiglayout-java, junit4, libitext5-java, netpbm
+Standards-Version: 3.9.1
 Homepage: http://openrocket.sourceforge.net/
+Vcs-Git: git://git.gag.com/debian/openrocket
+Vcs-Browser: http://git.gag.com/?p=debian/openrocket
 
 Package: openrocket
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre, libjcommon-java, libjfreechart-java, libmiglayout-java
 Description: Model Rocket Simulator
  OpenRocket is a free, fully featured model rocket simulator that allows 
  you to design and simulate your rockets before actually building and 
  flying them.
-
+ .
  OpenRocket features a full six-degree-of-freedom simulation, realistic 
  wind modeling, a multitude of different components including free-form 
  and canted fins, clustering and staging.