From 1605256c1369304bad3c29fddf81d6c9424a92a0 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Wed, 21 Dec 2011 13:52:26 -0500
Subject: [PATCH] Minor fixes.

* Migrated packaging info form debian.scala to packaging.scala
* Fixed issue with using sourceDirectory in Debian instead of
  in Linux
---
 project/build.scala                       | 4 ++--
 project/{debian.scala => packaging.scala} | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename project/{debian.scala => packaging.scala} (92%)

diff --git a/project/build.scala b/project/build.scala
index 22e8505c6..a546ea1ff 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -2,6 +2,6 @@ import sbt._
 import Keys._
 
 object SbtExtras extends Build {
-  // TODO - Detect Debian distribution and enable debian settings for the project.
-  val root = Project("sbt-extras", file(".")) settings(DebianPkg.settings:_*)
+  // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution.
+  val root = Project("sbt-extras", file(".")) settings(Packaging.settings:_*)
 }
diff --git a/project/debian.scala b/project/packaging.scala
similarity index 92%
rename from project/debian.scala
rename to project/packaging.scala
index e010457c4..35a8fabf7 100644
--- a/project/debian.scala
+++ b/project/packaging.scala
@@ -3,7 +3,7 @@ import com.typesafe.packager.Keys._
 import sbt.Keys._
 import com.typesafe.packager.PackagerPlugin._
 
-object DebianPkg {
+object Packaging {
   
   val settings: Seq[Setting[_]] = packagerSettings ++ Seq(
       
@@ -21,12 +21,12 @@ object DebianPkg {
         (bd / "linux" / "usr/share/man/man1/sbt.1") -> "/usr/share/man/man1/sbt.1.gz"
       ) withPerms "0644" gzipped) asDocs()
     },
-    linuxPackageMappings <+= (sourceDirectory in Debian) map { bd =>
+    linuxPackageMappings <+= (sourceDirectory in Linux) map { bd =>
       packageMapping(
         (bd / "usr/share/doc/sbt/copyright") -> "/usr/share/doc/sbt/copyright"
       ) withPerms "0644" asDocs()
     },   
-    linuxPackageMappings <+= (sourceDirectory in Debian) map { bd =>
+    linuxPackageMappings <+= (sourceDirectory in Linux) map { bd =>
       packageMapping(
         (bd / "usr/share/doc/sbt") -> "/usr/share/doc/sbt"
       ) asDocs()