X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=RELEASE.md;h=8d7859ac3d76b952c639c7a3906ff9e6acb0519a;hb=b2a154139400763517e36903c41e9976f93e35a6;hp=e3035dac555eedd3351a37199305bc3b270cd4ef;hpb=d5ae85a06d7a9f1bf3d8f1a8776b9afbeff72bba;p=icinga2

diff --git a/RELEASE.md b/RELEASE.md
index e3035dac5..8d7859ac3 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -11,14 +11,28 @@ Check the following issue filters:
 
 ## Backport Commits
 
-    $ ./pick.py -V 2.4.5
+    $ git checkout master
+    $ ./pick.py -V 2.4.9
+
+The script creates a new branch 'auto-merged-2.4.9' which is based on the
+current support branch. It then merges all commits from the 'master' branch which
+reference a ticket for the version that was specified.
+
+If there are any merge commits you will need to manually fix them and continue the
+rebase until no commits are left:
+
+    $ git rebase --continue
 
-Verify the created branch and replace it into the current support branch.
+After finishing the rebase the branch needs to be merged into the support branch:
+
+    $ git checkout support/2.4
+    $ git merge --ff-only auto-merged-2.4.9
 
 ## Authors
 
 Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
 
+    $ git checkout master
     $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
 
 ## Version
@@ -27,7 +41,7 @@ Update the version number in the following files:
 
 * [icinga2.spec]: Version: (.*)
 * [icinga2.nuspec]: <version>(.*)</version>
-* [tools/chocolateyInstall.ps1]: Icinga2-v(.*).exe
+* [tools/chocolateyInstall.ps1]: Icinga2-v(.*)-{x86,x86_64}.msi
 
 ## Changelog
 
@@ -36,15 +50,15 @@ the changelog.py script. Also generate HTML for the wordpress release announceme
 
 Changelog:
 
-    $ ./changelog.py -V 2.4.5
+    $ ./changelog.py -V 2.4.9
 
 Docs:
 
-    $ ./changelog.py -V 2.4.5 -l
+    $ ./changelog.py -V 2.4.9 -l
 
 Wordpress:
 
-    $ ./changelog.py -V 2.4.5 -H -l
+    $ ./changelog.py -V 2.4.9 -H -l
 
 ## Git Tag
 
@@ -116,6 +130,21 @@ Example for CentOS7:
 Create a new release for the newly created Git tag.
 https://github.com/Icinga/icinga2/releases
 
+## Chocolatey
+
+Navigate to the git repository on your Windows box which
+already has chocolatey installed. Pull/checkout the release.
+
+Create the nupkg package:
+
+    cpack
+
+Install the created icinga2 package locally:
+
+    choco install icinga2 -version 2.4.9 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+
+Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
+
 ## Online Documentation
 
 SSH into the web box, navigate into `icinga2-latest/module/icinga2`