rename binary from mutt to neomutt

diff --git a/.gitignore b/.gitignore
index 9f2db69060ea551b13d3767d1b344d9705f7d803..8f7b61b0a71ad336f1deb2ad6cee4395047b919f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,7 @@ autom4te.cache/
 conststrings.c
 git_ver.h
 hcache/hcversion.h
-mutt
-mutt_md5
+neomutt
 pgpewrap
 pgpring
 txt2c
@@ -29,7 +28,7 @@ config.status
 stamp-h1
 
 # Ignored within subdirectories
-doc/mutt.1
+doc/neomutt.1
 doc/*.html
 doc/makedoc
 doc/manual.txt

diff --git a/Makefile.am b/Makefile.am
index 97218b8f4febbdd3a7cee4ff97ca433ace42be04..30f880c80e65347f0cbfe933a038f5daadfbdd57 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,13 +38,13 @@ endif
 
 bin_SCRIPTS = $(SMIMEAUX_TARGET)
 
-distdir = neo$(PACKAGE)-$(VERSION)
+distdir = $(PACKAGE)-$(VERSION)
 
 BUILT_SOURCES = conststrings.c git_ver.h
 
-bin_PROGRAMS = mutt $(PGPAUX_TARGET)
+bin_PROGRAMS = neomutt $(PGPAUX_TARGET)
 
-mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
+neomutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
        bcache.c body.c body.h browser.c buffy.c charset.c color.c \
        commands.c complete.c compose.c compress.c content.h context.h copy.c \
        curs_lib.c curs_main.c edit.c editmsg.c enter.c enter_state.h \
@@ -59,7 +59,7 @@ mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
        smtp.c sort.c state.c state.h status.c system.c thread.c thread.h url.c \
        version.c where.h
 
-nodist_mutt_SOURCES = $(BUILT_SOURCES)
+nodist_neomutt_SOURCES = $(BUILT_SOURCES)
 
 LIBIMAP = -Limap -limap
 LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
@@ -67,10 +67,10 @@ LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
 LIBMUTT = -Llib -lmutt
 LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libmutt.a
 
-mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
+neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
        $(LIBIMAP) $(LIBMUTT) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS)
 
-mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
+neomutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
        $(LIBMUTTDEPS) $(HCACHE_DEPS) $(NCRYPT_DEPS) $(INTLDEPS)
 
 DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -78,7 +78,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 
 AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
 
-EXTRA_mutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
+EXTRA_neomutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
        mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_ssl.c mutt_ssl_gnutls.c \
        remailer.c remailer.h resize.c url.h
 
@@ -130,7 +130,7 @@ LDADD = $(LIBOBJS) $(INTLLIBS)
 dist-hook:
        echo $(VERSION) > $(distdir)/.tarball-version
 
-git_ver.h: $(mutt_SOURCES) $(SUBDIRS)
+git_ver.h: $(neomutt_SOURCES) $(SUBDIRS)
        version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \
        echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \
        cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \

diff --git a/configure.ac b/configure.ac
index b5dcc656ce7823ea503911a23e5a57eeb31a242e..cf133e45fe8825915704d0b4f0eccb3e72c9f46c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl     autoreconf -i
 CFLAGS=$CFLAGS
 LDFLAGS=$LDFLAGS
 
-AC_INIT([NeoMutt], [20170912], [neomutt-devel@neomutt.org], [mutt], [https://www.neomutt.org])
+AC_INIT([NeoMutt], [20170912], [neomutt-devel@neomutt.org], [neomutt], [https://www.neomutt.org])
 AC_CONFIG_SRCDIR(mutt.h)
 AC_CONFIG_AUX_DIR([.build-aux])
 AM_INIT_AUTOMAKE

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9e8027e94453e2a2f696a1e7d531d4478511fc0f..f498bc001b4bf8a8908b8a77b9cd431d4cd9e18a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,7 +14,7 @@ noinst_PROGRAMS = makedoc
 
 EXTRA_DIST = $(BUILT_DISTFILES) chunk.xsl gen-map-doc html.xsl makedoc.c \
        makedoc_defs.h manual.xml.head manual.xml.tail mbox.5 mmdf.5 \
-       mutt-1.7.0-syntax.vim mutt.css mutt.man mutt.xsl Muttrc Muttrc.head \
+       mutt-1.7.0-syntax.vim mutt.css neomutt.man mutt.xsl Muttrc Muttrc.head \
        muttrc.man.head muttrc.man.tail neomutt-syntax.vim PGP-Notes.txt \
        smime-notes.txt pgpewrap.1 pgpring.1 smime_keys.1
 
@@ -33,14 +33,14 @@ topsrcdir_DOCFILES = ChangeLog.md CODE_OF_CONDUCT.md COPYRIGHT INSTALL \
 
 all: makedoc-all
 
-makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt mutt.1 \
+makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt neomutt.1 \
        Muttrc muttrc.man neomutt-syntax.vim
 
 install-data-local: makedoc-all
        $(MKDIR_P) $(DESTDIR)$(mandir)/man1
        $(MKDIR_P) $(DESTDIR)$(mandir)/man5
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)
-       $(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
+       $(INSTALL) -m 644 neomutt.1 $(DESTDIR)$(mandir)/man1/neomutt.1
        $(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
        $(INSTALL) -m 644 $(srcdir)/smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
        $(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
@@ -69,7 +69,7 @@ install-data-local: makedoc-all
        -$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir)
 
 uninstall-local:
-       for f in mutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
+       for f in neomutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
                rm -f $(DESTDIR)$(mandir)/man1/$$f; \
        done
        for f in muttrc.5 mbox.5 mmdf.5; do \
@@ -120,7 +120,7 @@ sortcheck: manual.xml
        rm -rf vars.tmp.1 vars.tmp.2
 
 clean-local:
-       rm -f *.html mutt.1 muttrc.man
+       rm -f *.html neomutt.1 muttrc.man
 
 DISTCLEANFILES = manual.txt manual.html manual.xml Muttrc
 
@@ -133,8 +133,8 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
        -e 's,@bindir\@,$(bindir),g' \
        -e 's,@docdir\@,$(docdir),g'
 
-mutt.1: $(srcdir)/mutt.man
-       $(EDIT) $(srcdir)/mutt.man > $@
+neomutt.1: $(srcdir)/neomutt.man
+       $(EDIT) $(srcdir)/neomutt.man > $@
 
 manual.xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
        manual.xml.head $(top_srcdir)/functions.h manual.xml.tail \

diff --git a/doc/mutt.man b/doc/neomutt.man
similarity index 100%
rename from doc/mutt.man
rename to doc/neomutt.man

diff --git a/po/mutt.pot b/po/neomutt.pot
similarity index 100%
rename from po/mutt.pot
rename to po/neomutt.pot