X Strike Force X.Org X11 SVN commit: r234 - in trunk/debian: . patches
Author: branden
Date: 2005-06-20 01:44:02 -0500 (Mon, 20 Jun 2005)
New Revision: 234
Removed:
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/control
trunk/debian/xbase-clients.install
trunk/debian/xbase-clients.install.s390
Log:
Revert r175 (disable building/shipping of x11perf).
Update versioned build-dependency on libxrender-dev to be >> 1:0.9.0, as
x11perf uses XRenderAddTraps(), new to libXrender 0.9.0.
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2005-06-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.alpha.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -436,6 +436,7 @@
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,6 +505,8 @@
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
@@ -1417,6 +1420,9 @@
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
@@ -1638,6 +1644,7 @@
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
@@ -1702,6 +1709,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.amd64.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -449,6 +449,7 @@
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
@@ -523,6 +524,8 @@
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
@@ -1465,6 +1468,9 @@
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
@@ -1692,6 +1698,7 @@
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
@@ -1761,6 +1768,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.arm.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -436,6 +436,7 @@
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
@@ -503,6 +504,8 @@
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
@@ -1416,6 +1419,9 @@
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
@@ -1625,6 +1631,7 @@
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
@@ -1689,6 +1696,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.hppa.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -450,6 +450,7 @@
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
@@ -523,6 +524,8 @@
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
@@ -1465,6 +1468,9 @@
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
@@ -1583,6 +1589,7 @@
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
@@ -1652,6 +1659,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.hurd-i386.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -436,6 +436,7 @@
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,6 +505,8 @@
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
@@ -1418,6 +1421,9 @@
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
@@ -1647,6 +1653,7 @@
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,6 +1718,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.i386.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -450,6 +450,7 @@
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,6 +525,8 @@
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
@@ -1466,6 +1469,9 @@
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
@@ -1702,6 +1708,7 @@
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
@@ -1771,6 +1778,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.ia64.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -450,6 +450,7 @@
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,6 +525,8 @@
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
@@ -1466,6 +1469,9 @@
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
@@ -1695,6 +1701,7 @@
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
@@ -1764,6 +1771,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.m68k.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -436,6 +436,7 @@
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
@@ -503,6 +504,8 @@
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
@@ -1416,6 +1419,9 @@
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
@@ -1627,6 +1633,7 @@
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
@@ -1691,6 +1698,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.mips.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -436,6 +436,7 @@
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
@@ -503,6 +504,8 @@
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
@@ -1417,6 +1420,9 @@
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
@@ -1520,6 +1526,7 @@
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
@@ -1584,6 +1591,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.mipsel.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -436,6 +436,7 @@
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
@@ -503,6 +504,8 @@
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
@@ -1417,6 +1420,9 @@
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
@@ -1520,6 +1526,7 @@
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
@@ -1584,6 +1591,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.powerpc.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -450,6 +450,7 @@
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
@@ -523,6 +524,8 @@
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
@@ -1465,6 +1468,9 @@
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
@@ -1673,6 +1679,7 @@
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
@@ -1742,6 +1749,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.s390.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -429,6 +429,7 @@
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
@@ -491,6 +492,8 @@
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
@@ -1346,6 +1349,9 @@
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
@@ -1446,6 +1452,7 @@
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
@@ -1507,6 +1514,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/MANIFEST.sparc.in 2005-06-20 06:44:02 UTC (rev 234)
@@ -453,6 +453,7 @@
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
@@ -526,6 +527,8 @@
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
@@ -1468,6 +1471,9 @@
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
@@ -1696,6 +1702,7 @@
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
@@ -1765,6 +1772,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/TODO 2005-06-20 06:44:02 UTC (rev 234)
@@ -7,10 +7,6 @@
xorg-x11 6.8.2-0pre1v1 (experimental)
-------------------------------------
-* 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. [branden]
xorg-x11 6.8.2-0pre1v2 (experimental)
-----------------------------
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-06-20 05:48:13 UTC (rev 233)
+++ trunk/debian/control 2005-06-20 06:44:02 UTC (rev 234)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
Standards-Version: 3.6.1
-Build-Depends: bison, bsdmainutils, flex, fontconfig, groff, tetex-bin, libexpat1-dev | libexpat-dev, libfreetype6-dev, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libpng12-dev | libpng-dev, libxcursor-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 0.8.3), render-dev (>> 1:0.9) zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), lynx, po-debconf, dbs
+Build-Depends: bison, bsdmainutils, flex, fontconfig, groff, tetex-bin, libexpat1-dev | libexpat-dev, libfreetype6-dev, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, libpng12-dev | libpng-dev, libxcursor-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), render-dev (>> 1:0.9) zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), lynx, po-debconf, dbs
Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1), linux-kernel-headers (<< 2.5.999-test7-bk-15) [sparc]
# Reasons for Build-Depends:
@@ -225,7 +225,7 @@
# xc/programs/xterm/aclocal.m4:#include <X11/Xft/Xft.h>],[
# xc/programs/xterm/configure:#include <X11/Xft/Xft.h>
# xc/programs/xterm/ptyx.h:#include <X11/Xft/Xft.h>
-# libxrender-dev (>> 0.8.3)
+# libxrender-dev (>> 1:0.9.0)
# R xc/lib/Xft/Xft.h:#include <X11/extensions/Xrender.h>
# R xc/lib/Xft1/Xft.h:#include <X11/extensions/Xrender.h>
# R xc/lib/Xrandr/Xrandr.c:#include <X11/extensions/Xrender.h>
Deleted: trunk/debian/patches/999_disable_x11perf.diff
===================================================================
--- trunk/debian/patches/999_disable_x11perf.diff 2005-06-20 05:48:13 UTC (rev 233)
+++ trunk/debian/patches/999_disable_x11perf.diff 2005-06-20 06:44:02 UTC (rev 234)
@@ -1,24 +0,0 @@
-$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 \
Modified: trunk/debian/xbase-clients.install
===================================================================
--- trunk/debian/xbase-clients.install 2005-06-20 05:48:13 UTC (rev 233)
+++ trunk/debian/xbase-clients.install 2005-06-20 06:44:02 UTC (rev 234)
@@ -33,6 +33,7 @@
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
@@ -56,6 +57,8 @@
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
@@ -121,6 +124,9 @@
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
@@ -139,6 +145,7 @@
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
@@ -162,6 +169,8 @@
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-20 05:48:13 UTC (rev 233)
+++ trunk/debian/xbase-clients.install.s390 2005-06-20 06:44:02 UTC (rev 234)
@@ -30,6 +30,7 @@
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
@@ -53,6 +54,8 @@
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
@@ -112,6 +115,9 @@
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
@@ -129,6 +135,7 @@
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
@@ -152,6 +159,8 @@
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
Reply to: