Author: branden
Date: 2004-01-27 15:16:29 -0500 (Tue, 27 Jan 2004)
New Revision: 984
Modified:
trunk/debian/patches/062_proxymngr_manpage_fixes.diff
trunk/debian/patches/063_mga_texmode_restore_fix.diff
trunk/debian/patches/067_nonexecutable_malloced_mem.diff
Log:
Update patch upstream-status annotations.
Modified: trunk/debian/patches/062_proxymngr_manpage_fixes.diff
===================================================================
--- trunk/debian/patches/062_proxymngr_manpage_fixes.diff 2004-01-27
20:14:04 UTC (rev 983)
+++ trunk/debian/patches/062_proxymngr_manpage_fixes.diff 2004-01-27
20:16:29 UTC (rev 984)
@@ -2,8 +2,14 @@
This patch by Branden Robinson.
-Not submitted upstream yet.
+Applied upstream.
+xc/programs/proxymngr/proxymngr.man
+revision 1.8
+date: 2003/02/20 03:27:32; author: dawes; state: Exp; lines: +5 -3
+ 927. Fix hard-coded ProjectRoot paths in the proxymngr man page (#5634,
+ Branden Robinson).
+
--- xc/programs/proxymngr/proxymngr.man~ Tue Jan 1 20:28:41 2002
+++ xc/programs/proxymngr/proxymngr.man Tue Jan 1 20:34:05 2002
@@ -76,7 +76,9 @@
Modified: trunk/debian/patches/063_mga_texmode_restore_fix.diff
===================================================================
--- trunk/debian/patches/063_mga_texmode_restore_fix.diff 2004-01-27
20:14:04 UTC (rev 983)
+++ trunk/debian/patches/063_mga_texmode_restore_fix.diff 2004-01-27
20:16:29 UTC (rev 984)
@@ -4,7 +4,9 @@
Fixes restoration of nonstandard text modes.
-Not submitted upstream yet.
+Upstream incorporated equivalent fix in:
+xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h 16 Sep 2002 18:05:55
-0000 1.83
+xc/programs/Xserver/hw/xfree86/drivers/mga//mga_dacG.c 16 Sep 2002 18:05:55
-0000 1.51
diff -u xc.orig/programs/Xserver/hw/xfree86/drivers/mga/mga.h
xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h
--- xc.orig/programs/Xserver/hw/xfree86/drivers/mga/mga.h Fri May 4
14:05:41 2001
Modified: trunk/debian/patches/067_nonexecutable_malloced_mem.diff
===================================================================
--- trunk/debian/patches/067_nonexecutable_malloced_mem.diff 2004-01-27
20:14:04 UTC (rev 983)
+++ trunk/debian/patches/067_nonexecutable_malloced_mem.diff 2004-01-27
20:16:29 UTC (rev 984)
@@ -12,7 +12,8 @@
__ia64__ only. Perhaps that code should also be enabled for all
linux platforms.
-Not submitted upstream yet.
+Equivalent patch partially applied upstream in revision 1.43; restricted to
+IA-64 only.
--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c~ 2003-08-27
01:56:18.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2003-08-27
01:56:25.000000000 -0500
