[Debburn-changes] r383 - in nonameyet/trunk: . debian libscg

[Eduard Bloch]

Author: blade
Date: 2006-11-07 11:35:25 +0100 (Tue, 07 Nov 2006)
New Revision: 383

Added:
   nonameyet/trunk/libscg/scsi-remote.c
Removed:
   nonameyet/trunk/librscg/
Modified:
   nonameyet/trunk/debian/changelog
   nonameyet/trunk/libscg/CMakeLists.txt
   nonameyet/trunk/libscg/scsiopen.c
Log:
moved scsi-remote.c to the libscg sources and adapted the CMakefile to use it instead of rdummy, for #396460

Modified: nonameyet/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog	2006-11-06 09:49:31 UTC (rev 382)
+++ nonameyet/trunk/debian/changelog	2006-11-07 10:35:25 UTC (rev 383)
@@ -3,6 +3,7 @@
   * New upstream source snapshot
     + typos in wodim.1 fixes, thanks to J. Alto (closes: #386898)
     + reenabled libedc support (closes: #387429)
+    + terminates FIFO process on exist (closes: #397271)
   * fixed installation of FAQ and FORK files (closes: #386735)
   * cdda2ogg/cdda2mp3 are unified, installing cdda2mp3 as symlink
   * remove . from the include list, patch by Modestas Vainius
@@ -13,7 +14,7 @@
     new target locations /etc/{wodim,rscsi}.conf 
     (closes: #388403, #390084, #388119, #387854)
 
- -- Eduard Bloch <blade at debian.org>  Tue, 12 Sep 2006 11:16:34 +0200
+ -- Eduard Bloch <blade at debian.org>  Mon, 06 Nov 2006 10:47:33 +0100
 
 cdrkit (5:1.0~pre4-1.1) unstable; urgency=medium
 

Modified: nonameyet/trunk/libscg/CMakeLists.txt
===================================================================
--- nonameyet/trunk/libscg/CMakeLists.txt	2006-11-06 09:49:31 UTC (rev 382)
+++ nonameyet/trunk/libscg/CMakeLists.txt	2006-11-07 10:35:25 UTC (rev 383)
@@ -3,7 +3,7 @@
 include(../include/AddScgBits.cmake)
 
 #SET(LIBSCG_SRCS rdummy.c scgsettarget.c scgtimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
-SET(LIBSCG_SRCS rdummy.c scgsettarget.c scgtimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c)
+SET(LIBSCG_SRCS scgsettarget.c scgtimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c)
 LINK_DIRECTORIES(../libschily)
 ADD_LIBRARY (scg STATIC ${LIBSCG_SRCS})
 TARGET_LINK_LIBRARIES(scg schily ${SCG_SELF_LIBS})

Copied: nonameyet/trunk/libscg/scsi-remote.c (from rev 382, nonameyet/trunk/librscg/scsi-remote.c)

Modified: nonameyet/trunk/libscg/scsiopen.c
===================================================================
--- nonameyet/trunk/libscg/scsiopen.c	2006-11-06 09:49:31 UTC (rev 382)
+++ nonameyet/trunk/libscg/scsiopen.c	2006-11-07 10:35:25 UTC (rev 383)
@@ -245,6 +245,7 @@
 			}
 		}
 	}
+    fprintf(stderr, "wtf, open: %s\n", sdev);
 nulldevice:
 
 /*fprintf(stderr, "10 scsidev '%s' sdev '%s' devp '%s' b: %d t: %d l: %d\n", scsidev, sdev, devp, bus, tgt, lun);*/