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

On branch  : 

http://hackage.haskell.org/trac/ghc/changeset/1facd9015bc1348e69d4e844b4cf64d9b451cb7f

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

commit 1facd9015bc1348e69d4e844b4cf64d9b451cb7f
Author: Duncan Coutts <[email protected]>
Date:   Sat Dec 19 03:10:17 2009 +0000

    Use the standard form of copyright statement in BSD3 license template
    See http://www.opensource.org/licenses/bsd-license.php

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

 cabal-install/Distribution/Client/Init/Licenses.hs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cabal-install/Distribution/Client/Init/Licenses.hs 
b/cabal-install/Distribution/Client/Init/Licenses.hs
index 0a0831d..73bba06 100644
--- a/cabal-install/Distribution/Client/Init/Licenses.hs
+++ b/cabal-install/Distribution/Client/Init/Licenses.hs
@@ -11,8 +11,8 @@ module Distribution.Client.Init.Licenses
 type License = String
 
 bsd3 :: String -> String -> License
-bsd3 s y = unlines
-    [ "Copyright " ++ s ++ " " ++ y
+bsd3 authors year = unlines
+    [ "Copyright (c)" ++ year ++ ", " ++ authors
     , ""
     , "All rights reserved."
     , ""
@@ -27,7 +27,7 @@ bsd3 s y = unlines
     , "      disclaimer in the documentation and/or other materials provided"
     , "      with the distribution."
     , ""
-    , "    * Neither the name of " ++ s ++ " nor the names of other"
+    , "    * Neither the name of " ++ authors ++ " nor the names of other"
     , "      contributors may be used to endorse or promote products derived"
     , "      from this software without specific prior written permission."
     , ""



_______________________________________________
Cvs-libraries mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-libraries

Reply via email to