Merge branch 'maint'

2013-02-09 14:11:22 +01:00 · 2013-02-09 14:11:22 +01:00 · 720189d03f
commit 720189d03f
parent b30ccc6319 6d6f76e76d
3 changed files with 18 additions and 1 deletions
--- a/12
+++ b/12
@ -1,3 +1,15 @@
+[09 Feb 2013]
+Version 3.1.4:
+- Bug fixes:
+  * Do not prompt for a todo after adding an appointment.
+
+  * Close key binding window when reassigning the same key (thanks to Michael
+    Smith for submitting a patch).
+
+  * Update copyright ranges.
+
+  * Do not ignore "--datarootdir" in the i18n Makefile.
+
 [02 Feb 2013]
 Version 3.1.3:
 - Bug fixes:
--- a/autogen.sh
+++ b/autogen.sh
@ -30,6 +30,11 @@
 #

 autopoint --force
+if ! grep -F -q datarootdir po/Makefile.in.in
+then
+  sed -i '/^datadir =/i\
+datarootdir = @datarootdir@\' po/Makefile.in.in
+fi
 aclocal -I m4
 autoheader
 automake --foreign --copy --add-missing
--- a/doc/manual.txt
+++ b/doc/manual.txt
@ -149,7 +149,7 @@ Install process
 First you need to gunzip and untar the source archive:

 ----
-$ tar zxvf calcurse-3.1.3.tar.gz
+$ tar zxvf calcurse-3.1.4.tar.gz
 ----

 Once you meet the requirements and have extracted the archive, the install