From 183a67b0c027b17b0d5506b4db7d4f6b5c21e0a4 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Thu, 11 Nov 2010 21:01:42 -0800
Subject: [PATCH] Revert "Use the new Sass gem now."

This reverts commit 822f35148be74fee4f80ed4881314c61c4543c85.

Conflicts:

	Gemfile
---
 Gemfile                     | 2 +-
 compass.gemspec             | 2 +-
 lib/compass/exec/helpers.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index dbee27e6..c9b3a08c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,5 +6,5 @@ gem "rspec"
 gem "rails", "~>3.0.0.rc"
 gem "compass-validator", "1.0.0"
 gem "css_parser"
-gem "sass", :path => "../sass"
+gem "sass"
 gem "rcov"
diff --git a/compass.gemspec b/compass.gemspec
index b3839637..a98566a3 100644
--- a/compass.gemspec
+++ b/compass.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gemspec|
   gemspec.require_paths = %w(lib)
   gemspec.rubygems_version = "1.3.5"
   gemspec.summary = %q{A Real Stylesheet Framework}
-  gemspec.add_dependency('sass', '~> 3.1.0')
+  gemspec.add_dependency('haml', '>= 3.0.4')
   gemspec.files = %w(README.markdown LICENSE.markdown VERSION.yml Rakefile)
   gemspec.files += Dir.glob("bin/*")
   gemspec.files += Dir.glob("examples/**/*.*")
diff --git a/lib/compass/exec/helpers.rb b/lib/compass/exec/helpers.rb
index 6a0fba57..f1e8db1a 100644
--- a/lib/compass/exec/helpers.rb
+++ b/lib/compass/exec/helpers.rb
@@ -7,7 +7,7 @@ module Compass::Exec
       else
         unless arguments.include?("-h") || arguments.include?("--help")
           Compass::Logger.new.red do
-            Sass::Util.sass_warn "WARNING: This interface is deprecated. Please use the new subcommand interface.\nSee `compass help` for more information.\n"
+            Haml::Util.haml_warn "WARNING: This interface is deprecated. Please use the new subcommand interface.\nSee `compass help` for more information.\n"
           end
         end
         SwitchUI