[SCM] Common Astronomy Software Applications core library branch, debian, updated. 0381337393acb61bb553e3071b96e250fabb4c30

Tue Sep 18 08:20:03 UTC 2012

The following commit has been merged in the debian branch:
commit 0381337393acb61bb553e3071b96e250fabb4c30
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Sep 18 10:19:34 2012 +0200

    Relicense non-LGPL files (with permission of the author)

diff --git a/debian/copyright b/debian/copyright
index 642f3c5..70ccd12 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,7 @@ Files: *
 Copyright: 1992-2012 Associated Universities, Inc. Washington DC, USA.
  2010, ESO (in the framework of the ALMA collaboration)
  1988, Free Software Foundation
+ 1985-2012 Distributed Systems Software (Barry Brachman)
  2012 Ole Streicher (Debian packaging)
 License: LGPL-2+
  This library is free software; you can redistribute it and/or modify it
@@ -22,6 +23,11 @@ License: LGPL-2+
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2+ can be found in the file
  `/usr/share/common-licenses/LGPL-2'.
+Note: The files install/printer/{range.c,lwf_a.c} document a non-DFSG
+ compatible license. I contacted the author (Barry Brachman <brachman at dss.ca>)
+ and got the permission from him to distribute the file as LGPL-2+ and to
+ remove or change the copyright note in the file. The license change is
+ reported to upstream.
 
 Files: */*/test/* images/Images/ImageReorderer.h
  install/codedevl/glish-mode.el
@@ -54,7 +60,7 @@ License: Free
   This program may be freely redistributed,
   but the copyright comment MUST remain intact.
 
-Files: install/printer/range.c
+Files: 
 Copyright: Barry Brachman
 License: Non-free: FIXME
  Permission is given to freely copy or distribute this program
diff --git a/debian/patches/lgpl_change_range_c.patch b/debian/patches/lgpl_change_range_c.patch
new file mode 100644
index 0000000..7c5f88c
--- /dev/null
+++ b/debian/patches/lgpl_change_range_c.patch
@@ -0,0 +1,96 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Change license and copyright info for range.c
+ The license written in the file is not DFSG compliant. I contacted the 
+ author (Barry Brachman <brachman at dss.ca>)and got the permission to re-release
+ the file under LGPL and accordingly change the copyright information.
+--- a/install/printer/range.c
++++ b/install/printer/range.c
+@@ -23,30 +23,25 @@
+  * I've left the error checking in inrange; it is redundant (I hope!)
+  * Nov/85 BJB
+  * ========================================================================
++ * Copyright (c) 1985-2012 Distributed Systems Software
+  *
+- * Copyright (c) Barry Brachman
+- *
+- * Permission is given to freely copy or distribute this program
+- * with the following restrictions:
+- *
+- *	1) The author is not responsible for the consequences of use of
+- *		this software and is not responsible for correcting any defects
+- *	2) The origin of this software must not be misrepresented, either by
+- *		explicit claim or by omission
+- *	3) You may not sell this program
+- *	4) Altered versions must be plainly marked as such, and must not
+- *		be misrepresented as being the original software
+- *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+  *
+  * Barry Brachman
+- * Dept. of Computer Science
+- * Univ. of British Columbia
+- * Vancouver, B.C. V6T 1W5
+- *
+- * .. {ihnp4!alberta, uw-beaver}!ubc-vision!ubc-cs!brachman
+- * brachman at cs.ubc.cdn
+- * brachman%ubc.csnet at csnet-relay.arpa
+- * brachman at ubc.csnet
++ * Distributed Systems Software
++ * brachman at dss.ca
+  * ========================================================================
+  */
+ /* $Id: range.c 16316 2003-07-16 03:38:11Z aips2adm $ */
+--- a/install/printer/lwf_a.c
++++ b/install/printer/lwf_a.c
+@@ -103,23 +103,25 @@
+  * BJB - Nov/85
+  * ===========================================================================
+  *
+- * Copyright (c) Barry Brachman
++ * Copyright (c) 1985-2012 Distributed Systems Software
+  *
+- * Permission is given to freely copy or distribute this program
+- * with the following restrictions:
+- *
+- *      1) The author is not responsible for the consequences of use of
+- *              this software and is not responsible for correcting any defects
+- *      2) The origin of this software must not be misrepresented, either by
+- *              explicit claim or by omission
+- *      3) You may not sell this program
+- *      4) Altered versions must be plainly marked as such, and must not
+- *              be misrepresented as being the original software
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+  *
+  * Barry Brachman
+- * Dept. of Computer Science
+- * Univ. of British Columbia
+- * Vancouver, B.C. V6T 1W5
++ * Distributed Systems Software
++ * brachman at dss.ca
+  *
+  * ===========================================================================
+  *
diff --git a/debian/patches/series b/debian/patches/series
index dfaefa7..a981deb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+lgpl_change_range_c.patch
 set_soversion.patch
 dont_install_testscript_to_bin.patch
 multiarch.patch

-- 
Common Astronomy Software Applications core library

