Merge branch 'master' into next

commit ec13fa74d98a4c8e7ae3ef077aa0308fccc5eb40
parent 111741d773cbc7eb0298842e34452943fdaef439
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date:   Fri, 14 Jan 2011 22:59:53 -0800

Merge branch 'master' into next

Diffstat:

M	Rakefile	\|	3	+--
M	sup-files.rb	\|	4	++--

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Rakefile b/Rakefile
@@ -48,10 +48,9 @@ spec = Gem::Specification.new do |s|
   s.executables = SUP_EXECUTABLES
 
   s.add_dependency "xapian-full", ">= 1.1.3.1"
-  s.add_dependency "ncurses"
+  s.add_dependency "ncursesw"
   s.add_dependency "rmail", ">= 0.17"
   s.add_dependency "highline"
-  s.add_dependency "net-ssh"
   s.add_dependency "trollop", ">= 1.12"
   s.add_dependency "lockfile"
   s.add_dependency "mime-types", "~> 1"
diff --git a/sup-files.rb b/sup-files.rb
@@ -1,5 +1,5 @@
-SUP_LIB_DIRS = %w(lib lib/sup lib/sup/modes lib/sup/mbox)
-SUP_EXECUTABLES = %w(sup sup-add sup-config sup-dump sup-recover-sources sup-sync sup-sync-back sup-tweak-labels)
+SUP_LIB_DIRS = %w(lib lib/sup lib/sup/modes)
+SUP_EXECUTABLES = %w(sup sup-add sup-cmd sup-config sup-dump sup-recover-sources sup-server sup-sync sup-sync-back sup-tweak-labels)
 SUP_EXTRA_FILES = %w(CONTRIBUTORS README.txt LICENSE History.txt ReleaseNotes)
 SUP_FILES =
   SUP_EXTRA_FILES +

sup.git