Made number transition to 1.3.3

10 years ago · 6b93e66cfd
parent 9afa5379e5
commit 6b93e66cfd
10 changed files with 84 additions and 74 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -118,9 +118,9 @@ test_structest_CPPFLAGS = -Ilibburn
 test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_structest_SOURCES = test/structest.c

-##  cdrskin construction site - ts A60816 - B30517
+##  cdrskin construction site - ts A60816 - B30807
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_3_1
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_3_3

 # cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking
--- a/13
+++ b/13
@ -11,7 +11,7 @@ Still containing parts of Libburn. By Derek Foreman <derek@signalmarketing.com>
 and Ben Jansens <xor@orodu.net>
 Copyright (C) 2002-2006  Derek Foreman and Ben Jansens

-     http://files.libburnia-project.org/releases/libburn-1.3.0.pl01.tar.gz
+     http://files.libburnia-project.org/releases/libburn-1.3.2.tar.gz

 ------------------------------------------------------------------------------

@ -19,10 +19,10 @@ Copyright (C) 2002-2006  Derek Foreman and Ben Jansens

                                From tarball

-Obtain libburn-1.3.0.pl01.tar.gz, take it to a directory of your choice and do:
+Obtain libburn-1.3.2.tar.gz, take it to a directory of your choice and do:

-   tar xzf libburn-1.3.0.pl01.tar.gz
-   cd libburn-1.3.0
+   tar xzf libburn-1.3.2.tar.gz
+   cd libburn-1.3.2
   ./configure --prefix=/usr
   make

@ -707,6 +707,11 @@ Project history as far as known to me:
  number as the next writable address.
  Regression introduced by version 1.2.8.

+- Fri Aug 07 2013 release 1.3.2:
+  cdrskin has aquired the capability to copy audio tracks to .wav files.
+  It can extract CD-TEXT in a form that is readable for humans and for
+  cdrskin itself. Several small bugs were fixed in xorriso. Its capabilities
+  to serve frontend programs in dialog mode have been improved.

 ------------------------------------------------------------------------------

--- a/cdrskin/README
+++ b/cdrskin/README
@ -4,7 +4,7 @@
 cdrskin. By Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org but also published via:
 http://scdbackup.sourceforge.net/cdrskin_eng.html
-http://scdbackup.sourceforge.net/cdrskin-1.3.1.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-1.3.3.tar.gz

 Copyright (C) 2006-2013 Thomas Schmitt, provided under GPL version 2 or later.
 ------------------------------------------------------------------------------
@ -26,10 +26,10 @@ By using this software you agree to the disclaimer at the end of this text

                   Compilation, First Glimpse, Installation

-Obtain cdrskin-1.3.1.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-1.3.3.tar.gz, take it to a directory of your choice and do:

-    tar xzf cdrskin-1.3.1.tar.gz
-    cd cdrskin-1.3.1
+    tar xzf cdrskin-1.3.3.tar.gz
+    cd cdrskin-1.3.3

 Within that directory execute:

@ -191,6 +191,11 @@ See below "Audio CD" for specifications.
    cdrskin -v dev=0,1,0 blank=fast -eject speed=48 -sao \
           -audio -swab track0[1-5].cd /path/to/track6.wav

+Extract audio tracks and CD-TEXT from CD into directory /home/me/my_cd:
+    mkdir /home/me/my_cd
+    cdrskin -v dev=/dev/sr0 extract_audio_to=/home/me/my_cd \
+            cdtext_to_v07t=/home/me/my_cd/cdtext.v07t
+

                                Restrictions

--- a/cdrskin/cdrskin.1
+++ b/cdrskin/cdrskin.1
@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH CDRSKIN 1 "Version 1.3.1, Aug 04, 2013"
+.TH CDRSKIN 1 "Version 1.3.3, Aug 07, 2013"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@ -1691,6 +1691,8 @@ cdrskin -v dev=ATA:1,0,0 speed=48 -sao \\
 .SS
 .B Extract audio tracks and CD-TEXT from CD into directory /home/me/my_cd:
 .br
