From 5aff007d8fcfb4c6cc3c3627ae15f45562db7a0d Mon Sep 17 00:00:00 2001 Message-Id: <5aff007d8fcfb4c6cc3c3627ae15f45562db7a0d.1713438391.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 29 Mar 2008 17:17:48 +0000 Subject: [PATCH] DisOrder 3.0 Organization: Straylight/Edgeware From: Richard Kettlewell --- BUGS | 7 +++++++ CHANGES | 4 +++- README.upgrades | 2 +- acinclude.m4 | 2 +- clients/Makefile.am | 2 +- clients/authorize.c | 2 +- clients/authorize.h | 2 +- clients/disorder.c | 2 +- clients/disorderfm.c | 2 +- clients/playrtp.c | 2 +- configure.ac | 6 +++--- debian/Makefile.am | 2 +- debian/README.Debian | 36 ++++-------------------------------- debian/changelog | 12 +++--------- debian/etc.disorder.config | 4 ++-- debian/htaccess | 4 ---- disobedience/client.c | 2 +- disobedience/disobedience.c | 2 +- disobedience/help.c | 2 +- disobedience/misc.c | 2 +- disobedience/settings.c | 2 +- doc/Makefile.am | 2 +- doc/disobedience.1.in | 2 +- doc/disorder-dbupgrade.8.in | 2 +- doc/disorder-deadlock.8.in | 2 +- doc/disorder-decode.8.in | 2 +- doc/disorder-dump.8.in | 2 +- doc/disorder-normalize.8 | 2 +- doc/disorder-playrtp.1.in | 2 +- doc/disorder-rescan.8.in | 2 +- doc/disorder-speaker.8 | 2 +- doc/disorder-stats.8.in | 2 +- doc/disorder.1.in | 2 +- doc/disorder.3 | 2 +- doc/disorderd.8.in | 2 +- doc/disorderfm.1.in | 2 +- driver/Makefile.am | 2 +- examples/Makefile.am | 2 +- examples/config.sample.in | 4 ++-- images/Makefile.am | 2 +- lib/addr.c | 2 +- lib/asprintf.c | 2 +- lib/base64.c | 2 +- lib/basen.c | 2 +- lib/basen.h | 2 +- lib/cache.c | 2 +- lib/cache.h | 2 +- lib/charset.c | 2 +- lib/charset.h | 2 +- lib/client-common.h | 2 +- lib/client.c | 2 +- lib/client.h | 2 +- lib/cookies.c | 2 +- lib/defs.c | 2 +- lib/defs.h | 2 +- lib/disorder.h | 2 +- lib/eclient.c | 2 +- lib/eventlog.c | 2 +- lib/eventlog.h | 2 +- lib/fprintf.c | 2 +- lib/hash.c | 2 +- lib/hash.h | 2 +- lib/heap.h | 2 +- lib/hex.c | 2 +- lib/hex.h | 2 +- lib/ifreq.c | 2 +- lib/ifreq.h | 2 +- lib/inputline.c | 2 +- lib/inputline.h | 2 +- lib/kvp.c | 2 +- lib/kvp.h | 2 +- lib/log-impl.h | 2 +- lib/log.c | 2 +- lib/log.h | 2 +- lib/logfd.h | 2 +- lib/mem-impl.h | 2 +- lib/mem.h | 2 +- lib/mime.h | 2 +- lib/mixer-alsa.c | 2 +- lib/plugin.c | 2 +- lib/plugin.h | 2 +- lib/printf.h | 2 +- lib/queue.c | 2 +- lib/queue.h | 2 +- lib/regsub.c | 2 +- lib/regsub.h | 2 +- lib/sendmail.c | 2 +- lib/sendmail.h | 2 +- lib/signame.c | 2 +- lib/signame.h | 2 +- lib/sink.c | 2 +- lib/sink.h | 2 +- lib/snprintf.c | 2 +- lib/speaker-protocol.h | 2 +- lib/split.c | 2 +- lib/split.h | 19 +++++++++++++++++++ lib/syscalls.c | 2 +- lib/syscalls.h | 2 +- lib/table.c | 2 +- lib/table.h | 2 +- lib/trackdb.h | 2 +- lib/trackname.h | 2 +- lib/types.h | 2 +- lib/url.c | 2 +- lib/user.h | 2 +- lib/vacopy.h | 2 +- lib/vector.c | 2 +- lib/vector.h | 2 +- lib/wstat.c | 2 +- lib/wstat.h | 2 +- plugins/Makefile.am | 2 +- plugins/exec.c | 2 +- plugins/fs.c | 2 +- plugins/madshim.h | 2 +- plugins/notify.c | 2 +- plugins/shell.c | 2 +- prepare | 2 +- python/Makefile.am | 2 +- scripts/completion.bash | 2 +- scripts/dist | 2 +- scripts/htmlman | 2 +- scripts/inst | 2 +- scripts/sedfiles.make | 2 +- scripts/text2c | 19 +++++++++++++++++++ server/api-client.c | 2 +- server/api-client.h | 2 +- server/api-server.c | 2 +- server/api.c | 2 +- server/cgi.c | 2 +- server/cgi.h | 2 +- server/daemonize.c | 2 +- server/daemonize.h | 2 +- server/dbupgrade.c | 2 +- server/dcgi.h | 2 +- server/deadlock.c | 2 +- server/decode.c | 2 +- server/disorderd.c | 2 +- server/dump.c | 2 +- server/normalize.c | 2 +- server/play.c | 2 +- server/play.h | 2 +- server/server.h | 2 +- server/speaker-network.c | 2 +- server/speaker.c | 2 +- server/speaker.h | 2 +- server/state.c | 2 +- server/state.h | 2 +- server/stats.c | 2 +- server/trackname.c | 2 +- sounds/Makefile.am | 2 +- templates/Makefile.am | 2 +- templates/about.html | 2 +- templates/credits.html | 2 +- templates/login.html | 2 +- templates/prefs.html | 2 +- templates/search.html | 2 +- templates/topbar.html | 2 +- tests/Makefile.am | 2 +- tests/queue.py | 2 +- 159 files changed, 211 insertions(+), 202 deletions(-) delete mode 100644 debian/htaccess diff --git a/BUGS b/BUGS index 69ed096..fdba82e 100644 --- a/BUGS +++ b/BUGS @@ -1,3 +1,7 @@ +* Bug Tracking System + +http://code.google.com/p/disorder/issues/list + * Compilation Bugs The configure script make pointless checks for C++ and Fortran compilers. This @@ -35,6 +39,9 @@ Solution: Use snd-via82xx driver instead (from ALSA). ALSA drivers can be found in Linux 2.6.x; for 2.4.x they must be built separately. +I would that some instances of this chipset appear to work incredibly badly +even with ALSA. + Local Variables: mode:outline fill-column:79 diff --git a/CHANGES b/CHANGES index 6da548b..2e98627 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ -* Changes up to version 2.1 +* Changes up to version 3.0 + +Important! See README.upgrades when upgrading. ** Platforms And Installation diff --git a/README.upgrades b/README.upgrades index 13a435b..d1c4024 100644 --- a/README.upgrades +++ b/README.upgrades @@ -17,7 +17,7 @@ all 1.1.x versions. If you install from .deb files then much of this work is automated. -* 2.0 -> 2.1 +* 2.0 -> 3.0 ** Authentication diff --git a/acinclude.m4 b/acinclude.m4 index 96670f7..9a11b7a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,5 +1,5 @@ # This file is part of DisOrder. -# Copyright (C) 2004, 2005 Richard Kettlewell +# Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell # # This program 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/clients/Makefile.am b/clients/Makefile.am index b9b3640..58316b4 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2006, 2007 Richard Kettlewell +# Copyright (C) 2006-2008 Richard Kettlewell # # This program 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/clients/authorize.c b/clients/authorize.c index fb88c68..1a0717e 100644 --- a/clients/authorize.c +++ b/clients/authorize.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2007 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/clients/authorize.h b/clients/authorize.h index 5734fa5..5fb9731 100644 --- a/clients/authorize.h +++ b/clients/authorize.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/clients/disorder.c b/clients/disorder.c index caeac18..fa42558 100644 --- a/clients/disorder.c +++ b/clients/disorder.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/clients/disorderfm.c b/clients/disorderfm.c index a55cc44..b834be6 100644 --- a/clients/disorderfm.c +++ b/clients/disorderfm.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2006 Richard Kettlewell + * Copyright (C) 2006, 2007, 2008 Richard Kettlewell * * This program 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/clients/playrtp.c b/clients/playrtp.c index b79e14d..31416ec 100644 --- a/clients/playrtp.c +++ b/clients/playrtp.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/configure.ac b/configure.ac index 2607d91..091f96a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. # # This file is part of DisOrder. -# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell +# Copyright (C) 2004-2008 Richard Kettlewell # Portions copyright (C) 2007 Ross Younger # # This program is free software; you can redistribute it and/or modify @@ -20,9 +20,9 @@ # USA # -AC_INIT([disorder], [2.0+], [richard+disorder@sfere.greenend.org.uk]) +AC_INIT([disorder], [3.0], [richard+disorder@sfere.greenend.org.uk]) AC_CONFIG_AUX_DIR([config.aux]) -AM_INIT_AUTOMAKE(disorder, [2.0+]) +AM_INIT_AUTOMAKE(disorder, [3.0]) AC_CONFIG_SRCDIR([server/disorderd.c]) AM_CONFIG_HEADER([config.h]) diff --git a/debian/Makefile.am b/debian/Makefile.am index 6296b24..8896a55 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -22,7 +22,7 @@ noinst_SCRIPTS=rules EXTRA_DIST=README.Debian config.disorder-server control \ copyright README.RTP \ - etc.disorder.options.user etc.disorder.config htaccess \ + etc.disorder.options.user etc.disorder.config \ postinst.disorder-server prerm.disorder-server \ postrm.disorder-server \ templates.disorder-server conffiles.disorder-server \ diff --git a/debian/README.Debian b/debian/README.Debian index 1ad7c28..a670319 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,36 +1,8 @@ Debian package for DisOrder =========================== -To get the web interface working: +The web interface should now start working automatically. Test it at +http://YOURHOSTNAME/cgi-bin/disorder/disorder If it doesn't work, +always look at the web server error log. -1) Make sure you /etc/apache/access.conf allows AuthConfig for - /usr/lib/cgi-bin. For instance: - - - AllowOverride AuthConfig - Options ExecCGI FollowSymLinks - - -2) If you want to use digest authentication, make sure your Apache has - mod_auth_digest enabled and edit - /usr/lib/cgi-bin/disorder/.htaccess accordingly (it has been made a - conffile). - -3) Remember to reload apache if you've changed anything. - -4) Add users to /etc/disorder/http.users. For instance: - - # htpasswd -b /etc/disorder/http.users USERNAME PASSWORD - - Or with digest authentication: - - # htdigest /etc/disorder/http.users USER - Adding password for USER in realm jukebox. - New password: - Re-type new password: - -5) Test it at http://YOURHOSTNAME/cgi-bin/disorder/disorder - - If it doesn't work, always look at the web server error log. - - -- Richard Kettlewell , Tue Jan 23 21:35:13 2007 + -- Richard Kettlewell , Sat, 29 Mar 2008 16:20:20 +0000 diff --git a/debian/changelog b/debian/changelog index 81c5f04..f669591 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,8 @@ -disorder (2.0.99) unstable; urgency=low +disorder (3.0) unstable; urgency=low - * Intermediate version number - - -- Richard Kettlewell Sat, 19 Jan 2008 14:55:51 +0000 - -disorder (2.0+) unstable; urgency=low - - * Intermediate version number + * DisOrder 3.0 - -- Richard Kettlewell Sun, 30 Dec 2007 11:25:08 +0000 + -- Richard Kettlewell Sat, 29 Mar 2008 15:45:11 +0000 disorder (2.0) unstable; urgency=low diff --git a/debian/etc.disorder.config b/debian/etc.disorder.config index f7b4991..8af055b 100644 --- a/debian/etc.disorder.config +++ b/debian/etc.disorder.config @@ -10,8 +10,8 @@ # # This line just ensures that the pre-existing root user gets admin -# rights and can be removed after upgrade to 2.1 or later, or if the -# initial install is of 2.1 or later. +# rights and can be removed after upgrade to 3.0 or later, or if the +# initial install is of 3.0 or later. trust root # Run as user jukebox. diff --git a/debian/htaccess b/debian/htaccess deleted file mode 100644 index ecc70f8..0000000 --- a/debian/htaccess +++ /dev/null @@ -1,4 +0,0 @@ -Require valid-user -AuthType basic -AuthName jukebox -AuthUserFile /etc/disorder/http.users diff --git a/disobedience/client.c b/disobedience/client.c index 35c1ce7..283ce8a 100644 --- a/disobedience/client.c +++ b/disobedience/client.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2006, 2007 Richard Kettlewell + * Copyright (C) 2006, 2007, 2008 Richard Kettlewell * * This program 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/disobedience/disobedience.c b/disobedience/disobedience.c index 42eb190..2cab9aa 100644 --- a/disobedience/disobedience.c +++ b/disobedience/disobedience.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2006, 2007 Richard Kettlewell + * Copyright (C) 2006, 2007, 2008 Richard Kettlewell * * This program 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/disobedience/help.c b/disobedience/help.c index 55309f0..f1822b9 100644 --- a/disobedience/help.c +++ b/disobedience/help.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/disobedience/misc.c b/disobedience/misc.c index b1558d3..db1f6ab 100644 --- a/disobedience/misc.c +++ b/disobedience/misc.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2006 Richard Kettlewell + * Copyright (C) 2006, 2007 Richard Kettlewell * * This program 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/disobedience/settings.c b/disobedience/settings.c index 3450085..ae8990e 100644 --- a/disobedience/settings.c +++ b/disobedience/settings.c @@ -1,6 +1,6 @@ /* * This file is part of Disobedience - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/doc/Makefile.am b/doc/Makefile.am index 9316298..0e79171 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell +# Copyright (C) 2004-2008 Richard Kettlewell # # This program 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/doc/disobedience.1.in b/doc/disobedience.1.in index e82ea3b..2c7ee78 100644 --- a/doc/disobedience.1.in +++ b/doc/disobedience.1.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell +.\" Copyright (C) 2004-2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-dbupgrade.8.in b/doc/disorder-dbupgrade.8.in index 5824cc8..966d88d 100644 --- a/doc/disorder-dbupgrade.8.in +++ b/doc/disorder-dbupgrade.8.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2007 Richard Kettlewell +.\" Copyright (C) 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-deadlock.8.in b/doc/disorder-deadlock.8.in index 175b570..249758d 100644 --- a/doc/disorder-deadlock.8.in +++ b/doc/disorder-deadlock.8.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2005 Richard Kettlewell +.\" Copyright (C) 2005, 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-decode.8.in b/doc/disorder-decode.8.in index 57c2a6d..47884cc 100644 --- a/doc/disorder-decode.8.in +++ b/doc/disorder-decode.8.in @@ -1,6 +1,6 @@ .\" -*-nroff-*- .\" -.\" Copyright (C) 2007 Richard Kettlewell +.\" Copyright (C) 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-dump.8.in b/doc/disorder-dump.8.in index 9d5f387..d6c6ba5 100644 --- a/doc/disorder-dump.8.in +++ b/doc/disorder-dump.8.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004, 2005 Richard Kettlewell +.\" Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-normalize.8 b/doc/disorder-normalize.8 index b68619d..df9f2fe 100644 --- a/doc/disorder-normalize.8 +++ b/doc/disorder-normalize.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2007 Richard Kettlewell +.\" Copyright (C) 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-playrtp.1.in b/doc/disorder-playrtp.1.in index 7b4e1d1..c187de4 100644 --- a/doc/disorder-playrtp.1.in +++ b/doc/disorder-playrtp.1.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2007 Richard Kettlewell +.\" Copyright (C) 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-rescan.8.in b/doc/disorder-rescan.8.in index 63ed7d7..7f67b23 100644 --- a/doc/disorder-rescan.8.in +++ b/doc/disorder-rescan.8.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2005 Richard Kettlewell +.\" Copyright (C) 2005, 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-speaker.8 b/doc/disorder-speaker.8 index 6b1d0bb..0517f6d 100644 --- a/doc/disorder-speaker.8 +++ b/doc/disorder-speaker.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2007 Richard Kettlewell +.\" Copyright (C) 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder-stats.8.in b/doc/disorder-stats.8.in index 8dffb71..af1958d 100644 --- a/doc/disorder-stats.8.in +++ b/doc/disorder-stats.8.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2007 Richard Kettlewell +.\" Copyright (C) 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorder.1.in b/doc/disorder.1.in index d77a62b..a056d63 100644 --- a/doc/disorder.1.in +++ b/doc/disorder.1.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell +.\" Copyright (C) 2004-2008 Richard Kettlewell .\" .\" This program 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/doc/disorder.3 b/doc/disorder.3 index d425770..f3bbe91 100644 --- a/doc/disorder.3 +++ b/doc/disorder.3 @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004, 2005, 2006 Richard Kettlewell +.\" Copyright (C) 2004-2008 Richard Kettlewell .\" .\" This program 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/doc/disorderd.8.in b/doc/disorderd.8.in index 73bfba4..ed488e9 100644 --- a/doc/disorderd.8.in +++ b/doc/disorderd.8.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2004, 2005, 2007 Richard Kettlewell +.\" Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell .\" .\" This program 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/doc/disorderfm.1.in b/doc/disorderfm.1.in index 8727d1e..822a366 100644 --- a/doc/disorderfm.1.in +++ b/doc/disorderfm.1.in @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2006 Richard Kettlewell +.\" Copyright (C) 2006-2008 Richard Kettlewell .\" .\" This program 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/driver/Makefile.am b/driver/Makefile.am index 7ccc4bf..7485b83 100644 --- a/driver/Makefile.am +++ b/driver/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder -# Copyright (C) 2005 Richard Kettlewell +# Copyright (C) 2005, 2007, 2008 Richard Kettlewell # # This program 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/examples/Makefile.am b/examples/Makefile.am index c33b554..8c671af 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2004, 2005, 2008 Richard Kettlewell +# Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell # # This program 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/examples/config.sample.in b/examples/config.sample.in index 3dc1cee..4e6c629 100644 --- a/examples/config.sample.in +++ b/examples/config.sample.in @@ -11,8 +11,8 @@ scratch pkgdatadir/slap.ogg scratch pkgdatadir/scratch.ogg # This line just ensures that the pre-existing root user gets admin -# rights and can be removed after upgrade to 2.1 or later, or if the -# initial install is of 2.1 or later. +# rights and can be removed after upgrade to 3.0 or later, or if the +# initial install is of 3.0 or later. trust root # Run as user jukebox. This must exist in /etc/passwd! diff --git a/images/Makefile.am b/images/Makefile.am index 2019fb4..1feb7e4 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2005, 2006, 2007 Richard Kettlewell +# Copyright (C) 2005-2008 Richard Kettlewell # # This program 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/lib/addr.c b/lib/addr.c index ec245c6..dd12a07 100644 --- a/lib/addr.c +++ b/lib/addr.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2007 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/asprintf.c b/lib/asprintf.c index 304304a..f3bebd5 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/base64.c b/lib/base64.c index d4ba61f..7909b4f 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2007 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/basen.c b/lib/basen.c index 7b66725..74cb836 100644 --- a/lib/basen.c +++ b/lib/basen.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/basen.h b/lib/basen.h index 72a7f80..4a3cdad 100644 --- a/lib/basen.h +++ b/lib/basen.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/cache.c b/lib/cache.c index faca540..60c2600 100644 --- a/lib/cache.c +++ b/lib/cache.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2006 Richard Kettlewell + * Copyright (C) 2006-2008 Richard Kettlewell * * This program 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/lib/cache.h b/lib/cache.h index b2c9ffc..26fa3dd 100644 --- a/lib/cache.h +++ b/lib/cache.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2006 Richard Kettlewell + * Copyright (C) 2006-2008 Richard Kettlewell * * This program 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/lib/charset.c b/lib/charset.c index fbcf275..bacaea9 100644 --- a/lib/charset.c +++ b/lib/charset.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/charset.h b/lib/charset.h index f7860df..e4c72a9 100644 --- a/lib/charset.h +++ b/lib/charset.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/client-common.h b/lib/client-common.h index bf7e0b5..271e28f 100644 --- a/lib/client-common.h +++ b/lib/client-common.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2007 Richard Kettlewell * * This program 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/lib/client.c b/lib/client.c index ccbdf6d..75381c6 100644 --- a/lib/client.c +++ b/lib/client.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/client.h b/lib/client.h index 4a6eac7..674272c 100644 --- a/lib/client.h +++ b/lib/client.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/cookies.c b/lib/cookies.c index 70c8097..c98db8f 100644 --- a/lib/cookies.c +++ b/lib/cookies.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/lib/defs.c b/lib/defs.c index 21dda51..b5e1eff 100644 --- a/lib/defs.c +++ b/lib/defs.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/defs.h b/lib/defs.h index f27e02d..94f7059 100644 --- a/lib/defs.h +++ b/lib/defs.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/disorder.h b/lib/disorder.h index 98ddff0..856f0a3 100644 --- a/lib/disorder.h +++ b/lib/disorder.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/eclient.c b/lib/eclient.c index d19eb15..98f60a8 100644 --- a/lib/eclient.c +++ b/lib/eclient.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2006, 2007 Richard Kettlewell + * Copyright (C) 2006-2008 Richard Kettlewell * * This program 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/lib/eventlog.c b/lib/eventlog.c index 1d1fb8b..d22a144 100644 --- a/lib/eventlog.c +++ b/lib/eventlog.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/eventlog.h b/lib/eventlog.h index a60e694..6549796 100644 --- a/lib/eventlog.h +++ b/lib/eventlog.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/fprintf.c b/lib/fprintf.c index 6f86493..1e1b93c 100644 --- a/lib/fprintf.c +++ b/lib/fprintf.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/hash.c b/lib/hash.c index d334612..a77bd3a 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006 Richard Kettlewell + * Copyright (C) 2005-2008 Richard Kettlewell * * This program 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/lib/hash.h b/lib/hash.h index ac79645..484fda2 100644 --- a/lib/hash.h +++ b/lib/hash.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006 Richard Kettlewell + * Copyright (C) 2005-2008 Richard Kettlewell * * This program 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/lib/heap.h b/lib/heap.h index c9913de..6f9bcab 100644 --- a/lib/heap.h +++ b/lib/heap.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/lib/hex.c b/lib/hex.c index 42b15c0..15860ad 100644 --- a/lib/hex.c +++ b/lib/hex.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/hex.h b/lib/hex.h index 47e8f96..6ae642c 100644 --- a/lib/hex.h +++ b/lib/hex.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/ifreq.c b/lib/ifreq.c index 3704aa6..7071a0e 100644 --- a/lib/ifreq.c +++ b/lib/ifreq.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/lib/ifreq.h b/lib/ifreq.h index fbf304d..7a65d80 100644 --- a/lib/ifreq.h +++ b/lib/ifreq.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/lib/inputline.c b/lib/inputline.c index 855910f..5af46f9 100644 --- a/lib/inputline.c +++ b/lib/inputline.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/inputline.h b/lib/inputline.h index 937b767..96f5907 100644 --- a/lib/inputline.h +++ b/lib/inputline.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/kvp.c b/lib/kvp.c index f9081ef..4aa31a1 100644 --- a/lib/kvp.c +++ b/lib/kvp.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/kvp.h b/lib/kvp.h index 5240526..0daa9d2 100644 --- a/lib/kvp.h +++ b/lib/kvp.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/log-impl.h b/lib/log-impl.h index b0147a6..d42cec4 100644 --- a/lib/log-impl.h +++ b/lib/log-impl.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/log.c b/lib/log.c index e0b741e..cae84a7 100644 --- a/lib/log.c +++ b/lib/log.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/log.h b/lib/log.h index 85a6e05..d112685 100644 --- a/lib/log.h +++ b/lib/log.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/logfd.h b/lib/logfd.h index 2aec236..31e7f49 100644 --- a/lib/logfd.h +++ b/lib/logfd.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/mem-impl.h b/lib/mem-impl.h index 3db9c7f..08978bd 100644 --- a/lib/mem-impl.h +++ b/lib/mem-impl.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/mem.h b/lib/mem.h index 20f40f6..2b0396d 100644 --- a/lib/mem.h +++ b/lib/mem.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/mime.h b/lib/mime.h index 434b373..1fdf9b7 100644 --- a/lib/mime.h +++ b/lib/mime.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2007 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/mixer-alsa.c b/lib/mixer-alsa.c index a0e5767..40103e0 100644 --- a/lib/mixer-alsa.c +++ b/lib/mixer-alsa.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/lib/plugin.c b/lib/plugin.c index abeaa66..c23865d 100644 --- a/lib/plugin.c +++ b/lib/plugin.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/plugin.h b/lib/plugin.h index 4134111..1283555 100644 --- a/lib/plugin.h +++ b/lib/plugin.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/printf.h b/lib/printf.h index ca93fc8..9125ace 100644 --- a/lib/printf.h +++ b/lib/printf.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004, 2006 Richard Kettlewell + * Copyright (C) 2004, 2006-2008 Richard Kettlewell * * This program 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/lib/queue.c b/lib/queue.c index 466fe7b..2b10f7a 100644 --- a/lib/queue.c +++ b/lib/queue.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/queue.h b/lib/queue.h index ce43fc5..6bcbeed 100644 --- a/lib/queue.h +++ b/lib/queue.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/lib/regsub.c b/lib/regsub.c index 78dfe14..6345725 100644 --- a/lib/regsub.c +++ b/lib/regsub.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 20008 Richard Kettlewell * * This program 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/lib/regsub.h b/lib/regsub.h index ed439a1..e85a597 100644 --- a/lib/regsub.h +++ b/lib/regsub.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder -* Copyright (C) 2004, 2005 Richard Kettlewell +* Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/sendmail.c b/lib/sendmail.c index f7b0155..95ad2a1 100644 --- a/lib/sendmail.c +++ b/lib/sendmail.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007-2008 Richard Kettlewell * * This program 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/lib/sendmail.h b/lib/sendmail.h index d54def8..e8d87a0 100644 --- a/lib/sendmail.h +++ b/lib/sendmail.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/lib/signame.c b/lib/signame.c index 3e30f80..85e79c2 100644 --- a/lib/signame.c +++ b/lib/signame.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/signame.h b/lib/signame.h index 9b831a5..85e1b80 100644 --- a/lib/signame.h +++ b/lib/signame.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/sink.c b/lib/sink.c index 245ee26..a3e9257 100644 --- a/lib/sink.c +++ b/lib/sink.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/sink.h b/lib/sink.h index 6134501..cde7161 100644 --- a/lib/sink.h +++ b/lib/sink.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/snprintf.c b/lib/snprintf.c index 42a4447..3b41af7 100644 --- a/lib/snprintf.c +++ b/lib/snprintf.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/speaker-protocol.h b/lib/speaker-protocol.h index 92ce747..55a016e 100644 --- a/lib/speaker-protocol.h +++ b/lib/speaker-protocol.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2007 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/split.c b/lib/split.c index e39506b..610fb3e 100644 --- a/lib/split.c +++ b/lib/split.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2006 Richard Kettlewell + * Copyright (C) 2004, 2006-2008 Richard Kettlewell * * This program 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/lib/split.h b/lib/split.h index cd22645..78a0b69 100644 --- a/lib/split.h +++ b/lib/split.h @@ -1,3 +1,22 @@ +/* + * This file is part of DisOrder. + * Copyright (C) 2004-2008 Richard Kettlewell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA + */ #ifndef SPLIT_H #define SPLIT_H diff --git a/lib/syscalls.c b/lib/syscalls.c index 66c3d47..c398c93 100644 --- a/lib/syscalls.c +++ b/lib/syscalls.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/syscalls.h b/lib/syscalls.h index 4f3d780..8e9d9b8 100644 --- a/lib/syscalls.h +++ b/lib/syscalls.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/table.c b/lib/table.c index 503638b..f2835cb 100644 --- a/lib/table.c +++ b/lib/table.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/table.h b/lib/table.h index f269ddd..11215bb 100644 --- a/lib/table.h +++ b/lib/table.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/trackdb.h b/lib/trackdb.h index cfe4e2e..804ff5a 100644 --- a/lib/trackdb.h +++ b/lib/trackdb.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2005-2008 Richard Kettlewell * * This program 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/lib/trackname.h b/lib/trackname.h index 3d5ba65..129e1b5 100644 --- a/lib/trackname.h +++ b/lib/trackname.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006 Richard Kettlewell + * Copyright (C) 2005-2008 Richard Kettlewell * * This program 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/lib/types.h b/lib/types.h index 7673a51..6b3dc37 100644 --- a/lib/types.h +++ b/lib/types.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/url.c b/lib/url.c index 2579ec1..6d19911 100644 --- a/lib/url.c +++ b/lib/url.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/lib/user.h b/lib/user.h index 8996032..84d0030 100644 --- a/lib/user.h +++ b/lib/user.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/vacopy.h b/lib/vacopy.h index 1fcd57e..316e7e0 100644 --- a/lib/vacopy.h +++ b/lib/vacopy.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/vector.c b/lib/vector.c index 4144197..6f397ce 100644 --- a/lib/vector.c +++ b/lib/vector.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/vector.h b/lib/vector.h index bb944a2..33f3d35 100644 --- a/lib/vector.h +++ b/lib/vector.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/lib/wstat.c b/lib/wstat.c index 0fd124c..67de318 100644 --- a/lib/wstat.c +++ b/lib/wstat.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/lib/wstat.h b/lib/wstat.h index 873b4f4..afae594 100644 --- a/lib/wstat.h +++ b/lib/wstat.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/plugins/Makefile.am b/plugins/Makefile.am index fe51ade..2655ebb 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder -# Copyright (C) 2004, 2005, 2006 Richard Kettlewell +# Copyright (C) 2004-2008 Richard Kettlewell # # This program 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/plugins/exec.c b/plugins/exec.c index 7584809..185ab60 100644 --- a/plugins/exec.c +++ b/plugins/exec.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/plugins/fs.c b/plugins/fs.c index 167c1dd..eea7bf5 100644 --- a/plugins/fs.c +++ b/plugins/fs.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/plugins/madshim.h b/plugins/madshim.h index e1e8f48..969b9d3 100644 --- a/plugins/madshim.h +++ b/plugins/madshim.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/plugins/notify.c b/plugins/notify.c index 0323c78..4f80cc2 100644 --- a/plugins/notify.c +++ b/plugins/notify.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/plugins/shell.c b/plugins/shell.c index 3ff071f..31297f1 100644 --- a/plugins/shell.c +++ b/plugins/shell.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/prepare b/prepare index e9e91c7..f38be5b 100755 --- a/prepare +++ b/prepare @@ -1,7 +1,7 @@ #! /bin/bash # # This file is part of DisOrder. -# Copyright (C) 2004, 2005, 2006, 2008 Richard Kettlewell +# Copyright (C) 2004-2008 Richard Kettlewell # # This program 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/python/Makefile.am b/python/Makefile.am index c1d4b05..6925587 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2004, 2005 Richard Kettlewell +# Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell # # This program 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/scripts/completion.bash b/scripts/completion.bash index 898157c..8aff361 100644 --- a/scripts/completion.bash +++ b/scripts/completion.bash @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2005, 2006 Richard Kettlewell +# Copyright (C) 2005-2008 Richard Kettlewell # # This program 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/scripts/dist b/scripts/dist index d5134e4..5f9d2fe 100755 --- a/scripts/dist +++ b/scripts/dist @@ -1,7 +1,7 @@ #! /bin/bash # # This file is part of DisOrder -# Copyright (C) 2005, 2006 Richard Kettlewell +# Copyright (C) 2005-2008 Richard Kettlewell # # This program 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/scripts/htmlman b/scripts/htmlman index 04851fa..5bbc07b 100755 --- a/scripts/htmlman +++ b/scripts/htmlman @@ -1,7 +1,7 @@ #! /bin/sh # # This file is part of DisOrder -# Copyright (C) 2004, 2005 Richard Kettlewell +# Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell # # This program 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/scripts/inst b/scripts/inst index 18cfee0..790037c 100755 --- a/scripts/inst +++ b/scripts/inst @@ -1,6 +1,6 @@ #! /bin/bash # -# Copyright (C) 2004, 2005, 2006 Richard Kettlewell +# Copyright (C) 2004-2008x Richard Kettlewell # # This program 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/scripts/sedfiles.make b/scripts/sedfiles.make index da6727a..cbae8c1 100644 --- a/scripts/sedfiles.make +++ b/scripts/sedfiles.make @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2004, 2005, 2007 Richard Kettlewell +# Copyright (C) 2004-2008 Richard Kettlewell # # This program 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/scripts/text2c b/scripts/text2c index 95d2181..937fe66 100755 --- a/scripts/text2c +++ b/scripts/text2c @@ -1,4 +1,23 @@ #! /usr/bin/perl -w +# +# This file is part of DisOrder. +# Copyright (C) 2004-2008 Richard Kettlewell +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA +# my $class = "static"; if($ARGV[0] eq '-extern') { $class = ""; diff --git a/server/api-client.c b/server/api-client.c index 1e0ed7a..2f6a01f 100644 --- a/server/api-client.c +++ b/server/api-client.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/server/api-client.h b/server/api-client.h index b2a8d36..9d61fcb 100644 --- a/server/api-client.h +++ b/server/api-client.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/server/api-server.c b/server/api-server.c index e152980..b1267f0 100644 --- a/server/api-server.c +++ b/server/api-server.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/server/api.c b/server/api.c index 1b1df0e..5366468 100644 --- a/server/api.c +++ b/server/api.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/server/cgi.c b/server/cgi.c index 095611a..2017d1b 100644 --- a/server/cgi.c +++ b/server/cgi.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2008 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/server/cgi.h b/server/cgi.h index 385b9f2..2381c03 100644 --- a/server/cgi.h +++ b/server/cgi.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2008 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/server/daemonize.c b/server/daemonize.c index fe275d6..7dea700 100644 --- a/server/daemonize.c +++ b/server/daemonize.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2008 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/server/daemonize.h b/server/daemonize.h index 398cc79..23d88a6 100644 --- a/server/daemonize.h +++ b/server/daemonize.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/server/dbupgrade.c b/server/dbupgrade.c index 7f4eeac..f972b59 100644 --- a/server/dbupgrade.c +++ b/server/dbupgrade.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/server/dcgi.h b/server/dcgi.h index ac110d8..09e74da 100644 --- a/server/dcgi.h +++ b/server/dcgi.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/server/deadlock.c b/server/deadlock.c index 6aa130c..dba28d3 100644 --- a/server/deadlock.c +++ b/server/deadlock.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005 Richard Kettlewell + * Copyright (C) 2005, 2007, 2008 Richard Kettlewell * * This program 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/server/decode.c b/server/decode.c index 36d98ca..c693c75 100644 --- a/server/decode.c +++ b/server/decode.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/server/disorderd.c b/server/disorderd.c index 913721b..2fd317d 100644 --- a/server/disorderd.c +++ b/server/disorderd.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/server/dump.c b/server/dump.c index 64a3d8d..18a2f6e 100644 --- a/server/dump.c +++ b/server/dump.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2007 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/server/normalize.c b/server/normalize.c index 8b871c8..6d8823e 100644 --- a/server/normalize.c +++ b/server/normalize.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/server/play.c b/server/play.c index f38c9d5..2b6422d 100644 --- a/server/play.c +++ b/server/play.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/server/play.h b/server/play.h index a7e57c6..c402312 100644 --- a/server/play.h +++ b/server/play.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/server/server.h b/server/server.h index a3a5beb..0d34d1e 100644 --- a/server/server.h +++ b/server/server.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2006 Richard Kettlewell + * Copyright (C) 2004, 2006-2008 Richard Kettlewell * * This program 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/server/speaker-network.c b/server/speaker-network.c index 2f3750c..73d59b8 100644 --- a/server/speaker-network.c +++ b/server/speaker-network.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2005-2008 Richard Kettlewell * * This program 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/server/speaker.c b/server/speaker.c index 4a8966d..bcc44cc 100644 --- a/server/speaker.c +++ b/server/speaker.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2005-2008 Richard Kettlewell * Portions (C) 2007 Mark Wooding * * This program is free software; you can redistribute it and/or modify diff --git a/server/speaker.h b/server/speaker.h index 2af2c6b..2288042 100644 --- a/server/speaker.h +++ b/server/speaker.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2005-2008 Richard Kettlewell * * This program 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/server/state.c b/server/state.c index 3386cd4..e952556 100644 --- a/server/state.c +++ b/server/state.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005 Richard Kettlewell + * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell * * This program 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/server/state.h b/server/state.h index 893ddae..21f6a1a 100644 --- a/server/state.h +++ b/server/state.h @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004 Richard Kettlewell + * Copyright (C) 2004, 2007, 2008 Richard Kettlewell * * This program 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/server/stats.c b/server/stats.c index 84f50fa..5648ca0 100644 --- a/server/stats.c +++ b/server/stats.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007, 2008 Richard Kettlewell * * This program 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/server/trackname.c b/server/trackname.c index 8777475..3d7de6d 100644 --- a/server/trackname.c +++ b/server/trackname.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004, 2005, 2006 Richard Kettlewell + * Copyright (C) 2004-2008 Richard Kettlewell * * This program 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/sounds/Makefile.am b/sounds/Makefile.am index bf9f333..3722c39 100644 --- a/sounds/Makefile.am +++ b/sounds/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2004 Richard Kettlewell +# Copyright (C) 2004, 2007, 2008 Richard Kettlewell # # This program 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/templates/Makefile.am b/templates/Makefile.am index 8c18552..886e6a8 100644 --- a/templates/Makefile.am +++ b/templates/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2004, 2005, 2006 Richard Kettlewell +# Copyright (C) 2004-2008 Richard Kettlewell # # This program 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/templates/about.html b/templates/about.html index d5bbab3..93d0d11 100644 --- a/templates/about.html +++ b/templates/about.html @@ -1,7 +1,7 @@