[Debburn-changes] r312 - in nonameyet/trunk: . cdda2wav cdrecord
debian libdeflt libhfs_iso libparanoia libscg libschily
libunls mkisofs readcd rscsi scgcheck
Eduard Bloch
blade at costa.debian.org
Fri Sep 15 12:27:18 UTC 2006
Author: blade
Date: 2006-09-15 12:27:18 +0000 (Fri, 15 Sep 2006)
New Revision: 312
Modified:
nonameyet/trunk/Changelog
nonameyet/trunk/cdda2wav/CMakeLists.txt
nonameyet/trunk/cdrecord/CMakeLists.txt
nonameyet/trunk/cdrecord/drv_mmc.c
nonameyet/trunk/debian/changelog
nonameyet/trunk/libdeflt/CMakeLists.txt
nonameyet/trunk/libhfs_iso/CMakeLists.txt
nonameyet/trunk/libparanoia/CMakeLists.txt
nonameyet/trunk/libscg/CMakeLists.txt
nonameyet/trunk/libschily/CMakeLists.txt
nonameyet/trunk/libunls/CMakeLists.txt
nonameyet/trunk/mkisofs/CMakeLists.txt
nonameyet/trunk/mkisofs/apple.c
nonameyet/trunk/mkisofs/fnmatch.c
nonameyet/trunk/mkisofs/mac_label.c
nonameyet/trunk/readcd/CMakeLists.txt
nonameyet/trunk/rscsi/CMakeLists.txt
nonameyet/trunk/scgcheck/CMakeLists.txt
Log:
cmakelists fixes to use local headers, removed . from the include paths
Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/Changelog 2006-09-15 12:27:18 UTC (rev 312)
@@ -11,6 +11,10 @@
* better track numbers extraction command in cdda2ogg/cdda2mp3
* reenabled (forgotten) support for libedc
+ [ Modestas Vainius ]
+ * dropped . from the include path and fixed mkisofs source to use the local
+ headers
+
[ Christian Fromme ]
* detailed review and correction of author related data in manpages and
README files
Modified: nonameyet/trunk/cdda2wav/CMakeLists.txt
===================================================================
--- nonameyet/trunk/cdda2wav/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/cdda2wav/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (CDDA2WAV)
-INCLUDE_DIRECTORIES(../include ../cdrecord . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../cdrecord ${CMAKE_BINARY_DIR})
include(../include/AddScgBits.cmake)
FIND_FILE (HAVE_SYS_SOUNDCARD_H sys/soundcard.h)
Modified: nonameyet/trunk/cdrecord/CMakeLists.txt
===================================================================
--- nonameyet/trunk/cdrecord/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/cdrecord/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (CDRECORD)
-INCLUDE_DIRECTORIES(../include ../libedc . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libedc ${CMAKE_BINARY_DIR})
INCLUDE(../include/AddScgBits.cmake)
AUX_SOURCE_DIRECTORY(. CDRECORD_SRCS)
Modified: nonameyet/trunk/cdrecord/drv_mmc.c
===================================================================
--- nonameyet/trunk/cdrecord/drv_mmc.c 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/cdrecord/drv_mmc.c 2006-09-15 12:27:18 UTC (rev 312)
@@ -60,7 +60,7 @@
#include <scg/scsireg.h>
#include <scg/scsitransp.h>
-#include <scsimmc.h>
+#include "scsimmc.h"
#include "mmcvendor.h"
#include "cdrecord.h"
Modified: nonameyet/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/debian/changelog 2006-09-15 12:27:18 UTC (rev 312)
@@ -4,6 +4,7 @@
+ typos in wodim.1 fixes, thanks to J. Alto (closes: #386898)
+ enabled libedc support (closes: #387429)
* fixed installation of FAQ and FORK files (closes: #386735)
+ * remove . from the include list, patch by Modestas Vainius (closes: 358497)
-- Eduard Bloch <blade at debian.org> Tue, 12 Sep 2006 11:16:34 +0200
Modified: nonameyet/trunk/libdeflt/CMakeLists.txt
===================================================================
--- nonameyet/trunk/libdeflt/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/libdeflt/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (LIBdeflt)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ${CMAKE_BINARY_DIR} ../cdrecord)
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../cdrecord)
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
SET(LIBdeflt_SRCS default.c)
Modified: nonameyet/trunk/libhfs_iso/CMakeLists.txt
===================================================================
--- nonameyet/trunk/libhfs_iso/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/libhfs_iso/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (LIBhfs_iso)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ../cdrecord ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../cdrecord ${CMAKE_BINARY_DIR})
ADD_DEFINITIONS(-DUSE_LARGEFILES -DABORT_DEEP_ISO_ONLY -DAPPLE_HYB -DUDF -DDVD_VIDEO -DSORTING -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG)
Modified: nonameyet/trunk/libparanoia/CMakeLists.txt
===================================================================
--- nonameyet/trunk/libparanoia/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/libparanoia/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (LIBparanoia)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR} ../cdrecord)
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../cdrecord)
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
SET(LIBparanoia_SRCS gap.c isort.c overlap.c p_block.c paranoia.c pmalloc.c)
Modified: nonameyet/trunk/libscg/CMakeLists.txt
===================================================================
--- nonameyet/trunk/libscg/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/libscg/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (LIBSCG)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR} ../cdrecord)
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR} ../cdrecord)
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)
Modified: nonameyet/trunk/libschily/CMakeLists.txt
===================================================================
--- nonameyet/trunk/libschily/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/libschily/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (LIBSCHILY)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ${CMAKE_BINARY_DIR} ../cdrecord)
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ${CMAKE_BINARY_DIR} ../cdrecord)
SET(LIBSCHILY_SRCS astoi.c astoll.c astoull.c breakline.c cmpbytes.c cmpnullbytes.c comerr.c cvt.c error.c fconv.c fexec.c fillbytes.c findbytes.c findline.c format.c getargs.c getav0.c getdomainname.c geterrno.c getfp.c gethostid.c gethostname.c getpagesize.c handlecond.c jsprintf.c jssnprintf.c jssprintf.c match.c matchl.c movebytes.c printf.c raisecond.c rename.c saveargs.c serrmsg.c seterrno.c setfp.c snprintf.c spawn.c sprintf.c strcatl.c strdup.c streql.c strtod.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fcons64.c stdio/fdown.c stdio/fdup.c stdio/fdup64.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/fgetstr.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/fileluopen64.c stdio/filemopen.c stdio/filemopen64.c stdio/fileopen.c stdio/fileopen64.c stdio/filepos.c stdio/filepos64.c stdio/fileread.c stdio/filereopen.c stdio/filereopen64.c stdio/fileseek.c stdio/fileseek64.c stdio/filesize.c stdio/filesize64.c stdio/filestat.c stdio/filestat64.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/openfd64.c stdio/peekc.c )
Modified: nonameyet/trunk/libunls/CMakeLists.txt
===================================================================
--- nonameyet/trunk/libunls/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/libunls/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (LIBunls)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ../cdrecord ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../cdrecord ${CMAKE_BINARY_DIR})
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
FIND_FILE (USE_ICONV iconv.h)
Modified: nonameyet/trunk/mkisofs/CMakeLists.txt
===================================================================
--- nonameyet/trunk/mkisofs/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/mkisofs/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -2,7 +2,7 @@
INCLUDE(../include/AddScgBits.cmake)
-INCLUDE_DIRECTORIES(../include ../libhfs_iso . ../cdrecord ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libhfs_iso ../cdrecord ${CMAKE_BINARY_DIR})
FIND_FILE (USE_MAGIC magic.h)
IF(USE_MAGIC)
@@ -34,7 +34,7 @@
# common lib set and mkisofs source parts for the rest
LINK_LIBRARIES(${SCG_LIBS} schily deflt unls ${EXTRA_LIBICONV} )
-SET(MI_COMMON diag/scsi.c diag/scsi_cdr.c diag/cd_misc.c diag/modes.c diag/defaults.c diag/getnum.c)
+SET(MI_COMMON scsi.c scsi_cdr.c cd_misc.c modes.c defaults.c getnum.c)
ADD_EXECUTABLE(devdump diag/dump.c ${MI_COMMON})
ADD_EXECUTABLE(isodebug diag/isodebug.c ${MI_COMMON})
ADD_EXECUTABLE(isodump diag/isodump.c ${MI_COMMON})
Modified: nonameyet/trunk/mkisofs/apple.c
===================================================================
--- nonameyet/trunk/mkisofs/apple.c 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/mkisofs/apple.c 2006-09-15 12:27:18 UTC (rev 312)
@@ -58,7 +58,7 @@
#include <utypes.h>
#include <ctype.h>
#include <netinet/in.h>
-#include <apple.h>
+#include "apple.h"
#include <schily.h>
#ifdef USE_MAGIC
Modified: nonameyet/trunk/mkisofs/fnmatch.c
===================================================================
--- nonameyet/trunk/mkisofs/fnmatch.c 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/mkisofs/fnmatch.c 2006-09-15 12:27:18 UTC (rev 312)
@@ -35,12 +35,12 @@
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include <errno.h>
#include <utypes.h>
-#include <fnmatch.h>
+#include "fnmatch.h"
#ifndef __STDC__
#define const
Modified: nonameyet/trunk/mkisofs/mac_label.c
===================================================================
--- nonameyet/trunk/mkisofs/mac_label.c 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/mkisofs/mac_label.c 2006-09-15 12:27:18 UTC (rev 312)
@@ -58,7 +58,7 @@
#include <mconfig.h>
#include "mkisofs.h"
-#include <mac_label.h>
+#include "mac_label.h"
#include "apple.h"
#ifdef PREP_BOOT
Modified: nonameyet/trunk/readcd/CMakeLists.txt
===================================================================
--- nonameyet/trunk/readcd/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/readcd/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (READECD)
-INCLUDE_DIRECTORIES(../include ../cdrecord . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../cdrecord ${CMAKE_BINARY_DIR})
INCLUDE(../include/AddScgBits.cmake)
AUX_SOURCE_DIRECTORY(. READCD_SRCS)
Modified: nonameyet/trunk/rscsi/CMakeLists.txt
===================================================================
--- nonameyet/trunk/rscsi/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/rscsi/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (RSCSI)
-INCLUDE_DIRECTORIES(../include ../cdrecord . ${CMAKE_BINARY_DIR} )
+INCLUDE_DIRECTORIES(../include ../cdrecord ${CMAKE_BINARY_DIR} )
INCLUDE(../include/AddScgBits.cmake)
LINK_DIRECTORIES(../libschily ../libscg ../libdeflt)
Modified: nonameyet/trunk/scgcheck/CMakeLists.txt
===================================================================
--- nonameyet/trunk/scgcheck/CMakeLists.txt 2006-09-15 01:53:32 UTC (rev 311)
+++ nonameyet/trunk/scgcheck/CMakeLists.txt 2006-09-15 12:27:18 UTC (rev 312)
@@ -1,5 +1,5 @@
PROJECT (SCGCHECK)
-INCLUDE_DIRECTORIES(../include ../cdrecord . )
+INCLUDE_DIRECTORIES(../include ../cdrecord )
INCLUDE(../include/AddScgBits.cmake)
More information about the Debburn-changes
mailing list