* Jesse Smith:

> 2. Why not remove the author's e-mail address from the Help->About menu?
> Leave the name so proper credit is given, but remove the e-mail address.

Yes! Thank you, I think this is a simple, brilliant idea. After all,
JWZ's main complaint seems to be that people bother him about old
xscreensaver versions via e-mail.

I have prepared a patch that removes the e-mail address (but not the
name) form all binaries, scripts, and manpages.

To be sure, I've also added some grep to debian/rules that checks the
directories from which the binary packages are built (before dh_compress
runs).

Cheers,
-Hilko
Index: xscreensaver/hacks/abstractile.man
===================================================================
--- xscreensaver.orig/hacks/abstractile.man
+++ xscreensaver/hacks/abstractile.man
@@ -41,7 +41,6 @@ stored in the RESOURCE_MANAGER property.
 Copyright \(co 2004 by Steve Sundstrom.  Based on
 examples from the hacks directory of xscreensaver,
 Copyright (c) 1997, 1998, 2002 Jamie Zawinski
-<[email protected]>
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
Index: xscreensaver/hacks/apple2.man
===================================================================
--- xscreensaver.orig/hacks/apple2.man
+++ xscreensaver/hacks/apple2.man
@@ -202,5 +202,5 @@ any purpose.  It is provided "as is" wit
 warranty.
 .SH AUTHOR
 Television and Apple ][ emulation by Trevor Blackwell <[email protected]>.
-Slideshow and text mode by Jamie Zawinski <[email protected]>.
+Slideshow and text mode by Jamie Zawinski.
 Pty and vt100 emulation by Fredrik Tolf <[email protected]>.
Index: xscreensaver/hacks/attraction.man
===================================================================
--- xscreensaver.orig/hacks/attraction.man
+++ xscreensaver/hacks/attraction.man
@@ -206,7 +206,7 @@ permission notice appear in supporting d
 made about the suitability of this software for any purpose.  It is provided
 "as is" without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 13-aug-92.
+Jamie Zawinski, 13-aug-92.
 
 Viscosity support by Philip Edward Cutone, III.
 
Index: xscreensaver/hacks/blitspin.man
===================================================================
--- xscreensaver.orig/hacks/blitspin.man
+++ xscreensaver/hacks/blitspin.man
@@ -90,7 +90,7 @@ notice and this permission notice appear
 representations are made about the suitability of this software for any
 purpose.  It is provided "as is" without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 17-aug-92.
+Jamie Zawinski, 17-aug-92.
 
 Based on SmallTalk code which appeared in the August 1981 issue of Byte
 magazine.
Index: xscreensaver/hacks/bouboule.man
===================================================================
--- xscreensaver.orig/hacks/bouboule.man
+++ xscreensaver/hacks/bouboule.man
@@ -77,4 +77,4 @@ VMS support by Jouk Jansen <joukj@alpha.
 TrueColor support by David Bagley <[email protected]>, 01-Feb-96.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 15-May-97.
+Jamie Zawinski, 15-May-97.
Index: xscreensaver/hacks/boxfit.man
===================================================================
--- xscreensaver.orig/hacks/boxfit.man
+++ xscreensaver/hacks/boxfit.man
@@ -99,4 +99,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>
+Jamie Zawinski
Index: xscreensaver/hacks/braid.man
===================================================================
--- xscreensaver.orig/hacks/braid.man
+++ xscreensaver/hacks/braid.man
@@ -66,4 +66,4 @@ supporting documentation.
 John Neil <[email protected]>, 29-Aug-95.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/bsod.man
===================================================================
--- xscreensaver.orig/hacks/bsod.man
+++ xscreensaver/hacks/bsod.man
@@ -137,4 +137,4 @@ express or implied warranty.  No animals
 these simulations.  Always mount a scratch monkey.
 .SH AUTHOR
 Concept cribbed from Stephen Martin <[email protected]>.  This version is by
-Jamie Zawinski <[email protected]>, with contributions from many others.
+Jamie Zawinski, with contributions from many others.
Index: xscreensaver/hacks/cloudlife.man
===================================================================
--- xscreensaver.orig/hacks/cloudlife.man
+++ xscreensaver/hacks/cloudlife.man
@@ -72,7 +72,6 @@ stored in the RESOURCE_MANAGER property.
 Copyright \(co 2003 by Don Marti.  Based on
 examples from the hacks directory of xscreensaver,
 Copyright (c) 1997, 1998, 2002 Jamie Zawinski
-<[email protected]>
 
 This man page based on the man page of sierpinski,
 Copyright \(co 1996 by Desmond Daignault.
Index: xscreensaver/hacks/critical.man
===================================================================
--- xscreensaver.orig/hacks/critical.man
+++ xscreensaver/hacks/critical.man
@@ -91,4 +91,4 @@ suitability of this software for any pur
 without express or implied warranty.
 .SH AUTHOR
 Martin Pool <[email protected]>, 1998-2000.  Based in part on the
-XScreenSaver code by Jamie Zawinski <[email protected]>.
+XScreenSaver code by Jamie Zawinski.
Index: xscreensaver/hacks/cwaves.man
===================================================================
--- xscreensaver.orig/hacks/cwaves.man
+++ xscreensaver/hacks/cwaves.man
@@ -73,4 +73,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 2-Jul-2007.
+Jamie Zawinski, 2-Jul-2007.
Index: xscreensaver/hacks/deco.man
===================================================================
--- xscreensaver.orig/hacks/deco.man
+++ xscreensaver/hacks/deco.man
@@ -100,6 +100,6 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 26-Apr-97, based on code by
+Jamie Zawinski, 26-Apr-97, based on code by
 Michael D. Bayne <[email protected]>. Golden ratio and 
 Mondrian settings by Lars Huttar.
Index: xscreensaver/hacks/distort.man
===================================================================
--- xscreensaver.orig/hacks/distort.man
+++ xscreensaver/hacks/distort.man
@@ -133,5 +133,5 @@ No representations are made about the su
 any purpose.  It is provided "as is" without express or implied
 warranty.
 .SH AUTHORS
-Jonas Munsin <[email protected]> and Jamie Zawinski <[email protected]>.
+Jonas Munsin <[email protected]> and Jamie Zawinski.
 This manual page by Matthias Warkus <[email protected]>, 17-Oct-1999.
Index: xscreensaver/hacks/drift.man
===================================================================
--- xscreensaver.orig/hacks/drift.man
+++ xscreensaver/hacks/drift.man
@@ -76,4 +76,4 @@ supporting documentation.
 Scott Draves <[email protected]>, 06-Jun-91, 01-Jun-95.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/flag.man
===================================================================
--- xscreensaver.orig/hacks/flag.man
+++ xscreensaver/hacks/flag.man
@@ -89,4 +89,4 @@ supporting documentation.
 Charles Vidal <[email protected]>, 1996.
 
 Ability to run standalone or with \fIxscreensaver\fP, and the \-text
-and \-bitmap options, added by Jamie Zawinski <[email protected]>, 24-May-97.
+and \-bitmap options, added by Jamie Zawinski, 24-May-97.
Index: xscreensaver/hacks/flame.man
===================================================================
--- xscreensaver.orig/hacks/flame.man
+++ xscreensaver/hacks/flame.man
@@ -71,4 +71,4 @@ supporting documentation.
 Scott Graves <[email protected]>, 06-Jun-91.n
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 18-Oct-93.
+Jamie Zawinski, 18-Oct-93.
Index: xscreensaver/hacks/fontglide.man
===================================================================
--- xscreensaver.orig/hacks/fontglide.man
+++ xscreensaver/hacks/fontglide.man
@@ -121,4 +121,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 15-Sep-2003.
+Jamie Zawinski, 15-Sep-2003.
Index: xscreensaver/hacks/forest.man
===================================================================
--- xscreensaver.orig/hacks/forest.man
+++ xscreensaver/hacks/forest.man
@@ -59,4 +59,4 @@ supporting documentation.
 Pascal Pensa <[email protected]>, 1995.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 27-May-97.
+Jamie Zawinski, 27-May-97.
Index: xscreensaver/hacks/galaxy.man
===================================================================
--- xscreensaver.orig/hacks/galaxy.man
+++ xscreensaver/hacks/galaxy.man
@@ -84,4 +84,4 @@ Modified by David Bagley <bagleyd@bigfoo
 Modified by Dave Mitchell <[email protected]>, 7-Apr-97.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/goop.man
===================================================================
--- xscreensaver.orig/hacks/goop.man
+++ xscreensaver/hacks/goop.man
@@ -81,4 +81,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 11-Jun-97.
+Jamie Zawinski, 11-Jun-97.
Index: xscreensaver/hacks/grav.man
===================================================================
--- xscreensaver.orig/hacks/grav.man
+++ xscreensaver/hacks/grav.man
@@ -75,4 +75,4 @@ supporting documentation.
 Greg Bowering <[email protected]>, 1993.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/greynetic.man
===================================================================
--- xscreensaver.orig/hacks/greynetic.man
+++ xscreensaver/hacks/greynetic.man
@@ -53,4 +53,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 13-aug-92.
+Jamie Zawinski, 13-aug-92.
Index: xscreensaver/hacks/halo.man
===================================================================
--- xscreensaver.orig/hacks/halo.man
+++ xscreensaver/hacks/halo.man
@@ -72,4 +72,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 6-jul-93.
+Jamie Zawinski, 6-jul-93.
Index: xscreensaver/hacks/helix.man
===================================================================
--- xscreensaver.orig/hacks/helix.man
+++ xscreensaver/hacks/helix.man
@@ -57,6 +57,6 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 13-aug-92.
+Jamie Zawinski, 13-aug-92.
 Screen eraser improved by Johannes Keukelaar <[email protected]>, 
  18-sep-97.
Index: xscreensaver/hacks/hopalong.man
===================================================================
--- xscreensaver.orig/hacks/hopalong.man
+++ xscreensaver/hacks/hopalong.man
@@ -79,4 +79,4 @@ supporting documentation.
 Patrick J. Naughton <[email protected]>, 23-mar-88.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 13-aug-92, and again on 10-May-97.
+Jamie Zawinski, 13-aug-92, and again on 10-May-97.
Index: xscreensaver/hacks/hypercube.man
===================================================================
--- xscreensaver.orig/hacks/hypercube.man
+++ xscreensaver/hacks/hypercube.man
@@ -94,4 +94,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 6-dec-92.
+Jamie Zawinski, 6-dec-92.
Index: xscreensaver/hacks/imsmap.man
===================================================================
--- xscreensaver.orig/hacks/imsmap.man
+++ xscreensaver/hacks/imsmap.man
@@ -61,4 +61,4 @@ stored in the RESOURCE_MANAGER property.
 .SH AUTHOR
 Juergen Nickelsen <[email protected]>, 23-aug-92.
 
-Hacked on by Jamie Zawinski <[email protected]>, 24-aug-92, 17-May-97.
+Hacked on by Jamie Zawinski, 24-aug-92, 17-May-97.
Index: xscreensaver/hacks/julia.man
===================================================================
--- xscreensaver.orig/hacks/julia.man
+++ xscreensaver/hacks/julia.man
@@ -78,4 +78,4 @@ supporting documentation.
 Sean McCullough <[email protected]>, 1995.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/laser.man
===================================================================
--- xscreensaver.orig/hacks/laser.man
+++ xscreensaver/hacks/laser.man
@@ -65,4 +65,4 @@ supporting documentation.
 Pascal Pensa <[email protected]>, 1995.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/lightning.man
===================================================================
--- xscreensaver.orig/hacks/lightning.man
+++ xscreensaver/hacks/lightning.man
@@ -59,4 +59,4 @@ supporting documentation.
 Keith Romberg <[email protected]>, 27-Jun-96.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/lisa.man
===================================================================
--- xscreensaver.orig/hacks/lisa.man
+++ xscreensaver/hacks/lisa.man
@@ -68,4 +68,4 @@ supporting documentation.
 Caleb Cullen, 1997.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 27-May-97.
+Jamie Zawinski, 27-May-97.
Index: xscreensaver/hacks/ljlatest.man
===================================================================
--- xscreensaver.orig/hacks/ljlatest.man
+++ xscreensaver/hacks/ljlatest.man
@@ -58,4 +58,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 30-Aug-2003.
+Jamie Zawinski, 30-Aug-2003.
Index: xscreensaver/hacks/lmorph.man
===================================================================
--- xscreensaver.orig/hacks/lmorph.man
+++ xscreensaver/hacks/lmorph.man
@@ -62,4 +62,4 @@ stored in the RESOURCE_MANAGER property.
 .BR xscreensaver (1)
 .SH AUTHOR
 Sverre H. Huseby <[email protected]> and Glenn T. Lines <[email protected]>,
-built on top of the screen saver routines by Jamie Zawinski <[email protected]>.
+built on top of the screen saver routines by Jamie Zawinski.
Index: xscreensaver/hacks/memscroller.man
===================================================================
--- xscreensaver.orig/hacks/memscroller.man
+++ xscreensaver/hacks/memscroller.man
@@ -75,4 +75,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 14-Aug-2004.
+Jamie Zawinski, 14-Aug-2004.
Index: xscreensaver/hacks/moire.man
===================================================================
--- xscreensaver.orig/hacks/moire.man
+++ xscreensaver/hacks/moire.man
@@ -64,5 +64,5 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 27-Apr-97, based on code by
+Jamie Zawinski, 27-Apr-97, based on code by
 Michael D. Bayne <[email protected]>.
Index: xscreensaver/hacks/noseguy.man
===================================================================
--- xscreensaver.orig/hacks/noseguy.man
+++ xscreensaver/hacks/noseguy.man
@@ -81,4 +81,4 @@ Copyright 1985, 1990 by Dan Heller <argv
 Dan Heller <[email protected]>, 1985.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 13-aug-92.
+Jamie Zawinski, 13-aug-92.
Index: xscreensaver/hacks/penrose.man
===================================================================
--- xscreensaver.orig/hacks/penrose.man
+++ xscreensaver/hacks/penrose.man
@@ -103,4 +103,4 @@ supporting documentation.
 Timo Korvola <[email protected]>, 1996.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/phosphor.man
===================================================================
--- xscreensaver.orig/hacks/phosphor.man
+++ xscreensaver/hacks/phosphor.man
@@ -169,5 +169,5 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 27-Apr-99.
+Jamie Zawinski, 27-Apr-99.
 Pty and vt100 emulation by Fredrik Tolf <[email protected]>.
Index: xscreensaver/hacks/pyro.man
===================================================================
--- xscreensaver.orig/hacks/pyro.man
+++ xscreensaver/hacks/pyro.man
@@ -61,4 +61,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 13-aug-92.
+Jamie Zawinski, 13-aug-92.
Index: xscreensaver/hacks/qix.man
===================================================================
--- xscreensaver.orig/hacks/qix.man
+++ xscreensaver/hacks/qix.man
@@ -127,6 +127,6 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 13-aug-92.
+Jamie Zawinski, 13-aug-92.
 
 Thanks to Ariel Scolnicov for the \-poly and \-gravity options.
Index: xscreensaver/hacks/rocks.man
===================================================================
--- xscreensaver.orig/hacks/rocks.man
+++ xscreensaver/hacks/rocks.man
@@ -85,6 +85,6 @@ express or implied warranty.
 .SH AUTHOR
 Based on Lisp Machine code copyright 1988 John Nguyen <[email protected]>.
 
-Ported to C and X by Jamie Zawinski <[email protected]>, 13-aug-92.
+Ported to C and X by Jamie Zawinski, 13-aug-92.
 
 Steering code by Jeremie Petit; 3D code by [email protected].
Index: xscreensaver/hacks/rorschach.man
===================================================================
--- xscreensaver.orig/hacks/rorschach.man
+++ xscreensaver/hacks/rorschach.man
@@ -72,4 +72,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 13-aug-92.
+Jamie Zawinski, 13-aug-92.
Index: xscreensaver/hacks/sierpinski.man
===================================================================
--- xscreensaver.orig/hacks/sierpinski.man
+++ xscreensaver/hacks/sierpinski.man
@@ -66,4 +66,4 @@ Desmond Daignault <[email protected].
 xlock version was called tri.c.)
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.  (Renamed to sierpinski.)
+Jamie Zawinski, 10-May-97.  (Renamed to sierpinski.)
Index: xscreensaver/hacks/slidescreen.man
===================================================================
--- xscreensaver.orig/hacks/slidescreen.man
+++ xscreensaver/hacks/slidescreen.man
@@ -94,4 +94,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 3-dec-92.
+Jamie Zawinski, 3-dec-92.
Index: xscreensaver/hacks/slip.man
===================================================================
--- xscreensaver.orig/hacks/slip.man
+++ xscreensaver/hacks/slip.man
@@ -83,4 +83,4 @@ supporting documentation.
 Scott Graves <[email protected]>.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 18-Oct-93.
+Jamie Zawinski, 18-Oct-93.
Index: xscreensaver/hacks/sphere.man
===================================================================
--- xscreensaver.orig/hacks/sphere.man
+++ xscreensaver/hacks/sphere.man
@@ -59,4 +59,4 @@ supporting documentation.
 Sun Microsystems, Inc, 1988.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 27-May-97.
+Jamie Zawinski, 27-May-97.
Index: xscreensaver/hacks/spiral.man
===================================================================
--- xscreensaver.orig/hacks/spiral.man
+++ xscreensaver/hacks/spiral.man
@@ -68,4 +68,4 @@ Darrick Brown, 1994.
 Improved by Peter Schmitzberger <[email protected]>, 24-Jul-95.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/starfish.man
===================================================================
--- xscreensaver.orig/hacks/starfish.man
+++ xscreensaver/hacks/starfish.man
@@ -81,4 +81,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 14-Jun-97.
+Jamie Zawinski, 14-Jun-97.
Index: xscreensaver/hacks/strange.man
===================================================================
--- xscreensaver.orig/hacks/strange.man
+++ xscreensaver/hacks/strange.man
@@ -59,4 +59,4 @@ supporting documentation.
 Massimino Pascal <[email protected]>, 1997.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/swirl.man
===================================================================
--- xscreensaver.orig/hacks/swirl.man
+++ xscreensaver/hacks/swirl.man
@@ -67,4 +67,4 @@ supporting documentation.
 M.Dobie <[email protected]>, 1994.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 13-May-97.
+Jamie Zawinski, 13-May-97.
Index: xscreensaver/hacks/vidwhacker.man
===================================================================
--- xscreensaver.orig/hacks/vidwhacker.man
+++ xscreensaver/hacks/vidwhacker.man
@@ -86,4 +86,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 18-Jan-98.
+Jamie Zawinski, 18-Jan-98.
Index: xscreensaver/hacks/vines.man
===================================================================
--- xscreensaver.orig/hacks/vines.man
+++ xscreensaver/hacks/vines.man
@@ -63,4 +63,4 @@ Tracy Camp <[email protected]>, 1997.
 Tweaked by David Hansen <[email protected]>, 21-Mar-97.
 
 Ability to run standalone or with \fIxscreensaver\fP added by 
-Jamie Zawinski <[email protected]>, 10-May-97.
+Jamie Zawinski, 10-May-97.
Index: xscreensaver/hacks/webcollage.man
===================================================================
--- xscreensaver.orig/hacks/webcollage.man
+++ xscreensaver/hacks/webcollage.man
@@ -244,4 +244,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 24-May-1998.
+Jamie Zawinski, 24-May-1998.
Index: xscreensaver/hacks/xflame.man
===================================================================
--- xscreensaver.orig/hacks/xflame.man
+++ xscreensaver/hacks/xflame.man
@@ -69,4 +69,4 @@ warranty.
 .SH AUTHOR
 Primarily written by Carsten Haitzler <[email protected]>.
 Modified over the years by Rahul Jain <[email protected]>, 
-Daniel Zahn <[email protected]>, and Jamie Zawinski <[email protected]>.
+Daniel Zahn <[email protected]>, and Jamie Zawinski.
Index: xscreensaver/hacks/xjack.man
===================================================================
--- xscreensaver.orig/hacks/xjack.man
+++ xscreensaver/hacks/xjack.man
@@ -49,4 +49,4 @@ makes jack a dull boy.  All work and no
 and no play makes jack a fnord dull boy.  All work and no play makes jack a
 dull boy.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 15-Nov-97.
+Jamie Zawinski, 15-Nov-97.
Index: xscreensaver/hacks/xmatrix.man
===================================================================
--- xscreensaver.orig/hacks/xmatrix.man
+++ xscreensaver/hacks/xmatrix.man
@@ -143,4 +143,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 25-Apr-99.
+Jamie Zawinski, 25-Apr-99.
Index: xscreensaver/hacks/t3d.man
===================================================================
--- xscreensaver.orig/hacks/t3d.man
+++ xscreensaver/hacks/t3d.man
@@ -99,7 +99,7 @@ Bernd Paysan
 
 Email: [email protected]
 
-Hacked on by [email protected] for xscreensaver.
+Hacked on by Jamie Zawinski for xscreensaver.
 
 .SH ACKNOWLEDGEMENT
 .PP
Index: xscreensaver/OSX/SaverListController.m
===================================================================
--- xscreensaver.orig/OSX/SaverListController.m
+++ xscreensaver/OSX/SaverListController.m
@@ -49,7 +49,7 @@
   NSString *line1 = [@"XScreenSaver " stringByAppendingString: vers];
   NSString *line2 = [@"\u00A9 " stringByAppendingString:
                         [year stringByAppendingString:
-                                @" Jamie Zawinski <[email protected]>"]];
+                                @" Jamie Zawinski"]];
 
   UIView *v = [[UIView alloc] initWithFrame:CGRectZero];
 
