Change copyright/license statement.

The copyright on all source now has the current preferred legalize.  All
source now also states that the license is New BSD.

CMakeLists.txt

 ## Copyright 2003 Sandia Coporation
-## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-## license for use of this work by or on behalf of the U.S. Government.
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that this Notice and any statement
-## of authorship are reproduced on all copies.
+## Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+## the U.S. Government retains certain rights in this software.
+##
+## This source code is released under the New BSD License.
 #
 
 PROJECT(ICET C)

History

@@ -3,11 +3,10 @@
 ** Revision history of IceT.
 **
 ** Copyright 2003 Sandia Coporation
-** Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-** license for use of this work by or on behalf of the U.S. Government.
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that this Notice and any statement
-** of authorship are reproduced on all copies.
+** Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+** the U.S. Government retains certain rights in this software.
+**
+** This source code is released under the New BSD License.
 **
 *****************************************************************************
 

IceTConfig.cmake.in

@@ -2,15 +2,14 @@
 #
 # ICETConfig.cmake - IceT CMake configuration file for external projects.
 #
-# This file is configured by IceT and used by the UseICET.cmake module
-# to load IceT's settings for an external project.
+# This file is configured by IceT and used by other CMake projects to load
+# IceT's settings.
 #
-## Copyright 2003 Sandia Coporation
-## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-## license for use of this work by or on behalf of the U.S. Government.
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that this Notice and any statement
-## of authorship are reproduced on all copies.
+# Copyright 2003 Sandia Coporation
+# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+# the U.S. Government retains certain rights in this software.
+#
+# This source code is released under the New BSD License.
 #
 
 # The IceT include file directories.

README

@@ -5,11 +5,10 @@
 ** Author: Kenneth Moreland (kmorel@sandia.gov)
 **
 ** Copyright 2003 Sandia Coporation
-** Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-** license for use of this work by or on behalf of the U.S. Government.
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that this Notice and any statement
-** of authorship are reproduced on all copies.
+** Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+** the U.S. Government retains certain rights in this software.
+**
+** This source code is released under the New BSD License.
 **
 *****************************************************************************
 
@@ -23,10 +22,12 @@ interactive CMake configuration tool.  On UNIX, run ccmake.  On Win32, run
 the CMake program on the desktop or in the start menu.  Note that when
 using the interactive configuration tool, you will need to ``configure''
 several times before you can generate the build files.  This is because as
-more information is retrieved, futher options are revealed.  Optionally,
-you may ``cmake -i'' for a Q/A form of the tool.
+more information is retrieved, futher options are revealed.
 
 After CMake generates build files, compile the applications as applicable
 for your system.
 
 
+IceT is released under the New BSD License.  Any contributions to IceT will
+also be considered to fall under this license, and it is the responsibility
+of the authors to secure the necessary permissions before contributing.

src/CMakeLists.txt

 ## Copyright 2003 Sandia Coporation
-## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-## license for use of this work by or on behalf of the U.S. Government.
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that this Notice and any statement
-## of authorship are reproduced on all copies.
+## Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+## the U.S. Government retains certain rights in this software.
+##
+## This source code is released under the New BSD License.
 #
 
 ADD_SUBDIRECTORY(ice-t)

src/communication/CMakeLists.txt

 ## Copyright 2003 Sandia Coporation
-## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-## license for use of this work by or on behalf of the U.S. Government.
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that this Notice and any statement
-## of authorship are reproduced on all copies.
+## Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+## the U.S. Government retains certain rights in this software.
+##
+## This source code is released under the New BSD License.
 #
 
 SET(ICET_MPI_SRCS

src/communication/mpi.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTMPI.h>

src/gl/CMakeLists.txt

 ## Copyright 2003 Sandia Coporation
-## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-## license for use of this work by or on behalf of the U.S. Government.
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that this Notice and any statement
-## of authorship are reproduced on all copies.
+## Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+## the U.S. Government retains certain rights in this software.
+##
+## This source code is released under the New BSD License.
 #
 
 SET(ICET_GL_SRCS

src/gl/gl_draw.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTGL.h>

src/gl/gl_image.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTDevGLImage.h>

src/gl/gl_state.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTGL.h>

src/ice-t/CMakeLists.txt

 ## Copyright 2003 Sandia Coporation
-## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-## license for use of this work by or on behalf of the U.S. Government.
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that this Notice and any statement
-## of authorship are reproduced on all copies.
+## Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+## the U.S. Government retains certain rights in this software.
+##
+## This source code is released under the New BSD License.
 #
 
 SET(ICET_SRCS

src/ice-t/communication.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTDevCommunication.h>

src/ice-t/compress_func_body.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 /* This is not a traditional header file, but rather a "macro" file that defines

src/ice-t/compress_template_body.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 /* This is not a traditional header file, but rather a "macro" file that defines

src/ice-t/context.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTDevContext.h>

src/ice-t/decompress_func_body.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 /* This is not a traditional header file, but rather a "macro" file that defines

src/ice-t/decompress_template_body.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 /* This is not a traditional header file, but rather a "macro" file that defines

src/ice-t/diagnostics.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTDevDiagnostics.h>

src/ice-t/draw.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceT.h>

src/ice-t/image.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTDevImage.h>

src/ice-t/porting.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTDevPorting.h>

src/ice-t/projections.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTDevProjections.h>

src/ice-t/state.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceTDevState.h>

src/ice-t/tiles.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceT.h>

src/include/IceT.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_H_

src/include/IceTConfig.h.in

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_CONFIG_H_

src/include/IceTDevCommunication.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_COMMUNICATION_H_

src/include/IceTDevContext.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_CONTEXT_H_

src/include/IceTDevDiagnostics.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_DIAGNOSTICS_H_

src/include/IceTDevGLImage.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef __icetGLImage_h

src/include/IceTDevImage.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_IMAGE_H_

src/include/IceTDevPorting.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_PORTING_H_

src/include/IceTDevProjections.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceT.h>

src/include/IceTDevState.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_STATE_H_

src/include/IceTDevStrategySelect.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef __IceTDevStrategySelect_h

src/include/IceTGL.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_GL_H_

src/include/IceTMPI.h

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #ifndef _ICET_MPI_H_

src/strategies/CMakeLists.txt

 ## Copyright 2003 Sandia Coporation
-## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
-## license for use of this work by or on behalf of the U.S. Government.
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that this Notice and any statement
-## of authorship are reproduced on all copies.
+## Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+## the U.S. Government retains certain rights in this software.
+##
+## This source code is released under the New BSD License.
 #
 
 # These source files are actually compiled in the Core IceT source

src/strategies/automatic.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceT.h>

src/strategies/bswap.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2010 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *
+ * This source code is released under the New BSD License.
  */
 
 #include <IceT.h>

src/strategies/common.c

 /* -*- c -*- *******************************************************/
 /*
  * Copyright (C) 2003 Sandia Corporation
- * Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
- * license for use of this work by or on behalf of the U.S. Government.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that this Notice and any statement
- * of authorship are reproduced on all copies.
+ * Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+ * the U.S. Government retains certain rights in this software.
+ *