From 8ce9ef039fa1722ba196d1291e59f011b9c3e730 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 1 Jan 2010 13:00:47 +0000 Subject: [PATCH] Updated copyright marks to 2010 --- libisoburn/trunk/COPYRIGHT | 8 ++++---- libisoburn/trunk/README | 4 ++-- libisoburn/trunk/libisoburn/data_source.c | 2 +- libisoburn/trunk/xorriso/README | 4 ++-- libisoburn/trunk/xorriso/compile_xorriso.sh | 14 ++++++++++++-- libisoburn/trunk/xorriso/xorriso.h | 4 ++-- libisoburn/trunk/xorriso/xorriso_private.h | 2 +- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.h | 2 +- 9 files changed, 26 insertions(+), 16 deletions(-) diff --git a/libisoburn/trunk/COPYRIGHT b/libisoburn/trunk/COPYRIGHT index 49f817e9..2a6a8f90 100644 --- a/libisoburn/trunk/COPYRIGHT +++ b/libisoburn/trunk/COPYRIGHT @@ -1,11 +1,11 @@ Mario Danic , Vreixo Formoso Thomas Schmitt -libisoburn is Copyright (C) 2007-2009 Vreixo Formoso, Thomas Schmitt -xorriso is Copyright (C) 2007-2009 Thomas Schmitt -libisofs (if included) is Copyright (C) 2007-2009 Vreixo Formoso, Mario Danic +libisoburn is Copyright (C) 2007-2010 Vreixo Formoso, Thomas Schmitt +xorriso is Copyright (C) 2007-2010 Thomas Schmitt +libisofs (if included) is Copyright (C) 2007-2010 Vreixo Formoso, Mario Danic libburn (if included) is Copyright (C) 2002-2006 Derek Foreman, Ben Jansens - and Copyright (C) 2006-2009 Mario Danic, Thomas Schmitt + and Copyright (C) 2006-2010 Mario Danic, Thomas Schmitt This program is free software; you can redistribute it and/or modify diff --git a/libisoburn/trunk/README b/libisoburn/trunk/README index 70f3311d..4fffb07f 100644 --- a/libisoburn/trunk/README +++ b/libisoburn/trunk/README @@ -5,7 +5,7 @@ libisoburn. By Vreixo Formoso and Thomas Schmitt Integrated sub project of libburnia-project.org. http://files.libburnia-project.org/releases/libisoburn-0.4.6.pl00.tar.gz -Copyright (C) 2006-2009 Vreixo Formoso, Thomas Schmitt. +Copyright (C) 2006-2010 Vreixo Formoso, Thomas Schmitt. Provided under GPL version 2. ------------------------------------------------------------------------------ @@ -176,7 +176,7 @@ libburnia-project.org By Mario Danic , Vreixo Formoso Thomas Schmitt -Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt. +Copyright (C) 2006-2010 Mario Danic, Vreixo Formoso, Thomas Schmitt. libburnia-project.org is inspired by and in other components still containing parts of old diff --git a/libisoburn/trunk/libisoburn/data_source.c b/libisoburn/trunk/libisoburn/data_source.c index 652602b3..9475b009 100644 --- a/libisoburn/trunk/libisoburn/data_source.c +++ b/libisoburn/trunk/libisoburn/data_source.c @@ -1,7 +1,7 @@ /* data source for libisoburn. - Copyright 2007 - 2009 Vreixo Formoso Lopes + Copyright 2007 - 2010 Vreixo Formoso Lopes and Thomas Schmitt */ diff --git a/libisoburn/trunk/xorriso/README b/libisoburn/trunk/xorriso/README index cdf4cd52..f261b423 100644 --- a/libisoburn/trunk/xorriso/README +++ b/libisoburn/trunk/xorriso/README @@ -5,7 +5,7 @@ xorriso. By Thomas Schmitt Integrated sub project of libburnia-project.org but also published via: http://scdbackup.sourceforge.net/xorriso_eng.html http://scdbackup.sourceforge.net/xorriso-0.4.7.tar.gz -Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2. +Copyright (C) 2006-2010 Thomas Schmitt, provided under GPL version 2. ------------------------------------------------------------------------------ @@ -306,7 +306,7 @@ libburnia-project.org By Mario Danic , Vreixo Formoso Thomas Schmitt -Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt. +Copyright (C) 2006-2010 Mario Danic, Vreixo Formoso, Thomas Schmitt. libburnia-project.org is inspired by and in other components still containing parts of old diff --git a/libisoburn/trunk/xorriso/compile_xorriso.sh b/libisoburn/trunk/xorriso/compile_xorriso.sh index 23ae6f5a..fcac371b 100755 --- a/libisoburn/trunk/xorriso/compile_xorriso.sh +++ b/libisoburn/trunk/xorriso/compile_xorriso.sh @@ -1,7 +1,7 @@ #!/bin/sh # compile_xorriso.sh -# Copyright 2005 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL version 2 +# Copyright 2005 - 2010 Thomas Schmitt, scdbackup@gmx.net, GPL version 2 # # Not intended for general use in production installations ! # Rather use: ./bootstrap ; ./configure ; make @@ -26,6 +26,7 @@ warn_opts="-Wall" nglibisofs=1 def_libreadline="-DXorriso_with_readlinE" link_libreadline="-lreadline" +link_libcdio= for i in "$@" do @@ -43,12 +44,20 @@ do then def_libreadline="" link_libreadline="" + elif test "$i" = "-dvd_obs_64k" + then + def_opts="$def_opts -DXorriso_dvd_obs_default_64K" + elif test "$i" = "-use_libcdio" + then + link_libcdio="-lcdio" elif test "$i" = "-help" -o "$i" = "--help" -o "$i" = "-h" then echo \ "$xorr/compile_xorriso.sh : to be executed above top level directories" echo "Options:" + echo " -dvd_obs_64k 64 KB default size for DVD/BD writing." echo " -no_libreadline do not compile for and link with libreadline." + echo " -use_libcdio link with -lcdio because libburn uses it." echo " -do_diet produce capability reduced lean version." echo " -do_strip apply program strip to compiled programs." echo " -g produce debuggable programm." @@ -98,7 +107,7 @@ echo "Version timestamp : $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$// date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >"$xorr"/xorriso_buildstamp.h echo "Build timestamp : $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)" -echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts" +echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts $link_libcdio" cc -I. -DXorriso_with_maiN $def_libreadline \ $warn_opts \ $static_opts \ @@ -147,6 +156,7 @@ cc -I. -DXorriso_with_maiN $def_libreadline \ $libisofs \ \ $link_libreadline \ + $link_libcdio \ \ -lpthread \ -lacl \ diff --git a/libisoburn/trunk/xorriso/xorriso.h b/libisoburn/trunk/xorriso/xorriso.h index 7b18e447..ff4d689c 100644 --- a/libisoburn/trunk/xorriso/xorriso.h +++ b/libisoburn/trunk/xorriso/xorriso.h @@ -2,7 +2,7 @@ /* Command line oriented batch and dialog tool which creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2009 Thomas Schmitt, + Copyright 2007-2010 Thomas Schmitt, Provided under GPL version 2. @@ -239,7 +239,7 @@ int Xorriso_msgs_submit_void(void *xorriso, /** Evaluate an advise whether to abort or whether to go on with option processing. This should be called after any option function was processed. It updates the problem status by processing the library message queues - and then it uses this status and the submitted return value ot the + and then it uses this status and the submitted return value of the option function to evaluate the situation. @param xorriso The environment handle @param ret The return value of the previously called option function diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h index 976f77f1..e860f3ed 100644 --- a/libisoburn/trunk/xorriso/xorriso_private.h +++ b/libisoburn/trunk/xorriso/xorriso_private.h @@ -2,7 +2,7 @@ /* Command line oriented batch and dialog tool which creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2009 Thomas Schmitt, + Copyright 2007-2010 Thomas Schmitt, Provided under GPL version 2. diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index e7970139..828690ce 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.01.01.125742" +#define Xorriso_timestamP "2010.01.01.130215" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.h b/libisoburn/trunk/xorriso/xorrisoburn.h index 0f4fe94f..a967f070 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.h +++ b/libisoburn/trunk/xorriso/xorrisoburn.h @@ -4,7 +4,7 @@ a command line oriented batch and dialog tool which creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2009 Thomas Schmitt, + Copyright 2007-2010 Thomas Schmitt, Provided under GPL version 2.