Index: xscreensaver/driver/pdf2jpeg.man
===================================================================
--- xscreensaver.orig/driver/pdf2jpeg.man
+++ xscreensaver/driver/pdf2jpeg.man
@@ -40,4 +40,4 @@ No representations are made about the su
 any purpose.  It is provided "as is" without express or implied
 warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 20-Oct-03.
+Jamie Zawinski, 20-Oct-03.
Index: xscreensaver/driver/xscreensaver-command.man
===================================================================
--- xscreensaver.orig/driver/xscreensaver-command.man
+++ xscreensaver/driver/xscreensaver-command.man
@@ -258,6 +258,6 @@ supporting documentation.  No representa
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 13-aug-1992.
+Jamie Zawinski, 13-aug-1992.
 
 Please let me know if you find any bugs or make any improvements.
Index: xscreensaver/driver/xscreensaver-demo.man
===================================================================
--- xscreensaver.orig/driver/xscreensaver-demo.man
+++ xscreensaver/driver/xscreensaver-demo.man
@@ -397,6 +397,6 @@ supporting documentation.  No representa
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 13-aug-92.
+Jamie Zawinski, 13-aug-92.
 
 Please let me know if you find any bugs or make any improvements.
Index: xscreensaver/driver/xscreensaver-getimage-desktop.man
===================================================================
--- xscreensaver.orig/driver/xscreensaver-getimage-desktop.man
+++ xscreensaver/driver/xscreensaver-getimage-desktop.man
@@ -52,4 +52,4 @@ No representations are made about the su
 any purpose.  It is provided "as is" without express or implied
 warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 20-Oct-03.
