fixed inclusion of scala-dbc.jar in the built p...

fixed inclusion of scala-dbc.jar in the built package

1 files changed, 6 insertions, 13 deletions

diff --git a/debian/control b/debian/control
index e580e55de3..d8f5759559 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: devel
 Priority: optional
 Maintainer: Lex Spoon <lex@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: java-compiler, ant, debhelper (>= 5)
+Build-Depends: gcj | java-compiler,  ant,  debhelper (>= 5)
 
 Package: scala
 Architecture: all
-Depends: scala-library, scala-dev
+Depends: scala-library, gij | java-virtual-machine
 Recommends: sbaz
 Description: The Scala programming language
  Scala is a Java-compatible programming language with many
@@ -17,8 +17,10 @@ Description: The Scala programming language
  includes modern language features such as closures,
  pattern-matching, parametric types, and virtual type members.
  .
- This package depends on all of the basic packages a typical
- Scala enthusiast would want.
+ This package includes the various tools used to develop
+ code written in Scala.  It includes a compiler (scalac),
+ a convenient command-runner (scala), an interpreter
+ (scalaint), and a source-scanning documentation generator (scaladoc).
 
 
 Package: scala-library
@@ -26,12 +28,3 @@ Architecture: all
 Depends: gij | java-virtual-machine
 Description: The Scala standard library
  The Scala standard library.  This is needed to run Scala programs.
-
-Package: scala-dev
-Architecture: all
-Depends: scala-library, java-virtual-machine
-Description: The Scala development tools
- This package includes the various tools used to develop
- code written in Scala.  It includes a compiler (scalac),
- a convenient command-runner (scala), an interpreter
- (scalaint), and a source-scanning documentation generator (scaladoc).