X Strike Force XFree86 SVN commit: r1886 - in trunk/debian: . patches
Author: fabbione
Date: 2004-09-28 06:06:09 -0500 (Tue, 28 Sep 2004)
New Revision: 1886
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Add patch copyright/licence paragraph from upstream (Rene Rebe).
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-09-28 06:12:42 UTC (rev 1885)
+++ trunk/debian/CHANGESETS 2004-09-28 11:06:09 UTC (rev 1886)
@@ -96,7 +96,7 @@
+ Update MANIFEST and xserver-xfree86.install files to reflect the new
riva128.o submodule.
(Closes: #269025, #268759, #271235, #270228, #271071, #270714)
- 1867, 1871, 1872, 1875
+ 1867, 1871, 1872, 1875, 1885
Update Czech debconf template translations (thanks, Miroslav Kure).
(Closes: #273516)
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-09-28 06:12:42 UTC (rev 1885)
+++ trunk/debian/TODO 2004-09-28 11:06:09 UTC (rev 1886)
@@ -14,14 +14,6 @@
scheduled. However, the package release manager can put an explicit freeze on
those by marking the package version section accordingly.
-4.3.0.dfsg.1-8
---------------
-* Determine the copryright-status and licensing of the little-endian fix to
- xf86xv.c (revision 1.38) in 000_stolen_from_HEAD.diff; or obtain the same fix
- from a source not contaminated by the XFree86 1.1 license (perhaps the author,
- Rene Rabe); or have the patch clean-room reimplemented (it's fairly trivial)
- and place the patch in an appropriate file.
-
4.3.0.dfsg.1-9
--------------
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-09-28 06:12:42 UTC (rev 1885)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-09-28 11:06:09 UTC (rev 1886)
@@ -154,9 +154,9 @@
xc/programs/Xserver/hw/xfree86/common/xf86xv.c @ 1.38
808. Fix big-endian typo in xf86CopyYUV12ToPacked (#6131, Rene Rebe).
[Marc Aurele La France]
-[XXX: This patch was applied to XFree86 CVS on 2004-02-19, after the
-XFree86 1.1 relicensing. We need to determine the provenance of this
-patch.]
+ Rene Rebe: "Yes, the change was done under the Version 1.0 license without
+ the advertising clause. I just double checked it is in X.Org - where indeed
+ is present, too."
xc/programs/xdm/access.c @ 3.14
Fix parsing of IPv4 host names in Xaccess (Chisato Yamauchi). [David Dawes]
Reply to: