Relicense as BSD-3

dstndstn · Sep 9, 2015 · 4671987 · 4671987
1 parent db49ad9
commit 4671987
Show file tree

Hide file tree

Showing 641 changed files with 1,541 additions and 13,021 deletions.
diff --git a/CREDITS b/CREDITS
@@ -11,8 +11,12 @@ First, the obvious ones:
 
 Now, some miscellaneous files:
 
--quads/qsort_reentrant.{c,h}
-  Yoinked from FreeBSD.  Distributed under the BSD license, big surprise.
+-util/EXIF.py
+  3-clause BSD license.
+  https://github.com/ianare/exif-py
+
+-util/ctmf.c
+  (c) Simon Perreault, licensed under the GPL v3+.
 
 -util/bt.c
   AVL code was yoinked from GNU libavl which is under the GPL.
@@ -22,25 +26,60 @@ Now, some miscellaneous files:
   http://cutest.sourceforge.net/
   zlib/libpng license.
 
+-util/md5.{c,h}
+  (c) Christophe Devine, licensed under the GPL v2+.
+
+-util/qsort_reentrant.{c,h}
+  From FreeBSD.  Distributed under the BSD license, big surprise.
+
+-util/radix.c
+  (c) Herf Consulting LLC
+  Use for anything you want, just tell me what you do with it.
+
+-sdss/sqlcl.py
+  (c) Tamas Budavari
+
+-sdss/yanny.py
+  (c) Ben Weaver
+
+-blind/an_mm_malloc.h
+  (c) FSF, from GCC.  Imported for use by ctmf.c
+
+-blind/anet.py
+  (c) Josh Bloom, licensed under GPL v3.
+
 -blind/{tablist,modhead,fitscopy,tabmerge,fitstomatlab,liststruc,listhead,
         imcopy,imarith,imstat}.c
   From the CFITSIO utilities web page.
   http://heasarc.gsfc.nasa.gov/docs/software/fitsio/cexamples.html
   "You may freely modify, reuse, and redistribute these programs as you wish."
   (fitstomatlab.c is just a modified version of tablist.c)
 
--tilecache/web/map.js includes code borrowed from wms236.js by John Deck,
-  UC Berkeley.
+-blind/fitsverify.c
+  From the "fitsverify" tool,
+  http://heasarc.gsfc.nasa.gov/docs/software/ftools/fitsverify/
 
--tilecache/web/map.js includes code borrowed from:
-  http://www.scottandrew.com/weblog/jsjunk#inpoly
-  Copyright 2001 scott andrew lepera
-
--quads/pnpoly.c
+-blind/pnpoly.c
+  (c) Wm. Randolph Franklin, MIT license
   From http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
 
+-blind/spike_join.c
+  (c) Christopher Stumm, GPL v2+
+
+-catalogs/ucac4-fits.c, ucac4.c, ucac4tofits.c
+  (c) Michal Kočer, Klet Observatory, GPL v2
+
+-libkd/an-fls.h
+  (c) Linus Torvalds, GPL v2
+
+
 Data files:
 
+-catalogs/constellation-boundaries.c
+ IAU Constellation boundaries, in J2000, from
+ http://vizier.cfa.harvard.edu/viz-bin/VizieR-3?-source=VI/49/bound_20
+
+
 -catalogs/ngc2000{,names}.dat
   Imported from ftp://cdsarc.u-strasbg.fr/cats/VII/118/
   NGC 2000.0, The Complete New General Catalogue and Index Catalogue

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -19,14 +19,20 @@ Latest release: http://astrometry.net/downloads/astrometry.net-latest.tar.gz
 > archival disarray. We hope this will help organize, annotate and make
 > searchable all the world's astronomical information.
 
-Copyright 2006-2014 Michael Blanton, David W. Hogg, Dustin Lang, Keir
-Mierle and Sam Roweis.
+Copyright 2006-2015 Michael Blanton, David W. Hogg, Dustin Lang, Keir
+Mierle and Sam Roweis (the Astrometry.net Team).
 
 Contributions from Sjoert van Velzen, Themos Tsikas (wcs-match.c),
-Andrew Hood, Thomas Stibor, Denis Vida, Ole Streicher and others.
+Andrew Hood, Thomas Stibor, Denis Vida, Ole Streicher, David
+Warde-Farley, Jon Barron, and others.
 
