diff options
-rw-r--r-- | debian/control | 19 | ||||
-rwxr-xr-x | debian/rules | 11 | ||||
-rw-r--r-- | debian/scala-library.dirs | 1 | ||||
-rw-r--r-- | debian/scala.dirs | 2 | ||||
-rw-r--r-- | debian/simpbuild.xml | 8 |
5 files changed, 19 insertions, 22 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). diff --git a/debian/rules b/debian/rules index f0522758a8..0fa65498dc 100755 --- a/debian/rules +++ b/debian/rules @@ -21,14 +21,15 @@ install: build dh_clean -k dh_installdirs -A - install simpbuild/lib/scala-library.jar $(CURDIR)/debian/scala-library/usr/share/java/ - install simpbuild/lib/scala-dbc.jar $(CURDIR)/debian/scala-library/usr/share/java/ + install -m644 simpbuild/lib/scala-library.jar $(CURDIR)/debian/scala-library/usr/share/java/ + install -m644 simpbuild/lib/scala-dbc.jar $(CURDIR)/debian/scala-library/usr/share/java/ + install -m644 simpbuild/lib/scala-actors.jar $(CURDIR)/debian/scala-library/usr/share/java/ - install simpbuild/lib/scala-compiler.jar $(CURDIR)/debian/scala-dev/usr/share/java/ - install debian/command-scripts/* $(CURDIR)/debian/scala-dev/usr/bin/ + install -m644 simpbuild/lib/scala-compiler.jar $(CURDIR)/debian/scala/usr/share/java/ + install -m755 debian/command-scripts/* $(CURDIR)/debian/scala/usr/bin/ dh_installdocs -A - dh_installman -pscala-dev docs/man/*/*.1 + dh_installman -pscala simpbuild/manual/man1/*.1 dh_installchangelogs -A dh_compress -A dh_fixperms -A diff --git a/debian/scala-library.dirs b/debian/scala-library.dirs index 17e8a2d271..f5cd8f2042 100644 --- a/debian/scala-library.dirs +++ b/debian/scala-library.dirs @@ -1,2 +1 @@ -usr/bin usr/share/java
\ No newline at end of file diff --git a/debian/scala.dirs b/debian/scala.dirs new file mode 100644 index 0000000000..e4bc73a714 --- /dev/null +++ b/debian/scala.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/java diff --git a/debian/simpbuild.xml b/debian/simpbuild.xml index 0baa7c1404..d086e16257 100644 --- a/debian/simpbuild.xml +++ b/debian/simpbuild.xml @@ -31,13 +31,15 @@ <!-- Location of pre-compiled libraries --> - <!-- <property name="starr.lib.jar" value="${lib.dir}/scala-library.jar"/> <property name="starr.comp.jar" value="${lib.dir}/scala-compiler.jar"/> - --> <property name="scala.home" value="${user.home}/sbaz"/> + + <!-- <property name="starr.lib.jar" value="${scala.home}/lib/scala-library.jar"/> <property name="starr.comp.jar" value="${scala.home}/lib/scala-compiler.jar"/> + --> + <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/> <property name="ant.jar" value="/usr/share/java/ant.jar"/> @@ -450,7 +452,7 @@ link="${sbaz.universe}/${sbaz.lib.name}-${version.number}.sbp" > <libset dir="${build.jar.dir}" includes="${lib.jar.name}"/> - <libset dir="${build.jar.dir}" includes="${dbc.jar.name}"/> + <libset dir="${build.jar.dir}" includes="${lib-dbc.jar.name}"/> <libset dir="${build.jar.dir}" includes="${actors.jar.name}"/> <srcset dir="${build.jar.dir}" includes="${libsrc.jar.name}"/> <srcset dir="${build.jar.dir}" includes="${dbcsrc.jar.name}"/> |