summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--THANKS2
-rw-r--r--attic/dpkg/dpkg.8-null2
-rw-r--r--attic/dpkg/lib.pl2
-rwxr-xr-xattic/dpkg/perl-dpkg.pl2
-rw-r--r--attic/split/mkdeb.sh2
-rw-r--r--attic/split/old-mksplit.sh2
-rw-r--r--debian/copyright2
-rw-r--r--doc/obsolete/guidelines.texi4
-rw-r--r--dpkg-deb/build.c2
-rw-r--r--dpkg-deb/dpkg-deb.h2
-rw-r--r--dpkg-deb/extract.c2
-rw-r--r--dpkg-deb/info.c2
-rw-r--r--dpkg-deb/main.c2
-rw-r--r--dselect/basecmds.cc2
-rw-r--r--dselect/baselist.cc2
-rw-r--r--dselect/basetop.cc2
-rw-r--r--dselect/bindings.cc2
-rw-r--r--dselect/bindings.h2
-rw-r--r--dselect/curkeys.cc2
-rw-r--r--dselect/dselect.h2
-rw-r--r--dselect/keyoverride2
-rw-r--r--dselect/main.cc2
-rw-r--r--dselect/methkeys.cc2
-rw-r--r--dselect/methlist.cc2
-rw-r--r--dselect/method.cc2
-rw-r--r--dselect/method.h2
-rw-r--r--dselect/methparse.cc2
-rwxr-xr-xdselect/mkcurkeys.pl2
-rw-r--r--dselect/pkgcmds.cc2
-rw-r--r--dselect/pkgdepcon.cc2
-rw-r--r--dselect/pkgdisplay.cc2
-rw-r--r--dselect/pkginfo.cc2
-rw-r--r--dselect/pkgkeys.cc2
-rw-r--r--dselect/pkglist.cc2
-rw-r--r--dselect/pkglist.h2
-rw-r--r--dselect/pkgsublist.cc2
-rw-r--r--dselect/pkgtop.cc2
-rw-r--r--include/dpkg-db.h2
-rw-r--r--include/dpkg.h.in2
-rw-r--r--include/myopt.h2
-rw-r--r--include/parsedump.h2
-rw-r--r--lib/compat.c2
-rw-r--r--lib/database.c2
-rw-r--r--lib/dbmodify.c2
-rw-r--r--lib/dump.c2
-rw-r--r--lib/ehandle.c2
-rw-r--r--lib/fields.c2
-rw-r--r--lib/lock.c2
-rw-r--r--lib/md5.c2
-rw-r--r--lib/md5.h2
-rw-r--r--lib/mlib.c2
-rw-r--r--lib/myopt.c2
-rw-r--r--lib/nfmalloc.c2
-rw-r--r--lib/parse.c2
-rw-r--r--lib/parsehelp.c2
-rw-r--r--lib/showcright.c2
-rw-r--r--lib/varbuf.c2
-rw-r--r--lib/vercmp.c2
-rw-r--r--main/archives.c2
-rw-r--r--main/archives.h2
-rw-r--r--main/cleanup.c2
-rw-r--r--main/configure.c2
-rw-r--r--main/depcon.c2
-rw-r--r--main/enquiry.c2
-rw-r--r--main/errors.c2
-rw-r--r--main/filesdb.c2
-rw-r--r--main/filesdb.h2
-rw-r--r--main/help.c2
-rw-r--r--main/main.c2
-rw-r--r--main/main.h2
-rw-r--r--main/packages.c2
-rw-r--r--main/processarc.c2
-rw-r--r--main/query.c2
-rw-r--r--main/remove.c2
-rw-r--r--main/select.c2
-rw-r--r--main/update.c2
-rw-r--r--man/en/dpkg.cfg.5.sgml2
-rw-r--r--man/fr/start-stop-daemon.82
-rw-r--r--man/ja/start-stop-daemon.82
-rw-r--r--man/ru/start-stop-daemon.82
-rw-r--r--man/sv/start-stop-daemon.82
-rw-r--r--po/fr.po2
-rw-r--r--po/ja.po2
-rw-r--r--split/dpkg-split.h2
-rw-r--r--split/info.c2
-rw-r--r--split/join.c2
-rw-r--r--split/main.c2
-rw-r--r--split/mksplit.pl2
-rw-r--r--split/queue.c2
-rw-r--r--split/split.c2
-rw-r--r--utils/start-stop-daemon.82
92 files changed, 96 insertions, 92 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a8c2fe13..1a731fccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 6 16:26:51 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+ * lots-a-files: update email address for Ian Jackson
+
Sun May 5 22:27:50 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
* configure.in: expand all paths before doing substitution
diff --git a/THANKS b/THANKS
index 3581c120e..342099f54 100644
--- a/THANKS
+++ b/THANKS
@@ -20,7 +20,7 @@ Guy Maor <maor@debian.org>
Hartmut Koptein <koptein@naffel.de>
Heiko Schlittermann <heiko@lotte.sax.de>
Hiroshi KISE <fuyuneko@ryukyu.ne.jp>
-Ian Jackson <ian@chiark.chu.cam.ac.uk>
+Ian Jackson <ian.greenend.org.uk>
Ian Murdock <imurdock@debian.org>
Ivo Timmermans <itimmermans@bigfoot.com>
J.H.M. Dassen <jdassen@cistron.nl>
diff --git a/attic/dpkg/dpkg.8-null b/attic/dpkg/dpkg.8-null
index bf760f430..8bff9573d 100644
--- a/attic/dpkg/dpkg.8-null
+++ b/attic/dpkg/dpkg.8-null
@@ -16,5 +16,5 @@ Type
for a brief summary of how to use dpkg.
.SH AUTHOR
-Ian Jackson <ijackson@gnu.ai.mit.edu>; tarfile extraction code
+Ian Jackson <ian.greenend.org.uk>; tarfile extraction code
contributed by Bruce Perens <bruce@pixar.com>.
diff --git a/attic/dpkg/lib.pl b/attic/dpkg/lib.pl
index ba9c12765..ab35397d7 100644
--- a/attic/dpkg/lib.pl
+++ b/attic/dpkg/lib.pl
@@ -6,7 +6,7 @@
# Copyright (C) 1994 Matt Welsh <mdw@sunsite.unc.edu>
# Copyright (C) 1994 Carl Streeter <streeter@cae.wisc.edu>
# Copyright (C) 1994 Ian Murdock <imurdock@debian.org>
-# Copyright (C) 1994 Ian Jackson <iwj10@cus.cam.ac.uk>
+# Copyright (C) 1994 Ian Jackson <ian.greenend.org.uk>
#
# dpkg is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
diff --git a/attic/dpkg/perl-dpkg.pl b/attic/dpkg/perl-dpkg.pl
index ba70fc5f5..6972f0e3c 100755
--- a/attic/dpkg/perl-dpkg.pl
+++ b/attic/dpkg/perl-dpkg.pl
@@ -5,7 +5,7 @@
# Copyright (C) 1994 Matt Welsh <mdw@sunsite.unc.edu>
# Copyright (C) 1994 Carl Streeter <streeter@cae.wisc.edu>
# Copyright (C) 1994 Ian Murdock <imurdock@debian.org>
-# Copyright (C) 1994 Ian Jackson <iwj10@cus.cam.ac.uk>
+# Copyright (C) 1994 Ian Jackson <ian.greenend.org.uk>
#
# dpkg is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
diff --git a/attic/split/mkdeb.sh b/attic/split/mkdeb.sh
index 146dd5362..b2e598264 100644
--- a/attic/split/mkdeb.sh
+++ b/attic/split/mkdeb.sh
@@ -3,7 +3,7 @@
# Its arguments are: <sourcefile> <partsize> <prefix> <totalsize>
# Stdin is also redirected from the source archive by dpkg-split.
-# Copyright (C) 1995 Ian Jackson <ijackson@nyx.cs.du.edu>
+# Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
diff --git a/attic/split/old-mksplit.sh b/attic/split/old-mksplit.sh
index 8743f9446..c2b6e9fb1 100644
--- a/attic/split/old-mksplit.sh
+++ b/attic/split/old-mksplit.sh
@@ -4,7 +4,7 @@
# <sourcefile> <partsize> <prefix> <totalsize> <partsizeallow> <msdostruncyesno>
# Stdin is also redirected from the source archive by dpkg-split.
-# Copyright (C) 1995 Ian Jackson <ijackson@nyx.cs.du.edu>
+# Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
diff --git a/debian/copyright b/debian/copyright
index 4f1abcb35..5f37e406b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ manuals which it installs in /usr/share/doc/dpkg and look at the `hello'
example package.
-Copyright (C) 1994-1999 Ian Jackson <ian@chiark.chu.cam.ac.uk>
+Copyright (C) 1994-1999 Ian Jackson <ian.greenend.org.uk>
Copyright (C) 1999 Richard Kettlewell <rjk@sfere.greenend.org.uk>
Copyright (C) 1999-2002 Wichert Akkerman <wakkerma@debian.org>
Copyright (C) 1999 Ben Collins <bcollins@debian.org>
diff --git a/doc/obsolete/guidelines.texi b/doc/obsolete/guidelines.texi
index f537b81b1..da03b55d5 100644
--- a/doc/obsolete/guidelines.texi
+++ b/doc/obsolete/guidelines.texi
@@ -765,7 +765,7 @@ fields. Most packages will need at least a @code{Depends} field.
@smallexample
Package: smail
Version: 3.1.29.1-13
-Maintainer: Ian Jackson <iwj10@@cus.cam.ac.uk>
+Maintainer: Ian Jackson <ian.greenend.org.uk>
Recommends: pine | mailx | elm | emacs | mail-user-agent
Suggests: metamail
Depends: cron, libc5
@@ -1322,7 +1322,7 @@ Example control file for Smail:
@smallexample
Package: smail
Version: 3.1.29.1-13
-Maintainer: Ian Jackson <iwj10@@cus.cam.ac.uk>
+Maintainer: Ian Jackson <ian.greenend.org.uk>
Recommends: pine | mailx | elm | emacs | mail-user-agent
Suggests: metamail
Depends: cron, libc5
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index ae9193e0d..8931602be 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -2,7 +2,7 @@
* dpkg-deb - construction and deconstruction of *.deb archives
* build.c - building archives
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2000,2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dpkg-deb/dpkg-deb.h b/dpkg-deb/dpkg-deb.h
index 6bb5c11ee..1ba14ac3c 100644
--- a/dpkg-deb/dpkg-deb.h
+++ b/dpkg-deb/dpkg-deb.h
@@ -2,7 +2,7 @@
* dpkg-deb - construction and deconstruction of *.deb archives
* dpkg-deb.h - external definitions for this program
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 6424354f1..9c0ddc2c7 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -2,7 +2,7 @@
* dpkg-deb - construction and deconstruction of *.deb archives
* extract.c - extracting archives
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index b03105818..d0000ed81 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -2,7 +2,7 @@
* dpkg-deb - construction and deconstruction of *.deb archives
* info.c - providing information
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman
*
* This is free software; you can redistribute it and/or modify
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index bceac9920..95450fc50 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -2,7 +2,7 @@
* dpkg-deb - construction and deconstruction of *.deb archives
* main.c - main program
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index 79e5398f9..d7412b0db 100644
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* bcommands.cc - base list keyboard commands display
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2000,2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index c74a45c3c..f81876d93 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* baselist.cc - list of somethings
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/basetop.cc b/dselect/basetop.cc
index 95b14fdea..8e3a39499 100644
--- a/dselect/basetop.cc
+++ b/dselect/basetop.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* bdrawtop.cc - base list class redraw of top
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/bindings.cc b/dselect/bindings.cc
index 4d2549f91..4ea693ee9 100644
--- a/dselect/bindings.cc
+++ b/dselect/bindings.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* bindings.cc - keybinding manager object definitions and default bindings
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/bindings.h b/dselect/bindings.h
index 981cf63ea..bc921e3f3 100644
--- a/dselect/bindings.h
+++ b/dselect/bindings.h
@@ -2,7 +2,7 @@
* dselect - selection of Debian packages
* bindings.h - keybindings class header file
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/curkeys.cc b/dselect/curkeys.cc
index f3d588de7..9a33b83c3 100644
--- a/dselect/curkeys.cc
+++ b/dselect/curkeys.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* curkeys.cc - list of ncurses keys for name <-> key mapping
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/dselect.h b/dselect/dselect.h
index fa092a5cc..0c281f63b 100644
--- a/dselect/dselect.h
+++ b/dselect/dselect.h
@@ -2,7 +2,7 @@
* dselect - selection of Debian packages
* dselect.h - external definitions for this program
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/keyoverride b/dselect/keyoverride
index ab6aa7ea4..fc6224134 100644
--- a/dselect/keyoverride
+++ b/dselect/keyoverride
@@ -1,7 +1,7 @@
# dselect - Debian package maintenance user interface
# keyoverride - override strings for ncurses key names
#
-# Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+# Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
diff --git a/dselect/main.cc b/dselect/main.cc
index 7172a53a5..652f7eaa3 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* main.cc - main program
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2000,2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc
index fb893ffbf..c3f686db7 100644
--- a/dselect/methkeys.cc
+++ b/dselect/methkeys.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* methkeys.cc - method list keybindings
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index 9a61b8d2f..2862d9dda 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* methlist.cc - list of access methods and options
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/method.cc b/dselect/method.cc
index 125351889..133dbc871 100644
--- a/dselect/method.cc
+++ b/dselect/method.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* method.cc - access method handling
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001,2002 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/method.h b/dselect/method.h
index b230af303..978090f5c 100644
--- a/dselect/method.h
+++ b/dselect/method.h
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* method.h - access method handling declarations
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 20001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index affb89eb4..85fc85347 100644
--- a/dselect/methparse.cc
+++ b/dselect/methparse.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* methparse.cc - access method list parsing
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/mkcurkeys.pl b/dselect/mkcurkeys.pl
index 1a34a0d00..3ed75ff52 100755
--- a/dselect/mkcurkeys.pl
+++ b/dselect/mkcurkeys.pl
@@ -3,7 +3,7 @@
# dselect - Debian package maintenance user interface
# mkcurkeys.pl - generate strings mapping key names to ncurses numbers
#
-# Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+# Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index 5558488ab..4945b3d4a 100644
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* pkgcmds.cc - package list keyboard commands
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index c2515c0f7..3c1ce175a 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* pkgdepcon.cc - dependency and conflict resolution
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 99f755750..994e27bff 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* pkgdisplay.cc - package list display
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index eeeb76bd7..761a64b8a 100644
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* pkginfo.cc - handles (re)draw of package list window infopad
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/pkgkeys.cc b/dselect/pkgkeys.cc
index b9da37b97..47caf854c 100644
--- a/dselect/pkgkeys.cc
+++ b/dselect/pkgkeys.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* pkgkeys.cc - package list keybindings
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index 81d3e65a3..7279886a0 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* pkglist.cc - package list administration
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index db17cf601..0c04befc5 100644
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -2,7 +2,7 @@
* dselect - selection of Debian packages
* pkglist.h - external definitions for package list handling
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 41451f34b..f64ff9a57 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* pkgsublist.cc - status modification and recursive package list handling
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index c2eba94ec..1850bb489 100644
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -2,7 +2,7 @@
* dselect - Debian package maintenance user interface
* pkgtop.cc - handles (re)draw of package list windows colheads, list, thisstate
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/include/dpkg-db.h b/include/dpkg-db.h
index cc02ec734..a1d1161e5 100644
--- a/include/dpkg-db.h
+++ b/include/dpkg-db.h
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* dpkg-db.h - declarations for in-core package database management
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2000,2001 Wichert Akkerman
*
* This is free software; you can redistribute it and/or modify
diff --git a/include/dpkg.h.in b/include/dpkg.h.in
index 826a0b2c8..515b62423 100644
--- a/include/dpkg.h.in
+++ b/include/dpkg.h.in
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* dpkg.h - general header for Debian package handling
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2000,2001 Wichert Akkerman <wichert@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/include/myopt.h b/include/myopt.h
index 34ab47241..de54bc29e 100644
--- a/include/myopt.h
+++ b/include/myopt.h
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* myopt.h - declarations for my very own option parsing
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/include/parsedump.h b/include/parsedump.h
index f4179c943..31ac5a259 100644
--- a/include/parsedump.h
+++ b/include/parsedump.h
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* parse.c - declarations for in-core database reading/writing
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman
*
* This is free software; you can redistribute it and/or modify
diff --git a/lib/compat.c b/lib/compat.c
index f92fb7821..80725687b 100644
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* compat.c - compatibility functions
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/database.c b/lib/database.c
index b636b8d76..5e0ab2cc3 100644
--- a/lib/database.c
+++ b/lib/database.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* dpkg-db.h - Low level package database routines (hash tables, etc.)
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index 57aca8223..7c64a7d92 100644
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* dbmodify.c - routines for managing dpkg database updates
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman <wichert@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/lib/dump.c b/lib/dump.c
index 0dae98d6e..79297c394 100644
--- a/lib/dump.c
+++ b/lib/dump.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* dump.c - code to write in-core database to a file
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2001 Wichert Akkerman
*
* This is free software; you can redistribute it and/or modify
diff --git a/lib/ehandle.c b/lib/ehandle.c
index 9d81c851b..9accf0975 100644
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* ehandle.c - error handling
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/fields.c b/lib/fields.c
index 3eaade804..437970c73 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* fields.c - parsing of all the different fields, when reading in
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright 2001 Wichert Akkerman
*
* This is free software; you can redistribute it and/or modify
diff --git a/lib/lock.c b/lib/lock.c
index e21b88a67..987ebd03b 100644
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* lock.c - packages database locking
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/md5.c b/lib/md5.c
index 0ac9d192d..9cee27bd0 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -16,7 +16,7 @@
*
* Changed so as no longer to depend on Colin Plumb's `usual.h' header
* definitions; now uses stuff from dpkg's config.h.
- * - Ian Jackson <ijackson@nyx.cs.du.edu>.
+ * - Ian Jackson <ian.greenend.org.uk>.
* Still in the public domain.
*/
diff --git a/lib/md5.h b/lib/md5.h
index 021766c17..02c625d52 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -16,7 +16,7 @@
*
* Changed so as no longer to depend on Colin Plumb's `usual.h'
* header definitions; now uses stuff from dpkg's config.h
- * - Ian Jackson <ijackson@nyx.cs.du.edu>.
+ * - Ian Jackson <ian.greenend.org.uk>.
* Still in the public domain.
*/
diff --git a/lib/mlib.c b/lib/mlib.c
index b9193ecc3..98421a2f2 100644
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* mlib.c - `must' library: routines will succeed or longjmp
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/myopt.c b/lib/myopt.c
index 14f10e040..7abce5397 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* myopt.c - my very own option parsing
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2000 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/lib/nfmalloc.c b/lib/nfmalloc.c
index af1477238..af208875b 100644
--- a/lib/nfmalloc.c
+++ b/lib/nfmalloc.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* nfmalloc.c - non-freeing malloc, used for in-core database
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/parse.c b/lib/parse.c
index 83f27a4d7..772299ef6 100644
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* parse.c - database file parsing, main package/field loop
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index a504204e5..e5b6413f1 100644
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* parsehelp.c - helpful routines for parsing and writing
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/showcright.c b/lib/showcright.c
index 5b232c0f3..b9ccc9ca1 100644
--- a/lib/showcright.c
+++ b/lib/showcright.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* showcright.c - show copyright file routine
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/varbuf.c b/lib/varbuf.c
index 736db42b2..83104a9eb 100644
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* varbuf.c - variable length expandable buffer handling
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/lib/vercmp.c b/lib/vercmp.c
index b97150f8e..8b0d8dfa3 100644
--- a/lib/vercmp.c
+++ b/lib/vercmp.c
@@ -2,7 +2,7 @@
* libdpkg - Debian packaging suite library routines
* vercmp.c - comparison of version numbers
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/archives.c b/main/archives.c
index 0c154e682..ffe5ad8a5 100644
--- a/main/archives.c
+++ b/main/archives.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* archives.c - actions that process archive files, mainly unpack
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2000 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/main/archives.h b/main/archives.h
index 65f85c2b7..4613c4d93 100644
--- a/main/archives.h
+++ b/main/archives.h
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* archives.h - functions common to archives.c and processarc.c
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/cleanup.c b/main/cleanup.c
index 693f0464f..200ffe930 100644
--- a/main/cleanup.c
+++ b/main/cleanup.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* cleanup.c - cleanup functions, used when we need to unwind
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/configure.c b/main/configure.c
index bac402d93..1272d5749 100644
--- a/main/configure.c
+++ b/main/configure.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* configure.c - configure packages
*
- * Copyright 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright 1999 Wichert Akkerman <wichert@deephackmode.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/main/depcon.c b/main/depcon.c
index 51bcaae91..56b0398eb 100644
--- a/main/depcon.c
+++ b/main/depcon.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* depcon.c - dependency and conflict checking
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/enquiry.c b/main/enquiry.c
index 5d14d1ce4..3b5ffb8df 100644
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* enquiry.c - status enquiry and listing options
*
- * Copyright (C) 1995,1996 Ian Jackson <ijackson@gnu.ai.mit.edu>
+ * Copyright (C) 1995,1996 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/errors.c b/main/errors.c
index c83e7aacf..637ece86e 100644
--- a/main/errors.c
+++ b/main/errors.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* main.c - main program
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/filesdb.c b/main/filesdb.c
index 79f89c263..03e2be9d9 100644
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* filesdb.c - management of database of files installed on system
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 2000,2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/main/filesdb.h b/main/filesdb.h
index 02c76fa52..f006a9a82 100644
--- a/main/filesdb.h
+++ b/main/filesdb.h
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* filesdb.h - management of database of files installed on system
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/help.c b/main/help.c
index 84257599d..bde16a7c0 100644
--- a/main/help.c
+++ b/main/help.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* help.c - various helper routines
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/main.c b/main/main.c
index fb69022bd..110a5d513 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* main.c - main program
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/main.h b/main/main.h
index c0515be24..cef7a28db 100644
--- a/main/main.h
+++ b/main/main.h
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* main.h - external definitions for this program
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/packages.c b/main/packages.c
index c293b3490..885c03e58 100644
--- a/main/packages.c
+++ b/main/packages.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* packages.c - common to actions that process packages
*
- * Copyright (C) 1994,1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1994,1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/processarc.c b/main/processarc.c
index c4c259e76..efd4702ca 100644
--- a/main/processarc.c
+++ b/main/processarc.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* processarc.c - the huge function process_archive
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/query.c b/main/query.c
index 8e8b4513c..b2f576995 100644
--- a/main/query.c
+++ b/main/query.c
@@ -5,7 +5,7 @@
* dpkg - main program for package management
* enquiry.c - status enquiry and listing options
*
- * Copyright (C) 1995,1996 Ian Jackson <ijackson@gnu.ai.mit.edu>
+ * Copyright (C) 1995,1996 Ian Jackson <ian.greenend.org.uk>
* Copyright (C) 200,2001 Wichert Akkerman <wakkerma@debian.org>
*
* This is free software; you can redistribute it and/or modify
diff --git a/main/remove.c b/main/remove.c
index ba2a8863b..7fd1b022b 100644
--- a/main/remove.c
+++ b/main/remove.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* remove.c - functionality for removing packages
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/select.c b/main/select.c
index 4d6a80dab..36725e573 100644
--- a/main/select.c
+++ b/main/select.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* select.c - by-hand (rather than dselect-based) package selection
*
- * Copyright (C) 1995,1996 Ian Jackson <ijackson@gnu.ai.mit.edu>
+ * Copyright (C) 1995,1996 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/main/update.c b/main/update.c
index 797d519ff..25b8b1e97 100644
--- a/main/update.c
+++ b/main/update.c
@@ -2,7 +2,7 @@
* dpkg - main program for package management
* update.c - options which update the `available' database
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/man/en/dpkg.cfg.5.sgml b/man/en/dpkg.cfg.5.sgml
index a938079d2..b719e7d81 100644
--- a/man/en/dpkg.cfg.5.sgml
+++ b/man/en/dpkg.cfg.5.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY % paths SYSTEM "../apt.ent">
+<!ENTITY % paths SYSTEM "paths.ent">
%paths
]>
diff --git a/man/fr/start-stop-daemon.8 b/man/fr/start-stop-daemon.8
index a3acbf5a6..4123dee33 100644
--- a/man/fr/start-stop-daemon.8
+++ b/man/fr/start-stop-daemon.8
@@ -175,7 +175,7 @@ Affiche une aide et se termine.
Affiche le numéro de version et se termine.
.SH AUTEURS
-Ian Jackson <ijackson@gnu.ai.mit.edu>
+Ian Jackson <ian.greenend.org.uk>
Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>
diff --git a/man/ja/start-stop-daemon.8 b/man/ja/start-stop-daemon.8
index 7dbd2c889..15f6e88fa 100644
--- a/man/ja/start-stop-daemon.8
+++ b/man/ja/start-stop-daemon.8
@@ -239,7 +239,7 @@ start\-stop\-daemon \- ¥·¥¹¥Æ¥à¥Ç¡¼¥â¥ó¥×¥í¥°¥é¥à¤Îµ¯Æ°¡¢Ää»ß
.SH Ãø¼Ô
Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>
-¤¬Ian Jackson <ian@chiark.greenend.org.uk>¤Ë¤è¤ë°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤ò
+¤¬Ian Jackson <ian.greenend.org.uk>¤Ë¤è¤ë°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤ò
¸µ¤ËºîÀ®¡£
¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Ï Klee Dienes <klee@mit.edu> ¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿¡£
diff --git a/man/ru/start-stop-daemon.8 b/man/ru/start-stop-daemon.8
index 60c00d0b2..934b9ea6b 100644
--- a/man/ru/start-stop-daemon.8
+++ b/man/ru/start-stop-daemon.8
@@ -233,7 +233,7 @@ start\-stop\-daemon \- ÚÁÐÕÓË É ÏÓÔÁÎÏ×ËÁ ÓÉÓÔÅÍÎÙÈ ÐÒÏÇÒÁÍÍ-ÄÅÍÏÎÏ×
.SH á÷ôïòù
Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, ÏÓÎÏ×Ù×ÁÑÓØ
-ÎÁ ×ÅÒÓÉÉ, ÓÄÅÌÁÎÎÏÊ by Ian Jackson <ian@chiark.greenend.org.uk>.
+ÎÁ ×ÅÒÓÉÉ, ÓÄÅÌÁÎÎÏÊ by Ian Jackson <ian.greenend.org.uk>.
óÔÒÁÎÉÃÁ ÒÕËÏ×ÏÄÓÔ×Á by Klee Dienes <klee@mit.edu>, ÞÁÓÔÉÞÎÏ
ÐÅÒÅÆÏÒÍÁÔÉÒÏ×ÁÎÏ by Ian Jackson.
diff --git a/man/sv/start-stop-daemon.8 b/man/sv/start-stop-daemon.8
index 73fda7f75..24cd80f35 100644
--- a/man/sv/start-stop-daemon.8
+++ b/man/sv/start-stop-daemon.8
@@ -223,7 +223,7 @@ Skriv ut versionsinformation och avsluta sedan.
.SH FÖRFATTARE
Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, baserat på en
-tidigare version av Ian Jackson <ian@chiark.greenend.org.uk>.
+tidigare version av Ian Jackson <ian.greenend.org.uk>.
Manualsida av Klee Dienes <klee@mit.edu>, delvis omformaterad av
Ian Jackson, översatt av Peter Karlsson <peterk@debian.org>.
diff --git a/po/fr.po b/po/fr.po
index aa9b003d4..68727e62d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
# Dpkg --- the Debian GNU/Linux package maintenance system.
#
-# Copyright (C) 1994,1995,1996 Ian Jackson <ian@chiark.chu.cam.ac.uk>
+# Copyright (C) 1994,1995,1996 Ian Jackson <ian.greenend.org.uk>
# Copyright (C) 1995,1996 Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
# Copyright (C) 1996 Miquel van Smoorenburg <miquels@cistron.nl>
# Copyright (C) 1996 Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
diff --git a/po/ja.po b/po/ja.po
index 4fa39a735..4595abd06 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
# Dpkg --- the Debian GNU/Linux package maintenance system.
#
-# Copyright (C) 1994,1995,1996 Ian Jackson <ian@chiark.chu.cam.ac.uk>
+# Copyright (C) 1994,1995,1996 Ian Jackson <ian.greenend.org.uk>
# Copyright (C) 1995,1996 Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
# Copyright (C) 1996 Miquel van Smoorenburg <miquels@cistron.nl>
# Copyright (C) 1996 Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
diff --git a/split/dpkg-split.h b/split/dpkg-split.h
index 1219052fc..12f21be57 100644
--- a/split/dpkg-split.h
+++ b/split/dpkg-split.h
@@ -2,7 +2,7 @@
* dpkg-split - splitting and joining of multipart *.deb archives
* dpkg-split.h - external definitions for this program
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/split/info.c b/split/info.c
index 2cc7a769a..49a029f80 100644
--- a/split/info.c
+++ b/split/info.c
@@ -2,7 +2,7 @@
* dpkg-split - splitting and joining of multipart *.deb archives
* info.c - information about split archives
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/split/join.c b/split/join.c
index a3865b615..350eb24d6 100644
--- a/split/join.c
+++ b/split/join.c
@@ -2,7 +2,7 @@
* dpkg-split - splitting and joining of multipart *.deb archives
* join.c - joining
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/split/main.c b/split/main.c
index 85e52644b..39f1c859c 100644
--- a/split/main.c
+++ b/split/main.c
@@ -2,7 +2,7 @@
* dpkg-split - splitting and joining of multipart *.deb archives
* main.c - main program
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/split/mksplit.pl b/split/mksplit.pl
index 697d8fdbf..9d887a8d6 100644
--- a/split/mksplit.pl
+++ b/split/mksplit.pl
@@ -4,7 +4,7 @@
# <sourcefile> <partsize> <prefix> <totalsize> <partsizeallow> <msdostruncyesno>
# Stdin is also redirected from the source archive by dpkg-split.
-# Copyright (C) 1995 Ian Jackson <ijackson@nyx.cs.du.edu>
+# Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
#
# This is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as
diff --git a/split/queue.c b/split/queue.c
index 8cfc084fd..3dfc7019a 100644
--- a/split/queue.c
+++ b/split/queue.c
@@ -2,7 +2,7 @@
* dpkg-split - splitting and joining of multipart *.deb archives
* queue.c - queue management
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/split/split.c b/split/split.c
index de68db5bc..049de0a96 100644
--- a/split/split.c
+++ b/split/split.c
@@ -2,7 +2,7 @@
* dpkg-split - splitting and joining of multipart *.deb archives
* split.c - splitting archives
*
- * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
+ * Copyright (C) 1995 Ian Jackson <ian.greenend.org.uk>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
diff --git a/utils/start-stop-daemon.8 b/utils/start-stop-daemon.8
index fbc07e123..875d649ab 100644
--- a/utils/start-stop-daemon.8
+++ b/utils/start-stop-daemon.8
@@ -226,7 +226,7 @@ Print version information; then exit.
.SH AUTHORS
Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> based on
-a previous version by Ian Jackson <ian@chiark.greenend.org.uk>.
+a previous version by Ian Jackson <ian.greenend.org.uk>.
Manual page by Klee Dienes <klee@mit.edu>, partially reformatted
by Ian Jackson.