Merge pull request #157 from SethTisue/fix-deb-name-regression

.deb naming regression fix, plus some random code improvement

project/ScalaDist.scala

@@ -40,7 +40,15 @@ object ScalaDist {
       mappings in upload += uploadMapping(packageZipTarball in UniversalDocs).value,
       mappings in upload += uploadMapping(packageXzTarball in UniversalDocs).value,
       mappings in upload += uploadMapping(packageBin in Rpm).value,
-      mappings in upload += uploadMapping(packageBin in Debian).value
+      // Debian needs special handling because the value sbt-native-packager
+      // gives us for `packageBin in Debian` (coming from the archiveFilename
+      // method) includes the debian version and arch information,
+      // which we historically have not included.  I don't see a way to
+      // override the filename on disk, so we re-map at upload time
+      mappings in upload += Def.task {
+        (packageBin in Debian).value ->
+          s"scala/${version.value}/${(name in Debian).value}-${version.value}.deb"
+      }.value
     )
 
   def settings: Seq[Setting[_]] =

project/Unix.scala

@@ -89,14 +89,10 @@ object Unix {
     // Debian Specific
     name in Debian    := "scala",
     debianPackageDependencies += "java6-runtime-headless",
-    // debianPackageDependencies += "libjansi-java",
 
     linuxPackageMappings in Debian += (packageMapping(
         (sourceDirectory.value / "debian" / "changelog") -> "/usr/share/doc/scala/changelog.gz"
-      ) withUser "root" withGroup "root" withPerms "0644" gzipped) asDocs(),
-
-    // Hack so we use regular version, rather than debian version.
-    target in Debian := target.value / s"${(name in Debian).value}-${version.value}"
+      ).withUser("root").withGroup("root").withPerms("0644").gzipped).asDocs()
 
   )
 }

project/plugins.sbt

@@ -1,3 +1,5 @@
+scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint")
+
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.4")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-s3" % "0.8")