use fixed version strings

diff --git a/Makefile.am b/Makefile.am
index bf8c591cda61fc24025f366039c10539207a70de..48747488b2ceaa679fceb2a27997116e560299cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,7 +151,7 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.NOTMUCH $(sr
                        > keymap_alldefs.h
 
 oldmutt_ver.h:
-       version=`git tag | grep ^mutt- | sort -V | tail -1 | LC_ALL=C cut -b 6-` && \
+       version="1.7.0" && \
        echo 'const char *OldMuttVer = "'$$version'";' > oldmutt_ver.h.tmp; \
        cmp -s oldmutt_ver.h.tmp oldmutt_ver.h || mv oldmutt_ver.h.tmp oldmutt_ver.h
 

diff --git a/configure.ac b/configure.ac
index fb656a620a41545c2556a3b3ba65f5511cbd3216..17273425c61417856ea2e254db6297a8a473aec9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,12 +6,12 @@ dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED            !!!
 CFLAGS=$CFLAGS
 LDFLAGS=$LDFLAGS
 
-AC_INIT([NeoMutt], m4_esyscmd(./git-version-gen .tarball-version 's/neomutt-/v/g'), [neomutt-devel@neomutt.org], [neomutt], [http://www.neomutt.org])
+AC_INIT([NeoMutt], [20160910], [neomutt-devel@neomutt.org], [neomutt], [http://www.neomutt.org])
 AC_CONFIG_SRCDIR(mutt.h)
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/.version'])
+AC_DEFINE(MUTT_VERSION, "1.7.0", [Version of upstream Mutt])
 
 AC_USE_SYSTEM_EXTENSIONS
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2c2d7e4147617f46e37c2098c1e5c7f2b4b37cae..eb82f3b7b65b2efc016091d5d3910832292d6f02 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -188,7 +188,7 @@ stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                $(srcdir)/gen-map-doc
        ( date=`head -n 1 $(top_srcdir)/ChangeLog.neomutt | LC_ALL=C cut -b 1-10` && \
-         sed -e "s/@VERSION\@/$(PACKAGE_VERSION) ($$date)/" $(srcdir)/manual.xml.head && \
+         sed -e "s/@VERSION\@/$(PACKAGE_VERSION) (1.7.0)/" $(srcdir)/manual.xml.head && \
          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \
          $(MAKEDOC_CPP) $(top_srcdir)/functions.h | \
            perl $(srcdir)/gen-map-doc $(srcdir)/manual.xml.tail $(top_srcdir)/OPS* \

diff --git a/init.c b/init.c
index 800e07e7b6dba8124ed2d794c518f428906a3b31..85c32feee0d05e46829666f1eabab3706b1c23c9 100644 (file)
--- a/init.c
+++ b/init.c
@@ -3150,8 +3150,8 @@ static void start_debug (void)
   /* rotate the old debug logs */
   for (i=3; i>=0; i--)
   {
-    snprintf (buf, sizeof(buf), "%s/.nmuttdebug%d", NONULL(Homedir), i);
-    snprintf (buf2, sizeof(buf2), "%s/.nmuttdebug%d", NONULL(Homedir), i+1);
+    snprintf (buf, sizeof(buf), "%s/.muttdebug%d", NONULL(Homedir), i);
+    snprintf (buf2, sizeof(buf2), "%s/.muttdebug%d", NONULL(Homedir), i+1);
     rename (buf, buf2);
   }
   if ((debugfile = safe_fopen(buf, "w")) != NULL)