Apparently there's 2 hardwired references of discid (cries for refactoring!).
Updated patch attached.

--mb still doesn't work because libwebservice-musicbrainz-perl doesn't seem to
provide the required module:

Please install MusicBrainz::DiscID and dependencies
from your closest CPAN mirror; e.g. type as root:
perl -MCPAN -e 'install MusicBrainz::DiscID'

Cheers,
Serafeim

-- 
debtags-organised WNPP bugs: http://members.hellug.gr/serzan/wnpp
diff -Nurp ripit-3.8.0.orig//debian/control ripit-3.8.0/debian/control
--- ripit-3.8.0.orig//debian/control	2010-03-27 20:40:37.000000000 +0100
+++ ripit-3.8.0/debian/control	2010-03-27 20:42:00.000000000 +0100
@@ -13,7 +13,8 @@ Depends: libwww-perl, libcddb-get-perl,
          cdparanoia | cdda2wav,
          vorbis-tools (>= 1.0beta4-1) | lame | flac | bladeenc | faac,
          normalize-audio,
-         libwebservice-musicbrainz-perl
+         libwebservice-musicbrainz-perl,
+         cd-discid
 Suggests: eject, id3 (>= 0.12), id3v2
 Description: Textbased audio cd ripper
  ripit runs in text mode (no fancy GUI here) and does everything required to
diff -Nurp ripit-3.8.0.orig//debian/patches/fix-discid-invocation.patch ripit-3.8.0/debian/patches/fix-discid-invocation.patch
--- ripit-3.8.0.orig//debian/patches/fix-discid-invocation.patch	1970-01-01 01:00:00.000000000 +0100
+++ ripit-3.8.0/debian/patches/fix-discid-invocation.patch	2010-03-27 21:01:21.000000000 +0100
@@ -0,0 +1,20 @@
+--- a/ripit.pl
++++ b/ripit.pl
+@@ -1051,7 +1051,7 @@
+    }
+ 
+    if($mb == 1) {
+-      open(DISCID, "discid $scsi_cddev|");
++      open(DISCID, "/usr/bin/cd-discid $scsi_cddev|");
+       my @response = <DISCID>;
+       close DISCID;
+       chomp($cd{discid} = join("", grep(s/^DiscID\s*:\s//, @response)));
+@@ -1186,7 +1186,7 @@
+    eval{ $disc = new MusicBrainz::DiscID($scsi_cddev);};
+    if($@) {
+       # Use the libdiscid command discid to retrieve the MB discid.
+-      open(DISCID, "discid $scsi_cddev|");
++      open(DISCID, "/usr/bin/cd-discid $scsi_cddev|");
+       my @response = <DISCID>;
+       close DISCID;
+       chomp($discid = join("", grep(s/^DiscID\s*:\s//, @response)));
diff -Nurp ripit-3.8.0.orig//debian/patches/series ripit-3.8.0/debian/patches/series
--- ripit-3.8.0.orig//debian/patches/series	2010-03-27 20:40:37.000000000 +0100
+++ ripit-3.8.0/debian/patches/series	2010-03-27 20:43:11.000000000 +0100
@@ -1,2 +1,3 @@
+fix-discid-invocation.patch
 normalize.patch
 makefile.patch

Reply via email to