[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : neil
Repository : xara
Revision   : 950
Date       : Wed May  3 17:46:34 BST 2006

Changed paths:
   A /Trunk/XaraLX/epm/LICENSE
   M /Trunk/XaraLX/epm/xaralx.list

epm list file changes and temp LICENSE file


Diff:
Index: Trunk/XaraLX/epm/LICENSE
===================================================================
--- Trunk/XaraLX/epm/LICENSE	(revision 0)
+++ Trunk/XaraLX/epm/LICENSE	(revision 950)
@@ -0,0 +1,83 @@
+               Xara LX, a vector drawing and manipulation program.
+                    Copyright (C) 1993-2006 Xara Group Ltd.
+       Copyright on certain contributions may be held in joint with their
+              respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+See the GPL file for a copy of the GNU General Public License
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights. 
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) and its constituent source
+files only, and does not necessarily apply to other Xara products which may
+in part share the same code base, and are subject to their own licensing
+terms.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+  http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+  http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+      Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+                        http://www.xara.com/
Index: Trunk/XaraLX/epm/xaralx.list
===================================================================
--- Trunk/XaraLX/epm/xaralx.list	(revision 949)
+++ Trunk/XaraLX/epm/xaralx.list	(revision 950)
@@ -19,7 +19,7 @@
 %requires pango
 d 755 root root /usr/share/xaralx
 d 755 root root /usr/share/xaralx/examples
-f 755 root root /usr/share/xaralx/examples 		XaraLX/Designs/*.xar
+f 755 root root /usr/share/xaralx/examples 		Designs/*.xar
 d 755 root root /usr/share/doc/xaralx-${ver}
 f 755 root root /usr/share/doc/xaralx-${ver}/README	README
 f 755 root root /usr/share/doc/xaralx-${ver}/LICENSE	LICENSE
@@ -27,6 +27,6 @@
 f 755 root root /usr/share/doc/xaralx-${ver}/AUTHORS	AUTHORS
 
 %format all
-f 755 root root /usr/bin/xaralx 			XaraLX/XaraLX
+f 755 root root /usr/bin/xaralx 			XaraLX
 f 644 root root /usr/share/applications/xaralx.desktop 	xaralx.desktop
 f 644 root root /usr/share/pixmaps/xaralx.xpm 		xaralx.xpm


Xara