X Strike Force X.Org X11 SVN commit: r314 - in trunk/debian: . local patches
Author: dnusinow
Date: 2005-07-05 21:16:18 -0500 (Tue, 05 Jul 2005)
New Revision: 314
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/local/debian.xpm
trunk/debian/local/debianbw.xpm
trunk/debian/patches/000_backport_from_author_xterm.diff
trunk/debian/patches/045_chips_default_to_swcursor_on_69k.diff
trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
trunk/debian/patches/099g_xkb_symbols_polish_fix_keypad_separator.diff
Log:
- Fix debian/local xpm's (remove SVN comments) to fix xdm breakage. Thanks
to Eugene Konvev for catching this!
- De-fuzz a few patches
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/TODO 2005-07-06 02:16:18 UTC (rev 314)
@@ -23,8 +23,6 @@
* patches to xc/programs/Xserver/hw/xfree86/drivers/{mga,rendition}/Imakefile
now in patch 908
-* Make sure xdm upgrades work properly
-
* C++ ABI Transition
xorg-x11 6.8.2-2 (unstable)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/changelog 2005-07-06 02:16:18 UTC (rev 314)
@@ -11,10 +11,13 @@
- Add -f to update-rc.d call in xfree86-common.postinst.in to get rid of
error during configure stage. Thanks to Norbert Tretowski for providing
the fix.
+
- Disable acceleration on C&T 69000 by default but allow it to be overrided
by config file. Thanks to Dan Christensen and Nathanael Nerode;
Closes: #315315
+ - Remove svn comments from debian/local xpm pixmaps to unbreak xdm
+
- Patch Audit
- 0000_backport_from_upstream.diff updated
- Thomas Winischhofer's post-6.8.2 fixes to MiscPassMessage();
Modified: trunk/debian/local/debian.xpm
===================================================================
--- trunk/debian/local/debian.xpm 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/local/debian.xpm 2005-07-06 02:16:18 UTC (rev 314)
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/* XPM */
static char * debian_xpm[] = {
"200 265 39 1",
Modified: trunk/debian/local/debianbw.xpm
===================================================================
--- trunk/debian/local/debianbw.xpm 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/local/debianbw.xpm 2005-07-06 02:16:18 UTC (rev 314)
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/* XPM */
static char * debianbw_xpm[] = {
"200 265 7 1",
Modified: trunk/debian/patches/000_backport_from_author_xterm.diff
===================================================================
--- trunk/debian/patches/000_backport_from_author_xterm.diff 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/patches/000_backport_from_author_xterm.diff 2005-07-06 02:16:18 UTC (rev 314)
@@ -14252,7 +14252,7 @@
/*
* $Xorg: input.c,v 1.3 2000/08/17 19:55:08 cpqbld Exp $
*/
-@@ -2,6 +4,6 @@
+@@ -4,6 +6,6 @@
-/* $XFree86: xc/programs/xterm/input.c,v 3.71 2004/12/01 01:27:46 dickey Exp $ */
+/* $XFree86: xc/programs/xterm/input.c,v 3.72 2005/01/14 01:50:03 dickey Exp $ */
Modified: trunk/debian/patches/045_chips_default_to_swcursor_on_69k.diff
===================================================================
--- trunk/debian/patches/045_chips_default_to_swcursor_on_69k.diff 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/patches/045_chips_default_to_swcursor_on_69k.diff 2005-07-06 02:16:18 UTC (rev 314)
@@ -4,7 +4,7 @@
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c~ 2004-08-12 17:31:33.000000000 -0500
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c 2004-08-12 17:31:41.000000000 -0500
-@@ -1519,6 +1519,18 @@
+@@ -1525,6 +1525,18 @@
} else {
cPtr->Accel.UseHWCursor = TRUE;
}
Modified: trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
===================================================================
--- trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-07-06 02:16:18 UTC (rev 314)
@@ -731,7 +731,7 @@
diff -ruN xc-old/programs/xterm/Imakefile xc/programs/xterm/Imakefile
--- xc-old/programs/xterm/Imakefile 2004-08-13 12:57:19.000000000 +0000
+++ xc/programs/xterm/Imakefile 2004-10-26 09:59:37.322950392 +0000
-@@ -97,7 +97,7 @@
+@@ -99,7 +99,7 @@
UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
#endif
Modified: trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff
===================================================================
--- trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/patches/099c_support_loadable_external_Xcursor_lib.diff 2005-07-06 02:16:18 UTC (rev 314)
@@ -25,7 +25,7 @@
diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile
--- xc-old/lib/X11/Imakefile 2004-10-27 08:40:37.114775000 +0000
+++ xc/lib/X11/Imakefile 2004-10-27 08:41:15.188986920 +0000
-@@ -133,7 +133,10 @@
+@@ -131,7 +131,10 @@
THRSTUBSRCS = UIThrStubs.c
THRSTUBOBJS = UIThrStubs.o
#endif
Modified: trunk/debian/patches/099g_xkb_symbols_polish_fix_keypad_separator.diff
===================================================================
--- trunk/debian/patches/099g_xkb_symbols_polish_fix_keypad_separator.diff 2005-07-06 01:35:55 UTC (rev 313)
+++ trunk/debian/patches/099g_xkb_symbols_polish_fix_keypad_separator.diff 2005-07-06 02:16:18 UTC (rev 314)
@@ -1,12 +1,6 @@
-$Id: 099g_xkb_symbols_polish_fix_keypad_separator.diff 1735 2004-08-13 06:43:54Z branden $
-
-This patch by Branden Robinson, based on a report from Emil Novak.
-
-Not submitted to XFree86.
-
diff -ruN xc-old/programs/xkbcomp/symbols/pc/pl xc/programs/xkbcomp/symbols/pc/pl
---- xc-old/programs/xkbcomp/symbols/pc/pl 2004-04-23 19:54:56.000000000 +0000
-+++ xc/programs/xkbcomp/symbols/pc/pl 2004-10-26 12:34:16.535295696 +0000
+--- xc-old/programs/xkbcomp/symbols/pc/pl 2005-05-08 23:28:57.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/pl 2005-07-05 21:51:12.000000000 -0400
@@ -21,5 +21,9 @@
key <AB03> { [ c, C, cacute, Cacute ] };
key <AB06> { [ n, N, nacute, Nacute ] };
@@ -18,8 +12,8 @@
include "level3(ralt_switch)"
};
diff -ruN xc-old/programs/xkbcomp/symbols/pc/pl2 xc/programs/xkbcomp/symbols/pc/pl2
---- xc-old/programs/xkbcomp/symbols/pc/pl2 2004-04-23 19:54:56.000000000 +0000
-+++ xc/programs/xkbcomp/symbols/pc/pl2 2004-10-26 12:34:59.992689168 +0000
+--- xc-old/programs/xkbcomp/symbols/pc/pl2 2005-05-08 23:28:57.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/pl2 2005-07-05 21:51:12.000000000 -0400
@@ -41,6 +41,10 @@
key <BKSL> { [ oacute, zacute, dead_grave, dead_breve ] };
key <AB03> { [ c, C, cent, copyright ] };
@@ -32,9 +26,9 @@
};
diff -ruN xc-old/programs/xkbcomp/symbols/pl xc/programs/xkbcomp/symbols/pl
---- xc-old/programs/xkbcomp/symbols/pl 2004-04-23 19:54:52.000000000 +0000
-+++ xc/programs/xkbcomp/symbols/pl 2004-10-26 12:35:38.879777432 +0000
-@@ -35,8 +35,12 @@
+--- xc-old/programs/xkbcomp/symbols/pl 2005-07-05 21:44:06.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pl 2005-07-05 21:51:12.000000000 -0400
+@@ -37,8 +37,12 @@
[ zabovedot, Zabovedot ] };
// End alphanumeric section
@@ -50,9 +44,9 @@
modifier_map Lock { Caps_Lock };
modifier_map Control{ Control_L };
diff -ruN xc-old/programs/xkbcomp/symbols/pl2 xc/programs/xkbcomp/symbols/pl2
---- xc-old/programs/xkbcomp/symbols/pl2 2003-11-14 16:49:23.000000000 +0000
-+++ xc/programs/xkbcomp/symbols/pl2 2004-10-26 12:36:05.506729520 +0000
-@@ -94,6 +94,10 @@
+--- xc-old/programs/xkbcomp/symbols/pl2 2005-07-05 21:44:06.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pl2 2005-07-05 21:51:12.000000000 -0400
+@@ -95,6 +95,10 @@
// End alphanumeric section
Reply to: