X Strike Force X.Org X11 SVN commit: r317 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-07-05 23:40:53 -0500 (Tue, 05 Jul 2005)
New Revision: 317
Added:
trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff
Modified:
trunk/debian/TODO
trunk/debian/changelog
Log:
- Patch audit
- 913_debian_remove_code_ref_to_object_code_files.diff ported
- patch to xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
re-added to comply with post-sarge SC
- 031_glxinfo_makefile.diff
- Removing from TODO. This is a porter issue and I'm going to leave it
to them.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-06 03:51:41 UTC (rev 316)
+++ trunk/debian/TODO 2005-07-06 04:40:53 UTC (rev 317)
@@ -7,17 +7,7 @@
xorg-x11 6.8.2-1 (unstable)
-----------------------------
-* Review all xfree86 4.3.0.dfsg.1-13 and -14 patches. [neroden]
-031_glxinfo_makefile.diff
- -- Upstream says that it's incorrect and due to a toolchain bug.
- Have to see whether it's still needed for GNU/kFreeBSD, and if so,
- fix the bug. See Freedesktop Bugzilla #1902.
-913_debian_remove_code_ref_to_object_code_files.diff - needs validation
- * patch to xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c lost
- * patches to xc/programs/Xserver/hw/xfree86/drivers/{mga,rendition}/Imakefile
- now in patch 908
-
* C++ ABI Transition
xorg-x11 6.8.2-2 (unstable)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-06 03:51:41 UTC (rev 316)
+++ trunk/debian/changelog 2005-07-06 04:40:53 UTC (rev 317)
@@ -40,6 +40,9 @@
- 099s_xkb_tr_fix_eacute.diff added
- 250_m68k_build_scanpci.diff updated
- 910_debian_Xserver_RTFF.diff updated
+ - 913_debian_remove_code_ref_to_object_code_files.diff ported
+ - patch to xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
+ re-added to comply with post-sarge SC
-- David Nusinow <dnusinow@debian.org> Fri, 24 Jun 2005 10:24:48 -0400
Added: trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff
===================================================================
--- trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff 2005-07-06 03:51:41 UTC (rev 316)
+++ trunk/debian/patches/913_debian_remove_code_ref_to_object_code_files.diff 2005-07-06 04:40:53 UTC (rev 317)
@@ -0,0 +1,25 @@
+$Id$
+
+Eliminate references to sourceless object code pruned from the source
+distribution in Debian packages.
+
+This patch by Fabio Massimo Di Nitto.
+
+diff -ruN xc-old/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c
+--- xc-old/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c 2005-05-08 23:23:22.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c 2005-07-06 00:12:00.000000000 -0400
+@@ -88,14 +88,6 @@
+ /* reset memory endian */
+ verite_out8(iob+MEMENDIAN, memendian);
+
+- if (V1000_DEVICE == pRendition->board.chip){
+- c=verite_load_ucfile(pScreenInfo, strcat ((char *)MICROCODE_DIR,"v10002d.uc"));
+- }
+- else {
+- /* V2x00 chip */
+- c=verite_load_ucfile(pScreenInfo, strcat ((char *)MICROCODE_DIR,"v20002d.uc"));
+- }
+-
+ if (c == -1) {
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
+ ("Microcode loading failed !!!\n"));
Reply to: