summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2013-02-09 14:11:22 +0100
committerLukas Fleischer <calcurse@cryptocrack.de>2013-02-09 14:11:22 +0100
commit720189d03fb9166a28e14cbf19d3b7ec46fa197a (patch)
tree81e7133ece60f8a10668bdeb621282ebfb0b60e7
parentb30ccc6319a7bc091bd770c0d4f78985658e92aa (diff)
parent6d6f76e76d7eea3f3798d72ab0722c41eb80830c (diff)
downloadcalcurse-720189d03fb9166a28e14cbf19d3b7ec46fa197a.tar.gz
calcurse-720189d03fb9166a28e14cbf19d3b7ec46fa197a.zip
Merge branch 'maint'
-rw-r--r--NEWS12
-rwxr-xr-xautogen.sh5
-rw-r--r--doc/manual.txt2
3 files changed, 18 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2a28742..4aff4bf 100644
--- a/NEWS
+++ b/NEWS
@@ -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:
diff --git a/autogen.sh b/autogen.sh
index 4323159..321876d 100755
--- 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
diff --git a/doc/manual.txt b/doc/manual.txt
index 6863850..09dc035 100644
--- 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