From 79f9d809d54e0aebe70d023e5d97931dda2e0fcd Mon Sep 17 00:00:00 2001 From: moritz Date: Sun, 4 Mar 2007 15:16:36 +0000 Subject: [PATCH] More pre-release maintenance. git-svn-id: https://svn.xiph.org/trunk/ezstream@12628 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- COPYING | 5 +++++ NEWS | 1 + src/configfile.c | 5 ++--- src/ezstream.c | 5 ++--- win32/README.win32 | 10 ++++++---- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/COPYING b/COPYING index d60c31a..ed5aea7 100644 --- a/COPYING +++ b/COPYING @@ -1,3 +1,8 @@ + ezstream - source client for Icecast with external en-/decoder support + Copyright (C) 2003, 2004, 2005, 2006 Ed Zaleski + Copyright (C) 2007 Moritz Grimm + + GNU GENERAL PUBLIC LICENSE Version 2, June 1991 diff --git a/NEWS b/NEWS index 3cdb405..20522e9 100644 --- a/NEWS +++ b/NEWS @@ -47,6 +47,7 @@ Changes in 0.3.0, (SVN trunk): parameter.) - Tweaked metadata string generation: no more lone " - " dashes at the beginning or end of the string. + - New command line option `-V': Print the version number and exit. diff --git a/src/configfile.c b/src/configfile.c index d6d3deb..a1a0a05 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -4,9 +4,8 @@ * Copyright (C) 2007 Moritz Grimm * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/ezstream.c b/src/ezstream.c index 00d0b10..25c4b11 100644 --- a/src/ezstream.c +++ b/src/ezstream.c @@ -4,9 +4,8 @@ * Copyright (C) 2007 Moritz Grimm * * 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. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/win32/README.win32 b/win32/README.win32 index f7f5b02..598ff49 100644 --- a/win32/README.win32 +++ b/win32/README.win32 @@ -17,6 +17,8 @@ README.win32 - Information about the binary Ezstream distribution for Windows +-----------------------+----------------------------------------------+ | \ezstream.exe | The ezstream executable file. | +-----------------------+----------------------------------------------+ +| \ezstream-X.Y.Z.zip | The ezstream source distribution. | ++-----------------------+----------------------------------------------+ | \conf\*.xml | Ezstream example configuration files. | +-----------------------+----------------------------------------------+ @@ -42,8 +44,8 @@ system. Ezstream uses libxml2 (http://xmlsoft.org/, BSD-like license), libogg and libvorbis (http://www.vorbis.com/, BSD-like license) and libshout -(http://www.icecast.org/, LGPL licensed). +(http://www.icecast.org/, LGPL licensed). These libraries are statically linked +into the ezstream.exe file. -Ezstream itself is licensed under the GPL (see COPYING.txt), with the source -code available at http://www.icecast.org/ezstream.php in the distribution -tarball (.tar.gz). +Ezstream itself is licensed under the GPL (see COPYING in the included source +archive for details.)