X Strike Force X.Org X11 SVN commit: r403 - in branches/6.9/debian: . patches patches/general
Author: dnusinow
Date: 2005-07-23 18:46:47 -0500 (Sat, 23 Jul 2005)
New Revision: 403
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/general/001_kernel_version_in_banner.diff
branches/6.9/debian/patches/series
Log:
- Remove general/000_stolen_from_unichrome.sf.net.diff from series.
Obsolete.
- Unfuzzy all other patches altered in this commit
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-07-23 21:55:21 UTC (rev 402)
+++ branches/6.9/debian/changelog 2005-07-23 23:46:47 UTC (rev 403)
@@ -4,6 +4,7 @@
- Remove obsolete by upstream patches:
- general/0000_backport_from_upstream.diff
- general/000_stolen_from_HEAD_i810.diff
+ - general/000_stolen_from_unichrome.sf.net.diff
- Update 000_stolen_from_linuxwacom_wacom_driver.diff to have version
0.6.8 of xf86Wacom.c to get the patch to apply
Modified: branches/6.9/debian/patches/general/001_kernel_version_in_banner.diff
===================================================================
--- branches/6.9/debian/patches/general/001_kernel_version_in_banner.diff 2005-07-23 21:55:21 UTC (rev 402)
+++ branches/6.9/debian/patches/general/001_kernel_version_in_banner.diff 2005-07-23 23:46:47 UTC (rev 403)
@@ -9,10 +9,11 @@
Not submitted upstream yet.
-diff -ruN xc-old/programs/Xserver/hw/xfree86/common/Imakefile xc/programs/Xserver/hw/xfree86/common/Imakefile
---- xc-old/programs/Xserver/hw/xfree86/common/Imakefile 2004-08-20 04:49:44.000000000 +0000
-+++ xc/programs/Xserver/hw/xfree86/common/Imakefile 2004-10-20 09:11:25.271387992 +0000
-@@ -198,6 +198,9 @@
+Index: xc/programs/Xserver/hw/xfree86/common/Imakefile
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/common/Imakefile.orig 2005-07-03 08:15:16.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/common/Imakefile 2005-07-23 18:15:43.000000000 -0400
+@@ -175,6 +175,9 @@
# endif /* XorgCustomVersion */
CUSTOMVERDEF = -DXORG_CUSTOM_VERSION='$(CUSTOMVERSION)'
#endif /* XorgCustomVersion || XFree86CustomVersion */
@@ -22,19 +23,20 @@
#if defined(BuilderString)
BUILDERSTRING = BuilderString
BUILDERMSG = -DBUILDERSTRING='$(BUILDERSTRING)'
-@@ -227,7 +230,7 @@
+@@ -204,7 +207,7 @@
AllTarget($(OFILES))
SpecialCObjectRule(xf86Bus,NullParameter,$(BUGMSG) $(VGAINCLUDES))
--SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(CUSTOMVERDEF) $(XORGREL_DEF) $(XORGDATE_DEF) $(EXT_DEFINES) $(BETADEFS) $(MDEBUGDEFS) $(KEYBOARD_DEFS))
-+SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(CUSTOMVERDEF) $(XORGREL_DEF) $(XORGDATE_DEF) $(EXT_DEFINES) $(BETADEFS) $(MDEBUGDEFS) $(KEYBOARD_DEFS) $(KERNELVER))
+-SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(CUSTOMVERDEF) $(XORGREL_DEF) $(XORGDATE_DEF) $(EXT_DEFINES) $(MDEBUGDEFS) $(KEYBOARD_DEFS))
++SpecialCObjectRule(xf86Init,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(BUGMSG) $(CUSTOMVERDEF) $(XORGREL_DEF) $(XORGDATE_DEF) $(EXT_DEFINES) $(MDEBUGDEFS) $(KEYBOARD_DEFS) $(KERNELVER))
SpecialCObjectRule(xf86Events,$(ICONFIGFILES),$(EXT_DEFINES) $(MDEBUGDEFS))
SpecialCObjectRule(xf86Globals,$(ICONFIGFILES),$(EXT_DEFINES) $(MODPATHDEFINES) $(LOGDEFINES))
SpecialCObjectRule(xf86AutoConfig,$(ICONFIGFILES),$(XCONFIGDEFINES))
-diff -ruN xc-old/programs/Xserver/hw/xfree86/common/xf86Init.c xc/programs/Xserver/hw/xfree86/common/xf86Init.c
---- xc-old/programs/Xserver/hw/xfree86/common/xf86Init.c 2004-08-20 05:22:39.000000000 +0000
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2004-10-20 09:15:11.853942208 +0000
-@@ -105,6 +105,9 @@
+Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/common/xf86Init.c.orig 2005-07-03 05:39:54.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c 2005-07-23 18:15:43.000000000 -0400
+@@ -109,6 +109,9 @@
static void xf86PrintBanner(void);
static void xf86PrintMarkers(void);
static void xf86RunVtInit(void);
@@ -42,9 +44,9 @@
+static void xf86PrintOSKernelString(void);
+#endif
- #ifdef DO_CHECK_BETA
- static int extraDays = 0;
-@@ -155,6 +158,39 @@
+ #ifdef __UNIXOS2__
+ extern void os2ServerVideoAccess();
+@@ -156,6 +159,39 @@
0
};
@@ -84,7 +86,7 @@
static Bool
xf86CreateRootWindow(WindowPtr pWin)
{
-@@ -1838,6 +1874,9 @@
+@@ -1848,6 +1884,9 @@
#ifdef XFree86LOADER
ErrorF("Module Loader present\n");
#endif
Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series 2005-07-23 21:55:21 UTC (rev 402)
+++ branches/6.9/debian/patches/series 2005-07-23 23:46:47 UTC (rev 403)
@@ -3,7 +3,6 @@
general/000_stolen_from_linuxwacom_wacom_driver.diff -p0
general/000_stolen_from_Mesa_6.2_branch.diff -p0
general/000_stolen_from_Mesa_6.2_branch_vb_cull.diff -p0
-general/000_stolen_from_unichrome.sf.net.diff -p0
general/001_kernel_version_in_banner.diff -p0
general/002a_xterm_no_overstrike_bold_fonts.diff -p0
general/002_xdm_fixes.diff -p0
Reply to: