Author: branden Date: 2005-06-09 23:44:22 -0500 (Thu, 09 Jun 2005) New Revision: 175
Added: trunk/debian/patches/999_disable_x11perf.diff Modified: trunk/debian/MANIFEST.alpha.in trunk/debian/MANIFEST.amd64.in trunk/debian/MANIFEST.arm.in trunk/debian/MANIFEST.hppa.in trunk/debian/MANIFEST.hurd-i386.in trunk/debian/MANIFEST.i386.in trunk/debian/MANIFEST.ia64.in trunk/debian/MANIFEST.m68k.in trunk/debian/MANIFEST.mips.in trunk/debian/MANIFEST.mipsel.in trunk/debian/MANIFEST.powerpc.in trunk/debian/MANIFEST.s390.in trunk/debian/MANIFEST.sparc.in trunk/debian/TODO trunk/debian/xbase-clients.install trunk/debian/xbase-clients.install.s390 Log: As a *temporary* kludge to permit xorg-x11 to build against Render/Xrender 0.8, disable building the x11perf program (the only thing in the tree which uses the new AddTrapezoids feature in Render/Xrender 0.9). Update MANIFEST files and xbase-clients's debhelper install files to reflect the absence of the x11perf utilities and manual pages. Add TODO item describing what needs to be done to revert his and deal with Render/Xrender 0.9. Modified: trunk/debian/MANIFEST.alpha.in =================================================================== --- trunk/debian/MANIFEST.alpha.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.alpha.in 2005-06-10 04:44:22 UTC (rev 175) @@ -436,7 +436,6 @@ usr/X11R6/bin/X usr/X11R6/bin/XFree86 usr/X11R6/bin/XFree86-debug -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xprt usr/X11R6/bin/Xvfb @@ -505,8 +504,6 @@ usr/X11R6/bin/ucs2any usr/X11R6/bin/uxterm usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1422,9 +1419,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1646,7 +1640,6 @@ usr/X11R6/lib/modules/v10002d.uc usr/X11R6/lib/modules/v20002d.uc usr/X11R6/man/man1/XFree86.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xserver.1x usr/X11R6/man/man1/Xvfb.1x @@ -1711,8 +1704,6 @@ usr/X11R6/man/man1/ucs2any.1x usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.amd64.in =================================================================== --- trunk/debian/MANIFEST.amd64.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.amd64.in 2005-06-10 04:44:22 UTC (rev 175) @@ -449,7 +449,6 @@ etc/init.d/xprint usr/X11R6/bin/X usr/X11R6/bin/Xdmx -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xorg usr/X11R6/bin/Xorg-debug @@ -524,8 +523,6 @@ usr/X11R6/bin/uxterm usr/X11R6/bin/vdltodmx usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1470,9 +1467,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1700,7 +1694,6 @@ usr/X11R6/lib/pkgconfig/xfixes.pc usr/X11R6/man/man1/XDarwin.1x usr/X11R6/man/man1/Xdmx.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xprt.1x usr/X11R6/man/man1/Xorg.1x @@ -1770,8 +1763,6 @@ usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/vdltodmx.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.arm.in =================================================================== --- trunk/debian/MANIFEST.arm.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.arm.in 2005-06-10 04:44:22 UTC (rev 175) @@ -436,7 +436,6 @@ usr/X11R6/bin/X usr/X11R6/bin/XFree86 usr/X11R6/bin/XFree86-debug -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xprt usr/X11R6/bin/Xvfb @@ -504,8 +503,6 @@ usr/X11R6/bin/ucs2any usr/X11R6/bin/uxterm usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1421,9 +1418,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1633,7 +1627,6 @@ usr/X11R6/lib/modules/libxf8_32bpp.a usr/X11R6/lib/modules/linux/libfbdevhw.a usr/X11R6/man/man1/XFree86.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xserver.1x usr/X11R6/man/man1/Xvfb.1x @@ -1698,8 +1691,6 @@ usr/X11R6/man/man1/ucs2any.1x usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.hppa.in =================================================================== --- trunk/debian/MANIFEST.hppa.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.hppa.in 2005-06-10 04:44:22 UTC (rev 175) @@ -450,7 +450,6 @@ etc/init.d/xprint usr/X11R6/bin/X usr/X11R6/bin/Xdmx -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xorg usr/X11R6/bin/Xorg-debug @@ -524,8 +523,6 @@ usr/X11R6/bin/uxterm usr/X11R6/bin/vdltodmx usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1470,9 +1467,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1591,7 +1585,6 @@ usr/X11R6/lib/pkgconfig/xfixes.pc usr/X11R6/man/man1/XDarwin.1x usr/X11R6/man/man1/Xdmx.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xorg.1x usr/X11R6/man/man1/Xprt.1x @@ -1661,8 +1654,6 @@ usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/vdltodmx.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.hurd-i386.in =================================================================== --- trunk/debian/MANIFEST.hurd-i386.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.hurd-i386.in 2005-06-10 04:44:22 UTC (rev 175) @@ -436,7 +436,6 @@ usr/X11R6/bin/X usr/X11R6/bin/XFree86 usr/X11R6/bin/XFree86-debug -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xprt usr/X11R6/bin/Xvfb @@ -505,8 +504,6 @@ usr/X11R6/bin/ucs2any usr/X11R6/bin/uxterm usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1423,9 +1420,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1655,7 +1649,6 @@ usr/X11R6/lib/modules/v10002d.uc usr/X11R6/lib/modules/v20002d.uc usr/X11R6/man/man1/XFree86.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xserver.1x usr/X11R6/man/man1/Xvfb.1x @@ -1720,8 +1713,6 @@ usr/X11R6/man/man1/ucs2any.1x usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.i386.in =================================================================== --- trunk/debian/MANIFEST.i386.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.i386.in 2005-06-10 04:44:22 UTC (rev 175) @@ -450,7 +450,6 @@ etc/init.d/xprint usr/X11R6/bin/X usr/X11R6/bin/Xdmx -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xorg usr/X11R6/bin/Xorg-debug @@ -525,8 +524,6 @@ usr/X11R6/bin/uxterm usr/X11R6/bin/vdltodmx usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1471,9 +1468,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1710,7 +1704,6 @@ usr/X11R6/lib/pkgconfig/xfixes.pc usr/X11R6/man/man1/XDarwin.1x usr/X11R6/man/man1/Xdmx.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xprt.1x usr/X11R6/man/man1/Xorg.1x @@ -1780,8 +1773,6 @@ usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/vdltodmx.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.ia64.in =================================================================== --- trunk/debian/MANIFEST.ia64.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.ia64.in 2005-06-10 04:44:22 UTC (rev 175) @@ -450,7 +450,6 @@ etc/init.d/xprint usr/X11R6/bin/X usr/X11R6/bin/Xdmx -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xorg usr/X11R6/bin/Xorg-debug @@ -525,8 +524,6 @@ usr/X11R6/bin/uxterm usr/X11R6/bin/vdltodmx usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1471,9 +1468,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1703,7 +1697,6 @@ usr/X11R6/lib/pkgconfig/xfixes.pc usr/X11R6/man/man1/XDarwin.1x usr/X11R6/man/man1/Xdmx.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xorg.1x usr/X11R6/man/man1/Xprt.1x @@ -1773,8 +1766,6 @@ usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/vdltodmx.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.m68k.in =================================================================== --- trunk/debian/MANIFEST.m68k.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.m68k.in 2005-06-10 04:44:22 UTC (rev 175) @@ -436,7 +436,6 @@ usr/X11R6/bin/X usr/X11R6/bin/XFree86 usr/X11R6/bin/XFree86-debug -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xprt usr/X11R6/bin/Xvfb @@ -504,8 +503,6 @@ usr/X11R6/bin/ucs2any usr/X11R6/bin/uxterm usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1421,9 +1418,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1635,7 +1629,6 @@ usr/X11R6/lib/modules/libxf8_32bpp.a usr/X11R6/lib/modules/linux/libfbdevhw.a usr/X11R6/man/man1/XFree86.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xserver.1x usr/X11R6/man/man1/Xvfb.1x @@ -1700,8 +1693,6 @@ usr/X11R6/man/man1/ucs2any.1x usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.mips.in =================================================================== --- trunk/debian/MANIFEST.mips.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.mips.in 2005-06-10 04:44:22 UTC (rev 175) @@ -436,7 +436,6 @@ usr/X11R6/bin/X usr/X11R6/bin/XFree86 usr/X11R6/bin/XFree86-debug -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xprt usr/X11R6/bin/Xvfb @@ -504,8 +503,6 @@ usr/X11R6/bin/ucs2any usr/X11R6/bin/uxterm usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1422,9 +1419,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1528,7 +1522,6 @@ usr/X11R6/lib/libxkbui_pic.a usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/man/man1/XFree86.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xserver.1x usr/X11R6/man/man1/Xvfb.1x @@ -1593,8 +1586,6 @@ usr/X11R6/man/man1/ucs2any.1x usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.mipsel.in =================================================================== --- trunk/debian/MANIFEST.mipsel.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.mipsel.in 2005-06-10 04:44:22 UTC (rev 175) @@ -436,7 +436,6 @@ usr/X11R6/bin/X usr/X11R6/bin/XFree86 usr/X11R6/bin/XFree86-debug -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xprt usr/X11R6/bin/Xvfb @@ -504,8 +503,6 @@ usr/X11R6/bin/ucs2any usr/X11R6/bin/uxterm usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1422,9 +1419,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1528,7 +1522,6 @@ usr/X11R6/lib/libxkbui_pic.a usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/man/man1/XFree86.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xserver.1x usr/X11R6/man/man1/Xvfb.1x @@ -1593,8 +1586,6 @@ usr/X11R6/man/man1/ucs2any.1x usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.powerpc.in =================================================================== --- trunk/debian/MANIFEST.powerpc.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.powerpc.in 2005-06-10 04:44:22 UTC (rev 175) @@ -450,7 +450,6 @@ etc/init.d/xprint usr/X11R6/bin/X usr/X11R6/bin/Xdmx -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xorg usr/X11R6/bin/Xorg-debug @@ -524,8 +523,6 @@ usr/X11R6/bin/uxterm usr/X11R6/bin/vdltodmx usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1470,9 +1467,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1681,7 +1675,6 @@ usr/X11R6/lib/pkgconfig/xfixes.pc usr/X11R6/man/man1/XDarwin.1x usr/X11R6/man/man1/Xdmx.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xprt.1x usr/X11R6/man/man1/Xorg.1x @@ -1751,8 +1744,6 @@ usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/vdltodmx.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.s390.in =================================================================== --- trunk/debian/MANIFEST.s390.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.s390.in 2005-06-10 04:44:22 UTC (rev 175) @@ -429,7 +429,6 @@ etc/X11/xserver/SecurityPolicy etc/X11/xsm/system.xsm usr/X11R6/bin/X -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xprt usr/X11R6/bin/Xvfb @@ -492,8 +491,6 @@ usr/X11R6/bin/ucs2any usr/X11R6/bin/uxterm usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1351,9 +1348,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1454,7 +1448,6 @@ usr/X11R6/lib/libxkbui.a usr/X11R6/lib/libxkbui_pic.a usr/X11R6/lib/libxrx.so.6.3 -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xserver.1x usr/X11R6/man/man1/Xvfb.1x @@ -1516,8 +1509,6 @@ usr/X11R6/man/man1/ucs2any.1x usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/MANIFEST.sparc.in =================================================================== --- trunk/debian/MANIFEST.sparc.in 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/MANIFEST.sparc.in 2005-06-10 04:44:22 UTC (rev 175) @@ -453,7 +453,6 @@ etc/init.d/xprint usr/X11R6/bin/X usr/X11R6/bin/Xdmx -usr/X11R6/bin/Xmark usr/X11R6/bin/Xnest usr/X11R6/bin/Xorg usr/X11R6/bin/Xorg-debug @@ -527,8 +526,6 @@ usr/X11R6/bin/uxterm usr/X11R6/bin/vdltodmx usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -1473,9 +1470,6 @@ usr/X11R6/lib/X11/locale/zh_TW/Compose usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -1704,7 +1698,6 @@ usr/X11R6/lib/pkgconfig/xfixes.pc usr/X11R6/man/man1/XDarwin.1x usr/X11R6/man/man1/Xdmx.1x -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/Xnest.1x usr/X11R6/man/man1/Xprt.1x usr/X11R6/man/man1/Xorg.1x @@ -1774,8 +1767,6 @@ usr/X11R6/man/man1/uxterm.1x usr/X11R6/man/man1/vdltodmx.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/TODO 2005-06-10 04:44:22 UTC (rev 175) @@ -247,6 +247,11 @@ useful -- if not the source of as many reverse dependencies -- even if the X11 installation moves to /usr.) +* Trash patch #999 (disable x11perf), revert changes to MANIFESTs and + xbase-clients's .install files (revert r175), and increment versioned + build-dependency on render-dev/libxrender-dev so that we demand Render/Xrender + 0.9. + xorg-x11 6.8.2-1 (unstable) --------------------------- * Migrate source package to traditional .orig.tar.gz/.diff.gz layout, adopt Added: trunk/debian/patches/999_disable_x11perf.diff =================================================================== --- trunk/debian/patches/999_disable_x11perf.diff 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/patches/999_disable_x11perf.diff 2005-06-10 04:44:22 UTC (rev 175) @@ -0,0 +1,24 @@ +$Id$ + +As a *temporary* kludge to permit xorg-x11 to build against Render/Xrender +0.8, disable building the x11perf program (the only thing in the tree which +uses the new AddTrapezoids feature in Render/Xrender 0.9). + +This patch by Branden Robinson. + +By its nature, not suitable for submission upstream. + +Index: xc/programs/Imakefile +=================================================================== +--- xc/programs/Imakefile (revision 140) ++++ xc/programs/Imakefile (working copy) +@@ -133,7 +133,8 @@ + $(MKCFMSRCDIR) \ + mkfontdir $(MKFONTSCALEDIR) oclock $(PROXYMGRSRCDIR) \ + $(RGBSRCDIR) $(RSTARTSRCDIR) showfont \ +- $(SMPROXYSRCDIR) $(TWMSRCDIR) viewres x11perf xauth xbiff xcalc \ ++ /* x11perf temporarily disabled; Debian kludge */ \ ++ $(SMPROXYSRCDIR) $(TWMSRCDIR) viewres /* x11perf */ xauth xbiff xcalc \ + xclipboard xclock \ + xcmsdb $(XCONSOLESRCDIR) xditview $(XDMSRCDIR) xdpyinfo \ + $(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel $(XFSSRCDIR) xfsinfo \ Property changes on: trunk/debian/patches/999_disable_x11perf.diff ___________________________________________________________________ Name: svn:keywords + Id Modified: trunk/debian/xbase-clients.install =================================================================== --- trunk/debian/xbase-clients.install 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/xbase-clients.install 2005-06-10 04:44:22 UTC (rev 175) @@ -33,7 +33,6 @@ etc/X11/xinit/xinitrc etc/X11/xinit/xserverrc etc/X11/xsm/system.xsm -usr/X11R6/bin/Xmark usr/X11R6/bin/appres usr/X11R6/bin/atobm usr/X11R6/bin/beforelight @@ -57,8 +56,6 @@ usr/X11R6/bin/sxpm usr/X11R6/bin/texteroids usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -124,9 +121,6 @@ usr/X11R6/bin/xwud usr/X11R6/lib/X11/Cards usr/X11R6/lib/X11/Options -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -145,7 +139,6 @@ usr/X11R6/lib/X11/xedit/lisp/syntax.lsp usr/X11R6/lib/X11/xedit/lisp/xedit.lsp usr/X11R6/lib/X11/xman.help -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/appres.1x usr/X11R6/man/man1/atobm.1x usr/X11R6/man/man1/beforelight.1x @@ -169,8 +162,6 @@ usr/X11R6/man/man1/sxpm.1x usr/X11R6/man/man1/texteroids.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x Modified: trunk/debian/xbase-clients.install.s390 =================================================================== --- trunk/debian/xbase-clients.install.s390 2005-06-10 00:01:12 UTC (rev 174) +++ trunk/debian/xbase-clients.install.s390 2005-06-10 04:44:22 UTC (rev 175) @@ -30,7 +30,6 @@ etc/X11/xinit/xinitrc etc/X11/xinit/xserverrc etc/X11/xsm/system.xsm -usr/X11R6/bin/Xmark usr/X11R6/bin/appres usr/X11R6/bin/atobm usr/X11R6/bin/beforelight @@ -54,8 +53,6 @@ usr/X11R6/bin/sxpm usr/X11R6/bin/texteroids usr/X11R6/bin/viewres -usr/X11R6/bin/x11perf -usr/X11R6/bin/x11perfcomp usr/X11R6/bin/xauth usr/X11R6/bin/xbiff usr/X11R6/bin/xcalc @@ -115,9 +112,6 @@ usr/X11R6/bin/xwd usr/X11R6/bin/xwininfo usr/X11R6/bin/xwud -usr/X11R6/lib/X11/x11perfcomp/fillblnk -usr/X11R6/lib/X11/x11perfcomp/perfboth -usr/X11R6/lib/X11/x11perfcomp/perfratio usr/X11R6/lib/X11/xedit/lisp/indent.lsp usr/X11R6/lib/X11/xedit/lisp/lisp.lsp usr/X11R6/lib/X11/xedit/lisp/progmodes/c.lsp @@ -135,7 +129,6 @@ usr/X11R6/lib/X11/xedit/lisp/syntax.lsp usr/X11R6/lib/X11/xedit/lisp/xedit.lsp usr/X11R6/lib/X11/xman.help -usr/X11R6/man/man1/Xmark.1x usr/X11R6/man/man1/appres.1x usr/X11R6/man/man1/atobm.1x usr/X11R6/man/man1/beforelight.1x @@ -159,8 +152,6 @@ usr/X11R6/man/man1/sxpm.1x usr/X11R6/man/man1/texteroids.1x usr/X11R6/man/man1/viewres.1x -usr/X11R6/man/man1/x11perf.1x -usr/X11R6/man/man1/x11perfcomp.1x usr/X11R6/man/man1/xauth.1x usr/X11R6/man/man1/xbiff.1x usr/X11R6/man/man1/xcalc.1x -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
