X Strike Force XFree86 SVN commit: r1222 - trunk/debian/patches
Author: branden
Date: 2004-04-02 15:37:48 -0500 (Fri, 02 Apr 2004)
New Revision: 1222
Modified:
trunk/debian/patches/080_pci_isolate_device_feature.diff
Log:
Change license of PCI "IsolateDevice" feature to MIT/X11 terms per
communication from its author, Aivils Stoss.
Modified: trunk/debian/patches/080_pci_isolate_device_feature.diff
===================================================================
--- trunk/debian/patches/080_pci_isolate_device_feature.diff 2004-04-02 19:10:38 UTC (rev 1221)
+++ trunk/debian/patches/080_pci_isolate_device_feature.diff 2004-04-02 20:37:48 UTC (rev 1222)
@@ -4,10 +4,30 @@
-isolateDevice command-line flag for XFree86 X server. Useful for
multi-card setups where different X servers run on each card.
-This patch by Aivils Stoss <Aivils.Stoss@unibanka.lv>, licensed under the
-GNU GPL. Minor modifications by Andreas Schuldei and Branden Robinson;
-documentation added by Branden Robinson.
+This patch by Aivils Stoss <Aivils.Stoss@unibanka.lv>; copyright and
+license as below. Minor modifications by Andreas Schuldei and Branden
+Robinson; documentation added by Branden Robinson.
+ Copyright 2003 Aivils Stoss.
+
+ 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 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 COPYRIGHT HOLDER(S) 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.
+
--- xc/programs/Xserver/hw/xfree86/XF86Config.man~ 2004-03-26 18:10:22.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/XF86Config.man 2004-03-26 18:53:20.000000000 -0500
@@ -1592,7 +1592,7 @@
Reply to: