[SCM] BOINC packaging branch, debian/experimental-6.4.5, updated. debian/6.2.18-2-7-gb120029
rmayorga
rmayorga at debian.org
Mon Feb 9 19:47:49 UTC 2009
The following commit has been merged in the debian/experimental-6.4.5 branch:
commit b120029c54291e35bde40a5fecbd537830b85c06
Author: rmayorga <rmayorga at debian.org>
Date: Mon Feb 9 13:39:00 2009 -0600
Updating TODO.Debian
Reviewing debian/copyright and adding more info
from upstream source, also add somo more TODO Items.
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 54067d5..81c6d12 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,40 +1,34 @@
The to-do list for developers of the BOINC Debian packages is here:
http://wiki.debian.org/BOINC/Development#TODO
+This is a more detailed todo anyway:
TODO for this version(6.4.5)
-Licenses
-========
-
-client/app_stats_mac.cpp:
--------------------------
-this file should be removed from upstream source, since
-it has some copyright notice from Apple:
-(ref: line 24...)
- 24 * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
- 25 *
- 26 * @APPLE_LICENSE_HEADER_START@
-And http://wiki.debian.org/DFSGLicenses#head-0a5ca8d24d2dfd3d3c954c1abb441ad54b37461e
-stands that this license is not free.
-
-
-client/stream.cpp:
-------------------
-STREAM license should be need reviewed? ( just a really fuzzy view by
-my side here, nothing serious )
-
-
-Review debian/copyright
------------------------
-Bump copyright years comming from upstrem if it is needed
-and review that all files has they _right_ copyright entry on
-debian/copyright.
-
-
-samples/*
----------
-Those files needs a copyright entry on debian/copyright
-
-
+Licenses and debian/copyright
+==============================
+
+ client/app_stats_mac.cpp:
+ -------------------------
+ this file should be removed from upstream source, since
+ it has some copyright notice from Apple:
+ (ref: line 24...)
+ 24 * Copyright (c) 2002-2004 Apple Computer, Inc. All rights reserved.
+ 25 *
+ 26 * @APPLE_LICENSE_HEADER_START@
+ And http://wiki.debian.org/DFSGLicenses#head-0a5ca8d24d2dfd3d3c954c1abb441ad54b37461e
+ stands that this license is not free.
+
+
+ api/textfont.[ch] and samples/glut/win32_util.c
+ ------------------------------------------------
+ The license on this file is not clear enough IMHO.
+ also there is a precedent that this license is considered
+ as non-DFSG (#467123). *IMPORTANT*
+
+ samples/jpeglib/
+ ---------------
+ Maybe Clarify this license text, since the files refer to
+ a non-existent README file, I actually check
+ the license from libjpeg62 README file.
diff --git a/debian/changelog b/debian/changelog
index 570c401..496c7da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,16 @@ boinc (6.4.5-1) UNRELEASED; urgency=low
of `BOINC' the include/ dir
* debian/boinc-dev.links; make BOINC point to boinc, this
will save those who still point to the wrong PATH
-
+ * debian/copyright:
+ + Update upstream license from LGPL-2.1 to LGPL-3
+ + update the file name on : api/textfont.[ch], client/stream.cpp,
+ clientgui/wizardex.cpp
+ + update copyright years on html/inc/geoip.inc and correct license
+ + add copyright and license info for samples/glut/Roman.stroke,
+ client/install-sh, samples/glut/win32_util.c,
+ samples/glut/win32_x11.[ch], samples/glut/stroke.h,
+ samples/glut/glut.h, samples/jpeglib/*
+
-- Rene Mayorga <rmayorga at debian.org> Thu, 29 Jan 2009 13:44:11 -0600
boinc (6.2.18-2) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 966ab27..a3446c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,16 +13,85 @@ Upstream authors:
Files: *
Copyright: © 2005-2008 University of California
-License: LGPL-2.1+
+License: LGPL-3+
-Files: api/texfont.[Ch]
+Files: client/install-sh
+Copyright: © 1991 by the Massachusetts Institute of Technology
+License: other
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of M.I.T. not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission. M.I.T. makes no representations about the
+ suitability of this software for any purpose. It is provided "as is"
+ without express or implied warranty.
+
+Files: api/texfont.[ch], samples/glut/glutbitmap.h
Copyright: © 1997 Mark J. Kilgard
License: other
This program is freely distributable without licensing fees and is
provided without guarantee or warrantee expressed or implied.
This program is -not- in the public domain.
-Files: client/stream.C
+Files: samples/glut/glut.h
+Copyright: © 1994, 1995, 1996, 1998 Mark J. Kilgard
+License: other
+ This program is freely distributable without licensing fees and is
+ provided without guarantee or warrantee expressed or implied.
+ This program is -not- in the public domain.
+
+Files: samples/jpeglib/*
+Copyright: © 1991-1997, Thomas G. Lane.
+License: other
+ Permission is hereby granted to use, copy, modify, and distribute this
+ software (or portions thereof) for any purpose, without fee, subject to these
+ conditions:
+ (1) If any part of the source code for this software is distributed, then this
+ README file must be included, with this copyright and no-warranty notice
+ unaltered; and any additions, deletions, or changes to the original files
+ must be clearly indicated in accompanying documentation.
+ (2) If only executable code is distributed, then the accompanying
+ documentation must state that "this software is based in part on the work of
+ the Independent JPEG Group".
+ (3) Permission for use of this software is granted only if the user accepts
+ full responsibility for any undesirable consequences; the authors accept
+ NO LIABILITY for damages of any kind.
+ .
+ (License Info from libjpeg62 README) FIXME.
+
+Files: samples/glut/win32_util.[ch] samples/glut/win32_x11.[ch]
+Copyright: © 1997 Nate Robins
+ © 1997-1998 Mark Kilgar
+License: other
+ This program is freely distributable without licensing fees and is
+ provided without guarantee or warrantee expressed or implied.
+ This program is -not- in the public domain.
+
+Files: samples/glut/Roman.stroke, samples/glut/stroke.h
+Copyright: © 1989,1990, 1991 by Sun Microsystems, Inc. and the X Consortium
+License: other
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the names of Sun Microsystems,
+ the X Consortium, and MIT not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+ .
+ SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+
+
+Files: client/stream.cpp
Copyright: © 1991-2005: John D. McCalpin
© 2005 University of California
License: LGPL-2.1+, other
@@ -114,7 +183,7 @@ License: other
If you do not wish that, you must delete the exception notice from such
code and/or adjust the licensing conditions notice accordingly.
-Files: clientgui/wizard.*
+Files: clientgui/wizardex.*
Copyright: © 1999 Vadim Zeitlin <zeitlin at dptmaths.ens-cachan.fr>
License: other
wxWindows Library Licence, Version 3, see above for details
@@ -143,8 +212,8 @@ License: GFDL-1.2+
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
Files: html/inc/geoip.inc
-Copyright: © 2003 MaxMind LLC
-License: GPL-2.1+
+Copyright: © 2004 MaxMind LLC
+License: LGPL-2.1+
Files: html/inc/kses.php
Copyright: © 2002-2003 Ulf Harnhammar
@@ -171,7 +240,7 @@ License: other
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-Files: lib/md5.[Ch]
+Files: lib/md5.[ch]
Copyright: © 1999 Aladdin Enterprises
License: other
This software is provided 'as-is', without any express or implied
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list