+++ /dev/null
---- cdrdao-1.1.7/xdao/Makefile.in.orig Sun Oct 6 20:53:56 2002
-+++ cdrdao-1.1.7/xdao/Makefile.in Wed Dec 25 20:59:56 2002
-@@ -71,32 +71,32 @@
- all: $(PRG)
-
- install: all installdirs
-- $(INSTALL_PROGRAM) $(PRG) $(bindir)
-- $(INSTALL_DATA) xcdrdao.man $(man1dir)/xcdrdao.1
-- $(INSTALL_DATA) gcdmaster.png $(PIXMAPS_DIR)/gcdmaster.png
-- $(INSTALL_DATA) pixmap_audiocd.png $(PIXMAPS_DIR)/pixmap_audiocd.png
-- $(INSTALL_DATA) pixmap_copycd.png $(PIXMAPS_DIR)/pixmap_copycd.png
-- $(INSTALL_DATA) pixmap_datacd.png $(PIXMAPS_DIR)/pixmap_datacd.png
-- $(INSTALL_DATA) pixmap_dumpcd.png $(PIXMAPS_DIR)/pixmap_dumpcd.png
-- $(INSTALL_DATA) pixmap_help.png $(PIXMAPS_DIR)/pixmap_help.png
-- $(INSTALL_DATA) pixmap_mixedcd.png $(PIXMAPS_DIR)/pixmap_mixedcd.png
-- $(INSTALL_DATA) pixmap_open.png $(PIXMAPS_DIR)/pixmap_open.png
-- $(INSTALL_DATA) pixmap_play-start.xpm $(PIXMAPS_DIR)/pixmap_play-start.xpm
-- $(INSTALL_DATA) pixmap_play-pause.xpm $(PIXMAPS_DIR)/pixmap_play-pause.xpm
-- $(INSTALL_DATA) pixmap_play-stop.xpm $(PIXMAPS_DIR)/pixmap_play-stop.xpm
-- $(INSTALL_DATA) pixmap_cursor-tool.xpm $(PIXMAPS_DIR)/pixmap_cursor-tool.xpm
-- $(INSTALL_DATA) pixmap_zoom-tool.xpm $(PIXMAPS_DIR)/pixmap_zoom-tool.xpm
-- $(INSTALL_DATA) pixmap_zoom-in.xpm $(PIXMAPS_DIR)/pixmap_zoom-in.xpm
-- $(INSTALL_DATA) pixmap_zoom-out.xpm $(PIXMAPS_DIR)/pixmap_zoom-out.xpm
-- $(INSTALL_DATA) pixmap_zoom-selection.xpm $(PIXMAPS_DIR)/pixmap_zoom-selection.xpm
-- $(INSTALL_DATA) pixmap_zoom-fit.xpm $(PIXMAPS_DIR)/pixmap_zoom-fit.xpm
-- $(INSTALL_DATA) gcdmaster.desktop $(datadir)/gnome/apps/Applications/gcdmaster.desktop
-+ $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir)
-+ $(INSTALL_DATA) xcdrdao.man $(DESTDIR)$(man1dir)/gcdmaster.1x
-+ $(INSTALL_DATA) gcdmaster.png $(DESTDIR)$(PIXMAPS_DIR)/gcdmaster.png
-+ $(INSTALL_DATA) pixmap_audiocd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_audiocd.png
-+ $(INSTALL_DATA) pixmap_copycd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_copycd.png
-+ $(INSTALL_DATA) pixmap_datacd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_datacd.png
-+ $(INSTALL_DATA) pixmap_dumpcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_dumpcd.png
-+ $(INSTALL_DATA) pixmap_help.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_help.png
-+ $(INSTALL_DATA) pixmap_mixedcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_mixedcd.png
-+ $(INSTALL_DATA) pixmap_open.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_open.png
-+ $(INSTALL_DATA) pixmap_play-start.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-start.xpm
-+ $(INSTALL_DATA) pixmap_play-pause.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-pause.xpm
-+ $(INSTALL_DATA) pixmap_play-stop.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-stop.xpm
-+ $(INSTALL_DATA) pixmap_cursor-tool.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_cursor-tool.xpm
-+ $(INSTALL_DATA) pixmap_zoom-tool.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-tool.xpm
-+ $(INSTALL_DATA) pixmap_zoom-in.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-in.xpm
-+ $(INSTALL_DATA) pixmap_zoom-out.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-out.xpm
-+ $(INSTALL_DATA) pixmap_zoom-selection.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-selection.xpm
-+ $(INSTALL_DATA) pixmap_zoom-fit.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-fit.xpm
-+ $(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/applications/gcdmaster.desktop
-
- installdirs:
-- $(srcdir)/../mkinstalldirs $(bindir)
-- $(srcdir)/../mkinstalldirs $(man1dir)
-- $(srcdir)/../mkinstalldirs $(PIXMAPS_DIR)
-- $(srcdir)/../mkinstalldirs $(datadir)/gnome/apps/Applications
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(PIXMAPS_DIR)
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/applications
-
- uninstall:
- rm -f $(bindir)/$(PRG) $(man1dir)/xcdrdao.1
---- cdrdao-1.1.7/dao/Makefile.in.orig Thu Dec 26 09:27:54 2002
-+++ cdrdao-1.1.7/dao/Makefile.in Thu Dec 26 09:27:03 2002
-@@ -67,14 +67,14 @@
- all: $(PRG)
-
- install: all installdirs
-- $(INSTALL_PROGRAM) $(PRG) $(bindir)
-- $(INSTALL_DATA) cdrdao.man $(man1dir)/cdrdao.1
-- $(INSTALL_DATA) cdrdao.drivers $(DRIVER_TABLE_FILE)
-+ $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir)
-+ $(INSTALL_DATA) cdrdao.man $(DESTDIR)$(man1dir)/cdrdao.1
-+ $(INSTALL_DATA) cdrdao.drivers $(DESTDIR)$(DRIVER_TABLE_FILE)
-
- installdirs:
-- $(srcdir)/../mkinstalldirs $(bindir)
-- $(srcdir)/../mkinstalldirs $(man1dir)
-- $(srcdir)/../mkinstalldirs $(CDRDAO_DATA_DIR)
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(CDRDAO_DATA_DIR)
-
- clean:
- rm -f *.o $(PRG)
---- cdrdao-1.1.7/utils/Makefile.in.orig Sun Oct 6 20:53:56 2002
-+++ cdrdao-1.1.7/utils/Makefile.in Thu Dec 26 09:31:35 2002
-@@ -53,10 +53,10 @@
- all: @utils_targets@
-
- install: all installdirs
-- $(INSTALL_PROGRAM) @utils_targets@ $(bindir)
-+ $(INSTALL_PROGRAM) @utils_targets@ $(DESTDIR)$(bindir)
-
- installdirs:
-- $(srcdir)/../mkinstalldirs $(bindir)
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
- # $(srcdir)/../mkinstalldirs $(man1dir)
- # $(srcdir)/../mkinstalldirs $(CDRDAO_DATA_DIR)
-
+++ /dev/null
---- cdrdao-1.1.5/trackdb/CdTextItem.cc.orig Sun Apr 29 15:42:08 2001
-+++ cdrdao-1.1.5/trackdb/CdTextItem.cc Sat Oct 12 21:13:26 2002
-@@ -18,6 +18,7 @@
- */
-
- #include <iostream.h>
-+#include <iomanip.h>
- #include <assert.h>
- #include <string.h>
- #include <ctype.h>
-@@ -129,7 +130,7 @@
- else if (isprint(data_[i]))
- out << data_[i];
- else
-- out.form("\\%03o", (unsigned int)data_[i]);
-+ out << '\\' << setw(3) << setfill('0') << oct << (unsigned int)data_[i] << setfill(' ') << dec;
- }
-
- out << "\"";
-@@ -140,7 +141,7 @@
- out << " {";
- for (i = 0; i < dataLen_; i++) {
- if (i == 0) {
-- out.form("%2d", (unsigned int)data_[i]);
-+ out << setw(2) << dec << (unsigned int)data_[i];
- }
- else {
- if (i % 12 == 0)
-@@ -148,7 +149,7 @@
- else
- out << ", ";
-
-- out.form("%2d", (unsigned int)data_[i]);
-+ out << setw(2) << dec << (unsigned int)data_[i];
- }
- }
-
---- cdrdao-1.1.5/utils/toc2cue.cc.orig Sun Apr 29 15:42:09 2001
-+++ cdrdao-1.1.5/utils/toc2cue.cc Sat Oct 12 21:21:18 2002
-@@ -27,6 +27,7 @@
- #include <stdarg.h>
- #include <getopt.h>
- #include <fstream.h>
-+#include <iomanip.h>
-
- #include "util.h"
- #include "Toc.h"
-@@ -291,7 +292,7 @@
- trun != NULL;
- trun = titr.next(start, end), trackNr++) {
- out << " TRACK ";
-- out.form("%02d ", trackNr);
-+ out << setw(2) << setfill('0') << dec << trackNr << setfill(' ') << " ";
-
- switch (trun->type()) {
- case TrackData::AUDIO: