Skip to content

fix errors in bug #135 and fix bug #66 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions project/ScalaDist.scala
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ object ScalaDist {
useNativeZip ++ // use native zip to preserve +x permission on scripts
Seq(
name := "scala",
maintainer := "LAMP/EPFL and Typesafe, Inc.",
packageSummary := "Scala",
packageDescription := "The Scala Programming Language.",
maintainer := "LAMP/EPFL and Typesafe, Inc. <[email protected]>",
packageSummary := "The Scala Programming Language.",
packageDescription := "Have the best of both worlds. Construct elegant class hierarchies for maximum code reuse and extensibility, implement their behavior using higher-order functions. Or anything in-between.",
crossPaths := false,

ivyConfigurations += config(ScalaDistConfig),
Expand Down
2 changes: 1 addition & 1 deletion project/Unix.scala
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ object Unix {

// Debian Specific
name in Debian := "scala",
debianPackageDependencies += "openjdk-6-jre | java6-runtime",
debianPackageDependencies += "openjdk-7-jre-headless | java-runtime-headless",
// debianPackageDependencies += "libjansi-java",

linuxPackageMappings in Debian += (packageMapping(
Expand Down