summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS.org4
-rw-r--r--README.org41
-rw-r--r--configure.ac28
-rw-r--r--meson.build2
4 files changed, 40 insertions, 35 deletions
diff --git a/NEWS.org b/NEWS.org
index 17aaf15..3d1a996 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,7 +1,7 @@
#+STARTUP:showall
* NEWS (user visible changes & bigger non-visible ones)
-* 1.5.x (unreleased, development version)
+* 1.6 (released, as of July 27 2021)
*** mu
@@ -43,7 +43,7 @@
faster crypto, support for S/MIME, syntax-highlighting, calendar
invitations and more.
- The new view is superior in most ways, but if you still depend need
+ The new view is superior in most ways, but if you still depend on
something from the old one, you can use:
#+begin_example
;; set *before* loading mu4e; and restart emacs if you want to change it
diff --git a/README.org b/README.org
index fa800e0..70260f9 100644
--- a/README.org
+++ b/README.org
@@ -14,24 +14,27 @@
Welcome to ~mu~!
-*Note*: you are looking at the *development* branch, which is where new code is being developed and
-tested, and which may occasionally break.
+*Note*: you are looking at the *development* branch, which is where new
+code is being developed and tested, and which may occasionally break.
-Distribution and non-adventurous users are instead recommended to use the 1.4.x Release Branch [[https://github.com/djcb/mu/tree/release/1.4.x][1.4.x
-Release Branch]] or to pick up one of the [[https://github.com/djcb/mu/releases][1.4.x Releases]].
+Distribution and non-adventurous users are instead recommended to use
+the [[https://github.com/djcb/mu/tree/release/1.6.x][1.6.x Release Branch]] or to pick up one of the [[https://github.com/djcb/mu/releases][1.4.x Releases]].
-Given the enormous amounts of e-mail many people gather and the importance of e-mail message in our
-work-flows, it's essential to quickly deal with all that mail - in particular, to instantly find
-that one important e-mail you need right now, and quickly file away message for later use.
+Given the enormous amounts of e-mail many people gather and the
+importance of e-mail message in our work-flows, it's essential to
+quickly deal with all that mail - in particular, to instantly find
+that one important e-mail you need right now, and quickly file away
+message for later use.
-~mu~ is a tool for dealing with e-mail messages stored in the Maildir-format. ~mu~'s purpose in life is
-to help you to quickly find the messages you need; in addition, it allows you to view messages,
-extract attachments, create new maildirs, and so on. See the [[www/cheatsheet.md][mu cheatsheet]] for some examples. =mu=
-is fully documented.
+~mu~ is a tool for dealing with e-mail messages stored in the
+Maildir-format. ~mu~'s purpose in life is to help you to quickly find
+the messages you need; in addition, it allows you to view messages,
+extract attachments, create new maildirs, and so on. See the [[www/cheatsheet.md][mu
+cheatsheet]] for some examples. =mu= is fully documented.
-After indexing your messages into a [[http://www.xapian.org][Xapian]]-database, you can search them
-using a custom query language. You can use various message fields or words in the body text to find
-the right messages.
+After indexing your messages into a [[http://www.xapian.org][Xapian]]-database, you can search
+them using a custom query language. You can use various message fields
+or words in the body text to find the right messages.
Built on top of ~mu~ are some extensions (included in this package):
@@ -39,8 +42,10 @@ Built on top of ~mu~ are some extensions (included in this package):
- mu-guile: bindings for the Guile/Scheme programming language (version 2.2 and later)
-~mu~ is written in C and C++; ~mu4e~ is written in elisp, and ~mu-guile~ in a mix of C and Scheme.
+~mu~ is written in C and C++; ~mu4e~ is written in elisp, and ~mu-guile~ in
+a mix of C and Scheme.
-Note, ~mu~ is available in Linux distributions (e.g. Debian/Ubuntu and Fedora) under the name
-~maildir-utils~; apparently because they don't like short names. The all of the code is distributed
-under the terms of the [[https://www.gnu.org/licenses/gpl-3.0.en.html][GNU General Public License version 3]] (or higher).
+Note, ~mu~ is available in Linux distributions (e.g. Debian/Ubuntu and
+Fedora) under the name ~maildir-utils~; apparently because they don't
+like short names. The all of the code is distributed under the terms
+of the [[https://www.gnu.org/licenses/gpl-3.0.en.html][GNU General Public License version 3]] (or higher).
diff --git a/configure.ac b/configure.ac
index 5a281df..7af7143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
AC_PREREQ([2.68])
-AC_INIT([mu],[1.5.14],[https://github.com/djcb/mu/issues],[mu])
+AC_INIT([mu],[1.6.0],[https://github.com/djcb/mu/issues],[mu])
AC_COPYRIGHT([Copyright (C) 2008-2020 Dirk-Jan C. Binnema])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([mu/mu.cc])
@@ -43,10 +43,10 @@ AC_PROG_INSTALL
AC_HEADER_STDC
extra_flags="-Wformat-security \
- -Wstack-protector \
- -Wstack-protector-all \
- -Wno-cast-function-type \
- -Wno-bad-function-cast"
+ -Wstack-protector \
+ -Wstack-protector-all \
+ -Wno-cast-function-type \
+ -Wno-bad-function-cast"
AX_CXX_COMPILE_STDCXX_14
AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])
@@ -68,7 +68,7 @@ AC_SYS_LARGEFILE
# asan is somewhat similar to valgrind, but has low enough overhead so it
# can be used during normal operation.
AC_ARG_ENABLE([asan],[AS_HELP_STRING([--enable-asan],
- [Enable Address Sanitizer])], [use_asan=$enableval], [use_asan=no])
+ [Enable Address Sanitizer])], [use_asan=$enableval], [use_asan=no])
AS_IF([test "x$use_asan" = "xyes"],[
AC_SUBST(ASAN_CFLAGS, "-fsanitize=address -static-libasan -fno-omit-frame-pointer")
AC_SUBST(ASAN_CXXFLAGS,"-fsanitize=address -static-libasan -fno-omit-frame-pointer")
@@ -107,11 +107,11 @@ AM_CONDITIONAL(BUILD_MU4E, test "x$build_mu4e" = "xyes")
# testing purposes only
AC_ARG_ENABLE([dirent-d-type],
AC_HELP_STRING([--disable-dirent-d-type],
- [Don't use dirent->d_type, even if you have it]),
+ [Don't use dirent->d_type, even if you have it]),
[], [AC_STRUCT_DIRENT_D_TYPE]
)
AS_IF([test "x$ac_cv_member_struct_dirent_d_type" != "xyes"],
- [use_dirent_d_type="no"], [use_dirent_d_type="yes"])
+ [use_dirent_d_type="no"], [use_dirent_d_type="yes"])
# support for d_ino (inode) in struct dirent is optional; if it's
# available we can sort direntries by inode and access them in that
@@ -119,11 +119,11 @@ AS_IF([test "x$ac_cv_member_struct_dirent_d_type" != "xyes"],
# Explicitly disabling it is for testing purposes only.
AC_ARG_ENABLE([dirent-d-ino],
AC_HELP_STRING([--disable-dirent-d-ino],
- [Don't use dirent->d_ino, even if you have it]),
+ [Don't use dirent->d_ino, even if you have it]),
[], [AC_STRUCT_DIRENT_D_INO]
)
AS_IF([test "x$ac_cv_member_struct_dirent_d_ino" != "xyes"],
- [use_dirent_d_ino="no"], [use_dirent_d_ino="yes"])
+ [use_dirent_d_ino="no"], [use_dirent_d_ino="yes"])
AC_CHECK_FUNCS([memset memcpy realpath setlocale strerror getpass setsid])
AC_CHECK_FUNCS([vasprintf strptime])
@@ -171,8 +171,8 @@ PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
AS_CASE([$xapian_version],
[1.[[4-9]].[[0-9]]*],
- [AC_MSG_NOTICE([xapian $xapian_version found.])],
- [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
+ [AC_MSG_NOTICE([xapian $xapian_version found.])],
+ [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
@@ -210,7 +210,7 @@ AC_ARG_ENABLE([webkit],AS_HELP_STRING([--disable-webkit],[Disable webkit]))
AS_IF([test "x$enable_webkit" != "xno"],[
PKG_CHECK_MODULES(WEBKIT,webkit2gtk-4.0 >= 2.0, [have_webkit=yes],[have_webkit=no])
AS_IF([test "x$have_webkit" = "xyes"],[
- webkit_version="$($PKG_CONFIG --modversion webkit2gtk-4.0)"])
+ webkit_version="$($PKG_CONFIG --modversion webkit2gtk-4.0)"])
])
AM_CONDITIONAL(HAVE_WEBKIT, [test "x$have_webkit" = "xyes"])
AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"])
@@ -244,7 +244,7 @@ AS_IF([test "x$enable_guile" != "xno"],[
])
AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes" -a \
- "x$ac_cv_prog_GUILE_SNARF" != "xno"])
+ "x$ac_cv_prog_GUILE_SNARF" != "xno"])
AM_COND_IF([BUILD_GUILE],[AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])])
###############################################################################
diff --git a/meson.build b/meson.build
index 4dc9ef1..726da2d 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@
# project setup
#
project('mu', ['c', 'cpp'],
- version: '1.5.14',
+ version: '1.6.0',
meson_version: '>= 0.52.0', # debian 10
license: 'GPL-3.0-or-later',
default_options : [