Added or adjusted copyright and license statements in single files
This commit is contained in:
parent
91e0b07080
commit
38e16d9370
|
|
@ -0,0 +1,6 @@
|
|||
Derek Foreman
|
||||
Ben Jansens
|
||||
Thomas Schmitt
|
||||
Mario Danic
|
||||
Vreixo Formoso Lopes
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
Derek Foreman <derek@signalmarketing.com>
|
||||
Ben Jansens <xor@orodu.net>
|
||||
Thomas Schmitt <scdbackup@gmx.net>
|
||||
Mario Danic <mario.danic@gmail.com>,
|
||||
Vreixo Formoso <metalpain2002@yahoo.es>
|
||||
|
||||
GNU xorriso is a compilation of
|
||||
xorriso Copyright (C) 2007-2010 Thomas Schmitt
|
||||
libisoburn Copyright (C) 2007-2010 Vreixo Formoso, Thomas Schmitt
|
||||
libisofs Copyright (C) 2007-2010 Vreixo Formoso, Mario Danic, Thomas Schmitt
|
||||
libburn Copyright (C) 2002-2006 Derek Foreman, Ben Jansens
|
||||
2006-2010 Mario Danic, Thomas Schmitt
|
||||
from libburnia-project.org with a license derived from GPLv2+.
|
||||
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License version 3
|
||||
or later as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
|
@ -1,3 +1,8 @@
|
|||
|
||||
# configure.ac stems from xorriso/configure_ac.txt and leads to ./configure
|
||||
# Copyright (c) 2007 - 2010 Thomas Schmitt <scdbackup@gmx.net>
|
||||
# Provided under GPL version 2 or later.
|
||||
|
||||
AC_INIT([xorriso], [0.4.9], [http://libburnia-project.org])
|
||||
AC_PREREQ([2.50])
|
||||
dnl AC_CONFIG_HEADER([config.h])
|
||||
|
|
@ -157,7 +162,7 @@ AC_ARG_ENABLE(xattr,
|
|||
[ --enable-xattr Enable use of xattr by libisofs, default=yes],
|
||||
, enable_xattr=yes)
|
||||
if test x$enable_xattr = xyes; then
|
||||
dnl Check whether there is the header for Linux xattr.
|
||||
dnl Check whether there is the header for GNU/Linux xattr.
|
||||
dnl If not, erase this macro which would enable use of listxattr and others
|
||||
XATTR_DEF="-DLibisofs_with_aaip_xattR"
|
||||
AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= , XATTR_DEF= ), XATTR_DEF= )
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
#!/bin/sh
|
||||
|
||||
# make_xorriso_standalone.sh
|
||||
# Copyright 2008 - 2010 Thomas Schmitt, scdbackup@gmx.net, GPL
|
||||
# Copyright 2008 - 2010 Thomas Schmitt, scdbackup@gmx.net, GPLv2+
|
||||
#
|
||||
# Not intended for general use in production installations !
|
||||
#
|
||||
# This is a development tool which expects a special setup of directories.
|
||||
# It is to be executed in a common parent of the directories
|
||||
# nglibisofs-develop libburn-develop libisoburn-develop
|
||||
# where tarballs or repository copies have been installed of
|
||||
# libisofs libburn libisoburn
|
||||
# obtained by following instructions on http://libburnia-project.org.
|
||||
#
|
||||
# Creates a standalone tree for building xorriso
|
||||
# It creates a standalone tree for building GNU xorriso
|
||||
# from the contents of a unified libburnia development tree.
|
||||
#
|
||||
# The ./bootstrap script gets applied and a source tarball
|
||||
|
|
@ -22,6 +25,18 @@
|
|||
# ./configure && make
|
||||
#
|
||||
|
||||
# By the following variable setting
|
||||
# create_gnu_xorriso="yes"
|
||||
# the result will become a GNU xorriso tarball under GPLv3+.
|
||||
# Without this setting, the result is technically equivalent but
|
||||
# stays under GPLv2+. In that case the files xorriso/*_gnu_xorriso
|
||||
# are merely informative.
|
||||
# Note that it is not permissible to revert the transition from
|
||||
# GPLv2+ to GPLv3+. (Rather derive a new GPLv2+ from libburnia.)
|
||||
|
||||
create_gnu_xorriso="yes"
|
||||
|
||||
|
||||
current_dir=$(pwd)
|
||||
lone_dir="$current_dir"/"xorriso-standalone"
|
||||
|
||||
|
|
@ -105,9 +120,6 @@ copy_files xorriso/xorriso_makefile_am.txt "$lone_dir"/Makefile.am
|
|||
|
||||
# copy_files xorriso/xorriso_pc_in.txt "$lone_dir"/xorriso.pc.in
|
||||
|
||||
copy_files xorriso/README_gnu_xorriso "$lone_dir"/README
|
||||
copy_files xorriso/COPYING_gnu_xorriso "$lone_dir"/COPYING
|
||||
|
||||
# echo "See end of xorriso/changelog.txt" >"$lone_dir"/TODO
|
||||
|
||||
|
||||
|
|
@ -156,6 +168,7 @@ copy_files doc/susp_aaip*.txt "$lone_dir"/doc
|
|||
copy_files doc/zisofs_format.txt "$lone_dir"/doc
|
||||
copy_files doc/checksums.txt "$lone_dir"/doc
|
||||
copy_files COPYRIGHT "$lone_dir"/libisofs
|
||||
test -e CONTRIBUTORS && cat CONTRIBUTORS >>"$lone_dir"/CONTRIBUTORS
|
||||
|
||||
# To get a common version.h
|
||||
cat version.h.in >> "$lone_dir"/version.h.in
|
||||
|
|
@ -198,11 +211,32 @@ create_dir "$lone_dir"/libburn
|
|||
goto_dir "$current_dir"/libburn-develop
|
||||
copy_files libburn/*.[ch] "$lone_dir"/libburn
|
||||
copy_files COPYRIGHT "$lone_dir"/libburn
|
||||
cat CONTRIBUTORS >>"$lone_dir"/CONTRIBUTORS
|
||||
|
||||
|
||||
# To get a common version.h
|
||||
cat version.h.in >> "$lone_dir"/version.h.in
|
||||
|
||||
# Decision about legal situation
|
||||
goto_dir "$current_dir"/libisoburn-develop
|
||||
if test "$create_gnu_xorriso" = "yes"
|
||||
then
|
||||
copy_files xorriso/README_gnu_xorriso "$lone_dir"/README
|
||||
copy_files xorriso/COPYRIGHT_gnu_xorriso "$lone_dir"/COPYRIGHT
|
||||
copy_files xorriso/COPYING_gnu_xorriso "$lone_dir"/COPYING
|
||||
copy_files xorriso/AUTHORS_gnu_xorriso "$lone_dir"/AUTHORS
|
||||
|
||||
# patch xorriso/xorriso.c to be GNU xorriso
|
||||
sed -e's/define Xorriso_libburnia_xorrisO/define Xorriso_GNU_xorrisO/' \
|
||||
-e's/This may be changed to Xorriso_GNU_xorrisO in order to c/C/' \
|
||||
<xorriso/xorriso.c >"$lone_dir"/xorriso/xorriso.c
|
||||
|
||||
else
|
||||
|
||||
copy_files README "$lone_dir"/README
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# tarball
|
||||
|
||||
|
|
|
|||
|
|
@ -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 XORRISO 1 "Feb 12, 2009"
|
||||
.TH XORRISO 1 "Feb 14, 2010"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.\"
|
||||
.\" Some roff macros, for reference:
|
||||
|
|
@ -3722,6 +3722,12 @@ MD5 checksums
|
|||
Thomas Schmitt <scdbackup@gmx.net>
|
||||
.br
|
||||
for libburnia-project.org
|
||||
.SH COPYRIGHT
|
||||
Copyright (c) 2007 - 2010 Thomas Schmitt
|
||||
.br
|
||||
This text shall only be modified in sync with the technical properties of
|
||||
xorriso. If you make use of the license to derive modified versions of xorriso
|
||||
then you are entitled to modify this text under that same license.
|
||||
.SH CREDITS
|
||||
xorriso is in part based on work by Vreixo Formoso who provides libisofs
|
||||
together with Mario Danic who also leads the libburnia team.
|
||||
|
|
|
|||
|
|
@ -33,9 +33,8 @@ or
|
|||
Provided under GPL version 2 or later, with the announcement that this
|
||||
might get changed in future. I would prefer BSD or LGPL as soon as the
|
||||
license situation of the library code allows that.
|
||||
(This announcement affects only future releases of xorriso.
|
||||
If you obtain a copy licensed as "GPL version X" then this license is
|
||||
not revocable for that particular copy, of course.)
|
||||
(This announcement affects only future releases of xorriso and it will
|
||||
always be possible to derive a GPLv2+ from the future license.)
|
||||
|
||||
There is a derived package "GNU xorriso" under GPLv3+ which combines the
|
||||
libburnia libraries and program xorriso to a statically linked binary.
|
||||
|
|
@ -74,6 +73,10 @@ or
|
|||
|
||||
*/
|
||||
|
||||
/* This may be changed to Xorriso_GNU_xorrisO in order to create GNU xorriso */
|
||||
#define Xorriso_libburnia_xorrisO yes
|
||||
|
||||
|
||||
#ifdef Xorriso_without_subS
|
||||
|
||||
|
||||
|
|
@ -12266,7 +12269,7 @@ too_long:;
|
|||
}
|
||||
}
|
||||
|
||||
if(sys_code == 1) { /* Linux */
|
||||
if(sys_code == 1) { /* GNU/Linux */
|
||||
sprintf(form,
|
||||
"%smount -t iso9660 -o %snodev,noexec,nosuid,ro,sbsector=%%sbsector%% %%device%% %s",
|
||||
(flag & 1 ? "/bin/" : ""),
|
||||
|
|
@ -19119,11 +19122,11 @@ int Xorriso_option_use_readline(struct XorrisO *xorriso, char *mode, int flag)
|
|||
/* Option -version */
|
||||
int Xorriso_option_version(struct XorrisO *xorriso, int flag)
|
||||
{
|
||||
#ifdef Xorriso_standalonE
|
||||
#ifdef Xorriso_GNU_xorrisO
|
||||
sprintf(xorriso->result_line, "GNU xorriso %s\n", Xorriso_program_versioN);
|
||||
#else
|
||||
sprintf(xorriso->result_line, "xorriso %s\n", Xorriso_program_versioN);
|
||||
#endif /* ! Xorriso_standalonE */
|
||||
#endif /* ! Xorriso_GNU_xorrisO */
|
||||
Xorriso_result(xorriso, 0);
|
||||
sprintf(xorriso->result_line,
|
||||
"ISO 9660 Rock Ridge filesystem manipulator and CD/DVD/BD burn program\n");
|
||||
|
|
@ -19139,7 +19142,7 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag)
|
|||
Xorriso_result(xorriso, 0);
|
||||
Xorriso_report_lib_versions(xorriso, 0);
|
||||
|
||||
#ifdef Xorriso_standalonE
|
||||
#ifdef Xorriso_GNU_xorrisO
|
||||
sprintf(xorriso->result_line,
|
||||
"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n");
|
||||
Xorriso_result(xorriso, 0);
|
||||
|
|
@ -19149,7 +19152,7 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag)
|
|||
#else
|
||||
sprintf(xorriso->result_line, "Provided under GNU GPL version 2 or later.\n");
|
||||
Xorriso_result(xorriso, 0);
|
||||
#endif /* ! Xorriso_standalonE */
|
||||
#endif /* ! Xorriso_GNU_xorrisO */
|
||||
|
||||
sprintf(xorriso->result_line,
|
||||
"There is NO WARRANTY, to the extent permitted by law.\n");
|
||||
|
|
@ -20597,8 +20600,13 @@ char *Xorriso__get_version_text(int flag)
|
|||
static void yell_xorriso()
|
||||
{
|
||||
fprintf(stderr,
|
||||
"xorriso %s : RockRidge filesystem manipulator, libburnia project.\n\n",
|
||||
Xorriso_main_program_versioN);
|
||||
"%sxorriso %s : RockRidge filesystem manipulator, libburnia project.\n\n",
|
||||
#ifdef Xorriso_GNU_xorrisO
|
||||
"GNU ",
|
||||
#else
|
||||
"",
|
||||
#endif
|
||||
Xorriso_main_program_versioN);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -665,6 +665,13 @@ pppoem, a DSL throughput monitor (for GNU/Linux kernel 2.4 and 2.6)</A></DD>
|
|||
</DL>
|
||||
<BR><BR>
|
||||
Legal statement: This website does not serve any commercial purpose.<BR>
|
||||
<BR>
|
||||
Copyright © 2008 - 2010 Thomas Schmitt.
|
||||
<BR>
|
||||
This text shall only be modified in sync with the factual properties of
|
||||
xorriso and its public storage locations.
|
||||
If you make use of the license to derive modified versions of xorriso
|
||||
then you are entitled to modify this text under that same license.
|
||||
<BR><BR>
|
||||
</FONT>
|
||||
</BODY>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
|
||||
# Copyright (c) 2007 - 2010 Thomas Schmitt <scdbackup@gmx.net>
|
||||
# Provided under GPL version 2 or later.
|
||||
|
||||
# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
|
||||
# was: pkgconfigdir=$(libdir)/pkgconfig
|
||||
pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
#define Xorriso_timestamP "2010.02.14.151045"
|
||||
#define Xorriso_timestamP "2010.02.14.151610"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
|
||||
|
||||
Provided under GPL version 2.
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue