- updated to 1.1.7

Changed files:
    cdrdao-destdir.patch -> 1.3
    cdrdao-gcdmaster-paths.patch -> 1.3
    cdrdao-opt.patch -> 1.2

diff --git a/cdrdao-destdir.patch b/cdrdao-destdir.patch
index e1d451b283c10aa7e120b6c0f698074dea0e0c4a..4bedce4f2501954a32d543c43f0e3f2965a2b6e2 100644 (file)
--- a/cdrdao-destdir.patch
+++ b/cdrdao-destdir.patch
@@ -1,31 +1,6 @@
-diff -Nur cdrdao-1.1.5.orig/dao/Makefile.in cdrdao-1.1.5/dao/Makefile.in
---- cdrdao-1.1.5.orig/dao/Makefile.in  Sun Apr 29 15:42:08 2001
-+++ cdrdao-1.1.5/dao/Makefile.in       Fri Nov  2 12:59:50 2001
-@@ -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)
-diff -Nur cdrdao-1.1.5.orig/xdao/Makefile.in cdrdao-1.1.5/xdao/Makefile.in
---- cdrdao-1.1.5.orig/xdao/Makefile.in Sun Apr 29 15:42:09 2001
-+++ cdrdao-1.1.5/xdao/Makefile.in      Fri Nov  2 13:00:36 2001
-@@ -70,23 +70,23 @@
+--- 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
@@ -39,6 +14,15 @@ diff -Nur cdrdao-1.1.5.orig/xdao/Makefile.in cdrdao-1.1.5/xdao/Makefile.in
 -      $(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)/xcdrdao.1
@@ -50,6 +34,15 @@ diff -Nur cdrdao-1.1.5.orig/xdao/Makefile.in cdrdao-1.1.5/xdao/Makefile.in
 +      $(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)/gnome/apps/Applications/gcdmaster.desktop
  
  installdirs:
@@ -64,3 +57,41 @@ diff -Nur cdrdao-1.1.5.orig/xdao/Makefile.in cdrdao-1.1.5/xdao/Makefile.in
  
  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)
+ 

diff --git a/cdrdao-gcdmaster-paths.patch b/cdrdao-gcdmaster-paths.patch
index 1e463659ba1245b8172410b8105aedbd62728b4c..bcad813b90c828d47e174797432fae907c66e3e9 100644 (file)
--- a/cdrdao-gcdmaster-paths.patch
+++ b/cdrdao-gcdmaster-paths.patch
@@ -1,5 +1,5 @@
---- cdrdao-1.1.5/xdao/Makefile.in.orig Fri Nov  2 13:37:18 2001
-+++ cdrdao-1.1.5/xdao/Makefile.in      Fri Nov  2 13:56:09 2001
+--- cdrdao-1.1.7/xdao/Makefile.in.orig Wed Dec 25 21:09:53 2002
++++ cdrdao-1.1.7/xdao/Makefile.in      Wed Dec 25 21:12:03 2002
 @@ -8,16 +8,16 @@
  # 
  # Source and Installation Paths
@@ -22,7 +22,7 @@
  man1dir =      $(mandir)/man1
  #
  # install program
-@@ -71,7 +71,7 @@
+@@ -72,7 +72,7 @@
  
  install: all installdirs
        $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir)
@@ -31,10 +31,10 @@
        $(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
-@@ -80,13 +80,13 @@
-       $(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
+@@ -90,13 +90,13 @@
+       $(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)/gnome/apps/Applications/gcdmaster.desktop
 +      $(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/applnk/Applications/gcdmaster.desktop
  
@@ -43,7 +43,7 @@
        $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
        $(srcdir)/../mkinstalldirs $(DESTDIR)$(PIXMAPS_DIR)
 -      $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnome/apps/Applications
-+      $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/applnk/Applications
++      $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/applnk/Applications/
  
  uninstall:
        rm -f $(bindir)/$(PRG) $(man1dir)/xcdrdao.1

diff --git a/cdrdao-opt.patch b/cdrdao-opt.patch
index b70e724c7c1c7c4ea7bd3843faf57f010d916d4b..e708fd9310097f0e41b275deb775df2ddd45dc2b 100644 (file)
--- a/cdrdao-opt.patch
+++ b/cdrdao-opt.patch
@@ -1,16 +1,16 @@
-diff -Nur cdrdao-1.1.3.orig/paranoia/configure.in cdrdao-1.1.3/paranoia/configure.in
---- cdrdao-1.1.3.orig/paranoia/configure.in    Tue Oct 26 18:13:45 1999
-+++ cdrdao-1.1.3/paranoia/configure.in Thu Mar 15 01:42:51 2001
-@@ -16,10 +16,10 @@
+--- cdrdao-1.1.7/paranoia/configure.in.orig    Wed Dec 25 21:01:50 2002
++++ cdrdao-1.1.7/paranoia/configure.in Wed Dec 25 21:05:21 2002
+@@ -17,11 +17,11 @@
        case $host in 
        i?86-*-linux*)
                DEBUG="-g -Wall -fsigned-char"
--              OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
-+              OPT="$CFLAGS -ffast-math -fsigned-char -finline-functions";;
+-              OPT="-O20 -ffast-math -fsigned-char -finline-functions"
++              OPT="$CFLAGS -ffast-math -fsigned-char -finline-functions"
+                 ;;
        *)
                DEBUG="-g -Wall -fsigned-char"
--              OPT="-O20 -fsigned-char";;
-+              OPT="$CFLAGS -fsigned-char";;
+-              OPT="-O20 -fsigned-char"
++              OPT="$CFLAGS -fsigned-char"
+                 ;;
          esac
  fi
-