From c8fea7ae188bde75fed4e369fe42147eabbb2c53 Mon Sep 17 00:00:00 2001
From: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
Date: Tue, 7 Apr 2015 14:35:39 +0200
Subject: [PATCH] contrib/release.sh (v0.2): better format for announces

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
---
 Changelog.md       |  1 -
 contrib/release.sh | 15 ++++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 317f421..91006b9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -53,7 +53,6 @@ Sebastian Spaeth let us know he will be almost inactive. We wish you well, too!
 - release.sh: script for maintainers improved.
 
 
-
 ### OfflineIMAP v6.5.7-rc3 (2015-03-19)
 
 #### Notes
diff --git a/contrib/release.sh b/contrib/release.sh
index 5ff5548..72e9936 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -16,7 +16,7 @@
 # TODO: move configuration out and source it.
 # TODO: implement rollback.
 
-__VERSION__='v0.1'
+__VERSION__='v0.2'
 
 SPHINXBUILD=sphinx-build
 
@@ -352,14 +352,10 @@ OfflineIMAP $1 is out.
 Downloads:
   http://github.com/OfflineIMAP/offlineimap/archive/${1}.tar.gz
   http://github.com/OfflineIMAP/offlineimap/archive/${1}.zip
-
 EOF
 }
 
 
-#
-# $1: previous version
-#
 function announce_footer () {
   cat <<EOF
 
@@ -375,9 +371,11 @@ EOF
 #
 function build_announce () {
   announce_header "$1" > "$TMP_ANNOUNCE"
-  cat "$TMP_CHANGELOG_EXCERPT" >> "$TMP_ANNOUNCE"
+  grep -v '^### OfflineIMAP' "$TMP_CHANGELOG_EXCERPT" | \
+    grep -v '^#### Notes' >> "$TMP_ANNOUNCE"
   sed -i -r -e "s,^$ANNOUNCE_MAGIC,," "$TMP_ANNOUNCE"
-  announce_footer "$2" >> "$TMP_ANNOUNCE"
+  sed -i -r -e "s,^#### ,# ," "$TMP_ANNOUNCE"
+  announce_footer >> "$TMP_ANNOUNCE"
 }
 
 
@@ -387,6 +385,9 @@ function edit_announce () {
 
 
 
+#
+# run
+#
 function run () {
   debug 'in run'
   fix_pwd