update debian/changelog and release.sh after release (#2987)

diff --git a/debian/changelog b/debian/changelog
index bed38f8e0593779be621d895d8a36c734a0e18d9..b2cab272f773540e39572f3fa0212866501957b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-i3-wm (4.14.1-1) unstable; urgency=medium
+i3-wm (4.14.2-1) unstable; urgency=medium
 
   * UNRELEASED
 
- -- Michael Stapelberg <stapelberg@debian.org>  Mon, 04 Sep 2017 08:17:05 +0200
+ -- Michael Stapelberg <stapelberg@debian.org>  Mon, 25 Sep 2017 08:55:22 +0200
+
+i3-wm (4.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Sun, 24 Sep 2017 19:21:15 +0200
 
 i3-wm (4.14-1) unstable; urgency=medium
 

diff --git a/release.sh b/release.sh
index 8f537c0e25d32cccbbb7ab4e48b9b06f98ceefa5..cfb4beae4c6357e0db7e3bb114f9a01bee1665a3 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -1,9 +1,9 @@
 #!/bin/zsh
 # This script is used to prepare a new release of i3.
 
-export RELEASE_VERSION="4.13"
-export PREVIOUS_VERSION="4.12"
-export RELEASE_BRANCH="next"
+export RELEASE_VERSION="4.14.1"
+export PREVIOUS_VERSION="4.14"
+export RELEASE_BRANCH="master"
 
 if [ ! -e "../i3.github.io" ]
 then
@@ -232,9 +232,9 @@ echo ""
 echo "  cd ${TMPDIR}"
 echo "  sendmail -t < email.txt"
 echo ""
-echo "Update milestones on GitHub:"
-echo "  Set due date of ${RELEASE_VERSION} to $(date +'%Y-$m-%d') and close the milestone"
-echo "  Create milestone for the next version with unset due date"
+echo "Update milestones on GitHub (only for new major versions):"
+echo "  Set due date of ${RELEASE_VERSION} to $(date +'%Y-%m-%d') and close the milestone"
+echo "  Create milestone for the next major version with unset due date"
 echo ""
 echo "Announce on:"
 echo "  twitter"