Package: cdrkit
Version: 5:1.0~pre4-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my cdrkit 5:1.0~pre4-1.1 NMU.
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/cdda2wav/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/cdda2wav/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/cdda2wav/CMakeLists.txt 2006-09-05
09:04:37.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/cdda2wav/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/cdrecord/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/cdrecord/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/cdrecord/CMakeLists.txt 2006-09-06
17:58:47.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/cdrecord/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -1,5 +1,5 @@
PROJECT (CDRECORD)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ${CMAKE_BINARY_DIR})
INCLUDE(../include/AddScgBits.cmake)
AUX_SOURCE_DIRECTORY(. CDRECORD_SRCS)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/cdrecord/drv_mmc.c
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/cdrecord/drv_mmc.c
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/cdrecord/drv_mmc.c 2006-09-03
15:29:34.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/cdrecord/drv_mmc.c 2006-09-21
14:12:13.000000000 +0200
@@ -60,7 +60,7 @@
#include <scg/scsireg.h>
#include <scg/scsitransp.h>
-#include <scsimmc.h>
+#include "scsimmc.h"
#include "mmcvendor.h"
#include "cdrecord.h"
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/debian/changelog
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/debian/changelog
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/debian/changelog 2006-09-21
14:12:12.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/debian/changelog 2006-09-21
14:12:13.000000000 +0200
@@ -1,3 +1,12 @@
+cdrkit (5:1.0~pre4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't build with -I. -- fixes include of wrong endian.h, which in turn
+ makes sure mkisofs capitalizes filenames correctly; patch from
+ Modestas Vainius. (Closes: #358497)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Thu, 21 Sep 2006 13:58:12 +0200
+
cdrkit (5:1.0~pre4-1) unstable; urgency=low
[ Peter Samuelson ]
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libdeflt/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/libdeflt/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libdeflt/CMakeLists.txt 2006-08-25
18:54:59.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/libdeflt/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libhfs_iso/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/libhfs_iso/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libhfs_iso/CMakeLists.txt 2006-08-25
18:54:59.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/libhfs_iso/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libparanoia/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/libparanoia/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libparanoia/CMakeLists.txt 2006-08-25
18:54:59.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/libparanoia/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libscg/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/libscg/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libscg/CMakeLists.txt 2006-09-05
09:04:37.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/libscg/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libschily/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/libschily/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libschily/CMakeLists.txt 2006-08-25
18:54:59.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/libschily/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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 )
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libunls/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/libunls/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/libunls/CMakeLists.txt 2006-08-31
00:04:11.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/libunls/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/mkisofs/apple.c
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/mkisofs/apple.c
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/mkisofs/apple.c 2006-09-03
15:29:34.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/mkisofs/apple.c 2006-09-21
14:12:13.000000000 +0200
@@ -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
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/mkisofs/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/mkisofs/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/mkisofs/CMakeLists.txt 2006-09-05
09:04:37.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/mkisofs/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
@@ -33,7 +33,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})
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/mkisofs/fnmatch.c
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/mkisofs/fnmatch.c
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/mkisofs/fnmatch.c 2006-09-05
10:39:04.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/mkisofs/fnmatch.c 2006-09-21
14:12:13.000000000 +0200
@@ -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
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/mkisofs/mac_label.c
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/mkisofs/mac_label.c
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/mkisofs/mac_label.c 2006-09-05
10:39:04.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/mkisofs/mac_label.c 2006-09-21
14:12:13.000000000 +0200
@@ -58,7 +58,7 @@
#include <mconfig.h>
#include "mkisofs.h"
-#include <mac_label.h>
+#include "mac_label.h"
#include "apple.h"
#ifdef PREP_BOOT
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/readcd/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/readcd/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/readcd/CMakeLists.txt 2006-09-05
09:04:37.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/readcd/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/rscsi/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/rscsi/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/rscsi/CMakeLists.txt 2006-09-05
09:04:37.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/rscsi/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -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)
diff -Nru /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/scgcheck/CMakeLists.txt
/tmp/mW18YoyL7F/cdrkit-1.0~pre4/scgcheck/CMakeLists.txt
--- /tmp/MqhGzN5kxa/cdrkit-1.0~pre4/scgcheck/CMakeLists.txt 2006-09-05
09:04:37.000000000 +0200
+++ /tmp/mW18YoyL7F/cdrkit-1.0~pre4/scgcheck/CMakeLists.txt 2006-09-21
14:12:13.000000000 +0200
@@ -1,5 +1,5 @@
PROJECT (SCGCHECK)
-INCLUDE_DIRECTORIES(../include ../cdrecord . )
+INCLUDE_DIRECTORIES(../include ../cdrecord )
INCLUDE(../include/AddScgBits.cmake)