+Jamie Zawinski, 20-Oct-03.
Index: xscreensaver/driver/xscreensaver-getimage-file.man
===================================================================
--- xscreensaver.orig/driver/xscreensaver-getimage-file.man
+++ xscreensaver/driver/xscreensaver-getimage-file.man
@@ -63,4 +63,4 @@ No representations are made about the su
 any purpose.  It is provided "as is" without express or implied
 warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 14-Apr-01
+Jamie Zawinski, 14-Apr-01
Index: xscreensaver/driver/xscreensaver-getimage-video.man
===================================================================
--- xscreensaver.orig/driver/xscreensaver-getimage-video.man
+++ xscreensaver/driver/xscreensaver-getimage-video.man
@@ -48,4 +48,4 @@ No representations are made about the su
 any purpose.  It is provided "as is" without express or implied
 warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 14-Apr-01
+Jamie Zawinski, 14-Apr-01
Index: xscreensaver/driver/xscreensaver-getimage.man
===================================================================
--- xscreensaver.orig/driver/xscreensaver-getimage.man
+++ xscreensaver/driver/xscreensaver-getimage.man
@@ -70,4 +70,4 @@ No representations are made about the su
 any purpose.  It is provided "as is" without express or implied
 warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 14-Apr-01
+Jamie Zawinski, 14-Apr-01
Index: xscreensaver/driver/xscreensaver-text.man
===================================================================
--- xscreensaver.orig/driver/xscreensaver-text.man
+++ xscreensaver/driver/xscreensaver-text.man
@@ -82,4 +82,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 20-Mar-2005.
+Jamie Zawinski, 20-Mar-2005.
Index: xscreensaver/driver/xscreensaver.c
===================================================================
--- xscreensaver.orig/driver/xscreensaver.c
+++ xscreensaver/driver/xscreensaver.c
@@ -289,7 +289,7 @@ do_help (saver_info *si)
   fflush (stdout);
   fflush (stderr);
   fprintf (stdout, "\
-xscreensaver %s, copyright (c) 1991-%s by Jamie Zawinski <[email protected]>\n\
+xscreensaver %s, copyright (c) 1991-%s by Jamie Zawinski\n\
 \n\
   All xscreensaver configuration is via the `~/.xscreensaver' file.\n\
   Rather than editing that file by hand, just run `xscreensaver-demo':\n\
@@ -786,7 +786,7 @@ print_banner (saver_info *si)
   if (p->verbose_p)
     fprintf (stderr,
 	     "%s %s, copyright (c) 1991-%s "
-	     "by Jamie Zawinski <[email protected]>.\n",
+	     "by Jamie Zawinski.\n",
 	     progname, si->version, year);
 
   if (p->debug_p)
Index: xscreensaver/driver/xscreensaver.man
===================================================================
--- xscreensaver.orig/driver/xscreensaver.man
+++ xscreensaver/driver/xscreensaver.man
@@ -951,7 +951,7 @@ supporting documentation.  No representa
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>.  Written in late 1991; version 1.0 posted
+Jamie Zawinski.  Written in late 1991; version 1.0 posted
 to comp.sources.x on 17-Aug-1992.
 
 Please let me know if you find any bugs or make any improvements.
Index: xscreensaver/hacks/glx/boing.man
===================================================================
--- xscreensaver.orig/hacks/glx/boing.man
+++ xscreensaver/hacks/glx/boing.man
@@ -102,4 +102,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 19-Feb-2005.
+Jamie Zawinski, 19-Feb-2005.
Index: xscreensaver/hacks/glx/bouncingcow.man
===================================================================
--- xscreensaver.orig/hacks/glx/bouncingcow.man
+++ xscreensaver/hacks/glx/bouncingcow.man
@@ -69,5 +69,5 @@ Moo.  No representations are made about
 software for any purpose.  It is provided "as is" without express or
 implied warranty.  Moo.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>
+Jamie Zawinski
 
Index: xscreensaver/hacks/glx/fliptext.man
===================================================================
--- xscreensaver.orig/hacks/glx/fliptext.man
+++ xscreensaver/hacks/glx/fliptext.man
@@ -111,4 +111,4 @@ supporting documentation.  No representa
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>
+Jamie Zawinski
Index: xscreensaver/hacks/glx/glmatrix.man
===================================================================
--- xscreensaver.orig/hacks/glx/glmatrix.man
+++ xscreensaver/hacks/glx/glmatrix.man
@@ -113,4 +113,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 8-Jun-2003.
+Jamie Zawinski, 8-Jun-2003.
Index: xscreensaver/hacks/glx/gltext.man
===================================================================
--- xscreensaver.orig/hacks/glx/gltext.man
+++ xscreensaver/hacks/glx/gltext.man
@@ -125,4 +125,4 @@ supporting documentation.  No representa
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>
+Jamie Zawinski
Index: xscreensaver/hacks/glx/jigsaw.man
===================================================================
--- xscreensaver.orig/hacks/glx/jigsaw.man
+++ xscreensaver/hacks/glx/jigsaw.man
@@ -87,4 +87,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 25-Nov-97.
+Jamie Zawinski, 25-Nov-97.
Index: xscreensaver/hacks/glx/kaleidocycle.man
===================================================================
--- xscreensaver.orig/hacks/glx/kaleidocycle.man
+++ xscreensaver/hacks/glx/kaleidocycle.man
@@ -93,4 +93,4 @@ supporting documentation.  No representa
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>
+Jamie Zawinski
Index: xscreensaver/hacks/glx/lament.man
===================================================================
--- xscreensaver.orig/hacks/glx/lament.man
+++ xscreensaver/hacks/glx/lament.man
@@ -65,4 +65,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 25-Jul-98.
+Jamie Zawinski, 25-Jul-98.
Index: xscreensaver/hacks/glx/lavalite.man
===================================================================
--- xscreensaver.orig/hacks/glx/lavalite.man
+++ xscreensaver/hacks/glx/lavalite.man
@@ -157,4 +157,4 @@ trademarks of Haggerty Enterprises, Inc.
 countries around the world.
 
 .SH AUTHOR
-Jamie Zawinski <[email protected]>
+Jamie Zawinski
Index: xscreensaver/hacks/glx/molecule.man
===================================================================
--- xscreensaver.orig/hacks/glx/molecule.man
+++ xscreensaver/hacks/glx/molecule.man
@@ -157,4 +157,4 @@ supporting documentation.  No representa
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>
+Jamie Zawinski
Index: xscreensaver/hacks/glx/pinion.man
===================================================================
--- xscreensaver.orig/hacks/glx/pinion.man
+++ xscreensaver/hacks/glx/pinion.man
@@ -79,4 +79,4 @@ appear in supporting documentation.  No
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]>, 12-Dec-2004.
+Jamie Zawinski, 12-Dec-2004.
Index: xscreensaver/hacks/glx/sonar.man
===================================================================
--- xscreensaver.orig/hacks/glx/sonar.man
+++ xscreensaver/hacks/glx/sonar.man
@@ -149,7 +149,7 @@ Does not support IPv6.
 .BR ping (8),
 .BR ping6 (8)
 .SH COPYRIGHT
