[Erc-commit] [commit][emacs22] Merged from erc--main--0

[mwolson]

commit 0a4814c16f4728df93a60f0cff71790b24fb74ae
Author: Michael Olson <address@hidden>
Date:   Sun Apr 1 01:45:15 2007 +0000

    Merged from erc--main--0
    
    Patches applied:
    
     * address@hidden/erc--main--0--patch-133
       Makefile: Fix name of ChangeLog files
    git-archimport-id: address@hidden/erc--rel--5.2--patch-14

diff --git a/ChangeLog b/ChangeLog
index 2ad7799..825f4a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,8 @@
        (EXTRAS): New variable containing the contents of our "Emacs 22
        extras" tarball.
        (SOURCE): Remove $(TESTING).
-       (MISC): Add COPYING and ChangeLog.2006.
+       (MISC): Add COPYING and ChangeLog.06.  Fix ChangeLog.NNNN ->
+       ChangeLog.NN.
        (release): Use $(SNAPDIR) instead of erc-$(VERSION).
        (extras): New rule which implements the building of the extras
        tarball.
diff --git a/Makefile b/Makefile
index dbd9ab6..93b9914 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ SOURCE        = $(filter-out $(SPECIAL) $(UNCOMPILED), 
$(ALLSOURCE))
 TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
 MANUAL  = erc
 MISC   = AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
-               ChangeLog.2006 ChangeLog.2005 ChangeLog.2004 \
-               ChangeLog.2003 ChangeLog.2002 ChangeLog.2001 \
+               ChangeLog.06 ChangeLog.05 ChangeLog.04 ChangeLog.03 \
+               ChangeLog.02 ChangeLog.01 \
                servers.pl erc-auto.in erc.texi
 
 EMACS       = emacs
diff --git a/NEWS b/NEWS
index bce99d5..9c97183 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,7 @@ MS-DOS operating system.
  o erc-autojoin.el -> erc-join.el
  o erc-complete.el -> erc-hecomplete.el
  o erc-nickserv.el -> erc-services.el
+ o ChangeLog.NNNN -> ChangeLog.NN
 
 ** Header line changes