[Debburn-changes] r310 - in nonameyet/trunk: . cdrecord debian libedc

[Eduard Bloch]

Author: blade
Date: 2006-09-14 17:49:05 +0000 (Thu, 14 Sep 2006)
New Revision: 310

Added:
   nonameyet/trunk/libedc/CMakeLists.txt
Modified:
   nonameyet/trunk/Changelog
   nonameyet/trunk/cdrecord/CMakeLists.txt
   nonameyet/trunk/debian/changelog
Log:
Oops, I forgot enabling libedc support and the CMakeLists.txt for it was missing as well

Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog	2006-09-13 17:46:48 UTC (rev 309)
+++ nonameyet/trunk/Changelog	2006-09-14 17:49:05 UTC (rev 310)
@@ -9,6 +9,7 @@
   * fixed libmagic detection
   * rewrote README.mkisofs, README.win32
   * better track numbers extraction command in cdda2ogg/cdda2mp3
+  * reenabled (forgotten) support for libedc
 
   [ Christian Fromme ]
   * detailed review and correction of author related data in manpages and

Modified: nonameyet/trunk/cdrecord/CMakeLists.txt
===================================================================
--- nonameyet/trunk/cdrecord/CMakeLists.txt	2006-09-13 17:46:48 UTC (rev 309)
+++ nonameyet/trunk/cdrecord/CMakeLists.txt	2006-09-14 17:49:05 UTC (rev 310)
@@ -1,5 +1,5 @@
 PROJECT (CDRECORD)
-INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR})
+INCLUDE_DIRECTORIES(../include ../libedc . ${CMAKE_BINARY_DIR})
 INCLUDE(../include/AddScgBits.cmake)
 
 AUX_SOURCE_DIRECTORY(. CDRECORD_SRCS)
@@ -13,9 +13,12 @@
    MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
 endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CAPTEST)
 
-LINK_DIRECTORIES(../libschily ../libscg ../libdeflt)
+LINK_DIRECTORIES(../libschily ../libscg ../libdeflt ../libedc)
+
+ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC)
+
 ADD_EXECUTABLE (wodim ${CDRECORD_SRCS})
-TARGET_LINK_LIBRARIES(wodim ${SCG_LIBS} schily deflt ${CAPLINK})
+TARGET_LINK_LIBRARIES(wodim ${SCG_LIBS} schily deflt libedc ${CAPLINK})
 SET_TARGET_PROPERTIES(wodim PROPERTIES SKIP_BUILD_RPATH TRUE)
 
 INSTALL(TARGETS wodim DESTINATION bin)

Modified: nonameyet/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog	2006-09-13 17:46:48 UTC (rev 309)
+++ nonameyet/trunk/debian/changelog	2006-09-14 17:49:05 UTC (rev 310)
@@ -1,8 +1,9 @@
 cdrkit (5:1.0~pre5-2) unstable; urgency=low
 
   * New upstream source snapshot
+    + 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)
-  * typos in wodim.1 fixes, thanks to J. Alto (closes: #386898)
 
  -- Eduard Bloch <blade at debian.org>  Tue, 12 Sep 2006 11:16:34 +0200
 

Added: nonameyet/trunk/libedc/CMakeLists.txt
===================================================================
--- nonameyet/trunk/libedc/CMakeLists.txt	                        (rev 0)
+++ nonameyet/trunk/libedc/CMakeLists.txt	2006-09-14 17:49:05 UTC (rev 310)
@@ -0,0 +1,6 @@
+PROJECT (LIBEDC)
+INCLUDE_DIRECTORIES(../include . ${CMAKE_BINARY_DIR})
+
+AUX_SOURCE_DIRECTORY(. LIBEDC_SRCS)
+
+ADD_LIBRARY (libedc STATIC ${LIBEDC_SRCS})