From 5e9b080fc8a716070b1a182b173f93d9d53a12a2 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 7 May 2011 22:02:05 -0400
Subject: [PATCH] fix artifact name to be normalized

---
 main/Defaults.scala                         | 6 +++---
 sbt/src/sbt-test/package/manifest/build.sbt | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/main/Defaults.scala b/main/Defaults.scala
index 69efe03ef..ac1db6e0d 100644
--- a/main/Defaults.scala
+++ b/main/Defaults.scala
@@ -238,7 +238,7 @@ object Defaults
 	}
 
 	lazy val packageBase = Seq(
-		artifact <<= name(n => Artifact(n)),
+		artifact <<= normalizedName(n => Artifact(n)),
 		packageOptions in GlobalScope :== Nil,
 		artifactName in GlobalScope :== ( Artifact.artifactName _ )
 	)
@@ -538,8 +538,8 @@ object Classpaths
 		artifactPath in makePom <<= artifactPathSetting(artifact in makePom),
 		publishArtifact in makePom <<= publishMavenStyle.identity,
 		artifact in makePom <<= moduleID( name => Artifact(name, "pom", "pom") ),
-		projectID <<= (organization,moduleID,version,artifacts){ (org,module,version,as) =>
-			ModuleID(org, module, version).cross(true).artifacts(as : _*)
+		projectID <<= (organization,moduleID,version,artifacts,crossPaths){ (org,module,version,as,crossEnabled) =>
+			ModuleID(org, module, version).cross(crossEnabled).artifacts(as : _*)
 		},
 		resolvers in GlobalScope :== Nil,
 		projectDescriptors <<= depMap,
diff --git a/sbt/src/sbt-test/package/manifest/build.sbt b/sbt/src/sbt-test/package/manifest/build.sbt
index 2b8004dcc..ffe319563 100644
--- a/sbt/src/sbt-test/package/manifest/build.sbt
+++ b/sbt/src/sbt-test/package/manifest/build.sbt
@@ -1,6 +1,5 @@
 	import java.util.jar.{Attributes, Manifest}
 	import Path.makeString
-	import Configurations.Compile
 
 name :== "Jar Manifest Test"