[gnuastro-commits] master ad30979: Updates to the debian release checklist

[Mohammad Akhlaghi]

branch: master
commit ad309799022d0968ef2f40168e01063b4bf00c9f
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>

    Updates to the debian release checklist
    
    Following some suggestions from Ole Streicher, the Debian release notes
    were updated. In particular, the upstream branch is now merged with the
    master branch (and there is no need to un-tar the original tarball two
    times). Also, the `debian/changelog' will only keep changes in the
    Debian-related files.
---
 doc/announce-acknowledge.txt |  1 +
 doc/release-checklist.txt    | 47 +++++++++++++++++++-------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/doc/announce-acknowledge.txt b/doc/announce-acknowledge.txt
index c3d8955..9a22b81 100644
--- a/doc/announce-acknowledge.txt
+++ b/doc/announce-acknowledge.txt
@@ -6,4 +6,5 @@ Nicolas Bouché
 Aurélien Jarno
 Takashi Ichikawa
 Alan Lefor
+Ole Streicher
 David Valls-Gabaud
diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt
index 76dcee7..f4d4018 100644
--- a/doc/release-checklist.txt
+++ b/doc/release-checklist.txt
@@ -233,34 +233,15 @@ Steps necessary to Package Gnuastro for Debian.
      $ git checkout master
 
 
- - Again, we need to clean everything that already exists here, except
-   `.git' and `debian':
-
-     $ mv debian ../gnuastro-tmp-debian    # We want to keep `debian'.
-     $ mv .git ../gnuastro-tmp-git         # We want to keep `.git'.
-     $ rm -rf ./* ./.*                     # Delete everything.
-     $ mv ../gnuastro-tmp-git .git         # Bring back the `.git' directory.
-     $ mv ../gnuastro-tmp-debian debian    # Bring back the `debian' directory.
-
-
- - Unpack the distribution tarball into the master branch too:
-
-     $ tar xf ../gnuastro_$ver.orig.tar.gz --strip-components=1
+ - Merge the upstream branch into the master branch to update the Gnuastro
+   files in master also:
 
+     $ git merge upstream
 
- - Update the ChangeLog. But first get all the changes in this version from
-   the NEWS file.
 
-   IMPORTANT: An official release should have `unstable' after the
-   version. But if you just want to making sure Gnuastro builds on all
-   systems, it should be `experimental'.
-
-     $ git diff NEWS
-     $ emacs debian/changelog
-
-
- - Check the current Debian policy version at
-   https://www.debian.org/doc/debian-policy/ and update debian/control:
+ - Check the current Debian policy version and update it in
+   `debian/control'. The policy can be found here:
+   https://www.debian.org/doc/debian-policy/
 
      $ emacs debian/control
 
@@ -273,6 +254,18 @@ Steps necessary to Package Gnuastro for Debian.
      - In `debian/control', change all the old sonames to the new value.
 
 
+ - Update `debian/changeLog' with all the Debian-related changes (since
+   merging with the upstream branch). Gnuastro's changes don't need to be
+   mentioned here. If there was no major changes, just say "New upstream
+   version".
+
+   IMPORTANT: An official release should have `unstable' after the
+   version. But if you just want to make sure Gnuastro builds on all
+   systems, it should be `experimental'. If it is experimental, also add
+   this line in `debian/changelog': "Switch to experimental to prepare
+   transition".
+
+
  - Update your version of `pbuilder':
 
      $ sudo pbuilder update
@@ -289,8 +282,8 @@ Steps necessary to Package Gnuastro for Debian.
                /var/cache/pbuilder/result/gnuastro_$ver-1_amd64.changes
 
 
- - Commit the contents of the new release, make sure everything except the
-   `debian' directory is commited (with `git status'):
+ - Commit the contents of the new release (should be just the contents of
+   the `debian' directory).
 
      $ git add --all
      $ git status                         # For a visual check