X Strike Force X.Org X11 SVN commit: r1413 - branches/modular/app/xfs-X11R7.0-1.0.1/debian
Author: dnusinow
Date: 2006-03-08 00:42:56 -0500 (Wed, 08 Mar 2006)
New Revision: 1413
Modified:
branches/modular/app/xfs-X11R7.0-1.0.1/debian/changelog
branches/modular/app/xfs-X11R7.0-1.0.1/debian/copyright
Log:
* Provide the correct copyright info
Modified: branches/modular/app/xfs-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/app/xfs-X11R7.0-1.0.1/debian/changelog 2006-03-08 03:15:17 UTC (rev 1412)
+++ branches/modular/app/xfs-X11R7.0-1.0.1/debian/changelog 2006-03-08 05:42:56 UTC (rev 1413)
@@ -1,3 +1,9 @@
+xfs (1:1.0.1-3) experimental; urgency=low
+
+ * Provide the correct copyright info
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 8 Mar 2006 00:42:29 -0500
+
xfs (1:1.0.1-2) experimental; urgency=low
* Provide all our old packaging infrastrcture that I totally forgot. Thanks
Modified: branches/modular/app/xfs-X11R7.0-1.0.1/debian/copyright
===================================================================
--- branches/modular/app/xfs-X11R7.0-1.0.1/debian/copyright 2006-03-08 03:15:17 UTC (rev 1412)
+++ branches/modular/app/xfs-X11R7.0-1.0.1/debian/copyright 2006-03-08 05:42:56 UTC (rev 1413)
@@ -1,47 +1,25 @@
-Copyright 1989, 1998 The Open Group
-Copyright 2005 Hitachi, Ltd.
+Copyright (c) 1988 X Consortium
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
+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 above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
-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
-OPEN 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 THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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 X CONSORTIUM 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.
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
- Copyright 1988 by Evans & Sutherland Computer Corporation,
- Salt Lake City, Utah
- Cambridge, Massachusetts
-
- All Rights Reserved
-
- Permission to use, copy, modify, and distribute this software and
- its documentation for any purpose and without fee is hereby
- granted, provided that the above copyright notice appear in all
- copies and that both that copyright notice and this permis-
- sion notice appear in supporting documentation, and that the
- name of Evans & Sutherland not be used in advertising
- in publicity pertaining to distribution of the software without
- specific, written prior permission.
-
- EVANS & SUTHERLAND DISCLAIMs ALL WARRANTIES WITH REGARD
- TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
- ABILITY AND FITNESS, IN NO EVENT SHALL EVANS & SUTHERLAND
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAM-
- AGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
- OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
- OR PERFORMANCE OF THIS SOFTWARE.
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the X Consortium.
Reply to: