[DRE-commits] [sup-mail] 01/03: updated d/NEWS, removed wiki page

[Caitlin Matos]

This is an automated email from the git hooks/post-receive script.

cm-guest pushed a commit to branch master
in repository sup-mail.

commit 2b14dcf955d037aafa21ee6da257e2881ff6218e
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date:   Tue Sep 9 11:07:31 2014 -0400

    updated d/NEWS, removed wiki page
    
    - put step-by-step instructions in d/NEWS for offline use
    - updated wiki page on GitHub with these steps for online use
    - removed Migration*.md (as discussed on debian-ruby list)
---
 debian/Migration-0.13-to-0.14.md | 47 ----------------------------------------
 debian/NEWS                      | 22 ++++++++++++++-----
 2 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/debian/Migration-0.13-to-0.14.md b/debian/Migration-0.13-to-0.14.md
deleted file mode 100644
index ad0072c..0000000
--- a/debian/Migration-0.13-to-0.14.md
+++ /dev/null
@@ -1,47 +0,0 @@
-With the sup release 0.14 some major changes require some migration (and
-cautionary steps).
-
-
-## First steps
-
-Prior to updating sup, please back up your index, and preferably the whole
-.sup directory. 
-
-1. Use [sup-dump](https://github.com/sup-heliotrope/sup/wiki/Backing-up-the-index)
-   to back up the index.
-2. Back up your ~/.sup directory (with config files and index)
-
-
-## Migration
-
-Before 0.14, Sup used syck to store YAML documents (the format of Sup's
-configuration files). In version 0.14 and later, Sup uses the Psych format
-instead. When upgrading, please use the migration utility.
-
-
-### Ruby 2.0 and earlier
-
-After upgrading, run ```sup-psych-ify-config-files``` to update the format of
-the ```.sup/sources.yaml``` file. If something goes wrong, you probably need
-to manually re-add the sources (make sure that the source IDs match the old
-configuration!).
-
-
-### Ruby 2.1 or later
-
-Because later versions of Ruby drop support for the old syck format
-completely, the migration script will not run with Ruby >= 2.1
-([#268](https://github.com/sup-heliotrope/sup/pull/268)), and will eventually
-be completely removed. There are several possible options:
-
-* Don't make any changes to the configuration files and hope for the best
-  (this is likely to work, but be sure to back up everything first!)
-* Downgrade to Ruby <= 2.0 and use the migration script
-* Re-add syck support with the [syck gem](http://rubygems.org/gems/syck)
-  (experienced developers only)
-* Run ```sup-config``` to re-add your source(s). You must then manually edit
-  ```.sup/sources.yaml``` and edit the Source IDs (```id```) to match the old
-  configuration.
-* Make some changes manually. Some tips are available
-  [here](http://devblog.arnebrasseur.net/2014-02-yaml-syck-vs-psych) and
-  [here](http://docs.solanolabs.com/HandlingFailures/KnownIssues/psych-vs-syck-yaml-parsing/).
diff --git a/debian/NEWS b/debian/NEWS
index 01e19d2..4686dac 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -5,12 +5,22 @@ sup-mail (0.19.0-1) unstable; urgency=medium
   https://github.com/sup-heliotrope/sup/wiki/Using-sup-with-other-clients for
   more details.
 
-  If you are updating from Sup <= 0.13 (wheezy version is 0.12.1), you may
-  need to migrate your .sup/sources.yaml file. See
-  https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14 for more
-  details. The wiki page is also installed locally in /usr/share/doc/sup-mail.
-
- -- Caitlin Matos <caitlin.matos at zoho.com>  Tue, 26 Aug 2014 12:19:34 -0400
+  If you are updating from Sup <= 0.13 (wheezy version is 0.12.1), you will
+  need to update your ~/.sup/sources.yaml file. Step-by-step instructions are
+  included here. Further information can be found at
+  https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14.
+
+  NOTE: THIS ONLY APPLIES IF UPGRADING SUP, NOT FOR NEW INSTALLS
+
+  1. Open ~/.sup/sources.yaml and make note of the ID assigned to each
+  configuration.
+  2. Use the sup-dump utility to back up the current index.
+  3. Back up your current ~/.sup directory.
+  4. Run sup-config and follow the prompts.
+  5. Open ~/.sup/sources.yaml, find the newly added source, and modify the id
+  to match the old configuration.
+
+ -- Caitlin Matos <caitlin.matos at zoho.com>  Tue, 9 Sep 2014 11:05:23 -0400
 
 sup-mail (0.11-1) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/sup-mail.git