+mkdir /home/me/my_cd
+.br
 cdrskin -v dev=/dev/sr0 extract_audio_to=/home/me/my_cd \\
 .br
  cdtext_to_v07t=/home/me/my_cd/cdtext.v07t
--- a/cdrskin/cdrskin.c
+++ b/cdrskin/cdrskin.c
@ -87,7 +87,7 @@ or

 /** The official program version */
 #ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "1.3.1"
+#define Cdrskin_prog_versioN "1.3.3"
 #endif

 /** The official libburn interface revision to use.
@ -100,7 +100,7 @@ or
 #define Cdrskin_libburn_minoR 3
 #endif
 #ifndef Cdrskin_libburn_micrO
-#define Cdrskin_libburn_micrO 1
+#define Cdrskin_libburn_micrO 2
 #endif


@ -120,34 +120,34 @@ or
 #undef Cdrskin_libburn_versioN 
 #endif

-#ifdef Cdrskin_libburn_1_3_0
-#define Cdrskin_libburn_versioN "1.3.0"
+#ifdef Cdrskin_libburn_1_3_2
+#define Cdrskin_libburn_versioN "1.3.2"
 #endif

-#ifdef Cdrskin_libburn_1_3_1
-#define Cdrskin_libburn_versioN "1.3.1"
+#ifdef Cdrskin_libburn_1_3_3
+#define Cdrskin_libburn_versioN "1.3.3"
 #endif

 #ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_1_3_0
-#define Cdrskin_libburn_versioN "1.3.0"
+#define Cdrskin_libburn_1_3_2
+#define Cdrskin_libburn_versioN "1.3.2"
 #endif

-#ifdef Cdrskin_libburn_1_3_0
+#ifdef Cdrskin_libburn_1_3_2
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 1
 #define Cdrskin_libburn_minoR 3
-#define Cdrskin_libburn_micrO 0
+#define Cdrskin_libburn_micrO 2
 #endif
-#ifdef Cdrskin_libburn_1_3_1
+#ifdef Cdrskin_libburn_1_3_3
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 1
 #define Cdrskin_libburn_minoR 3
-#define Cdrskin_libburn_micrO 1
+#define Cdrskin_libburn_micrO 3
 #endif


--- a/cdrskin/cdrskin_eng.html
+++ b/cdrskin/cdrskin_eng.html
@ -65,7 +65,7 @@ connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-1.3.0.pl01</DT>
+<DT>libburn-1.3.2</DT>
 <DD>(founded by Derek Foreman and Ben Jansens,
 developed and maintained since August 2006 by
 Thomas Schmitt from team of libburnia-project.org)
@ -200,13 +200,13 @@ Standalone ISO 9660 multi-session CD/DVD/BD tool
 <P>
 <DL>
 <DT>Download as source code (see README):</DT>
-<DD><A HREF="cdrskin-1.3.0.pl01.tar.gz">cdrskin-1.3.0.pl01.tar.gz</A>
+<DD><A HREF="cdrskin-1.3.2.tar.gz">cdrskin-1.3.2.tar.gz</A>
 (950 KB).
 </DD>
-<DD><A HREF="cdrskin-1.3.0.pl01.tar.gz.sig">cdrskin-1.3.0.pl01.tar.gz.sig</A></DD>
+<DD><A HREF="cdrskin-1.3.2.tar.gz.sig">cdrskin-1.3.2.tar.gz.sig</A></DD>
 <DD>
 (detached GPG signature for verification by
-<KBD>gpg --verify cdrskin-1.3.0.pl01.tar.gz.sig cdrskin-1.3.0.pl01.tar.gz</KBD>
+<KBD>gpg --verify cdrskin-1.3.2.tar.gz.sig cdrskin-1.3.2.tar.gz</KBD>
 <BR>
 after <KBD>gpg --keyserver keys.gnupg.net --recv-keys ABC0A854</KBD>).
 </DD>
@ -257,56 +257,53 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
 <HR>

 <P>
-Enhancements towards previous stable version cdrskin-1.2.8:
-<UL>
-<LI>none</LI>
-<!--
-<LI>none</LI>
-->
-</UL>
-
-Bug fixes towards cdrskin-1.2.8:
+Enhancements towards previous stable version cdrskin-1.3.0:
 <UL>
 <LI>
-Full formatting of BD-RE used certification regardless of drive capabilities
+New option textfile_to_v07t=
+</LI>
+<LI>
+New options cdtext_to_textfile= and cdtext_to_v07t=
 </LI>
 <LI>
-DVD+R with damaged TOC were reported by -minfo with wrong end address
+New options extract_audio_to= , extract_tracks= , extract_basename= ,
+--extract_dap
+</LI>
+<LI>
+Improved granularity of SCSI log time measurement, now with timestamp
+</LI>
+<LI>
+New cdrskin option --pacifier_with_newline
 </LI>
 <!--
 <LI>none</LI>
 -->
 </UL>

-Bug fix towards cdrskin-1.3.0:
+Bug fixes towards cdrskin-1.3.0:
 <UL>
 <LI>
 cdrskin -msinfo on DVD and BD reported
 old session start = next writable address.
-Regression introduced by version 1.2.8
+Regression introduced by version 1.2.8.
+(Also fixed by patch release 1.3.0.pl01 in may 2013.)
 </LI>
+<LI>
+The signal handler aborted on SIGCONT, SIGTSTP, SIGTTIN, SIGTTOU
+</LI>
+<!--
+<LI>none</LI>
+-->
 </UL>

 <HR>

 <P>
 <DL>
-<DT><H3>Development snapshot, version 1.3.1 :</H3></DT>
-<DD>Enhancements towards current stable version 1.3.0.pl01:
+<DT><H3>Development snapshot, version 1.3.3 :</H3></DT>
+<DD>Enhancements towards current stable version 1.3.2:
 <UL>
-<LI>
-New option textfile_to_v07t=
-</LI>
-<LI>
-New options cdtext_to_textfile= and cdtext_to_v07t=
-</LI>
-<LI>
-New options extract_audio_to= , extract_tracks= , extract_basename= ,
--extract_dap
-</LI>
-<LI>
-Improved granularity of SCSI log time measurement timestamp
-</LI>
+<LI>none yet</LI>
 <!--
 <LI>none yet</LI>
 -->
@ -314,7 +311,7 @@ Improved granularity of SCSI log time measurement timestamp
 </UL>
 </DD>

-<DD>Bug fixes towards cdrskin-1.3.0.pl01:
+<DD>Bug fixes towards cdrskin-1.3.2:
 <UL>
 <LI>none yet</LI>
 <!--
@ -324,10 +321,10 @@ Improved granularity of SCSI log time measurement timestamp
 </DD>

 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 1.3.1</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin-1.3.1 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin-1.3.1 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.3.1)</A></DD>
+<DD><A HREF="README_cdrskin_devel">README 1.3.3</A>
+<DD><A HREF="cdrskin__help_devel">cdrskin-1.3.3 --help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin-1.3.3 -help</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.3.3)</A></DD>
 <DD>&nbsp;</DD>
 <DT>Maintainers of cdrskin unstable packages please use SVN of
 <A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
@ -347,7 +344,7 @@ admins with full system souvereignty.</DT>
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-1.3.1.tar.gz">cdrskin-1.3.1.tar.gz</A>
+<A HREF="cdrskin-1.3.3.tar.gz">cdrskin-1.3.3.tar.gz</A>
 (950 KB).
 </DD>

--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@ -1 +1 @@
-#define Cdrskin_timestamP "2013.08.04.124449"
+#define Cdrskin_timestamP "2013.08.07.134744"
--- a/cdrskin/compile_cdrskin.sh
+++ b/cdrskin/compile_cdrskin.sh
@ -8,7 +8,7 @@ debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
 fifo_opts=""
-libvers="-DCdrskin_libburn_1_3_1"
+libvers="-DCdrskin_libburn_1_3_3"

 # To be used if Makefile.am uses libburn_libburn_la_CFLAGS
 # burn="libburn/libburn_libburn_la-"
@ -41,15 +41,15 @@ do
  elif test "$i" = "-compile_dewav"
  then
    compile_dewav=1
-  elif test "$i" = "-libburn_1_3_0"
+  elif test "$i" = "-libburn_1_3_2"
  then
-    libvers="-DCdrskin_libburn_1_3_0"
+    libvers="-DCdrskin_libburn_1_3_2"
    libdax_audioxtr_o="$burn"libdax_audioxtr.o
    libdax_msgs_o="$burn"libdax_msgs.o
    cleanup_src_or_obj="$burn"cleanup.o
  elif test "$i" = "-libburn_svn"
  then
-    libvers="-DCdrskin_libburn_1_3_1"
+    libvers="-DCdrskin_libburn_1_3_3"
    libdax_audioxtr_o="$burn"libdax_audioxtr.o
    libdax_msgs_o="$burn"libdax_msgs.o
    cleanup_src_or_obj="$burn"cleanup.o
@ -99,7 +99,7 @@ do
    echo "Options:"
    echo "  -compile_cdrfifo  compile program cdrskin/cdrfifo."
    echo "  -compile_dewav    compile program test/dewav without libburn."
-    echo "  -libburn_1_3_0    set macro to match libburn-1.3.0"
+    echo "  -libburn_1_3_2    set macro to match libburn-1.3.2"
    echo "  -libburn_svn      set macro to match current libburn-SVN."
    echo "  -dvd_obs_64k      64 KB default size for DVD/BD writing."
    echo "  -use_libcdio      link with -lcdio because libburn uses it."
--- a/configure.ac
+++ b/configure.ac
@ -1,4 +1,4 @@
-AC_INIT([libburn], [1.3.1], [http://libburnia-project.org])
+AC_INIT([libburn], [1.3.3], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	

@ -101,6 +101,7 @@ dnl    1.2.4 = libburn.so.4.77.0
 dnl    1.2.6 = libburn.so.4.79.0
 dnl    1.2.8 = libburn.so.4.81.0
 dnl    1.3.0 = libburn.so.4.83.0
+dnl    1.3.2 = libburn.so.4.85.0
 dnl
 dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
 dnl SONAME of the emerging library is  LT_CURRENT - LT_AGE.
@ -126,7 +127,7 @@ dnl
 dnl As said: Only copies. Original in libburn/libburn.h : burn_header_version_*
 BURN_MAJOR_VERSION=1
 BURN_MINOR_VERSION=3
-BURN_MICRO_VERSION=1
+BURN_MICRO_VERSION=3
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION

 AC_SUBST(BURN_MAJOR_VERSION)
@ -137,14 +138,14 @@ AC_SUBST(BURN_VERSION)
 dnl Libtool versioning
 LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 dnl
-dnl ### This is the release version libburn-1.3.0
+dnl ### This is the release version libburn-1.3.2
 dnl This is the development version after above release version
 dnl LT_CURRENT++, LT_AGE++ has not yet happened.
 dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 87 - 83 = 4 . Linux library name = libburn.so.4.83.0
-LT_CURRENT=87
-LT_AGE=83
+dnl SONAME = 89 - 85 = 4 . Linux library name = libburn.so.4.85.0
+LT_CURRENT=89
+LT_AGE=85
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`

--- a/libburn/libburn.h
+++ b/libburn/libburn.h
@ -3539,7 +3539,7 @@ void burn_version(int *major, int *minor, int *micro);
 */
 #define burn_header_version_major  1
 #define burn_header_version_minor  3
-#define burn_header_version_micro  1
+#define burn_header_version_micro  3
 /** Note:
    Above version numbers are also recorded in configure.ac because libtool
    wants them as parameters at build time.