[Pcsclite-cvs-commit] MusclePAM LICENSE,1.2,1.3

rousseau@quantz.debian.org rousseau@quantz.debian.org
Fri, 03 Oct 2003 19:26:19 +0200


Update of /cvsroot/muscleapps/MusclePAM
In directory quantz:/tmp/cvs-serv13595

Modified Files:
	LICENSE 
Log Message:
sync with COPYING


Index: LICENSE
===================================================================
RCS file: /cvsroot/muscleapps/MusclePAM/LICENSE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- LICENSE	10 Jul 2002 21:58:52 -0000	1.2
+++ LICENSE	3 Oct 2003 17:26:17 -0000	1.3
@@ -1,9 +1,6 @@
-Copyright (C) 2002 Eirik A. Herskedal  <ehersked@cs.purdue.edu>
-	  (C) 2000-2002 David Corcoran <corcoran@linuxnet.com>
+Copyright (C) 2000-2002 David Corcoran <corcoran@linuxnet.com>
           (C) 2001 by Martin Saegesser <m.sagi@bluemail.ch>
 
-All rights reserved.
-
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -13,15 +10,11 @@
 2. 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.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by: 
-      David Corcoran    <corcoran@linuxnet.com>
-      http://www.musclecard.com (MUSCLE)
-4. The name of the author may not be used to endorse or promote products
+3. The name of the author may not be used to endorse or promote products
    derived from this software without specific prior written permission.
-5. Changes to this license can only be made by the copyright author
-   through explicit written permission.
+
+   Changes to this license can be made only by the copyright author with 
+   explicit written consent.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES