From: Micah Cowan <micah@cowan.name>
Date: Sat, 13 Oct 2007 09:04:14 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~514
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=787ffba182f17dfe3d6335825fad08e26b516c90

Automated merge.
---

787ffba182f17dfe3d6335825fad08e26b516c90
diff --cc ChangeLog
index 4cb4b281,34cb3f76..0eb978b6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,55 -1,9 +1,61 @@@
+ 2007-10-12  Micah Cowan  <micah@cowan.name>
+ 
+ 	* PATCHES: Removed.
+ 	* NEWS: Updated info about source repositories, removal of
+ 	PATCHES file.
+ 
 +2007-10-09  Micah Cowan  <micah@cowan.name>
 +
 +	* configure.in: Renamed to configure.ac
 +	* configure.ac: Renamed from configure.in. Added invocations of
 +	AM_GNU_GETTEXT, etc. Added en@quot and en@boldquot pseudo-LINGUA
 +	support.
 +	* ABOUT-NLS: Added back in (required by autoreconf :\).
 +	* Makefile.am: Added ABOUT-NLS and msdos/Makefile.WC to EXTRA_DIST.
 +	* m4/wget.m4: Removed no-longer-used NLS stuff.
 +	* Makefile.in.in: Restore previous policy of not updating .po's
 +	unless explicitly asked (via update-po).
 +
 +2007-10-09  gettextize  <bug-gnu-gettext@gnu.org>
 +
 +	* m4/gettext.m4: New file, from gettext-0.16.1.
 +	* m4/iconv.m4: New file, from gettext-0.16.1.
 +	* m4/lib-ld.m4: Upgrade to gettext-0.16.1.
 +	* m4/lib-link.m4: Upgrade to gettext-0.16.1.
 +	* m4/lib-prefix.m4: Upgrade to gettext-0.16.1.
 +	* m4/nls.m4: New file, from gettext-0.16.1.
 +	* m4/po.m4: New file, from gettext-0.16.1.
 +	* m4/progtest.m4: New file, from gettext-0.16.1.
 +	* po/Makefile.in.in: Upgrade to gettext-0.16.1.
 +	* po/Rules-quot: New file, from gettext-0.16.1.
 +	* po/boldquot.sed: New file, from gettext-0.16.1.
 +	* po/en@boldquot.header: New file, from gettext-0.16.1.
 +	* po/en@quot.header: New file, from gettext-0.16.1.
 +	* po/insert-header.sin: New file, from gettext-0.16.1.
 +	* po/quot.sed: New file, from gettext-0.16.1.
 +	* po/remove-potcdate.sin: New file, from gettext-0.16.1.
 +
 +2007-10-08  Micah Cowan  <micah@cowan.name>
 +
 +	* AUTHORS: Credit to Ralf Wildenhues for automakifying patches.
 +
 +2007-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +	* po/Makefile.in.in: Since `distdir' is used now, adjust
 +	DISTFILES to the missing ChangeLog file.
 +	Add trivial targets ps, pdf, html.
 +	* Makefile.in: Removed, replaced by Makefile.am.
 +	* Makefile.am: Converted from Makefile.in.
 +	* util/Makefile.in: Removed, replaced by Makefile.am.
 +	* util/Makefile.am: Converted from Makefile.in.
 +	* configure.in: Adjust for automake support.
 +
 +2007-10-05  Micah Cowan  <micah@cowan.name>
 +
 +	* config.guess, config.sub, install-sh: Update from versions
 +	found in /usr/share/automake/.
 +	* autogen.sh: Removed, in favor of just running autoreconf.
 +
  2007-10-03  Micah Cowan  <micah@cowan.name>
  
  	* NEWS: Note missing functionality from GnuTLS support. Call out
diff --cc NEWS
index e7c854d6,518b561d..77faebe0
--- a/NEWS
+++ b/NEWS
@@@ -6,12 -6,17 +6,21 @@@ See the end for copying conditions
  
  Please send GNU Wget bug reports to <bug-wget@gnu.org>.
  
 +* Changes in Wget (MAINLINE).
 +
 +** Wget uses Automake now.
 +
  * Changes in Wget 1.11.
  
+ ** The source code has been migrated to Mercurial. The repositories are
+ available at http://hg.addictivecode.org/. Prior to this, the source
+ code was hosted on Subversion (migrated from the original CVS); you can
+ still get access to older tags and branches for Wget in the Subversion
+ repository at http://addictivecode.org/svn/wget/.
+ 
+ ** PATCH file removed; see http://wget.addictivecode.org/PatchGuidelines
+ for current information about producing patches for GNU Wget.
+ 
  ** TODO file removed: we use a bugtracker now; see
  http://wget.addictivecode.org/BugTracker. Also,
  http://wget.addictivecode.org/FeatureSpecifications.