From 425368c60284c57856a5536fe94f5ee99bbcb5fe Mon Sep 17 00:00:00 2001 From: Darshit Shah Date: Tue, 16 Dec 2014 23:31:36 +0530 Subject: [PATCH] Revert "ChangeLog: Move all ChangeLog files to .pre-gitlog" This reverts commit fcd3b3c473be25c4967fd8139d976e76faaef1b6. Turns out that removing the ChangeLog files causes the Wget build to fail. While this issue is investigated and sorted out, the commit is reversed to allow people to be able to build Wget from master --- ChangeLog.pre-gitlog => ChangeLog | 1 + ChangeLog.README | 16 ++++++++++++++++ doc/{ChangeLog.pre-gitlog => ChangeLog} | 0 msdos/{ChangeLog.pre-gitlog => ChangeLog} | 2 +- src/{ChangeLog.pre-gitlog => ChangeLog} | 2 +- testenv/{ChangeLog.pre-gitlog => ChangeLog} | 0 tests/{ChangeLog.pre-gitlog => ChangeLog} | 1 + 7 files changed, 20 insertions(+), 2 deletions(-) rename ChangeLog.pre-gitlog => ChangeLog (99%) create mode 100644 ChangeLog.README rename doc/{ChangeLog.pre-gitlog => ChangeLog} (100%) rename msdos/{ChangeLog.pre-gitlog => ChangeLog} (98%) rename src/{ChangeLog.pre-gitlog => ChangeLog} (99%) rename testenv/{ChangeLog.pre-gitlog => ChangeLog} (100%) rename tests/{ChangeLog.pre-gitlog => ChangeLog} (99%) diff --git a/ChangeLog.pre-gitlog b/ChangeLog similarity index 99% rename from ChangeLog.pre-gitlog rename to ChangeLog index 1bb0521a..33433edc 100644 --- a/ChangeLog.pre-gitlog +++ b/ChangeLog @@ -3294,3 +3294,4 @@ * aclocal.m4 (AM_WITH_NLS, AM_GNU_GETTEXT, AM_LC_MESSAGES, AM_PATH_PROG_WITH_TEST): from gettext-0.10.32. + diff --git a/ChangeLog.README b/ChangeLog.README new file mode 100644 index 00000000..3a0dbf01 --- /dev/null +++ b/ChangeLog.README @@ -0,0 +1,16 @@ +Please note that Wget has more than one ChangeLog file: + + ./ChangeLog: documents changes to files in the top-level directory + and to files in subdirectories like po/ that don't have + their own ChangeLogs + + src/ChangeLog: documents only changes to files in the src directory + + doc/ChangeLog: documents only changes to files in the doc directory + + windows/ChangeLog: documents only changes to files in the windows directory + + msdos/ChangeLog: documents only changes to files in the msdos directory + +When checking to see if a patch you sent in has been applied, please +look in the appropriate ChangeLog(s). diff --git a/doc/ChangeLog.pre-gitlog b/doc/ChangeLog similarity index 100% rename from doc/ChangeLog.pre-gitlog rename to doc/ChangeLog diff --git a/msdos/ChangeLog.pre-gitlog b/msdos/ChangeLog similarity index 98% rename from msdos/ChangeLog.pre-gitlog rename to msdos/ChangeLog index d4c32e13..6a8f21b9 100644 --- a/msdos/ChangeLog.pre-gitlog +++ b/msdos/ChangeLog @@ -53,7 +53,7 @@ now wget.exe. * Makefile.WC: Added for building with OpenWatcom targeting - 32-bit DOS (DOS32A extender). + 32-bit DOS (DOS32A extender). 2007-09-24 Gisle Vanem diff --git a/src/ChangeLog.pre-gitlog b/src/ChangeLog similarity index 99% rename from src/ChangeLog.pre-gitlog rename to src/ChangeLog index e27da7b2..cbe19912 100644 --- a/src/ChangeLog.pre-gitlog +++ b/src/ChangeLog @@ -3369,7 +3369,7 @@ 2008-06-14 Xavier Saint - * iri.c, iri.h : New files. + * iri.c, iri.h : New files. * Makefile.am : Add files iri.h and conditional iri.c. diff --git a/testenv/ChangeLog.pre-gitlog b/testenv/ChangeLog similarity index 100% rename from testenv/ChangeLog.pre-gitlog rename to testenv/ChangeLog diff --git a/tests/ChangeLog.pre-gitlog b/tests/ChangeLog similarity index 99% rename from tests/ChangeLog.pre-gitlog rename to tests/ChangeLog index 7a7c0947..4f816797 100644 --- a/tests/ChangeLog.pre-gitlog +++ b/tests/ChangeLog @@ -1155,3 +1155,4 @@ testing is supported at the moment). * test1: Added basic HTTP test. +