From f4d2c025563f301e939197071570db1543e6738b Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Fri, 25 Jul 2003 08:29:35 +0000 Subject: [PATCH] Changed license to GPL + SANE exception. --- ChangeLog | 3 +++ include/sane/sanei_scsi.h | 20 ++++++++++++++++++++ include/sane/sanei_wire.h | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index 418099d27..780351de0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ po/sane-backends.nl.po po/sane-backends.no.po po/sane-backends.pt.po po/sane-backends.ru.po po/sane-backends.sv.po: Regenerated to include recent changes in the backends. + * include/sane/sanei_scsi.h include/sane/sanei_wire.h: Changed + license to GPL + SANE exception. + 2003-07-24 Peter Kirchgessner diff --git a/include/sane/sanei_scsi.h b/include/sane/sanei_scsi.h index 44034f5e3..5fbe2504f 100644 --- a/include/sane/sanei_scsi.h +++ b/include/sane/sanei_scsi.h @@ -16,6 +16,26 @@ along with sane; see the file COPYING. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + As a special exception, the authors of SANE give permission for + additional uses of the libraries contained in this release of SANE. + + The exception is that, if you link a SANE library with other files + to produce an executable, this does not by itself cause the + resulting executable to be covered by the GNU General Public + License. Your use of that executable is in no way restricted on + account of linking the SANE library code into it. + + This exception does not, however, invalidate any other reasons why + the executable file might be covered by the GNU General Public + License. + + If you submit changes to SANE to the maintainers to be included in + a subsequent release, you agree by submitting the changes that + those changes may be distributed with this exception intact. + + If you write modifications of your own for SANE, it is your choice + whether to permit this exception to apply to your modifications. + If you do not wish that, delete this exception notice. */ /** @file sanei_scsi.h diff --git a/include/sane/sanei_wire.h b/include/sane/sanei_wire.h index f50906cdc..99899cfdb 100644 --- a/include/sane/sanei_wire.h +++ b/include/sane/sanei_wire.h @@ -16,6 +16,27 @@ along with sane; see the file COPYING. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + As a special exception, the authors of SANE give permission for + additional uses of the libraries contained in this release of SANE. + + The exception is that, if you link a SANE library with other files + to produce an executable, this does not by itself cause the + resulting executable to be covered by the GNU General Public + License. Your use of that executable is in no way restricted on + account of linking the SANE library code into it. + + This exception does not, however, invalidate any other reasons why + the executable file might be covered by the GNU General Public + License. + + If you submit changes to SANE to the maintainers to be included in + a subsequent release, you agree by submitting the changes that + those changes may be distributed with this exception intact. + + If you write modifications of your own for SANE, it is your choice + whether to permit this exception to apply to your modifications. + If you do not wish that, delete this exception notice. + Support routines to translate internal datatypes into a wire-format (used for RPCs and to save/restore options). */