Merge pull request #2009 from waja/post_release

Post release changes

4 files changed, 17 insertions, 21 deletions

diff --git a/NEWS b/NEWS
index 2b257aa6..fd43fd3a 100644
--- a/NEWS
+++ b/NEWS
@@ -17,8 +17,6 @@ This file documents the major additions and syntax changes between releases.
         * Fix logic in is_uint64_t to fix type-limit warning
         * check_ntp_peer: Fixes for Wmaybe-unitialized and some restructuring
         * check_dns: Remove unused variable
-        * check_ntp_peer: Fixes for Wmaybe-unitialized and some restructuring
-        * check_dns: Remove unused variable
         * check_disk: fix ignore-missing in combination with includes
         * check_procs: ignore our own children
         * Prevent -lcrypto from showing up in Makefile dependencies
@@ -26,8 +24,6 @@ This file documents the major additions and syntax changes between releases.
         * check_http: Remove self assignment of a variable and add some comments
         * check_snmp: Remove unused variable
         * check_dhcp: Make implicit conversion explicit to dismiss warning
-        * check_http: Remove self assignment of a variable and add some comments
-        * check_dhcp: Make implicit conversion explicit to dismiss warning
         * Ini Parser: Avoid freeing symbols from text section
         * check_icmp: keep performance data order in case of none-reachable hosts
         * check_swap: Change another fake boolean to a real one
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
index 9bcbb734..e16f37da 100755
--- a/NP-VERSION-GEN
+++ b/NP-VERSION-GEN
@@ -6,7 +6,7 @@
 SRC_ROOT=`dirname $0`
 
 NPVF=NP-VERSION-FILE
-DEF_VER=2.4.0
+DEF_VER=2.4git
 
 LF='
 '
diff --git a/configure.ac b/configure.ac
index 79123748..8594238f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.64)
-AC_INIT(monitoring-plugins,2.4.0)
+AC_INIT(monitoring-plugins,2.4git)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile])
 AC_CONFIG_AUX_DIR(build-aux)
diff --git a/doc/RELEASING.md b/doc/RELEASING.md
index cd2deaef..e1f3bf74 100644
--- a/doc/RELEASING.md
+++ b/doc/RELEASING.md
@@ -2,7 +2,7 @@ Releasing a New Monitoring Plugins Version
 ==========================================
 
 Throughout this document, it is assumed that the current Monitoring
-Plugins version is 2.3.5, and that we're about to publish version 2.4.
+Plugins version is 2.4.0, and that we're about to publish version 2.5.
 It is also assumed that the official repository on GitHub is tracked
 using the remote name `monitoring-plugins` (rather than `origin`).
 
@@ -11,14 +11,14 @@ Before you start
 
 - Check Github Actions status.
 - Update local Git repository to the current `master` tip.  For a
-  maintenance release (e.g., version 2.3.6), update to the current
-  `maint-2.3` tip, instead.
+  maintenance release (e.g., version 2.4.1), update to the current
+  `maint-2.4` tip, instead.
 
 Prepare and commit files
 ------------------------
 
 - Update `configure.ac` and `NP-VERSION-GEN` with new version.
-- Update `NEWS` from `git log --reverse v2.3.5..` output, and specify
+- Update `NEWS` from `git log --reverse v2.4.0..` output, and specify
   the release version/date.
 - Update `AUTHORS` if there are new team members.
 - Update `THANKS.in` using `tools/update-thanks`.
@@ -29,27 +29,27 @@ Prepare and commit files
 Create annotated tag
 --------------------
 
-    git tag -a -m 'Monitoring Plugins 2.4' v2.4
+    git tag -a -m 'Monitoring Plugins 2.5' v2.5
 
 Push the code and tag to GitHub
 -------------------------------
 
     git push monitoring-plugins master
-    git push monitoring-plugins v2.4
+    git push monitoring-plugins v2.5
 
 Create new maintenance branch
 -----------------------------
 
 _Only necessary when creating a feature release._
 
-    git checkout -b maint-2.4 v2.4
-    git push -u monitoring-plugins maint-2.4
+    git checkout -b maint-2.5 v2.5
+    git push -u monitoring-plugins maint-2.5
 
 Checkout new version
 --------------------
 
     rm -rf /tmp/plugins
-    git archive --prefix=tmp/plugins/ v2.4 | (cd /; tar -xf -)
+    git archive --prefix=tmp/plugins/ v2.5 | (cd /; tar -xf -)
 
 Build the tarball
 -----------------
@@ -62,26 +62,26 @@ Build the tarball
 Upload tarball to web site
 --------------------------
 
-    scp monitoring-plugins-2.4.tar.gz \
+    scp monitoring-plugins-2.5.tar.gz \
         plugins@orwell.monitoring-plugins.org:web/download/
 
 Generate SHA1 checksum file on web site
 ---------------------------------------
 
     ssh plugins@orwell.monitoring-plugins.org \
-        '(cd web/download; $HOME/bin/create-checksum monitoring-plugins-2.4.tar.gz)'
+        '(cd web/download; $HOME/bin/create-checksum monitoring-plugins-2.5.tar.gz)'
 
 Announce new release
 --------------------
 
 - In the site.git repository:
 
-    - Create `web/input/news/release-2-4.md`.
+    - Create `web/input/news/release-2.5.md`.
     - Update the `plugins_release` version in `web/macros.py`.
     - Commit and push the result:
 
-            git add web/input/news/release-2-4.md
-            git commit web/input/news/release-2-4.md web/macros.py
+            git add web/input/news/release-2.5.md
+            git commit web/input/news/release-2.5.md web/macros.py
             git push origin master
 
 - Post an announcement on (at least) the following mailing lists:
@@ -93,6 +93,6 @@ Announce new release
 
 If you want to mention the number of contributors in the announcement:
 
-    git shortlog -s v2.3.5..v2.4 | wc -l
+    git shortlog -s v2.4.0..v2.5 | wc -l
 
 <!-- vim:set filetype=markdown textwidth=72: -->