[sagenb] 146/157: Finalize release instructions

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository sagenb.

commit f06506c38d84bfa04f7a83899ff6fda79e252bd7
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Thu Nov 6 21:50:46 2014 -0500

    Finalize release instructions
    
    Also fix a few other minor notes in README
---
 MANIFEST.in     |  2 +-
 README.rst      | 17 ++++++++++++++++-
 ReleaseInstr.md | 11 +++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 39d637b..67c7f65 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,6 @@ graft sagenb
 graft sass
 graft util
 prune sass/src/.sass-cache
-include *.txt MANIFEST.in .gitignore dist.sh README.rst
+include *.txt MANIFEST.in .gitignore dist.sh README.rst ReleaseInstr.md
 prune .git
 global-exclude *.pyc *.pyo *.orig *.rej *~ \#* *\# *.sassc *.scssc *.DS_Store
diff --git a/README.rst b/README.rst
index b5e93f7..f738416 100644
--- a/README.rst
+++ b/README.rst
@@ -81,7 +81,8 @@ http://wiki.sagemath.org/devel/SageNotebook
 
 Stylesheets (CSS)
 -----------------
-See ``sass/readme.txt``.
+See ``sass/readme.txt`` for information about how to
+use sagenb's SCSS files to update its CSS *properly*.
 
 
 Localization
@@ -104,6 +105,20 @@ possibly outdated instructions:
     * Copy ``sagenb.mo`` to ``sagenb/locale/xx_YY/LC_MESSAGES/``, where
       xx_YY is a locale code (en_US, pt_BR, en_UK, etc.)
 
+Release Instructions
+--------------------
+
+Currently, sagenb is an upstream project from Sage proper.
+That means any new sagenb release needs to be packaged properly
+in order to be included in Sage.  Read ``ReleaseInstr.md`` for
+basic details on how to create such a release, including minor changes
+needed on the Sage side to ``build/pkgs/sagenb/package-version.txt``
+and the checksum file.
+
+See the older instructions below for some additional details that would
+need to be taken into account for more major changes, especially the
+ones about the manifest and localization updates.
+
 
 Older Release Instructions
 --------------------------
diff --git a/ReleaseInstr.md b/ReleaseInstr.md
index c097051..b9d0464 100644
--- a/ReleaseInstr.md
+++ b/ReleaseInstr.md
@@ -58,9 +58,16 @@ in your local `SAGENB_ROOT`.
     ./dist.sh -s
     ```
 
-1. Create the sagenb tar file for inclusion into Sage.
+   Be careful to check that the ``dist`` directory still has a copy of
+   each upstream package and the sagenb package; it's worth also checking
+   that ``dist/sagenb-<version>.tar.gz`` only contains sagenb and not
+   extra copies of the upstream files, by checking the output of
 
-    FIXME - probably the dist is actually the right one
+    ```sh
+    tar -tzf dist/sagenb-<version>.tar.gz
+    ```
+
+1. Create the sagenb tar file for inclusion into Sage.
 
     ```sh
     mv dist sagenb-<version>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git