diff -u multicd-1.7.3/debian/multicd.1 multicd-1.7.3/debian/multicd.1 --- multicd-1.7.3/debian/multicd.1 +++ multicd-1.7.3/debian/multicd.1 @@ -23,7 +23,7 @@ .SH OPTIONS For more assistance see the comments in /etc/multicdrc. .SH SEE ALSO -.BR cdrecord (1). +.BR wodim (1). .br .SH AUTHOR This manual page was originally written by Dr. Guenter Bechly diff -u multicd-1.7.3/debian/control multicd-1.7.3/debian/control --- multicd-1.7.3/debian/control +++ multicd-1.7.3/debian/control @@ -7,7 +7,7 @@ Package: multicd Architecture: all -Depends: ${perl:Depends}, cdrecord +Depends: ${perl:Depends}, wodim Description: Backup your data to CD-R/CD-RW multicd provides an easy way to backup a large number of files to multiple CDs. Give multicd the files/directories you want backed up and it will diff -u multicd-1.7.3/debian/changelog multicd-1.7.3/debian/changelog --- multicd-1.7.3/debian/changelog +++ multicd-1.7.3/debian/changelog @@ -1,3 +1,13 @@ +multicd (1.7.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "Depend on wodim" (Closes: + #418480) + * changed command names: s/cdrecord/wodim/, s/cdda2wav/icedax/, + s/mkisofs/genisoimage/ in script and manpage + + -- Martin Schauer Sat, 03 Dec 2011 16:27:18 +0100 + multicd (1.7.3-1) unstable; urgency=low * New upstream release. only in patch2: unchanged: --- multicd-1.7.3.orig/multicd +++ multicd-1.7.3/multicd @@ -117,6 +117,10 @@ # ## 14/12/04 Version 1.7.3 released. # +# 03/12/11 Martin E. Schauer Change from cdrecord to wodim +# sed -i -e 's/cdrecord/wodim/g' \ +# 's/cdda2wav/icedax/g' \ +# 's/mkisofs/genisoimage/g' multicd require 5; @@ -208,7 +212,7 @@ $disc_ready = 0; } -# Process id of the child process used to run cdrecord. Used when multi is enabled. +# Process id of the child process used to run wodim. Used when multi is enabled. my $pid; my $image_count = 0; @@ -661,7 +665,7 @@ } else { die "This should never happen. Program is broken!\n"; } - $status = system "$config{cdrecord} '$image'"; + $status = system "$config{wodim} '$image'"; $err = $!; } } @@ -670,13 +674,13 @@ } } - # Prepare to run cdrecord. - my $cdrecord = "$config{cdrecord} '$cur_image'"; + # Prepare to run wodim. + my $wodim = "$config{wodim} '$cur_image'"; unless($disc_ready) { { print "*** Make sure a CD is in the drive. ***\n", - "About to run cdrecord like this:\n", - "$cdrecord\n"; + "About to run wodim like this:\n", + "$wodim\n"; print "\n"; print "(s)kip CD, (q)uit program, or (c)ontinue? "; $_ = ; @@ -692,9 +696,9 @@ $disc_ready = 1; } - # Run cdrecord. If multi is on, run cdrecord in a child process. + # Run wodim. If multi is on, run wodim in a child process. # If no more CDs need to be created, then there is no need to fork - # another process, and so the parent process can run cdrecord. + # another process, and so the parent process can run wodim. if ($config{multi} and (@{$config{files}} or @path)) { # Change the current image file so the parent process can add files to a # new one while the child burns the other to cd. @@ -706,7 +710,7 @@ die "Never happen. Unless the code is screwed up.\n"; } - # Creating a new image file tends to bog the system down, and cdrecord will + # Creating a new image file tends to bog the system down, and wodim will # choke if we try running it at the same time, so create the new image file # before forking if one needs to be created. print "Checking for an extra image file before the burn starts...\n"; @@ -722,12 +726,12 @@ # Child process here. STDOUT->autoflush(1); STDERR->autoflush(1); - open STDOUT, ">&STDERR"; # Make all the cdrecord output go to stderr. - my $status = system $cdrecord; + open STDOUT, ">&STDERR"; # Make all the wodim output go to stderr. + my $status = system $wodim; if (defined $config{cd_done}) { system $config{cd_done}; } - # Exit code of child process depends on success of the cdrecord command. + # Exit code of child process depends on success of the wodim command. if ($status != 0) { exit 1; } else { @@ -740,7 +744,7 @@ print "Burning your CD...\n"; open SAVEOUT, ">&STDOUT"; open STDOUT, ">&STDERR"; - my $status = system $cdrecord; + my $status = system $wodim; open STDOUT, ">&SAVEOUT"; close SAVEOUT; if (defined $config{cd_done}) { @@ -757,7 +761,7 @@ } elsif ($cont eq 'q') { last CD; } elsif ($cont eq 'r') { - $status = system "$config{cdrecord} '$cur_image'"; + $status = system "$config{wodim} '$cur_image'"; } } } @@ -802,7 +806,7 @@ my($cfg) = @_; my @optnames = qw(multi only_one image_file1 image_file2 image_mount - cd_size fs_type files exclude cdrecord cd_done noburn + cd_size fs_type files exclude wodim cd_done noburn image_dir image_dir2 first_disc addfiles cd_dev cd_mount mkfs_opts index_file help check_config maxfile_size compress compress_level files_list exclude_list since); @@ -906,7 +910,7 @@ } # Required fields - foreach (qw(cd_size maxfile_size image_file1 image_mount fs_type cdrecord)) { + foreach (qw(cd_size maxfile_size image_file1 image_mount fs_type wodim)) { unless (defined $cfg->{$_}) { print "Required option '$_' not found.\n"; return 0;