From 21d34545d4204a0f5672c8bdbeb6a79803eb3a54 Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Sat, 28 Oct 2006 00:18:55 +0200
Subject: [PATCH] more and more cleansing

---
 Makefile.am                          |  6 +++---
 TODO.mutt-ng                         | 24 ------------------------
 VERSION.svn                          |  1 -
 doc/Makefile.in                      |  4 ++--
 NEWS => legacy/NEWS.mutt             |  0
 UPGRADING => legacy/UPGRADING.muttng |  0
 6 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 TODO.mutt-ng
 delete mode 100644 VERSION.svn
 rename NEWS => legacy/NEWS.mutt (100%)
 rename UPGRADING => legacy/UPGRADING.muttng (100%)

diff --git a/Makefile.am b/Makefile.am
index 12c4aa0..ae01e84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,7 +102,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
 	mbox.h mh.h mx.h pager.h pgp.h protos.h reldate.h rfc1524.h rfc2047.h \
 	rfc2231.h rfc822.h rfc3676.h \
-	sha1.h sort.h mime.types VERSION autogen.sh \
+	sha1.h sort.h mime.types autogen.sh \
 	_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
 	mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
 	makedoc.c stamp-doc-rc README.SSL smime.h\
@@ -152,8 +152,8 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
 		$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
 			> keymap_alldefs.h
 
-version.h: $(srcdir)/VERSION.svn
-	echo "#define MUTT_REVISION \"`cat $(srcdir)/VERSION.svn`\"" > version.h
+version.h: Makefile
+	echo "#define MUTT_REVISION \"git\"" > version.h
 
 reldate:
 	echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
diff --git a/TODO.mutt-ng b/TODO.mutt-ng
deleted file mode 100644
index 36f5cc9..0000000
--- a/TODO.mutt-ng
+++ /dev/null
@@ -1,24 +0,0 @@
-Here's a list of all mutt-ng specific TODOs (not in priority order):
-
-- We need to do a security audit. At least remove all the unsafe
-  function calls, even when they're marked with "secure" or "checked",
-  and replace it with secure alternatives instead. In this process,
-  remove any calls of functions for which we have internal library
-  alternatives already.
-
-- Start cleanup and finally make all the patches work together. As some
-  starting hints: kill the caching for NNTP in favor of the header
-  caching patch, move as much code of optional compile-time features out
-  to their subdirectories, and so forth.
-
-- Stop making up names of global functions with mutt_*; give meaningful
-  names and declare them in the right headers to eventually obsolote
-  protos.h. This counts for data typedef's, too! Write one header and
-  one source file per datatype, do proper information hiding and thus
-  provide sane internal abstraction to get "future ready." For example,
-  for all the mailbox handling, the mbox_*/mmdf_* and mh_*/maildir_*
-  functions should only be called directly in the right abstraction
-  layer's implementation. And so forth.
-
-- Improve documentation, update/rewrite/remove README.SSL and files in doc/
-  all other documents in directory root are up-to-date
diff --git a/VERSION.svn b/VERSION.svn
deleted file mode 100644
index 14b76cb..0000000
--- a/VERSION.svn
+++ /dev/null
@@ -1 +0,0 @@
-804
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b07b92f..4b820ec 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -206,8 +206,8 @@ muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.he
 		> muttrc.man
 	touch stamp-doc-man
 
-manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttng-manual.xsl manual.xml.head manual.xml.tail $(top_srcdir)/VERSION.in $(top_srcdir)/VERSION.svn
-	( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-r`cat $(top_srcdir)/VERSION.svn`/" $(srcdir)/manual.xml.head ;\
+manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttng-manual.xsl manual.xml.head manual.xml.tail $(top_srcdir)/VERSION.in
+	( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-rgit/" $(srcdir)/manual.xml.head ;\
 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
 		cat - $(srcdir)/manual.xml.tail > manual-pre.xml
 	-xsltproc --novalid --nonet $(srcdir)/muttng-manual.xsl manual-pre.xml > manual.xml
diff --git a/NEWS b/legacy/NEWS.mutt
similarity index 100%
rename from NEWS
rename to legacy/NEWS.mutt
diff --git a/UPGRADING b/legacy/UPGRADING.muttng
similarity index 100%
rename from UPGRADING
rename to legacy/UPGRADING.muttng
-- 
2.20.1