-Copyright \(co 2000-2012 by Jamie Zawinski <[email protected]>
+Copyright \(co 2000-2012 by Jamie Zawinski
 .RE
 Copyright \(co 1998 by Stephen Martin. <[email protected]>
 
Index: xscreensaver/hacks/glx/starwars.man
===================================================================
--- xscreensaver.orig/hacks/glx/starwars.man
+++ xscreensaver/hacks/glx/starwars.man
@@ -178,4 +178,4 @@ supporting documentation.  No representa
 suitability of this software for any purpose.  It is provided "as is"
 without express or implied warranty.
 .SH AUTHOR
-Jamie Zawinski <[email protected]> and Claudio Matauoka <[email protected]>
+Jamie Zawinskiand Claudio Matauoka <[email protected]>
Index: xscreensaver/utils/version.h
===================================================================
--- xscreensaver.orig/utils/version.h
+++ xscreensaver/utils/version.h
@@ -1,2 +1,2 @@
 static const char screensaver_id[] =
-	"@(#)xscreensaver 5.34 (24-Oct-2015), by Jamie Zawinski ([email protected])";
+	"@(#)xscreensaver 5.34 (24-Oct-2015), by Jamie Zawinski";
Index: xscreensaver/driver/XScreenSaver.ad.in
===================================================================
--- xscreensaver.orig/driver/XScreenSaver.ad.in
+++ xscreensaver/driver/XScreenSaver.ad.in
@@ -442,7 +442,7 @@ XScreenSaver.bourneShell:		/bin/sh
 
 *splash.heading.label:		XScreenSaver %s
 *splash.body.label:		Copyright \251 1991-2015 by
-*splash.body2.label:		Jamie Zawinski <[email protected]>
+*splash.body2.label:		Jamie Zawinski
 *splash.demo.label:		Settings
 *splash.help.label:		Help
 
Index: xscreensaver/driver/xscreensaver-command.c
===================================================================
--- xscreensaver.orig/driver/xscreensaver-command.c
+++ xscreensaver/driver/xscreensaver-command.c
@@ -65,7 +65,7 @@ static char *usage = "\n\
 usage: %s -<option>\n\
 \n\
   This program provides external control of a running xscreensaver process.\n\
-  Version %s, copyright (c) 1991-%s Jamie Zawinski <[email protected]>.\n\
+  Version %s, copyright (c) 1991-%s Jamie Zawinski.\n\
 \n\
   The xscreensaver program is a daemon that runs in the background.\n\
   You control a running xscreensaver process by sending it messages\n\
Index: xscreensaver/driver/xscreensaver-getimage-video
===================================================================
--- xscreensaver.orig/driver/xscreensaver-getimage-video
+++ xscreensaver/driver/xscreensaver-getimage-video
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2001-2015 Jamie Zawinski <[email protected]>.
+# Copyright © 2001-2015 Jamie Zawinski.
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
Index: xscreensaver/hacks/webcollage-helper.c
===================================================================
--- xscreensaver.orig/hacks/webcollage-helper.c
+++ xscreensaver/hacks/webcollage-helper.c
@@ -417,7 +417,7 @@ add_jpeg_comment (struct jpeg_compress_s
   const char fmt[] =
     "\r\n"
     "    Generated by WebCollage: Exterminate All Rational Thought. \r\n"
-    "    Copyright (c) 1999-%Y by Jamie Zawinski <[email protected]> \r\n"
+    "    Copyright (c) 1999-%Y by Jamie Zawinski\r\n"
     "\r\n"
     "        http://www.jwz.org/webcollage/ \r\n"
     "\r\n"
Index: xscreensaver/utils/images/logo-180.xpm
===================================================================
--- xscreensaver.orig/utils/images/logo-180.xpm
+++ xscreensaver/utils/images/logo-180.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 
 /* XScreenSaver Logo, designed by Angela Goodman <[email protected]>
-   Copyright (c) 2001, 2002 by Jamie Zawinski <[email protected]>
+   Copyright (c) 2001, 2002 by Jamie Zawinski
    Unauthorized use or reproduction prohibited.
 
    http://www.jwz.org/xscreensaver/
Index: xscreensaver/utils/images/logo-50.xpm
===================================================================
--- xscreensaver.orig/utils/images/logo-50.xpm
+++ xscreensaver/utils/images/logo-50.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 
 /* XScreenSaver Logo, designed by Angela Goodman <[email protected]>
-   Copyright (c) 2001, 2002 by Jamie Zawinski <[email protected]>
+   Copyright (c) 2001, 2002 by Jamie Zawinski
    Unauthorized use or reproduction prohibited.
 
    http://www.jwz.org/xscreensaver/
Index: xscreensaver/driver/xscreensaver-getimage-file
===================================================================
--- xscreensaver.orig/driver/xscreensaver-getimage-file
+++ xscreensaver/driver/xscreensaver-getimage-file
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2001-2013 Jamie Zawinski <[email protected]>.
+# Copyright © 2001-2013 Jamie Zawinski.
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
Index: xscreensaver/driver/xscreensaver-text
===================================================================
--- xscreensaver.orig/driver/xscreensaver-text
+++ xscreensaver/driver/xscreensaver-text
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2005-2015 Jamie Zawinski <[email protected]>
+# Copyright © 2005-2015 Jamie Zawinski
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
Index: xscreensaver/hacks/webcollage
===================================================================
--- xscreensaver.orig/hacks/webcollage
+++ xscreensaver/hacks/webcollage
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# webcollage, Copyright © 1999-2015 by Jamie Zawinski <[email protected]>
+# webcollage, Copyright © 1999-2015 by Jamie Zawinski
 # This program decorates the screen with random images from the web.
 # One satisfied customer described it as "a nonstop pop culture brainbath."
 #
Index: xscreensaver/driver/XScreenSaver_ad.h
===================================================================
--- xscreensaver.orig/driver/XScreenSaver_ad.h
+++ xscreensaver/driver/XScreenSaver_ad.h
@@ -304,7 +304,7 @@
 "*passwd.uname:                  True",
 "*splash.heading.label:		XScreenSaver %s",
 "*splash.body.label:		Copyright \\251 1991-2015 by",
-"*splash.body2.label:		Jamie Zawinski <[email protected]>",
+"*splash.body2.label:		Jamie Zawinski",
 "*splash.demo.label:		Settings",
 "*splash.help.label:		Help",
 "*hacks.antinspect.name:     AntInspect",
diff --git a/debian/copyright b/debian/copyright
index aff3af4..fb105b7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: XScreenSaver
-Upstream-Contact: Jamie Zawinski <[email protected]>
+Upstream-Contact: Jamie Zawinski
 Source: http://www.jwz.org/xscreensaver/
 
 Files: *
        hacks/noseguy.*
        hacks/hyperball.*
-Copyright: 1991-2008 Jamie Zawinski <[email protected]>
+Copyright: 1991-2008 Jamie Zawinski
            1985-1990 Dan Heller <[email protected]>
            2000 Joe Keane
 License: Other_1
diff --git a/debian/rules b/debian/rules
index 08f30e3..eb93546 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,6 +119,20 @@ binary-arch:	build
 		debian/xscreensaver-data/etc/X11/app-defaults/XScreenSaver-nogl
 	dh_link -a
 	dh_strip -a
+
+	if grep -lF "jwz@jwz" \
+		`find debian/xscreensaver \
+		      debian/xscreensaver-data \
+		      debian/xscreensaver-data-extra \
+		      debian/xscreensaver-gl \
+		      debian/xscreensaver-gl-extra \
+		      debian/xscreensaver-screensaver-webcollage \
+		      debian/xscreensaver-screensaver-bsod \
+		 -type f`; \
+	then \
+		echo "traces of JWZ's mail address found in binary packages." >&2; exit 1; \
+	fi
+
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a

Reply via email to