-Licensed under GPLv2.  Please contact us about other licensing
-arrangements.
+Parts of the code written by the Astrometry.net Team are licensed
+under a 3-clause BSD-style license.  See the file LICENSE for the full
+license text.  However, since this code uses libraries licensed under
+the GNU GPL, the whole work is distributed under the GPL version 3 or
+later.
+
+Code development happens at http://github.com/dstndstn/astrometry.net
 
 The documentation is at http://astrometry.net/doc
 
@@ -38,7 +44,6 @@ Code snapshots and releases are at http://astrometry.net/downloads
 
 The web service is at http://nova.astrometry.net
 
-
 For academic use, please cite the paper:
 
 > Lang, D., Hogg, D.W., Mierle, K., Blanton, M., & Roweis, S.,

diff --git a/blind/2mass-cut.py b/blind/2mass-cut.py
@@ -1,3 +1,5 @@
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 from astrometry.util.fits import *
 from numpy import logical_and
 

diff --git a/blind/Makefile b/blind/Makefile
@@ -1,18 +1,5 @@
 # This file is part of the Astrometry.net suite.
-# Copyright 2006-2008 Dustin Lang, Keir Mierle and Sam Roweis.
-#
-# The Astrometry.net suite 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, version 2.
-#
-# The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# Licensed under a 3-clause BSD style license - see LICENSE
 
 BASEDIR := ..
 COMMON := $(BASEDIR)/util

diff --git a/blind/README b/blind/README
diff --git a/blind/add-text.c b/blind/add-text.c
@@ -1,3 +1,7 @@
+/*
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>

diff --git a/blind/agreeable.c b/blind/agreeable.c
@@ -1,19 +1,6 @@
 /*
-  This file is part of the Astrometry.net suite.
-  Copyright 2006, 2007 Dustin Lang, Keir Mierle and Sam Roweis.
-
-  The Astrometry.net suite 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, version 2.
-
-  The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 */
 
 #include <stdio.h>

diff --git a/blind/allquads-main.c b/blind/allquads-main.c
@@ -1,19 +1,6 @@
 /*
-  This file is part of the Astrometry.net suite.
-  Copyright 2009 Dustin Lang.
-
-  The Astrometry.net suite 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, version 2.
-
-  The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 */
 
 #include <math.h>

diff --git a/blind/allquads.c b/blind/allquads.c
@@ -1,19 +1,6 @@
 /*
-  This file is part of the Astrometry.net suite.
-  Copyright 2009 Dustin Lang.
-
-  The Astrometry.net suite 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, version 2.
-
-  The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 */
 
 #include <math.h>

diff --git a/blind/augment-xylist-main.c b/blind/augment-xylist-main.c
@@ -1,19 +1,6 @@
 /*
- This file is part of the Astrometry.net suite.
- Copyright 2007-2008 Dustin Lang, Keir Mierle and Sam Roweis.
-
- The Astrometry.net suite 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, version 2.
-
- The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA	 02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
  */
 
 /**

diff --git a/blind/augment-xylist.c b/blind/augment-xylist.c
@@ -1,20 +1,6 @@
 /*
- This file is part of the Astrometry.net suite.
- Copyright 2007-2009 Dustin Lang, Keir Mierle and Sam Roweis.
- Copyright 2010, 2011 Dustin Lang.
-
- The Astrometry.net suite 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, version 2.
-
- The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA	 02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
  */
 
 /**

diff --git a/blind/backend_client.py b/blind/backend_client.py
diff --git a/blind/bands.py b/blind/bands.py
@@ -1,3 +1,5 @@
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 from pylab import *
 from numpy import *
 from math import *

diff --git a/blind/bgsubtract.c b/blind/bgsubtract.c
@@ -1,19 +1,6 @@
 /*
-  This file is part of the Astrometry.net suite.
-  Copyright 2006, 2007 Dustin Lang, Keir Mierle and Sam Roweis.
-
-  The Astrometry.net suite 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, version 2.
-
-  The Astrometry.net suite 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 the Astrometry.net suite ; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# This file is part of the Astrometry.net suite.
+# Licensed under a 3-clause BSD style license - see LICENSE
 */
 
 #include <unistd.h>