Copyright notice

[Carl Fredrik Hammar]

Hi!

I'm copying over some files from libstore to use as a base for
libchannel, I'm rewriting part of them and I'm not sure how to treat
the copyright notices, i.e. which parts to keep.

For instance the copyright notice in libstore/store.h is:

   Store I/O

   Copyright (C) 1995,96,97,98,99,2001,02,04,05 Free Software Foundation, Inc.
   Written by Miles Bader <miles@gnu.org>
   This file is part of the GNU Hurd.

   <rest of licence>

Which I changed to the following in libchannel/channel.h:

   Channel I/O

   Copyright (C) 1995,96,97,98,99,2001,02,04,05,07 Free Software Foundation, 
Inc.
   Written by Carl Fredrik Hammar <hammy.lite@gmail.com>
   This file is part of the GNU Hurd.

   <rest of licence>

Would this be appropriate, or should I reset the copyright years?
Should I keep Miles Bader as an author?  Should I break the overly
long copyright line?

Regards,
Fredrik