[Pkg-octave-commit] [SCM] octave-xraylib branch, master, updated. b3c571a9fb12f33471684f1df31b89c63e5953b5

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit a8d39406175b440908a10ce0f14c39250487686b
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat May 23 17:48:29 2009 +0200

    Add licensing terms for the upstream sources

diff --git a/debian/copyright b/debian/copyright
index 8894d96..7124e2e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,3 +6,45 @@ Upstream-Source: http://octave.sourceforge.net/xraylib/index.html
 Files: debian/*
 Copyright: © 2008 Olafur Jens Sigurdsson <ojsbug at gmail.com>
 License: GPL-3+
+
+Files: src/xraylib.cc
+Copyright: © 2009 Teemu Ikonen
+License: GPL-2+
+
+Files: src/xraylib/*
+Copyright: © 2009 Manuel Sanchez del Rio
+License: "GNU-like"
+ The xraylib library does not com with proper Copyright notices and
+ licensing terms.  However, the author of the Octave binding, Teemu
+ Ikonen contact the upstream author and got the following response:
+ .
+ Date: Fri, 26 May 2006 10:53:52 +0200
+ From: Manuel Sanchez Del Rio <srio at esrf.fr>
+ To: Teemu Ikonen <tpikonen at pcu.helsinki.fi>
+ Subject:  Re: XRAYLIB
+ .
+ Dear Teemu,
+ .
+ thanks for your email and your nice projects regarding XrayLib. You are
+ welcome to modify and redistribute the code, considering that you cite
+ the reference and sources. Thus, you can assume a GNU-type license. We
+ would also be interested in your applications for our users.
+ .
+ Best regards,
+ .
+ ____
+ Manuel Sanchez del Rio
+ European Synchrotron Radiation Facility
+ BP 220
+ 38043 Grenoble-Cedex 9 (France)
+ Tel +33-476 882513 Fax +33-476 882542 http://www.esrf.fr
+
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 3, can be found in the file
+ `/usr/share/common-licenses/GPL-3'.

-- 
octave-xraylib