Author: dnusinow
Date: 2005-06-06 20:37:48 -0500 (Mon, 06 Jun 2005)
New Revision: 150
Modified:
trunk/debian/TODO
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Fix thinko in 000_stolen_from_HEAD.diff fix from svn revision 137.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-06-06 03:10:53 UTC (rev 149)
+++ trunk/debian/TODO 2005-06-07 01:37:48 UTC (rev 150)
@@ -9,7 +9,221 @@
-------------------------------------
* Copy over applicable packaging infrastructure from xfree86.
-* Review all xfree86 4.3.0.dfsg.1-13 and -14 patches.
+* Review all xfree86 4.3.0.dfsg.1-13 and -14 patches. [neroden]
+
+000_post430.diff -- upstream
+000_stolen_from_HEAD.diff -- upstream
+000_stolen_from_HEAD_ati_driver.diff -- upstream but
+ verify that no reversions are necessary regarding DRI revision.
+000_stolen_from_HEAD_bsdsupport.diff -- upstream
+000_stolen_from_HEAD_i830_driver.diff -- upstream
+000_stolen_from_HEAD_int10.diff -- upstream
+000_stolen_from_HEAD_mouse_driver.diff -- upstream
+000_stolen_from_HEAD_netbsd.diff -- upstream
+000_stolen_from_HEAD_pci_support.diff -- upstream
+000_stolen_from_HEAD_trident_driver.diff -- upstream
+000_stolen_from_HEAD_via_driver.diff -- upstream
+000_stolen_from_HEAD_xaa.diff -- upstream
+000_stolen_from_HEAD_xedit.diff -- upstream
+000_stolen_from_HEAD_xineramify_xscreensaver.diff -- upstream
+000_stolen_from_HEAD_xkb_data.diff -- upstream
+000_stolen_from_Mesa_5.1.diff -- Mesa 6.1 is upstream (different files)
+000_stolen_from_Mesa_CVS.diff -- Mesa 6.1 is upstream (different files)
+000_stolen_from_author_sis_driver.diff -- upstream
+000_stolen_from_author_xterm.diff -- NEEDS PORTING
+ Upstream is up to Dickey's patch #197. This is up to his patch #199,
+ or possibly #200.
+000_stolen_from_sourceforge_wacom_driver.diff -- NEEDS HELP
+ Probably replaced by 000_stolen_from_linuxwacom_wacom_driver.diff.
+ Unfortunately that patch does not say which upstream version was taken,
+ unlike the old patch. That should be fixed.
+000_stolen_from_xorg.diff -- upstream except
+ xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c @ 1.4
+ -- part of new 000_stolen_from_HEAD
+ xc/include/extensions/xf86mscstr.h @ 1.3
+ xc/programs/Xserver/Xext/xf86misc.c @ 1.2
+ xc/programs/Xserver/Xext/xf86misc.c @ 1.3
+ xc/programs/Xserver/hw/xfree86/common/compiler.h @ 1.5
+ xc/programs/Xserver/hw/xfree86/loader/elfloader.c @ 1.5
+ -- NEED PORTING to new 000_stolen_from_HEAD
+000_stolen_from_xorg_nv_driver.diff
+001_kernel_version_in_banner.diff
+002_xdm_fixes.diff
+003_linux.cf_and_xfree86.cf.diff
+003b_xfs_fixes.diff
+004_imake_manpage_handling_overhaul.diff
+005_rgb.txt_in_etc_X11.diff
+006_ati_radeon_fix_eternal_initialization.diff
+007_fix_xfree86_man_version_string.diff
+008_fix_xgetpw_macro.diff
+009_ati_r128_retry_idle_until_timeout.diff
+010_s3_trio64_dx_and_gx_support.diff
+011_SECURITY_makedepend_safer.diff
+011a_recognize_glibc_2.3.2_locale_names.diff
+012_Xaw_StripChart_fix.diff
+013_xkb_symbols_euro_support.diff
+014_startx_hostname_fix.diff
+015_vesa_ifdef_afb_calls.diff
+016_ICE_subprotocol_reply_fix.diff
+017_fix_Xlib_depend_target.diff
+018_xtt_1.4.1.diff
+019_iso8859-15_Compose_fix.diff
+020_conditionalize_xie_headers.diff
+021_riscpc_ioport_fix.diff
+022_ati_r128_support_800_byte_pitch.diff
+023_specs_doc_fixes.diff
+024_ati_r128_and_radeon_enable_build_without_vgahw.diff
+025_fix_dri_resume.diff
+026_xc_programs_manpage_overhaul.diff
+027_ati_driver_message_cleanups.diff
+028_fbdev_depth24_support.diff
+029_xinerama_needs_xlib.h.diff
+030_Xserver_and_driver_region_primitive_fixups.diff
+031_glxinfo_makefile.diff
+032_xserver_manpage_fix.diff
+033_no_specindex.html.diff
+034_xset_manpage_update.diff
+035_tdfx_disable_dri_on_16mb_with_highres.diff
+036_fix_r200_DRI_driver_assertion_failures.diff
+037_mga_fix_unresolved_symbols.diff
+038_ICE_remove_bogus_delay.diff
+039_mkfontdir_force_correct_perms.diff
+040_extend_netmouse_support.diff
+041_make_xcursor_icondir_configurable.diff
+042_savage_fix_pci_ids.diff
+043_ati_r128_update_chip_identification.diff
+044_chips_default_to_noaccel_on_69k.diff
+045_chips_default_to_swcursor_on_69k.diff
+046_fix_cyrillic_font_aliases.diff
+047_mga_manpage_updates.diff
+048_via_driver_enable.diff
+049_Xserver_recognize_Linux_2.6_proc_bus_pci.diff
+050_fix_lnx_io_kbd_rate_fix.diff
+051_xkb_documentation_updates.diff
+052_glint_fix_unresolved_symbols.diff
+053_lnx_evdev.diff
+054_lnx_evdev_mouse.diff
+055_lnx_evdev_keyboard.diff
+056_xdmcp_Wrap.h_fixes.diff
+057_X11.tmpl_warning_fix.diff
+058_external_XrenderXftXcursor_X11.tmpl.diff
+059_external_XrenderXftXcursor_programs.diff
+060_external_XrenderXftXcursor_lib.diff
+061_savage_driver_1.1.27t.diff
+062_make_libGL_PIC_compliant.diff
+063_fix_weak_deps.diff
+064_remove_duplicate_XShm_prototype.diff
+065_Xft1_manpage_conflict.diff
+066_XKB_recognize_keypad_period_on_ABNT2_keyboards.diff
+067_fix_X11_and_xdm_build_problems.diff
+068_fix_InstallAppDefFiles_screwage.diff
+069_ati_r128_fix_ugly_warning.diff
+070_fbdevhw_device_node_warnings.diff
+071_nonexecutable_malloced_mem.diff
+072_Xserver_fb_convert_RGB_to_BGR.diff
+073_xev_flush_standard_output.diff
+074_freetype_fix_underlining.diff
+075_elographics_improve_manpage.diff
+076_xfree86_server_fix_aout_loader_include.diff
+077_xdm_honor_request_port_zero.diff
+078_xdm_log_sourcing_better.diff
+079_ati_radeon_fix_power_resume.diff
+080_pci_isolate_device_feature.diff
+081_xkb_fix_AB10_minus_underscore_on_hr.diff
+082_xkb_AE12_apostrophe_on_pc_de_nodeadkeys.diff
+083_siliconmotion_rotate_option_disables_randr.diff
+084_xkb_implement_grp:sclk_toggle.diff
+085_sessreg_implement_hostname_hashing.diff
+086_fix_SEGV_in_ximcp.diff
+087_SECURITY_libXpm_vulnerabilities.diff
+088_fix_keyboard_rate_ioctls.diff
+089_xkb_fix_symbols_pc_lt.diff
+090_xkb_fix_uk_macintosh_problems.diff
+091_xkb_implement_compose:caps.diff
+092_Xserver_sunffb_xaa_extension.diff
+093_xkb_fix_macintosh_problems.diff
+094_gbk_compound_text_transformation_fix.diff
+095_fontutils_are_not_fonts.diff
+096_Xlib_l10n_pt_BR.UTF-8.diff
+097_mouse_zaxis_mapping_pushes_up_buttons.diff
+098_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff
+099a_improve_search_for_libXcursor.diff
+099b_Xft_FreeType_2.1.7_build_fix.diff
+099c_support_loadable_external_Xcursor_lib.diff
+099d_Imake.rules_fix_RawCppFileTarget.diff
+099e_XF86Config_manpage_overhaul.diff
+099f_savage_driver_disable_randr_on_rotation.diff
+099g_xkb_symbols_polish_fix_keypad_separator.diff
+099h_mesa_tdfx_load_right_glide_library.diff
+099i_pro_savage_ddr_set_use_bios_to_false.diff
+099j_xkb_new_layouts.diff
+099k_Compose_fix_latin1_UTF8.diff
+099l_neomagic_magic_poke_for_video_performance.diff
+099m_mga_increase_minimum_pixel_clock.diff
+099n_fbdev_driver_message_improvements.diff
+099o_ati_radeon_fix_SEGV_in_display_query.diff
+099p_xkb_brazilian_fix_keypad_separator.diff
+099q_tdfx_improve_mode_rejection_diagnostics.diff
+099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
+099s_selinux_support.diff
+099t_xkb_remove_hidden_attributes.diff
+099u_mkdirhier_rewrite.diff
+099v_fontserver_fix_SEGV.diff
+099w_fix_XGetWProp_manpage.diff
+099x_xdm_support_logfile_rotation.diff
+099z_xkb_fix_rules_xfree86.diff
+099z_xkb_level3_ralt_switch.diff
+100_sparc_4m_hw_mult_fix.diff
+101_type6_xkb_support.diff
+101b_xkb_sun_loads_srvr_ctrl.diff
+102_sparc_pci_fix.diff
+103_sparc_dont_build_useless_drivers.diff
+104_sparc_fix_GL_library.diff
+150_powerpc_build_nv_driver.diff
+200_alpha_xpm_get_long64.diff
+201_alpha_freetype_gcc_2.95_bugfix.diff
+202_alpha_elfloader_support_R_ALPHA_SREL32.diff
+250_m68k_build_scanpci.diff
+300_riscpc_xkb_keycodes.diff
+301_not_all_arm_boxes_run_netbsd.diff
+302_arm_compiler.h.diff
+303_arm_cache_flush.diff
+304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff
+315_arm_is_not_x86_and_has_no_vga.diff
+450_ia64_ati_avoid_cpio.diff
+451_ia64_ati_r128_and_radeon_generalize_pagesize.diff
+452_ia64_smart_pci_rom_probe.diff
+500_s390_support.diff
+600_amd64_support.diff
+800_gnu_config.diff
+801_gnu_os-support_Imake.diff
+802_gnu_disable_vt_switching.diff
+803_gnu_xterm_openpty.diff
+804_gnu_xdm.diff
+820_gnu-freebsd_config.diff
+822_gnu-freebsd_xload.diff
+823_gnu-freebsd_xterm.diff
+840_netbsd_bsdLib.rules_fix.diff
+841_netbsd_imake.c_fixes.diff
+842_netbsd_NetBSD.cf_fixes.diff
+843_netbsd_no_shared_OldX_lib.diff
+844_netbsd_no_kbd_mode_command.diff
+900_debian_config.diff
+901_debian_Wraphelp.c.diff
+902_debian_startx_manpage.diff
+903_debian_system.twmrc.diff
+904_debian_xinitrc.diff
+905_debian_xdm.diff
+906_debian_xfs.diff
+907_debian_xterm.diff
+908_debian_exclude_non-free_fonts_and_docs.diff
+909_debian_piclib_support.diff
+910_debian_Xserver_RTFF.diff
+911_debian_XF86Config_to_XF86Config-4.diff
+912_debian_rstart.real_location.diff
+913_debian_remove_code_ref_to_object_code_files.diff
+914_debian_Xserver_send_bugs_to_us.diff
+
+ Grab Thomas Winischhofer's post-6.8.2 fixes to MiscPassMessage() from CVS
(see Debian #285807).
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2005-06-06 03:10:53 UTC
(rev 149)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2005-06-07 01:37:48 UTC
(rev 150)
@@ -68,9 +68,13 @@
diff -ur xc.orig/extras/Xpm/lib/create.c xc/extras/Xpm/lib/create.c
--- xc.orig/extras/Xpm/lib/create.c 2005-06-04 11:27:07.000000000 -0400
-+++ xc/extras/Xpm/lib/create.c 2005-06-04 11:29:07.000000000 -0400
-@@ -1218,7 +1218,7 @@
- register unsigned int x, y, i;
++++ xc/extras/Xpm/lib/create.c 2005-06-04 12:43:28.000000000 -0400
+@@ -1215,10 +1215,10 @@
+ register char *src;
+ register char *dst;
+ register unsigned int *iptr;
+- register unsigned int x, y, i;
++ register unsigned int x, y;
register char *data;
Pixel pixel, px;
- int nbytes, depth, ibu, ibpp;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
