From 0e0bc17992251f32ba43990e41c52b36ad344515 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 6 Jun 2022 12:08:49 +0200
Subject: [PATCH] tag as 1.4.1

---
 NEWS                   |  5 +++--
 configure.ac           |  2 +-
 meson.build            |  2 +-
 utils/irssi-version.sh | 39 ++++++++++++++++++++-------------------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/NEWS b/NEWS
index 95f2c385..501ef0ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
-v1.4.0 2022-xx-xx The Irssi team <staff@irssi.org>
+v1.4.1 2022-06-12 The Irssi team <staff@irssi.org>
+	! Note: botti no longer compiles; get in touch if you use it
 	* Format the output of /QUOTE HELP (#1371, an#82). By Val
 	  Lorentz. Add /SHELP as default alias (an#83)
 	+ GLib log message filter: /SET glib_log_domains (an#50,
@@ -6,7 +7,7 @@ v1.4.0 2022-xx-xx The Irssi team <staff@irssi.org>
 	+ An option to clear the cutbuffer:
 	  /SET empty_kill_clears_cutbuffer (an#58). By Mikael
 	  Magnusson
-	+ Scriptable pastebin (an#60)
+	+ Scriptable pastebin (an#60, an#88)
 	+ Configurable actlist separator: /SET actlist_separator
 	  (#1364, an#61)
 	- Fix window left/right not skipping visible windows
diff --git a/configure.ac b/configure.ac
index d0de185b..f03569eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 1.4.0)
+AC_INIT(irssi, 1.4.1)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/meson.build b/meson.build
index 59a26f3c..71dacead 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('irssi', 'c',
-  version : '1.4.0',
+  version : '1.4.1',
   meson_version : '>=0.49',
   default_options : ['warning_level=1'])
 
diff --git a/utils/irssi-version.sh b/utils/irssi-version.sh
index 75c62835..0d82147f 100755
--- a/utils/irssi-version.sh
+++ b/utils/irssi-version.sh
@@ -1,30 +1,31 @@
 #!/bin/sh
 
-DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null`
-
-VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
-VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`
-
-if test -z "$VERSION_DATE"; then
-    DATE=`grep '^v' $1/NEWS | head -1`
-    VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
-    case $VERSION_DATE in
-	*xx)
-	    VERSION_DATE=`date +%Y%m%d`
-	;;
-    esac
-    VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '`
-    VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null | cut -c 1-4`
-fi
-
-echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
-echo "#define IRSSI_VERSION_TIME $VERSION_TIME"
+DATE=`grep '^v' $1/NEWS | head -1`
+VERSION_DATE=`echo "$DATE" | cut -f 2 -d ' ' | tr -d -`
+case $VERSION_DATE in
+  *xx)
+    VERSION_DATE=`date +%Y%m%d`
+    ;;
+esac
+VERSION_TIME=`echo "$DATE" | cut -f 1 -d ' ' | tr -d v | tr .- ' '`
+VERSION_TIME=`printf %d%d%02d $VERSION_TIME 2>/dev/null | cut -c 1-4`
 
 if echo "${VERSION}" | grep -q -- -head; then
   # -head version, get extra details from git if we can
+  DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ci HEAD 2>/dev/null`
+
+  VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
+
+  if test -z "$VERSION_DATE"; then
+    VERSION_DATE=`date +%Y%m%d`
+  fi
+
   git_version=$(GIT_DIR=$1/.git git describe --dirty --long --tags --match '[0-9]*.[0-9]*' 2>/dev/null)
   if [ $? = 0 ]; then
     echo "#undef PACKAGE_VERSION"
     echo "#define PACKAGE_VERSION \"${git_version}\""
   fi
 fi
+
+echo "#define IRSSI_VERSION_DATE $VERSION_DATE"
+echo "#define IRSSI_VERSION_TIME $VERSION_TIME"