X Strike Force X.Org X11 SVN commit: r528 - in branches/6.9/debian: . patches patches/debian patches/general
Author: dnusinow
Date: 2005-08-15 00:02:37 -0500 (Mon, 15 Aug 2005)
New Revision: 528
Modified:
branches/6.9/debian/changelog
branches/6.9/debian/patches/debian/990_ubuntu_accept_enabled_for_extensions.diff
branches/6.9/debian/patches/general/099e_xorgconf_manpage_overhaul.diff
branches/6.9/debian/patches/series
Log:
- general/080_pci_isolate_device_feature.diff is obsolete. Removing.
- Un-fuzzy all other patches in this commit
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-08-14 23:22:35 UTC (rev 527)
+++ branches/6.9/debian/changelog 2005-08-15 05:02:37 UTC (rev 528)
@@ -16,6 +16,7 @@
- general/025b_xkb_README_typos.diff
- general/063_fix_weak_deps.diff
- general/072_Xserver_fb_convert_RGB_to_BGR.diff
+ - general/080_pci_isolate_device_feature.diff
- general/086_fix_SEGV_in_ximcp.diff
- general/092_Xserver_sunffb_xaa_extension.diff
- general/094_gbk_compound_text_transformation_fix.diff
@@ -37,7 +38,6 @@
- general/053_lnx_evdev.diff
- general/058_support_external_Xcursor_Xft_Xrender_libs.diff
- general/062_make_libGL_PIC_compliant.diff
- - general/080_pci_isolate_device_feature.diff
- general/089_xkb_fix_symbols_pc_lt.diff
- general/097_mouse_zaxis_mapping_pushes_up_buttons.diff
- general/099e_xorgconf_manpage_overhaul.diff
Modified: branches/6.9/debian/patches/debian/990_ubuntu_accept_enabled_for_extensions.diff
===================================================================
--- branches/6.9/debian/patches/debian/990_ubuntu_accept_enabled_for_extensions.diff 2005-08-14 23:22:35 UTC (rev 527)
+++ branches/6.9/debian/patches/debian/990_ubuntu_accept_enabled_for_extensions.diff 2005-08-15 05:02:37 UTC (rev 528)
@@ -7,9 +7,9 @@
Index: xc/programs/Xserver/hw/xfree86/common/xf86Config.c
===================================================================
---- xc/programs/Xserver/hw/xfree86/common/xf86Config.c.orig 2005-08-02 23:53:12.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2005-08-03 00:42:45.000000000 -0400
-@@ -2471,12 +2471,14 @@
+--- xc/programs/Xserver/hw/xfree86/common/xf86Config.c.orig 2005-08-15 00:42:21.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/common/xf86Config.c 2005-08-15 00:42:23.000000000 -0400
+@@ -2457,12 +2457,14 @@
if (!val ||
xf86NameCmp(val, "enable") == 0 ||
Modified: branches/6.9/debian/patches/general/099e_xorgconf_manpage_overhaul.diff
===================================================================
--- branches/6.9/debian/patches/general/099e_xorgconf_manpage_overhaul.diff 2005-08-14 23:22:35 UTC (rev 527)
+++ branches/6.9/debian/patches/general/099e_xorgconf_manpage_overhaul.diff 2005-08-15 05:02:37 UTC (rev 528)
@@ -13,8 +13,8 @@
Index: xc/programs/Xserver/hw/xfree86/xorg.conf.man
===================================================================
---- xc/programs/Xserver/hw/xfree86/xorg.conf.man.orig 2005-08-02 23:53:12.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/xorg.conf.man 2005-08-03 00:09:10.000000000 -0400
+--- xc/programs/Xserver/hw/xfree86/xorg.conf.man.orig 2005-08-15 00:41:25.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/xorg.conf.man 2005-08-15 00:41:29.000000000 -0400
@@ -3,7 +3,7 @@
.ds q \N'34'
.TH __xconfigfile__ __filemansuffix__ __vendorversion__
@@ -1916,7 +1916,7 @@
-session-specific
+session\-specific
.BR Options .
- In addition to options specific to this section (described below), the
+ The
.B ServerFlags
@@ -1698,21 +1852,25 @@
.PP
Modified: branches/6.9/debian/patches/series
===================================================================
--- branches/6.9/debian/patches/series 2005-08-14 23:22:35 UTC (rev 527)
+++ branches/6.9/debian/patches/series 2005-08-15 05:02:37 UTC (rev 528)
@@ -64,7 +64,6 @@
general/075_elographics_improve_manpage.diff -p0
general/076_xfree86_server_fix_aout_loader_include.diff -p0
general/078_xdm_log_sourcing_better.diff -p0
-general/080_pci_isolate_device_feature.diff -p0
general/081_xkb_fix_AB10_minus_underscore_on_hr.diff -p0
general/082_xkb_AE12_apostrophe_on_pc_de_nodeadkeys.diff -p0
general/083_siliconmotion_rotate_option_disables_randr.diff -p0
Reply to: