[commit: Cabal] master: Fix LICENSE and remove duplicate copyright file (bd50927)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/bd50927406451de01739c64a0fc3b735a9aa26ee

>---------------------------------------------------------------

commit bd50927406451de01739c64a0fc3b735a9aa26ee
Author: Duncan Coutts <duncan at haskell.org>
Date:   Mon Sep 17 03:31:18 2007 +0000

    Fix LICENSE and remove duplicate copyright file
    Lemmih, Paolo Martini are the primary authors of cabal-install but were
    missing from the list in LICENCE.

>---------------------------------------------------------------

 cabal-install/LICENSE   |    5 ++++-
 cabal-install/copyright |   32 --------------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/cabal-install/LICENSE b/cabal-install/LICENSE
index 01636f5..cf4351d 100644
--- a/cabal-install/LICENSE
+++ b/cabal-install/LICENSE
@@ -1,4 +1,7 @@
-Copyright Isaac Jones 2003-2005.
+Copyright (c) 2003-2007, Isaac Jones, Simon Marlow, Martin Sjögren,
+                         Bjorn Bringert, Krasimir Angelov,
+                         Malcolm Wallace, Ross Patterson,
+                         Lemmih, Paolo Martini
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/cabal-install/copyright b/cabal-install/copyright
deleted file mode 100644
index 782463e..0000000
--- a/cabal-install/copyright
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright (c) 2003-2005, Isaac Jones, Simon Marlow, Martin Sjögren,
-                         Bjorn Bringert, Krasimir Angelov,
-                         Malcolm Wallace, Ross Patterson
-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.