30 files changed, 31 insertions, 31 deletions
diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index c3cd55c09..44ce64def 100644
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -2,7 +2,7 @@
  * dselect - Debian package maintenance user interface
  * basecmds.cc - base list keyboard commands display
  *
- * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 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 0536c891b..25599758b 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 © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2001 Wichert Akkerman <wakkerma@debian.org>
  * Copyright © 2007-2013 Guillem Jover <guillem@debian.org>
  *
diff --git a/dselect/basetop.cc b/dselect/basetop.cc
index bd03c2b98..7176fc145 100644
--- a/dselect/basetop.cc
+++ b/dselect/basetop.cc
@@ -2,7 +2,7 @@
  * dselect - Debian package maintenance user interface
  * basetop.cc - base list class redraw of top
  *
- * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/bindings.cc b/dselect/bindings.cc
index fa454b85c..fe65c451b 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/bindings.h b/dselect/bindings.h
index 3cac14612..47ef83845 100644
--- a/dselect/bindings.h
+++ b/dselect/bindings.h
@@ -2,7 +2,7 @@
  * dselect - Debian package maintenance user interface
  * bindings.h - keybindings class header file
  *
- * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/curkeys.cc b/dselect/curkeys.cc
index f8b650ea4..fd9a599dc 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/dselect.h b/dselect/dselect.h
index 50cf8eefd..2c6b4b36e 100644
--- a/dselect/dselect.h
+++ b/dselect/dselect.h
@@ -2,7 +2,7 @@
  * dselect - Debian package maintenance user interface
  * dselect.h - external definitions for this program
  *
- * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2001 Wichert Akkerman <wakkerma@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
diff --git a/dselect/helpmsgs.cc b/dselect/helpmsgs.cc
index 840edcc2b..d1641dd11 100644
--- a/dselect/helpmsgs.cc
+++ b/dselect/helpmsgs.cc
@@ -2,7 +2,7 @@
  * dselect - Debian package maintenance user interface
  * helpmsgs.cc - list of help messages
  *
- * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/helpmsgs.h b/dselect/helpmsgs.h
index 93e416348..7872ac67b 100644
--- a/dselect/helpmsgs.h
+++ b/dselect/helpmsgs.h
@@ -2,7 +2,7 @@
  * dselect - Debian package maintenance user interface
  * helpmsgs.h - external definitions for the list of help messages
  *
- * Copyright © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/keyoverride b/dselect/keyoverride
index 6e7253daa..35967ffec 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+# Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/main.cc b/dselect/main.cc
index ad2cb9c5a..163b38839 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -2,7 +2,7 @@
  * dselect - Debian package maintenance user interface
  * main.cc - main program
  *
- * Copyright © 1994-1996 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994-1996 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2000,2001 Wichert Akkerman <wakkerma@debian.org>
  * Copyright © 2006-2015 Guillem Jover <guillem@debian.org>
  *
diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc
index dbea8149e..19902d8e8 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index b9fe3cc29..2eed98484 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 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 38bf096e3..cdafd12f1 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 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 838f50f6c..ac6c2cb6f 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2001 Wichert Akkerman <wakkerma@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install
index d494be449..990ef118d 100755
--- a/dselect/methods/multicd/install
+++ b/dselect/methods/multicd/install
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright © 1995-1998 Ian Jackson <ian@chiark.greenend.org.uk>
+# Copyright © 1995-1998 Ian Jackson <ijackson@chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko@lotte.sax.de>
 #
 # This is free software; you can redistribute it and/or modify
diff --git a/dselect/methods/multicd/setup b/dselect/methods/multicd/setup
index 860720607..c166a5f63 100755
--- a/dselect/methods/multicd/setup
+++ b/dselect/methods/multicd/setup
@@ -2,12 +2,12 @@
 #
 # The ‘multicd’ package was initially written by Heiko Schlittermann
 # <heiko@lotte.sax.de> based on builtin access methods written by Ian
-# Jackson <ian@chiark.greenend.org.uk>.  The final packaging as well as
+# Jackson <ijackson@chiark.greenend.org.uk>.  The final packaging as well as
 # cleanups were made by Martin Schulze <joey@infodrom.north.de> who also
 # put this package together for the slink release (Debian GNU/Linux
 # 2.1).
 
-# Copyright © 1995-1998 Ian Jackson <ian@chiark.greenend.org.uk>
+# Copyright © 1995-1998 Ian Jackson <ijackson@chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko@lotte.sax.de>
 #
 # This is free software; you can redistribute it and/or modify
diff --git a/dselect/methods/multicd/update b/dselect/methods/multicd/update
index 47368ba25..90e71fd74 100755
--- a/dselect/methods/multicd/update
+++ b/dselect/methods/multicd/update
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright © 1995-1998 Ian Jackson <ian@chiark.greenend.org.uk>
+# Copyright © 1995-1998 Ian Jackson <ijackson@chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko@lotte.sax.de>
 #
 # This is free software; you can redistribute it and/or modify
diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index 0780c9e8f..131e79fbf 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2008-2011, 2013-2015 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
diff --git a/dselect/mkcurkeys.pl b/dselect/mkcurkeys.pl
index 342d4919b..603e90135 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+# Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index c0a1c736e..340c60a06 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 © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 95f96e5cc..e3d2dc4bb 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index ad8c4ba4b..2396a85bf 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 © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2006, 2008-2015 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index 8e80dfb4b..70d9f8a98 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/pkgkeys.cc b/dselect/pkgkeys.cc
index 36eec2be7..ddf4987fb 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.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 published by
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index f6be1873a..823e754a8 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2001 Wichert Akkerman <wakkerma@debian.org>
  * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
  *
diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index 4be10fcfa..1c39f04b4 100644
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -2,7 +2,7 @@
  * dselect - Debian package maintenance user interface
  * pkglist.h - external definitions for package list handling
  *
- * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2001 Wichert Akkerman <wakkerma@debian.org>
  * Copyright © 2007-2014 Guillem Jover <guillem@debian.org>
  *
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 09e7da1bd..4e9bac5bb 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 © 1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2007-2014 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index a940eaa5c..39893f5c6 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 © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2007-2014 Guillem Jover <guillem@debian.org>
  *
  * This is free software; you can redistribute it and/or modify
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index 0dd052cfa..db517b670 100644
--- a/dselect/po/ja.po
+++ b/dselect/po/ja.po
@@ -1,6 +1,6 @@
 # Dpkg --- the Debian GNU/Linux package maintenance system.
 #
-# Copyright (C) 1994,1995,1996 Ian Jackson <ian@chiark.greenend.org.uk>
+# Copyright (C) 1994,1995,1996 Ian Jackson <ijackson@chiark.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>