From 75b1424c52db20e79cdefd65f30809c422a9770b Mon Sep 17 00:00:00 2001 From: Philip Kendall Date: Mon, 7 Jan 2008 12:27:37 +0000 Subject: [PATCH] Merge fuse-utils_0_9_0-branch changes r3451:3480 to trunk. Legacy-ID: 3481 --- ChangeLog | 2 +- Makefile.am | 2 +- README | 2 +- hacking/ChangeLog | 8 ++++++++ hacking/cvs-tags | 6 ++++++ man/audio2tape.1 | 2 +- man/createhdf.1 | 2 +- man/fuse-utils.1 | 2 +- man/listbasic.1 | 2 +- man/profile2map.1 | 2 +- man/raw2hdf.1 | 2 +- man/rzxcheck.1 | 2 +- man/rzxdump.1 | 2 +- man/rzxtool.1 | 2 +- man/scl2trd.1 | 2 +- man/snap2tzx.1 | 2 +- man/snapconv.1 | 2 +- man/tape2wav.1 | 2 +- man/tapeconv.1 | 2 +- man/tzxlist.1 | 2 +- 20 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90dd66f..a4f8d8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2007-12-18 Philip Kendall +2008-01-05 Philip Kendall * Version 0.9.0 released diff --git a/Makefile.am b/Makefile.am index 759113b..f11adb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,4 +89,4 @@ audio2tape_LDADD = @LIBSPEC_LIBS@ @AUDIOFILE_LIBS@ tape2wav_SOURCES = tape2wav.c utils.c tape2wav_LDADD = @LIBSPEC_LIBS@ @AUDIOFILE_LIBS@ -noinst_HEADERS = ide.h utils.h +noinst_HEADERS = compat.h ide.h utils.h diff --git a/README b/README index 39596d3..a5d027e 100644 --- a/README +++ b/README @@ -60,6 +60,6 @@ released tarballs, you'll need to run `autogen.sh' before running 'configure' for the first time. Philip Kendall -18 December 2007 +5 January 2008 $Id$ diff --git a/hacking/ChangeLog b/hacking/ChangeLog index b257eb2..6d7ad3f 100644 --- a/hacking/ChangeLog +++ b/hacking/ChangeLog @@ -218,3 +218,11 @@ 20071221 BRANCH: fuse-utils_0_9_0-branch 20071221 TAG: fuse-utils_0_9_0pre1 (from fuse-utils_0_9_0-branch). 20071221 man/tape2wav.1: fix whitespace (Stuart). +20080104 ChangeLog,README,man/{audio2tape.1,createhdf.1,fuse-utils.1, + listbasic.1,profile2map.1,raw2hdf.1,rzxcheck.1,rzxdump.1,rzxtool.1, + scl2trd.1,snap2tzx.1,snapconv.1,tape2wav.1,tapeconv.1,tzxlist.1}: + update dates (fuse-utils_0_9_0-branch) (Stuart). +20080105 Makefile.am: distribute compat.h (thanks, make distcheck) + (fuse-utils_0_9_0-branch). +20080105 TAG: fuse-utils_0_9_0 +20080107 Merge fuse-utils_0_9_0-branch changes r3451:3480 to trunk. diff --git a/hacking/cvs-tags b/hacking/cvs-tags index cce5917..147cedf 100644 --- a/hacking/cvs-tags +++ b/hacking/cvs-tags @@ -12,4 +12,10 @@ CVS tags for fuse-utils | | fuse-utils_0_8_0-merge-1 | ++-\ +| | fuse-utils_0_9_0-pre1 +| | fuse-utils_0_9_0 +| | +| | fuse-utils_0_9_0-branch +| HEAD diff --git a/man/audio2tape.1 b/man/audio2tape.1 index 3b63cb4..7808679 100644 --- a/man/audio2tape.1 +++ b/man/audio2tape.1 @@ -22,7 +22,7 @@ .\" E-mail: fredm@spamcop.net .\" .\" -.TH audio2tape 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH audio2tape 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/createhdf.1 b/man/createhdf.1 index fc32d57..8e42f3b 100644 --- a/man/createhdf.1 +++ b/man/createhdf.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH createhdf 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH createhdf 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/fuse-utils.1 b/man/fuse-utils.1 index 4fdaaa1..8231f30 100644 --- a/man/fuse-utils.1 +++ b/man/fuse-utils.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH fuse\-utils 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH fuse\-utils 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/listbasic.1 b/man/listbasic.1 index e74a214..2319e32 100644 --- a/man/listbasic.1 +++ b/man/listbasic.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH listbasic 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH listbasic 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/profile2map.1 b/man/profile2map.1 index 0c58e34..24cc12d 100644 --- a/man/profile2map.1 +++ b/man/profile2map.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH profile2map 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH profile2map 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/raw2hdf.1 b/man/raw2hdf.1 index 1903636..b3c66da 100644 --- a/man/raw2hdf.1 +++ b/man/raw2hdf.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH raw2hdf 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH raw2hdf 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/rzxcheck.1 b/man/rzxcheck.1 index 73af2b3..9e2da10 100644 --- a/man/rzxcheck.1 +++ b/man/rzxcheck.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH rzxcheck 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH rzxcheck 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/rzxdump.1 b/man/rzxdump.1 index 44627ce..f8594ae 100644 --- a/man/rzxdump.1 +++ b/man/rzxdump.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH rzxdump 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH rzxdump 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/rzxtool.1 b/man/rzxtool.1 index 685cd81..7c30baf 100644 --- a/man/rzxtool.1 +++ b/man/rzxtool.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH rzxtool 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH rzxtool 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/scl2trd.1 b/man/scl2trd.1 index 56f2b7c..318d1cb 100644 --- a/man/scl2trd.1 +++ b/man/scl2trd.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH scl2trd 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH scl2trd 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/snap2tzx.1 b/man/snap2tzx.1 index a863aa7..ef44c80 100644 --- a/man/snap2tzx.1 +++ b/man/snap2tzx.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH snap2tzx 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH snap2tzx 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/snapconv.1 b/man/snapconv.1 index fd9df13..95d2427 100644 --- a/man/snapconv.1 +++ b/man/snapconv.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH snapconv 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH snapconv 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/tape2wav.1 b/man/tape2wav.1 index afc533d..0b637a9 100644 --- a/man/tape2wav.1 +++ b/man/tape2wav.1 @@ -22,7 +22,7 @@ .\" E-mail: fredm@spamcop.net .\" .\" -.TH tape2wav 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH tape2wav 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/tapeconv.1 b/man/tapeconv.1 index 35f0918..a384d35 100644 --- a/man/tapeconv.1 +++ b/man/tapeconv.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH tapeconv 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH tapeconv 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\" diff --git a/man/tzxlist.1 b/man/tzxlist.1 index f0b7a95..28d9541 100644 --- a/man/tzxlist.1 +++ b/man/tzxlist.1 @@ -22,7 +22,7 @@ .\" E-mail: philip-fuse@shadowmagic.org.uk .\" .\" -.TH tzxlist 1 "18th December, 2007" "Version 0.9.0" "Emulators" +.TH tzxlist 1 "5th January, 2008" "Version 0.9.0" "Emulators" .\" .\"------------------------------------------------------------------ .\"