(no commit message)

[imagemagick] / NOTICE

diff --git a/NOTICE b/NOTICE
index 8b74568ec2802975ee872b4d72dd6e6b2460bb5d..eed70e10db7df7de85d9eaf8fa2206e230e794da 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -25,7 +25,6 @@ This copyright is limited to the image patterns in magick/nt-base.c, incorporate
 
 This copyright is limited to code for reading XML files in magick/xml-tree.c, incorporated from the ezxml package:
 
-
   Copyright 2004-2006 Aaron Voisine <aaron@voisine.org>
  
   Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -38,13 +37,11 @@ This copyright is limited to code for reading XML files in magick/xml-tree.c, in
 
 This copyright is limited to the Windows installer and enhancements to the automake and autoconf configure scripts, incorporated from the GraphicsMagick package:
 
-  Copyright (C) 2002-2009 GraphicsMagick Group, an organization dedicated to making software imaging solutions freely available.
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files ("GraphicsMagick"), to deal in GraphicsMagick without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of GraphicsMagick, and to permit persons to whom GraphicsMagick is furnished to do so, subject to the following conditions:
+  Copyright (C) 2002 - 2009 GraphicsMagick Group
 
-  The above copyright notice and this permission notice shall be included in all copies or substantial portions of GraphicsMagick.
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement.  In no event shall GraphicsMagick Group be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with GraphicsMagick or the use or other dealings in GraphicsMagick.
+  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-  Except as contained in this notice, the name of the GraphicsMagick Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in GraphicsMagick without prior written authorization from the GraphicsMagick Group.
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.