Merge pull request #6644 from phadej/update-copyright-years-2020

Update copyright years 2020
haskell · Apr 3, 2020 · 8ffb885 · 8ffb885
2 parents a1a5fc7 + 0565f51
commit 8ffb885
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 14 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -1,7 +1,7 @@
 cabal-version: >=1.10
 name:          Cabal
 version:       3.3.0.0
-copyright:     2003-2019, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2020, Cabal Development Team (see AUTHORS file)
 license:       BSD3
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>

diff --git a/Cabal/LICENSE b/Cabal/LICENSE
@@ -1,5 +1,8 @@
-Copyright (c) 2003-2017, Cabal Development Team.
+Copyright (c) 2003-2020, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
+
+See */LICENSE for the copyright holders of the subcomponents.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2017, Cabal Development Team.
+Copyright (c) 2003-2020, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
 
 See */LICENSE for the copyright holders of the subcomponents.

diff --git a/cabal-benchmarks/LICENSE b/cabal-benchmarks/LICENSE
@@ -0,0 +1,34 @@
+Copyright (c) 2003-2020, Cabal Development Team.
+See the AUTHORS file for the full list of copyright holders.
+
+See */LICENSE for the copyright holders of the subcomponents.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Isaac Jones nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cabal-benchmarks/README.md b/cabal-benchmarks/README.md
@@ -0,0 +1,3 @@
+# cabal-benchmarks
+
+TBW
diff --git a/cabal-benchmarks/cabal-benchmarks.cabal b/cabal-benchmarks/cabal-benchmarks.cabal
@@ -1,6 +1,6 @@
 name:               cabal-benchmarks
 version:            3
-copyright:          2003-2017, Cabal Development Team (see AUTHORS file)
+copyright:          2003-2020, Cabal Development Team (see AUTHORS file)
 license:            BSD3
 license-file:       LICENSE
 author:             Cabal Development Team <cabal-devel@haskell.org>

diff --git a/cabal-dev-scripts/LICENSE b/cabal-dev-scripts/LICENSE
@@ -1,9 +1,13 @@
-opyright (c) 2017, Cabal Development Team
+Copyright (c) 2003-2020, Cabal Development Team.
+See the AUTHORS file for the full list of copyright holders.
+
+See */LICENSE for the copyright holders of the subcomponents.
 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are
+met:
 
     * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
@@ -13,7 +17,7 @@ modification, are permitted provided that the following conditions are met:
       disclaimer in the documentation and/or other materials provided
       with the distribution.
 
-    * Neither the name of Cabal Development Team nor the names of other
+    * Neither the name of Isaac Jones nor the names of other
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 

diff --git a/cabal-install/LICENSE b/cabal-install/LICENSE
@@ -1,5 +1,8 @@
-Copyright (c) 2003-2017, Cabal Development Team.
+Copyright (c) 2003-2020, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
+
+See */LICENSE for the copyright holders of the subcomponents.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
@@ -11,6 +11,9 @@ set -e
 # you don't want profiling and dynamic versions of libraries to be installed in
 # addition to vanilla, run 'EXTRA_CONFIGURE_OPTS="" ./bootstrap.sh'
 
+echo "DON'T USE THIS SCRIPT IF YOU HAVE other recent cabal-install INSTALLED"
+echo "THIS SCRIPT IS MADE FOR BOOTSTRAPPING cabal-install ON NEW ARCHITECTURES"
+
 #VERBOSE
 DEFAULT_CONFIGURE_OPTS="--enable-library-profiling --enable-shared"
 EXTRA_CONFIGURE_OPTS=${EXTRA_CONFIGURE_OPTS-$DEFAULT_CONFIGURE_OPTS}

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -16,7 +16,7 @@ License:            BSD3
 License-File:       LICENSE
 Author:             Cabal Development Team (see AUTHORS file)
 Maintainer:         Cabal Development Team <cabal-devel@haskell.org>
-Copyright:          2003-2019, Cabal Development Team
+Copyright:          2003-2020, Cabal Development Team
 Category:           Distribution
 Build-type:         Simple
 Extra-Source-Files:

diff --git a/cabal-install/cabal-install.cabal.pp b/cabal-install/cabal-install.cabal.pp
@@ -291,7 +291,7 @@
 License-File:       LICENSE
 Author:             Cabal Development Team (see AUTHORS file)
 Maintainer:         Cabal Development Team <cabal-devel@haskell.org>
-Copyright:          2003-2019, Cabal Development Team
+Copyright:          2003-2020, Cabal Development Team
 Category:           Distribution
 Build-type:         Simple
 Extra-Source-Files:

diff --git a/cabal-testsuite/LICENSE b/cabal-testsuite/LICENSE
@@ -1,5 +1,8 @@
-Copyright (c) 2003-2017, Cabal Development Team.
+Copyright (c) 2003-2020, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
+
+See */LICENSE for the copyright holders of the subcomponents.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -1,7 +1,7 @@
 cabal-version: 2.2
 name:          cabal-testsuite
 version:       3
-copyright:     2003-2019, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2020, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>

diff --git a/solver-benchmarks/LICENSE b/solver-benchmarks/LICENSE
@@ -1,5 +1,8 @@
-Copyright (c) 2003-2017, Cabal Development Team.
+Copyright (c) 2003-2020, Cabal Development Team.
 See the AUTHORS file for the full list of copyright holders.
+
+See */LICENSE for the copyright holders of the subcomponents.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal
@@ -1,6 +1,6 @@
 name:          solver-benchmarks
 version:       3
-copyright:     2003-2017, Cabal Development Team (see AUTHORS file)
+copyright:     2003-2020, Cabal Development Team (see AUTHORS file)
 license:       BSD3
 license-file:  LICENSE
 author:        Cabal Development Team <cabal-devel@haskell.org>