Use my samba.org email address.

diff --git a/Makefile b/Makefile
index 5391e67e8bd67a9c8ec17acf6c8d96f3e08da147..d67a5bc9eb2fdfe650a97b87212cffbac97b8d27 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,7 @@
+# Makefile for ctrlproxy
+# Copyright (C) 2002-2008 Jelmer Vernooij <jelmer@samba.org>
+# NOTE: This file is *NOT* autogenerated.
+
 -include Makefile.settings
 
 GCOV = gcov

diff --git a/configure.ac b/configure.ac
index 84900dd6146fef1ad1c05ba5fabe342dda68d582..9064f3a510b720e57f9e6c777e135f7f5e60075b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(ctrlproxy, 3.0.6, [jelmer@vernstok.nl])
+AC_INIT(ctrlproxy, 3.0.6, [jelmer@samba.org])
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE", [ Package name])

diff --git a/ctrlproxy.spec b/ctrlproxy.spec
index 95ed3343635ea2e1839caea205897f225f6dc047..18c29408aaa5a1474d48b2f85630c14567d105c0 100644 (file)
--- a/ctrlproxy.spec
+++ b/ctrlproxy.spec
@@ -6,7 +6,7 @@ License: GPL
 Group: Applications/Internet
 Source: http://www.ctrlproxy.org/releases/ctrlproxy-%{version}.tar.gz
 Url: http://www.ctrlproxy.org/
-Packager: Jelmer Vernooij <jelmer@vernstok.nl>
+Packager: Jelmer Vernooij <jelmer@samba.org>
 BuildRoot: /var/tmp/%{name}-buildroot
 
 %description

diff --git a/daemon/main.c b/daemon/main.c
index cb01465538f7d87ba9371fcadd6beaf8b7174928..2f3f27664812be340602cd90003a6093f3f882af 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -110,7 +110,7 @@ void signal_crash(int sig)
        }
 
 #endif
-       syslog(LOG_ALERT, "Please send a bug report to jelmer@vernstok.nl.");
+       syslog(LOG_ALERT, "Please send a bug report to jelmer@samba.org.");
        syslog(LOG_ALERT, "A gdb backtrace is appreciated if you can reproduce this bug.");
        abort();
 }

diff --git a/doc/user-guide.xml b/doc/user-guide.xml
index cb7d34d0a9d417079c054281ca840dd7a51c1702..e4438f333113470812418162f3370a65c0ac92bf 100644 (file)
--- a/doc/user-guide.xml
+++ b/doc/user-guide.xml
@@ -8,7 +8,7 @@
        <author>
                <firstname>Jelmer</firstname><surname>Vernooij</surname>
                <affiliation>
-                       <address><email>jelmer@vernstok.nl</email></address>
+                       <address><email>jelmer@samba.org</email></address>
                </affiliation>
        </author>
 
@@ -16,8 +16,6 @@
        <para>This document is still a work-in-progress. We're doing our best to 
                keep it up-to-date and understandable, but please don't hesitate to 
                contact us if you have comments or questions.</para>
-
-               <para>All comments, questions and updates are welcome at <ulink url="mailto:jelmer@vernstok.nl">jelmer@vernstok.nl</ulink>.</para>
        </abstract>
 </bookinfo>
 

diff --git a/lib/client.c b/lib/client.c
index dd8b3297f1e289c5cd8477d775d008405766e39a..870b61b98dea519e7aecb06a3a66adfc0ab00f50 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -372,7 +372,7 @@ static gboolean welcome_client(struct irc_client *client)
        client_send_response(client, RPL_YOURHOST, tmp, NULL); 
        g_free(tmp);
        client_send_response(client, RPL_CREATED, 
-               "Ctrlproxy (c) 2002-2008 Jelmer Vernooij <jelmer@vernstok.nl>", NULL);
+               "Ctrlproxy (c) 2002-2008 Jelmer Vernooij <jelmer@samba.org>", NULL);
        client_send_response(client, RPL_MYINFO, 
                 client->network->info->name, 
                 ctrlproxy_version(), 

diff --git a/motd b/motd
index 5ad3395294dead00d15eb6bb69d1810a489b67cf..a62113cc4fe666de1a49129c19b907d8e8a848ae 100644 (file)
--- a/motd
+++ b/motd
@@ -3,7 +3,7 @@
 - This is a placeholder motd.
 - 
 - This is a proxy IRC server running ctrlproxy. 
-- (C) 2002-2008 by Jelmer Vernooij <jelmer@vernstok.nl> and others.
+- (C) 2002-2008 by Jelmer Vernooij <jelmer@samba.org> and others.
 - For a list of contributions, see AUTHORS.
 - More information is available at http://www.ctrlproxy.org/
 - 

diff --git a/scripts/irssilog-to-raw b/scripts/irssilog-to-raw
index dd7c8a0aab88f480bcaba883e7b4ab202efa0fee..9b875c3cc8a02944be3c59354e23f5bf02c7887b 100755 (executable)
--- a/scripts/irssilog-to-raw
+++ b/scripts/irssilog-to-raw
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Simple irssi-log to raw-irc converter
-# (C) 2004 Jelmer Vernooij <jelmer@vernstok.nl>
+# (C) 2004 Jelmer Vernooij <jelmer@samba.org>
 # Published under the GPLv3 or later
 
 $target = shift or die("No channel/nick name specified");

diff --git a/src/main.c b/src/main.c
index b156297c9de03386d4e6888c4d7d9d99501d78ac..53c59c3bd3829a2e0753a8985b0ce0e4968417bc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -81,7 +81,7 @@ static void signal_crash(int sig)
        }
 
 #endif
-       log_global(LOG_ERROR, "Please send a bug report to jelmer@vernstok.nl.");
+       log_global(LOG_ERROR, "Please send a bug report to jelmer@samba.org.");
        log_global(LOG_ERROR, "A gdb backtrace is appreciated if you can reproduce this bug.");
        abort();
 }

diff --git a/testsuite/ctrlproxyrc.torture.in b/testsuite/ctrlproxyrc.torture.in
index 00d3b240288ed077fb22e77ada5b02762d729096..d92529a4a69a0747e4b3b9ca6171c8f03498f3f6 100644 (file)
--- a/testsuite/ctrlproxyrc.torture.in
+++ b/testsuite/ctrlproxyrc.torture.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
        TestRC file for ctrlproxy
-       (C) 2003-2004 Jelmer Vernooij <jelmer@vernstok.nl>
+       (C) 2003-2004 Jelmer Vernooij <jelmer@samba.org>
        Read the documentation for more information about certain plugins, 
        elements or attributes.
 -->