potato postgres copyright still contains BSD advertising clause

[mwooding@thecity.sfsu.edu (Miguel Wooding SF Ten.Union)]

The postgresql copyright file contains the following: 


The following copyright applies to the regex code in the backend:

  Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
  This software is not subject to any license of the American Telephone
  and Telegraph Company or of the Regents of the University of California.
...
   * Copyright (c) 1994
   *    The Regents of the University of California.  All rights reserved.
...
   * 3. All advertising materials mentioning features or use of this software
   *    must display the following acknowledgement:
   *    This product includes software developed by the University of
   *    California, Berkeley and its contributors.

Didn't I see a message in this list (perhaps from Joseph Carter or
Adrian Bunk) saying that UCB had revoked this clause?  If so,
shouldn't our copyright notice reflect that? Is this, then, a bug in
potato's postgresql package?  And how should this be fixed: Can
paragraph 3 just be omitted, and can paragraph 4 be renumbered?
Somehow that seems a bit funny.

It appears that this copyright applies only to the regex code in the
backend, not to the remainder of the distribution, and that this is
copyrighted by Henry Spencer.  So did UCB's change affect Henry
Spencer's modified version of the earlier UCB code?

Then there's the odd statement that the software is not subject to any 
license of UC followed by the UC copyright.  Hmm...

Thanks,
--Miguel