RFS: cdtool update for sarge

[Max Vozeler <max@hinterhof.net>]

Hi!

The version of cdtool in sarge has a nasty bug (#262661) that prevents
playing of the last track of audio CDs. There is a new upstream release
and Debian package ready that fixes it, but my usual sponsor hasn't had
time to look into it yet.

I known I'm late in the game, so I've prepared another upload (2.1.5-10)
of the current upstream version in Debian that only fixes this bug. I've
attached the small diff against the current 2.1.5-9 source package.

I'd be grateful if someone could look into / sponsor this.

Thanks,
Max

PS: This is assuming there's still a chance for medium or high urgency
uploads to make it in before the freeze. I have no idea how the buildd
backlog will affect this.

-- 
308E81E7B97963BCA0E6ED889D5BD511B7CDA2DC

Index: debian/changelog
===================================================================
--- debian/changelog	(.../9)	(revision 726)
+++ debian/changelog	(.../10)	(revision 726)
@@ -1,3 +1,10 @@
+cdtool (2.1.5-10) unstable; urgency=medium
+
+  * Applied patch to fix playing the last track. (Closes: #262661)
+    Thanks Jakob Bratkovic.
+
+ -- Max Vozeler <max@hinterhof.net>  Tue, 17 Aug 2004 11:30:20 +0200
+
 cdtool (2.1.5-9) unstable; urgency=low
 
   * Check that the number of tracks from TOC header doesn't exceed 99.
Index: debian/README.Debian
===================================================================
--- debian/README.Debian	(.../9)	(revision 726)
+++ debian/README.Debian	(.../10)	(revision 726)
@@ -6,7 +6,8 @@
   Kernels 2.2.16 - 2.2.17
    
     Some users reported problems playing CDs with 2.2.16 and 2.2.17 Linux
-    kernels. cdplay exists with the error message "ioctl cdromplaytrkind". The
-    cause of this was a kernel bug that's fixed in 2.2.18 and later kernels.
+    kernels. cdplay exits with the error message "ioctl cdromplaytrkind". The
+    cause of this was a kernel bug that has been fixed in 2.2.18 and later
+    kernels.
 
  -- Max Vozeler <max@hinterhof.net>  Thu May  6 22:23:23 CEST 2004
Index: hardware.c
===================================================================
--- hardware.c	(.../9)	(revision 726)
+++ hardware.c	(.../10)	(revision 726)
@@ -45,7 +45,7 @@
 /* note that this is the last *real* track; a LEADOUT track follows (?) */
 int
 last_track(const cdhw_t *hw) {
-  return hw->tochdr.cdth_trk1 - 1;
+  return hw->tochdr.cdth_trk1;
 }
 
 /* track is 1-based! */
@@ -128,9 +128,9 @@
 
   /* read individual tracks */
   hw->iData = hw->iAudio = 0;
-  for (ii=first_track(hw)-1; ii<=last_track(hw)+1; ii++) {
+  for (ii=first_track(hw)-1; ii<=last_track(hw); ii++) {
       hw->tocentries[ii].cdte_track=
-	  (ii==last_track(hw)+1) ? CDROM_LEADOUT : ii+1;
+	  (ii==last_track(hw)) ? CDROM_LEADOUT : ii+1;
       
       hw->tocentries[ii].cdte_format = CDROM_MSF;
       if ( ioctl(cdfile, CDROMREADTOCENTRY, &(hw->tocentries[ii])) == -1 ) {