commit 5b5d437acfcf751d07569e504e5904c5ee6f4758
parent 2086cffc0a47bd3e115454c8fc0310500e247383
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date: Mon, 24 Jan 2011 00:57:55 -0800
Merge branch 'master' into next
Diffstat:
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/History.txt b/History.txt
@@ -1,3 +1,7 @@
+== 0.12.1 / 2011-01-23
+* Depend on ncursesw rather than ncurses (Ruby 1.9 compatibility)
+* Add sup-import-dump
+
== 0.12 / 2011-01-13
* Remove deprecated IMAP, IMAPS, and mbox+ssh sources
* Inline GPG support
diff --git a/ReleaseNotes b/ReleaseNotes
@@ -1,3 +1,11 @@
+Release 0.12.1:
+
+This release changes the gem dependency on ncurses to ncursesw, which
+allows the gem to install cleanly on Ruby 1.9.
+
+The new sup-import-dump program applies labels to an existing index,
+which could be done with sup-sync before 0.12.
+
Release 0.12:
Deprecated remote sources have been removed.
diff --git a/sup-files.rb b/sup-files.rb
@@ -1,5 +1,5 @@
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_EXECUTABLES = %w(sup sup-add sup-cmd sup-config sup-dump sup-import-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 +
diff --git a/www/index.html b/www/index.html
@@ -111,7 +111,7 @@
<h2>Status</h2>
<p>
- The current version of Sup is 0.12, released 2011-01-13. This is a
+ The current version of Sup is 0.12.1, released 2011-01-23. This is a
beta release. It supports mbox and Maildir mailstores.
</p>