diff -u grabcd-0006/debian/changelog grabcd-0006/debian/changelog --- grabcd-0006/debian/changelog +++ grabcd-0006/debian/changelog @@ -1,3 +1,10 @@ +grabcd (0006-1ubuntu1) jaunty; urgency=low + + * debian/control: depend on an ssh client, not the server (LP: #46448) + * debian/rules, README: use descriptive filenames (LP: #46447) + + -- Daniel T Chen Thu, 18 Dec 2008 23:51:30 -0500 + grabcd (0006-1) unstable; urgency=low * New upstream release. diff -u grabcd-0006/debian/control grabcd-0006/debian/control --- grabcd-0006/debian/control +++ grabcd-0006/debian/control @@ -1,7 +1,8 @@ Source: grabcd Section: sound Priority: optional -Maintainer: Christian Garbs +XSBC-Original-Maintainer: Christian Garbs +Maintainer: Ubuntu MOTU Developers Build-Depends: debhelper (>= 4.0.0) Standards-Version: 3.6.1 @@ -28,7 +29,8 @@ Package: grabcd-rip Architecture: all -Depends: libgrabcd-readconfig-perl, libaudio-cd-perl, libterm-readline-gnu-perl, ssh, cdparanoia +Depends: libgrabcd-readconfig-perl, libaudio-cd-perl, libterm-readline-gnu-perl, + openssh-client | ssh-client, cdparanoia Description: rip and encode audio CDs - ripper grabcd lets you rip and encode audio CDs. Ripping and encoding can be done on different systems. diff -u grabcd-0006/debian/rules grabcd-0006/debian/rules --- grabcd-0006/debian/rules +++ grabcd-0006/debian/rules @@ -56,12 +56,12 @@ -rm -rf debian/grabcd-encode install -d $(CURDIR)/debian/grabcd-encode/usr/bin/ - install -m 0755 encode.pl $(CURDIR)/debian/grabcd-encode/usr/bin/ + install -m 0755 encode.pl $(CURDIR)/debian/grabcd-encode/usr/bin/grabcd-encode -rm -rf debian/grabcd-rip install -d $(CURDIR)/debian/grabcd-rip/usr/bin/ - install -m 0755 grabcd.pl $(CURDIR)/debian/grabcd-rip/usr/bin/ - install -m 0755 scancd.pl $(CURDIR)/debian/grabcd-rip/usr/bin/ + install -m 0755 grabcd.pl $(CURDIR)/debian/grabcd-rip/usr/bin/grabcd + install -m 0755 scancd.pl $(CURDIR)/debian/grabcd-rip/usr/bin/grabcd-scancd dh_installdocs -A README HISTORY only in patch2: unchanged: --- grabcd-0006.orig/README +++ grabcd-0006/README @@ -6,19 +6,19 @@ == What does it do? -"scancd.pl" reads a CD and lets you enter track information (I'm no +"grabcd-scancd" reads a CD and lets you enter track information (I'm no fan of CDDB as the data there is very limited - think of a hit sampler CD with different artists, you can't have a different artist per track). -"grabcd.pl" will then read the CD and start the encoding via -"encode.pl" (this will be done automatically). You will get OGG +"grabcd" will then read the CD and start the encoding via +"grabcd-encode" (this will be done automatically). You will get OGG encoded files in a specified directory hierarchy. == What's special about this? -grabcd.sh and encode.sh can run on different machines. This is +grabcd and grabcd-encode can run on different machines. This is essential for me as my CD-ROM is in my slow workstation while the server with the fast CPU has no CD-ROM. @@ -33,7 +33,7 @@ CDINFO_TEMP=/tmp/cdinfo CDINFO_REMOTE=/mnt/storage/scancd ENCODE_HOST=localhost -ENCODE_BINARY=/usr/bin/encode.pl +ENCODE_BINARY=/usr/bin/grabcd-encode ENCODE_NICE=20 ENCODE_PATH=/mnt/storage/ogg @@ -43,7 +43,7 @@ CDINFO_TEMP=/tmp/cdinfo CDINFO_REMOTE=mitch@yggdrasil.mitch.h.shuttle.de:/home/mitch/ogg/scancd ENCODE_HOST=mitch@yggdrasil.mitch.h.shuttle.de -ENCODE_BINARY=/home/mitch/bin/encode.pl +ENCODE_BINARY=/home/mitch/bin/grabcd-encode ENCODE_NICE=20 ENCODE_PATH=/home/mitch/ogg @@ -54,10 +54,10 @@ CDINFO_TEMP - The artist/track data is temporarily stored here CDINFO_REMOTE - The artist/track data is archived here. Useful if you want to reread a CD later. Just copy the - appropriate file to $CDINFO_TEMP and start grabcd.pl. -ENCODE_HOST - Where to run encode.pl. Set to empty or "localhost" + appropriate file to $CDINFO_TEMP and start grabcd. +ENCODE_HOST - Where to run grabcd-encode. Set to empty or "localhost" for local operation. Set to a "hostname" or "user@hostname" for remote operation. -ENCODE_BINARY - Where to find the encode.pl binary. -ENCODE_NICE - Nicelevel for encode.pl. +ENCODE_BINARY - Where to find the grabcd-encode binary. +ENCODE_NICE - Nicelevel for grabcd-encode. ENCODE_PATH - Where to put the encoded files.