[PATCH] (was Re: .cvsignore files in glibc)

[Jakub Jelinek]

On Wed, Apr 26, 2000 at 01:58:32PM -0700, Geoff Keating wrote:
> > Date: Wed, 26 Apr 2000 10:31:25 +0200
> > From: Jakub Jelinek <jakub@redhat.com>
> 
> > The only uncovered file then is ChangeLog.old which is ignored by default by
> > CVS. Can we rename that file, say to ChangeLog.1?
> 
> I named it ChangeLog.old so emacs wouldn't find it.  Probably the
> right thing to do is to merge all its entries into the toplevel
> ChangeLog and delete the whole file.

Ok with this?

--- libc/crypt/ChangeLog.old.jj	Tue Feb 29 06:21:42 2000
+++ libc/crypt/ChangeLog.old	Thu Apr 27 09:35:23 2000
@@ -1,24 +0,0 @@
-1998-12-25  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* sysdeps/unix/ufc-crypt.h: Use <stdint.h>.
-
-	* configure: Delete the code dealing with building the add-on
-	outside glibc, as this doesn't work.
-
-1998-12-10  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* sysdeps/unix/crypt-entry.c: Don't include "patchlevel.h".
-
-	* sysdeps/unix/crypt.h: Move __crypt_r, __setkey_r, __encrypt_r to...
-	* sysdeps/unix/crypt-private.h: ...here.
-
-	* sysdeps/unix/crypt.h: Add __restrict to the structure parameters.
-	* sysdeps/unix/crypt-private.h: Likewise.  Also add const to
-	first parameter of _ufc_mk_keytab_r.
-	* sysdeps/unix/crypt.c: Update prototypes. 
-	* sysdeps/unix/crypt-entry.c: Likewise.
-	* sysdeps/unix/crypt_util.c: Likewise.
-
-	* sysdeps/unix/crypt-entry.c (crypt): Use __crypt_r not crypt_r.
-
-ChangeLog starts here, with version 2.0.96.
--- libc/ChangeLog.9.jj	Sun Feb  7 01:05:42 1999
+++ libc/ChangeLog.9	Thu Apr 27 09:35:12 2000
@@ -1261,6 +1261,13 @@
 	* sysdeps/generic/statvfs64.c: Likewise.
 	* sysdeps/unix/sysv/linux/statvfs64.c: Likewise.
 
+1998-12-25  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* crypt/sysdeps/unix/ufc-crypt.h: Use <stdint.h>.
+
+	* crypt/configure: Delete the code dealing with building the add-on
+	outside glibc, as this doesn't work.
+
 1998-12-25  Ulrich Drepper  <drepper@cygnus.com>
 
 	* elf/dl-hash.h: Move to...
@@ -1680,6 +1687,24 @@
 
 	* po/es.po: Update from translation team.
 	* po/fr.po: Likewise.
+
+1998-12-10  Geoff Keating  <geoffk@ozemail.com.au>
+
+	* crypt/sysdeps/unix/crypt-entry.c: Don't include "patchlevel.h".
+
+	* crypt/sysdeps/unix/crypt.h: Move __crypt_r, __setkey_r,
+	__encrypt_r to...
+	* crypt/sysdeps/unix/crypt-private.h: ...here.
+
+	* crypt/sysdeps/unix/crypt.h: Add __restrict to the structure
+	parameters.
+	* crypt/sysdeps/unix/crypt-private.h: Likewise.  Also add const to
+	first parameter of _ufc_mk_keytab_r.
+	* crypt/sysdeps/unix/crypt.c: Update prototypes. 
+	* crypt/sysdeps/unix/crypt-entry.c: Likewise.
+	* crypt/sysdeps/unix/crypt_util.c: Likewise.
+
+	* crypt/sysdeps/unix/crypt-entry.c (crypt): Use __crypt_r not crypt_r.
 
 1998-12-10  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
 

	Jakub