summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INSTALL.git19
-rw-r--r--Makefile.am2
-rw-r--r--README2
-rw-r--r--doc/Makefile.am8
-rw-r--r--doc/doxygen/html/.cvsignore8
-rw-r--r--example/audio.c2
-rw-r--r--include/cdio++/enum.hpp4
-rw-r--r--include/cdio++/read.hpp4
-rw-r--r--include/cdio/rock.h4
-rw-r--r--include/cdio/scsi_mmc.h4
-rw-r--r--lib/driver/portable.h4
-rw-r--r--lib/driver/sector.c4
-rw-r--r--lib/iso9660/xa.c4
-rw-r--r--package/libcdio.spec.in6
-rw-r--r--parse/toc.y4
-rw-r--r--src/Makefile.am2
-rw-r--r--src/cd-drive.help2man2
-rw-r--r--src/cd-info.help2man2
-rw-r--r--src/cd-paranoia/doc/en/cd-paranoia.1.in2
-rw-r--r--src/cd-paranoia/header.c4
-rw-r--r--src/cd-read.help2man2
-rw-r--r--src/cdda-player.c2
-rw-r--r--src/cdinfo-linux.c2
-rw-r--r--src/iso-info.help2man2
-rw-r--r--src/iso-read.help2man2
-rw-r--r--src/util.c2
-rw-r--r--src/util.h2
27 files changed, 46 insertions, 59 deletions
diff --git a/INSTALL.git b/INSTALL.git
new file mode 100644
index 00000000..a339ad85
--- /dev/null
+++ b/INSTALL.git
@@ -0,0 +1,19 @@
+If you are building from the git repository, you will
+need the software listed in INSTALL. Additionally you will need:
+
+ - git (version control for checking out source code)
+ - autoconf (which contains programs autoconf and autoreconf)
+ - automake
+ - libtool (for building shared libraries),
+ - m4 (used by autoconf)
+ - texinfo (for building documentation)
+ - help2man (turns help for libcdio standalone programs into manual pages)
+
+If you have this
+
+ cd <parent directory for source code>
+ git clone git://git.savannah.gnu.org/libcdio.git
+ cd libcdio
+ sh ./autogen.sh
+
+Then follow instructions in INSTALL.
diff --git a/Makefile.am b/Makefile.am
index 2c32ef90..6bdad2f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,7 +124,7 @@ check_iso.sh: $(top_builddir)/config.status check_iso.sh.in
make-executable:
# cvs2cl
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog *.rej *.orig
if MAINTAINER_MODE
diff --git a/README b/README
index a066a3bd..1ab794f3 100644
--- a/README
+++ b/README
@@ -57,5 +57,3 @@ players mplayerxp (http://mplayerxp.sourceforge.net/) and gmerlin
extracting and editing ISO-9600 images (http://kiso.sourceforge.net),
and a Samba vfs module that allows exporting a CD without mounting it
(http://ontologistics.net/OpenSource/Samba/index.php).
-
-$Id: README,v 1.13 2006/03/28 14:48:44 rocky Exp $
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f8e72e86..dde10f01 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am,v 1.9 2008/04/17 17:39:47 karl Exp $
-#
# Copyright (C) 2003, 2004, 2008 Rocky Bernstein <rocky@gnu.org>
# 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
@@ -32,13 +30,13 @@ html: libcdio.html
%.ps.gz: %.ps
gzip -9c $< > $@
-.texi.pdf:
+.texi.pdf: stamp-vti
texi2pdf $<
-.texi.html:
+.texi.html: stamp-vti
texi2html $<
-.texi.txt:
+.texi.txt:
makeinfo --no-headers $< > $@
all-formats: pdf dvi txt ps html
diff --git a/doc/doxygen/html/.cvsignore b/doc/doxygen/html/.cvsignore
deleted file mode 100644
index d5527fb4..00000000
--- a/doc/doxygen/html/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.html
-doxygen.css
-doxygen.png
-libcdio.ps
-tab_b.gif
-tab_l.gif
-tab_r.gif
-tabs.css
diff --git a/example/audio.c b/example/audio.c
index 6fd5604a..4977222a 100644
--- a/example/audio.c
+++ b/example/audio.c
@@ -289,7 +289,7 @@ usage(char *prog)
"way on a spare console and forget about it...\n"
"\n"
"(c) 1997,98 Gerd Knorr <kraxel@goldbach.in-berlin.de>\n"
- "(c) 2005 Rocky Bernstein <rocky@panix.com>\n"
+ "(c) 2005 Rocky Bernstein <rocky@gnu.org>\n"
, prog, prog);
}
diff --git a/include/cdio++/enum.hpp b/include/cdio++/enum.hpp
index 9991be69..be0a1aba 100644
--- a/include/cdio++/enum.hpp
+++ b/include/cdio++/enum.hpp
@@ -1,7 +1,5 @@
/*
- $Id: enum.hpp,v 1.2 2008/03/25 15:59:10 karl Exp $
-
- Copyright (C) 2005, 2008 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
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/include/cdio++/read.hpp b/include/cdio++/read.hpp
index 7cce925b..cac45037 100644
--- a/include/cdio++/read.hpp
+++ b/include/cdio++/read.hpp
@@ -1,7 +1,5 @@
/*
- $Id: read.hpp,v 1.3 2008/03/25 15:59:10 karl Exp $
-
- Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
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/include/cdio/rock.h b/include/cdio/rock.h
index 57003276..480c7c63 100644
--- a/include/cdio/rock.h
+++ b/include/cdio/rock.h
@@ -1,7 +1,5 @@
/*
- $Id: rock.h,v 1.15 2008/03/25 15:59:09 karl Exp $
-
- Copyright (C) 2005, 2006 2008 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2005, 2006 2008 Rocky Bernstein <rocky@gnu.org>
See also rock.c by Eric Youngdale (1993) from GNU/Linux
This is Copyright 1993 Yggdrasil Computing, Incorporated
diff --git a/include/cdio/scsi_mmc.h b/include/cdio/scsi_mmc.h
index 2c8e5d55..7cff6857 100644
--- a/include/cdio/scsi_mmc.h
+++ b/include/cdio/scsi_mmc.h
@@ -1,7 +1,5 @@
/*
- $Id: scsi_mmc.h,v 1.46 2008/03/25 15:59:09 karl Exp $
-
- Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
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/driver/portable.h b/lib/driver/portable.h
index f8d0ceab..42e4d9e5 100644
--- a/lib/driver/portable.h
+++ b/lib/driver/portable.h
@@ -1,7 +1,5 @@
/*
- $Id: portable.h,v 1.4 2008/04/22 15:29:12 karl Exp $
-
- Copyright (C) 2006, 2008 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2006, 2008 Rocky Bernstein <rocky@gnu.org>
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/driver/sector.c b/lib/driver/sector.c
index 782e0de4..55e23b4c 100644
--- a/lib/driver/sector.c
+++ b/lib/driver/sector.c
@@ -1,7 +1,5 @@
/*
- $Id: sector.c,v 1.5 2005/02/06 04:20:25 rocky Exp $
-
- Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2004, 2005 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software; you can redistribute it and/or modify
diff --git a/lib/iso9660/xa.c b/lib/iso9660/xa.c
index cdc0d5e6..cf0fcd22 100644
--- a/lib/iso9660/xa.c
+++ b/lib/iso9660/xa.c
@@ -1,7 +1,5 @@
/*
- $Id: xa.c,v 1.8 2008/04/24 07:28:00 rocky Exp $
-
- Copyright (C) 2003, 2005, 2008 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2003, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software: you can redistribute it and/or modify
diff --git a/package/libcdio.spec.in b/package/libcdio.spec.in
index e6aa2783..cf25de25 100644
--- a/package/libcdio.spec.in
+++ b/package/libcdio.spec.in
@@ -120,16 +120,16 @@ rm -rf ${RPM_BUILD_ROOT}/%{_mandir}
* Sun Feb 15 2004 Manfred Tremmel <Manfred.Tremmel@iiv.de>
- some little changes
-* Sat Feb 14 2004 Rocky Bernstein <rocky@panix.com>
+* Sat Feb 14 2004 Rocky Bernstein <rocky@gnu.org>
- require vcdimager 0.7.20, small rpm fixes
-* Tue Sep 9 2003 Rocky Bernstein <rocky@panix.com>
+* Tue Sep 9 2003 Rocky Bernstein <rocky@gnu.org>
- small fixes really from Frantisek Dvorak <valtri@atlas.cz>
* Sun Aug 30 2003 Frantisek Dvorak <valtri@atlas.cz>
- two files added
-* Wed Aug 06 2003 Rocky Bernstein <rocky@panix.com>
+* Wed Aug 06 2003 Rocky Bernstein <rocky@gnu.org>
- fixes really Manfred Tremmel <Manfred.Tremmel@iiv.de>
at http://www.iiv.de/schwinde/buerger/tremmel/
diff --git a/parse/toc.y b/parse/toc.y
index 967ed089..18b041d4 100644
--- a/parse/toc.y
+++ b/parse/toc.y
@@ -1,7 +1,5 @@
/*
- $Id: toc.y,v 1.3 2008/03/23 17:21:34 karl Exp $
-
- Copyright (C) 2005, 2008 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
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/src/Makefile.am b/src/Makefile.am
index a1f0208f..a29e0aa3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,4 +94,4 @@ if MAINTAINER_MODE
$(man_MANS): %.1: %$(EXEEXT) %.help2man
-$(HELP2MAN) --opt-include=$(srcdir)/$(<:.exe=).help2man --no-info --output=$@ ./$<
endif
-MAINTAINERCLEANFILES = $(man_MANS)
+MAINTAINERCLEANFILES = $(man_MANS) *.rej *.orig
diff --git a/src/cd-drive.help2man b/src/cd-drive.help2man
index 63eb61ac..1e348c82 100644
--- a/src/cd-drive.help2man
+++ b/src/cd-drive.help2man
@@ -6,5 +6,5 @@ Shows CD-ROM drive characteristics.
[SEE ALSO]
\&\f(CWcd-info(1)\fR for information about the CD inside a CD-ROM.
[AUTHOR]
-Rocky Bernstein rocky@panix.com
+Rocky Bernstein rocky@gnu.org
diff --git a/src/cd-info.help2man b/src/cd-info.help2man
index efdab10a..dfe175fa 100644
--- a/src/cd-info.help2man
+++ b/src/cd-info.help2man
@@ -7,5 +7,5 @@ Shows Information about a CD or CD-image.
\&\f(CWcd-drive(1)\fR for CD-ROM characteristics;
\&\f(CWiso-info(1)\fR for information about an ISO-9660 image.
[AUTHOR]
-Rocky Bernstein rocky@panix.com, based on the cdinfo program by
+Rocky Bernstein rocky@gnu.org, based on the cdinfo program by
Gerd Knorr <kraxel@bytesex.org> and Heiko Eissfeldt <heiko@hexco.de>
diff --git a/src/cd-paranoia/doc/en/cd-paranoia.1.in b/src/cd-paranoia/doc/en/cd-paranoia.1.in
index 0d6fa4af..ecf409a2 100644
--- a/src/cd-paranoia/doc/en/cd-paranoia.1.in
+++ b/src/cd-paranoia/doc/en/cd-paranoia.1.in
@@ -375,7 +375,7 @@ Monty <monty@xiph.org>
Cdparanoia's homepage may be found at:
http://www.xiph.org/paranoia/
.P
-Revised for use with libcdio by Rocky <rocky@panix.com>
+Revised for use with libcdio by Rocky <rocky@gnu.org>
.P
The libcdio homepage may be found at:
http://www.gnu.org/software/libcdio
diff --git a/src/cd-paranoia/header.c b/src/cd-paranoia/header.c
index 05eab01a..51312729 100644
--- a/src/cd-paranoia/header.c
+++ b/src/cd-paranoia/header.c
@@ -1,7 +1,5 @@
/*
- $Id: header.c,v 1.2 2008/04/11 15:44:00 karl Exp $
-
- Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
+ Copyright (C) 2004 Rocky Bernstein <rocky@gnu.org
Copyright (C) 1998 Monty xiphmont@mit.edu
and Heiko Eissfeldt heiko@escape.colossus.de
diff --git a/src/cd-read.help2man b/src/cd-read.help2man
index 444c28e1..392b289d 100644
--- a/src/cd-read.help2man
+++ b/src/cd-read.help2man
@@ -8,4 +8,4 @@ Reads Information from a CD or CD-image.
\&\f(CWcd-drive(1)\fR for CD-ROM characteristics;
\&\f(CWiso-read(1)\fR for information about an ISO-9660 image.
[AUTHOR]
-Rocky Bernstein <rocky@panix.com>
+Rocky Bernstein <rocky@gnu.org>
diff --git a/src/cdda-player.c b/src/cdda-player.c
index 94f57466..4df91315 100644
--- a/src/cdda-player.c
+++ b/src/cdda-player.c
@@ -943,7 +943,7 @@ usage(char *prog)
"way on a spare console and forget about it...\n"
"\n"
"(c) 1997,98 Gerd Knorr <kraxel@goldbach.in-berlin.de>\n"
- "(c) 2005, 2006 Rocky Bernstein <rocky@panix.com>\n"
+ "(c) 2005, 2006 Rocky Bernstein <rocky@gnu.org>\n"
, prog, prog);
}
diff --git a/src/cdinfo-linux.c b/src/cdinfo-linux.c
index 9199213c..6ff8e940 100644
--- a/src/cdinfo-linux.c
+++ b/src/cdinfo-linux.c
@@ -218,7 +218,7 @@ char *devname = NULL;
char *program_name;
const char *argp_program_version = PROGRAM_NAME CDINFO_VERSION;
-const char *argp_program_bug_address = "rocky@panix.com";
+const char *argp_program_bug_address = "rocky@gnu.org";
/* Program documentation. */
const char doc[] =
diff --git a/src/iso-info.help2man b/src/iso-info.help2man
index 7f3273e4..d38af2cd 100644
--- a/src/iso-info.help2man
+++ b/src/iso-info.help2man
@@ -7,4 +7,4 @@ Shows Information about an ISO 9660 image.
\&\f(CWcd-info(1)\fR for information about an ISO-9660 image.
\&\f(CWcd-read(1)\fR to read portions of an ISO 9660 image.
[AUTHOR]
-Rocky Bernstein <rocky@panix.com>
+Rocky Bernstein <rocky@gnu.org>
diff --git a/src/iso-read.help2man b/src/iso-read.help2man
index 9f95b1f9..df3283bb 100644
--- a/src/iso-read.help2man
+++ b/src/iso-read.help2man
@@ -7,4 +7,4 @@ Reads portions of an ISO 9660 image.
\&\f(CWiso-info(1)\fR for information about an ISO-9660 image.
\&\f(CWcd-read(1)\fR to read portions of an ISO 9660 image.
[AUTHOR]
-Rocky Bernstein <rocky@panix.com>
+Rocky Bernstein <rocky@gnu.org>
diff --git a/src/util.c b/src/util.c
index c23a2ed2..707a11b9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -53,7 +53,7 @@ print_version (char *program_name, const char *version,
if (no_header == 0)
report( stdout,
- "%s version %s\nCopyright (c) 2003, 2004, 2005, 2007, 2008 R. Bernstein\n",
+ "%s version %s\nCopyright (c) 2003, 2004, 2005, 2007, 2008, 2011 R. Bernstein\n",
program_name, version);
report( stdout,
_("This is free software; see the source for copying conditions.\n\
diff --git a/src/util.h b/src/util.h
index 7ef6fc1e..aa978466 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,4 @@
/*
- $Id: util.h,v 1.16 2008/04/14 17:30:27 karl Exp $
-
Copyright (C) 2003, 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 11:19:17 +0000