[PATCH] traditional post-release doc text and release-check.sh updates

diff --git a/e2/2ce2e833cc1b3956dbe115d72ed32d2689ab79 b/e2/2ce2e833cc1b3956dbe115d72ed32d2689ab79
new file mode 100644 (file)
index 0000000..970c9f3
--- /dev/null
+++ b/e2/2ce2e833cc1b3956dbe115d72ed32d2689ab79
@@ -0,0 +1,127 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id B62A66DE13AB\r
+ for <notmuch@notmuchmail.org>; Mon, 29 Jun 2015 02:46:28 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.366\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.366 tagged_above=-999 required=5 tests=[AWL=0.906, \r
+ RP_MATCHES_RCVD=-0.55, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id D9sPfDctIfHu for <notmuch@notmuchmail.org>;\r
+ Mon, 29 Jun 2015 02:46:26 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 6D6FF6DE1343\r
+ for <notmuch@notmuchmail.org>; Mon, 29 Jun 2015 02:46:26 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 5BAFD1000F4; Mon, 29 Jun 2015 12:46:03 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] traditional post-release doc text and release-check.sh\r
+ updates\r
+Date: Mon, 29 Jun 2015 12:45:59 +0300\r
+Message-Id: <1435571159-23762-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.0.0\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 29 Jun 2015 09:46:28 -0000\r
+\r
+- added period to the end of the only 0.20.1 news item so that news2wiki\r
+  will not make it a header line\r
+\r
+- changed copyright year to 2015 in doc/conf.py\r
+\r
+- made release-checks.sh to check copyright year in doc/conf.py\r
+\r
+- made release-check.sh to execute python3 compatible version check code\r
+---\r
+ NEWS                    |  2 +-\r
+ devel/release-checks.sh | 15 +++++++++++++--\r
+ doc/conf.py             |  2 +-\r
+ 3 files changed, 15 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index e474e53..e04f4ab 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -20,7 +20,7 @@ Notmuch 0.20.1 (2015-06-01)\r
+ Test Suite\r
+ ----------\r
+ \r
+-Work around apparent gdb bug on arm64\r
++Work around apparent gdb bug on arm64.\r
+ \r
+ Notmuch 0.20 (2015-05-31)\r
+ =========================\r
+diff --git a/devel/release-checks.sh b/devel/release-checks.sh\r
+index efd0b34..6591ccd 100755\r
+--- a/devel/release-checks.sh\r
++++ b/devel/release-checks.sh\r
+@@ -66,7 +66,7 @@ then\r
+       echo Yes.\r
+ else\r
+       echo No.\r
+-      append_emsg "Git working directory is not clean (git status --porcelain)."\r
++      append_emsg "Git working directory is not clean (git status --porcelain)"\r
+ fi\r
+ unset git_status\r
+ \r
+@@ -141,7 +141,7 @@ else\r
+ fi\r
+ \r
+ echo -n "Checking that python bindings version is $VERSION... "\r
+-py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print __VERSION__"`\r
++py_version=`python -c "with open('$PV_FILE') as vf: exec(vf.read()); print(__VERSION__)"`\r
+ if [ "$py_version" = "$VERSION" ]\r
+ then\r
+       echo Yes.\r
+@@ -207,6 +207,17 @@ case $news_date in\r
+       append_emsg "Date '$news_date' in NEWS file is not in format (yyyy-mm-dd)"\r
+ esac\r
+ \r
++year=`exec date +%Y`\r
++echo -n "Checking that copyright line in documentation contains $year... "\r
++copyrightline=`exec grep -n '^copyright *=' doc/conf.py` || :\r
++case $copyrightline in\r
++      *$year*)\r
++              echo Yes. ;;\r
++      *)\r
++              echo No.\r
++              append_emsg "The copyright in doc/conf.py line $copyrightline does not contain $year"\r
++esac\r
++\r
+ if [ -n "$emsgs" ]\r
+ then\r
+       echo\r
+diff --git a/doc/conf.py b/doc/conf.py\r
+index 8fbc854..4609bfe 100644\r
+--- a/doc/conf.py\r
++++ b/doc/conf.py\r
+@@ -12,7 +12,7 @@ master_doc = 'index'\r
+ \r
+ # General information about the project.\r
+ project = u'notmuch'\r
+-copyright = u'2014, Carl Worth and many others'\r
++copyright = u'2015, Carl Worth and many others'\r
+ \r
+ location = os.path.dirname(__file__)\r
+ \r
+-- \r
+2.4.1\r
+\r