Author: ishikawa
Date: 2003-05-26 11:56:34 -0500 (Mon, 26 May 2003)
New Revision: 73
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/MANIFEST.i386
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/control
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/004_imake_manpage_handling_overhaul.diff
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/shlibs.local
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dbg.install
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dbg.links
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install.hurd-i386
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install.s390
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.links
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.install
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.install.s390
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.links
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.shlibs
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.shlibs.dummy
people/ishikawa/TODO
Log:
Now work in progress (not finished yet)
* libXrender and libXcursor separation
- debian/control:
remove description about libXrender
add Build-Depends: libxcursor-dev, libxrender-dev
- patch #003_linux.cf_and_xfree86.cf.diff
add `#define HasXftLibrary YES'
add `#define BuildXcursorLibrary NO'
add `#define HasXcursorLibrary YES'
add `#define BuildRenderLibrary NO'
add `#define HasRenderLibrary YES'
- patch #004_imake_manpage_handling_overhaul:
update to adapt #003 change
- debian/xlibs* debian/shlibs*:
remove libXcursor and libXrender related files
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dbg.install
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dbg.install
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dbg.install
2003-05-26 16:56:34 UTC (rev 73)
@@ -8,7 +8,6 @@
usr/X11R6/lib/libSM.so.6.0 usr/X11R6/lib/debug/libSM.so.6.0
usr/X11R6/lib/libX11.so.6.2 usr/X11R6/lib/debug/libX11.so.6.2
usr/X11R6/lib/libXTrap.so.6.4 usr/X11R6/lib/debug/libXTrap.so.6.4
-usr/X11R6/lib/libXcursor.so.1.0 usr/X11R6/lib/debug/libXcursor.so.1.0
usr/X11R6/lib/libXext.so.6.4 usr/X11R6/lib/debug/libXext.so.6.4
usr/X11R6/lib/libXft.so.1.1 usr/X11R6/lib/debug/libXft.so.1.1
usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/debug/libXi.so.6.0
@@ -17,7 +16,6 @@
usr/X11R6/lib/libXp.so.6.2 usr/X11R6/lib/debug/libXp.so.6.2
usr/X11R6/lib/libXpm.so.4.11 usr/X11R6/lib/debug/libXpm.so.4.11
usr/X11R6/lib/libXrandr.so.2.0 usr/X11R6/lib/debug/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.so.1.2 usr/X11R6/lib/debug/libXrender.so.1.2
usr/X11R6/lib/libXt.so.6.0 usr/X11R6/lib/debug/libXt.so.6.0
usr/X11R6/lib/libXtst.so.6.1 usr/X11R6/lib/debug/libXtst.so.6.1
usr/X11R6/lib/libxrx.so.6.3 usr/X11R6/lib/debug/libxrx.so.6.3
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/004_imake_manpage_handling_overhaul.diff
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/004_imake_manpage_handling_overhaul.diff
2003-05-26 15:40:41 UTC (rev 72)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/004_imake_manpage_handling_overhaul.diff
2003-05-26 16:56:34 UTC (rev 73)
@@ -305,7 +305,7 @@
/* The TT/Meltho fonts are all under non-free licenses. */
# define BuildTrueTypeFonts NO
# define BuildBethMarduthoFonts NO
-@@ -940,26 +941,6 @@
+@@ -945,26 +946,6 @@
# define ExtraLibraries -ldnet
#else
# define ConnectionFlags -DUNIXCONN -DTCPCONN
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff
2003-05-26 15:40:41 UTC (rev 72)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/003_linux.cf_and_xfree86.cf.diff
2003-05-26 16:56:34 UTC (rev 73)
@@ -1,7 +1,8 @@
Various Debian changes to xfree86.cf and linux.cf, including better
support for gcc flags. Forward-ported with some updates from 4.2.1.
This patch originally by Branden Robinson, forward-ported with a few
-updates by Daniel Stone.
+updates by Daniel Stone. Xrender and Xcursor separation by ISHIKAWA
+Mutsumi.
--- xc/config/cf/xfree86.cf.orig Fri Jan 3 11:55:00 2003
+++ xc/config/cf/xfree86.cf Fri Jan 3 11:55:09 2003
@@ -71,7 +72,7 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -146,6 +152,23 @@
+@@ -146,6 +152,28 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n
xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -90,9 +91,14 @@
+# define UseFontconfig YES
+# define FontconfigIncDir /usr/include/fontconfig
+# define BuildXftLibrary NO
++# define HasXftLibrary YES
+# define BuildXft1Library YES
+# define IconDir Concat(ProjectRoot,/lib/X11/icons)
-
++# define BuildXcursorLibrary NO
++# define HasXcursorLibrary YES
++# define BuildRenderLibrary NO
++# define HasRenderLibrary YES
+
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
@@ -701,7 +714,7 @@
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install.hurd-i386
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install.hurd-i386
2003-05-26 15:40:41 UTC (rev 72)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install.hurd-i386
2003-05-26 16:56:34 UTC (rev 73)
@@ -42,7 +42,6 @@
usr/X11R6/include/X11/Xcms.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xfuncproto.h
usr/X11R6/include/X11/Xfuncs.h
usr/X11R6/include/X11/Xlib.h
@@ -117,7 +116,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -204,7 +202,6 @@
usr/X11R6/lib/libXRes.a
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXau.a
-usr/X11R6/lib/libXcursor.a
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXfont.a
@@ -216,7 +213,6 @@
usr/X11R6/lib/libXp.a
usr/X11R6/lib/libXpm.a
usr/X11R6/lib/libXrandr.a
-usr/X11R6/lib/libXrender.a
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXtst.a
@@ -858,7 +854,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/MANIFEST.i386
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/MANIFEST.i386
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/MANIFEST.i386
2003-05-26 16:56:34 UTC (rev 73)
@@ -499,7 +499,6 @@
usr/X11R6/bin/xclock
usr/X11R6/bin/xcmsdb
usr/X11R6/bin/xconsole
-usr/X11R6/bin/xcursor-config
usr/X11R6/bin/xcursorgen
usr/X11R6/bin/xcutsel
usr/X11R6/bin/xditview
@@ -714,7 +713,6 @@
usr/X11R6/include/X11/Xaw/XawImP.h
usr/X11R6/include/X11/Xaw/XawInit.h
usr/X11R6/include/X11/Xcms.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
usr/X11R6/include/X11/Xfuncproto.h
@@ -889,7 +887,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -5941,8 +5938,6 @@
usr/X11R6/lib/libXaw.a
usr/X11R6/lib/libXaw.so.6.1
usr/X11R6/lib/libXaw.so.7.0
-usr/X11R6/lib/libXcursor.a
-usr/X11R6/lib/libXcursor.so.1.0
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXext.so.6.4
@@ -5962,8 +5957,6 @@
usr/X11R6/lib/libXpm.so.4.11
usr/X11R6/lib/libXrandr.a
usr/X11R6/lib/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.a
-usr/X11R6/lib/libXrender.so.1.2
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXt.so.6.0
@@ -6897,7 +6890,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.install.s390
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.install.s390
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.install.s390
2003-05-26 16:56:34 UTC (rev 73)
@@ -2,7 +2,6 @@
usr/X11R6/lib/libSM.so.6.0
usr/X11R6/lib/libX11.so.6.2
usr/X11R6/lib/libXTrap.so.6.4
-usr/X11R6/lib/libXcursor.so.1.0
usr/X11R6/lib/libXext.so.6.4
usr/X11R6/lib/libXft.so.1.1
usr/X11R6/lib/libXi.so.6.0
@@ -11,7 +10,6 @@
usr/X11R6/lib/libXp.so.6.2
usr/X11R6/lib/libXpm.so.4.11
usr/X11R6/lib/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.so.1.2
usr/X11R6/lib/libXt.so.6.0
usr/X11R6/lib/libXtst.so.6.1
usr/X11R6/lib/libXv.so.1.0
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/changelog
2003-05-26 16:56:34 UTC (rev 73)
@@ -11,6 +11,19 @@
the dependency, and thus allowing gcc3.2 to be removed.
(closes: #194136)
- New xlibmesa-drm-src package. (closes: #139817)
+ - remove description about libXrender [ISHIKAWA Mutsumi]
+ - add Build-Depends: libxcursor-dev, libxrender-dev [ISHIKAWA
Mutsumi]
+ * patch #003_linux.cf_and_xfree86.cf:
+ - add `#define HasXftLibrary YES' [ISHIKAWA Mutsumi]
+ - add `#define BuildXcursorLibrary NO' [ISHIKAWA Mutsumi]
+ - add `#define HasXcursorLibrary YES' [ISHIKAWA Mutsumi]
+ - add `#define BuildRenderLibrary NO' [ISHIKAWA Mutsumi]
+ - add `#define HasRenderLibrary YES' [ISHIKAWA Mutsumi]
+
+ * patch #004_imake_manpage_handling_overhaul:
+ - update to adapt #003 change [ISHIKAWA Mutsumi]
+ * debian/xlibs* debian/shlibs*:
+ - remove libXcursor and libXrender related files [ISHIKAWA Mutsumi]
-- Branden Robinson <[EMAIL PROTECTED]> Sun, 25 May 2003 03:51:59 -0500
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/control
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/control 2003-05-26
15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/control 2003-05-26
16:56:34 UTC (rev 73)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Branden Robinson <[EMAIL PROTECTED]>
Standards-Version: 3.5.8
-Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, m4, groff,
zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev |
libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>=
4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>>
2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd |
freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (>= 1.2.1),
libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev,
libstdc++5-dev | libstdc++-dev
+Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, m4, groff,
zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev |
libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>=
4.1.16), html2text, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>>
2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd |
freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (>= 1.2.1),
libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev,
libstdc++5-dev | libstdc++-dev, libxcursor-dev, libxrender-dev
Package: lbxproxy
Architecture: any
@@ -742,7 +742,6 @@
- libXft, a FreeType-based font rendering extension;
- libXi, the X Input extension;
- libXp, the X Printing extension;
- - libXrender, an extension for digital image composition;
- libXrandr, the RnR (resizing and rotation for the root window) extension;
- libXTrap, an extension for capturing the server protocol and synthesizing
core input events;
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.shlibs.dummy
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.shlibs.dummy
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.shlibs.dummy
2003-05-26 16:56:34 UTC (rev 73)
@@ -1,7 +1,6 @@
libICE 6
libSM 6
libX11 6
-libXcursor 1
libXext 6
libXft 1
libXi 6
@@ -9,7 +8,6 @@
libXmuu 1
libXp 6
libXpm 4
-libXrender 1
libXt 6
libXtst 6
libXTrap 6
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/shlibs.local
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/shlibs.local
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/shlibs.local
2003-05-26 16:56:34 UTC (rev 73)
@@ -17,7 +17,6 @@
libXmuu 1 xlibs (>> 4.1.0)
libXp 6 xlibs (>> 4.1.0)
libXpm 4 xlibs (>> 4.1.0)
-libXrender 1 xlibs (>> 4.1.0)
libXt 6 xlibs (>> 4.1.0)
libXtst 6 xlibs (>> 4.1.0)
libXTrap 6 xlibs (>> 4.2.0)
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install
2003-05-26 16:56:34 UTC (rev 73)
@@ -1,4 +1,3 @@
-usr/X11R6/bin/xcursor-config
usr/X11R6/include/X11/Composite.h
usr/X11R6/include/X11/CompositeP.h
usr/X11R6/include/X11/ConstrainP.h
@@ -42,7 +41,6 @@
usr/X11R6/include/X11/Xcms.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xfuncproto.h
usr/X11R6/include/X11/Xfuncs.h
usr/X11R6/include/X11/Xlib.h
@@ -117,7 +115,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -205,7 +202,6 @@
usr/X11R6/lib/libXRes.a
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXau.a
-usr/X11R6/lib/libXcursor.a
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXfont.a
@@ -217,7 +213,6 @@
usr/X11R6/lib/libXp.a
usr/X11R6/lib/libXpm.a
usr/X11R6/lib/libXrandr.a
-usr/X11R6/lib/libXrender.a
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXtst.a
@@ -859,7 +854,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.install
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.install
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.install
2003-05-26 16:56:34 UTC (rev 73)
@@ -2,7 +2,6 @@
usr/X11R6/lib/libSM.so.6.0
usr/X11R6/lib/libX11.so.6.2
usr/X11R6/lib/libXTrap.so.6.4
-usr/X11R6/lib/libXcursor.so.1.0
usr/X11R6/lib/libXext.so.6.4
usr/X11R6/lib/libXft.so.1.1
usr/X11R6/lib/libXi.so.6.0
@@ -11,7 +10,6 @@
usr/X11R6/lib/libXp.so.6.2
usr/X11R6/lib/libXpm.so.4.11
usr/X11R6/lib/libXrandr.so.2.0
-usr/X11R6/lib/libXrender.so.1.2
usr/X11R6/lib/libXt.so.6.0
usr/X11R6/lib/libXtst.so.6.1
usr/X11R6/lib/libXv.so.1.0
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install.s390
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install.s390
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.install.s390
2003-05-26 16:56:34 UTC (rev 73)
@@ -1,4 +1,3 @@
-usr/X11R6/bin/xcursor-config
usr/X11R6/include/X11/Composite.h
usr/X11R6/include/X11/CompositeP.h
usr/X11R6/include/X11/ConstrainP.h
@@ -42,7 +41,6 @@
usr/X11R6/include/X11/Xcms.h
usr/X11R6/include/X11/Xdefs.h
usr/X11R6/include/X11/Xdmcp.h
-usr/X11R6/include/X11/Xcursor/Xcursor.h
usr/X11R6/include/X11/Xfuncproto.h
usr/X11R6/include/X11/Xfuncs.h
usr/X11R6/include/X11/Xlib.h
@@ -117,7 +115,6 @@
usr/X11R6/include/X11/extensions/Xext.h
usr/X11R6/include/X11/extensions/Xinerama.h
usr/X11R6/include/X11/extensions/Xrandr.h
-usr/X11R6/include/X11/extensions/Xrender.h
usr/X11R6/include/X11/extensions/Xv.h
usr/X11R6/include/X11/extensions/XvMC.h
usr/X11R6/include/X11/extensions/XvMClib.h
@@ -205,7 +202,6 @@
usr/X11R6/lib/libXRes.a
usr/X11R6/lib/libXTrap.a
usr/X11R6/lib/libXau.a
-usr/X11R6/lib/libXcursor.a
usr/X11R6/lib/libXdmcp.a
usr/X11R6/lib/libXext.a
usr/X11R6/lib/libXfont.a
@@ -217,7 +213,6 @@
usr/X11R6/lib/libXp.a
usr/X11R6/lib/libXpm.a
usr/X11R6/lib/libXrandr.a
-usr/X11R6/lib/libXrender.a
usr/X11R6/lib/libXss.a
usr/X11R6/lib/libXt.a
usr/X11R6/lib/libXtst.a
@@ -859,7 +854,6 @@
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVC.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMaxVSamples.3x
usr/X11R6/man/man3/XcmsTekHVCQueryMinV.3x
-usr/X11R6/man/man3/Xcursor.3x
usr/X11R6/man/man3/XdbeAllocateBackBufferName.3x
usr/X11R6/man/man3/XdbeBeginIdiom.3x
usr/X11R6/man/man3/XdbeDeallocateBackBufferName.3x
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.links
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.links
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dev.links
2003-05-26 16:56:34 UTC (rev 73)
@@ -1,7 +1,6 @@
usr/X11R6/lib/libICE.so.6 usr/X11R6/lib/libICE.so
usr/X11R6/lib/libSM.so.6 usr/X11R6/lib/libSM.so
usr/X11R6/lib/libX11.so.6 usr/X11R6/lib/libX11.so
-usr/X11R6/lib/libXcursor.so.1 usr/X11R6/lib/libXcursor.so
usr/X11R6/lib/libXext.so.6 usr/X11R6/lib/libXext.so
usr/X11R6/lib/libXi.so.6 usr/X11R6/lib/libXi.so
usr/X11R6/lib/libXmu.so.6 usr/X11R6/lib/libXmu.so
@@ -9,7 +8,6 @@
usr/X11R6/lib/libXp.so.6 usr/X11R6/lib/libXp.so
usr/X11R6/lib/libXpm.so.4 usr/X11R6/lib/libXpm.so
usr/X11R6/lib/libXrandr.so.2 usr/X11R6/lib/libXrandr.so
-usr/X11R6/lib/libXrender.so.1 usr/X11R6/lib/libXrender.so
usr/X11R6/lib/libXt.so.6 usr/X11R6/lib/libXt.so
usr/X11R6/lib/libXtst.so.6 usr/X11R6/lib/libXtst.so
usr/X11R6/lib/libXv.so.1 usr/X11R6/lib/libXv.so
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dbg.links
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dbg.links
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs-dbg.links
2003-05-26 16:56:34 UTC (rev 73)
@@ -7,8 +7,6 @@
usr/X11R6/lib/debug/libXmuu.so.1.0 usr/X11R6/lib/debug/libXmuu.so.1
usr/X11R6/lib/debug/libXp.so.6.2 usr/X11R6/lib/debug/libXp.so.6
usr/X11R6/lib/debug/libXpm.so.4.11 usr/X11R6/lib/debug/libXpm.so.4
-usr/X11R6/lib/debug/libXrender.so.1.0 usr/X11R6/lib/debug/libXrender.so.1
usr/X11R6/lib/debug/libXt.so.6.0 usr/X11R6/lib/debug/libXt.so.6
usr/X11R6/lib/debug/libXtst.so.6.1 usr/X11R6/lib/debug/libXtst.so.6
usr/X11R6/lib/debug/libxrx.so.6.3 usr/X11R6/lib/debug/libxrx.so.6
-usr/X11R6/lib/debug/libXcursor.so.1.0 usr/X11R6/lib/debug/libXcursor.so.1
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.links
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.links
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.links
2003-05-26 16:56:34 UTC (rev 73)
@@ -4,7 +4,6 @@
usr/X11R6/lib/libSM.so.6.0 usr/X11R6/lib/libSM.so.6
usr/X11R6/lib/libX11.so.6.2 usr/X11R6/lib/libX11.so.6
usr/X11R6/lib/libXTrap.so.6.4 usr/X11R6/lib/libXTrap.so.6
-usr/X11R6/lib/libXcursor.so.1.0 usr/X11R6/lib/libXcursor.so.1
usr/X11R6/lib/libXext.so.6.4 usr/X11R6/lib/libXext.so.6
usr/X11R6/lib/libXft.so.1.1 usr/X11R6/lib/libXft.so.1
usr/X11R6/lib/libXi.so.6.0 usr/X11R6/lib/libXi.so.6
@@ -13,7 +12,6 @@
usr/X11R6/lib/libXp.so.6.2 usr/X11R6/lib/libXp.so.6
usr/X11R6/lib/libXpm.so.4.11 usr/X11R6/lib/libXpm.so.4
usr/X11R6/lib/libXrandr.so.2.0 usr/X11R6/lib/libXrandr.so.2
-usr/X11R6/lib/libXrender.so.1.2 usr/X11R6/lib/libXrender.so.1
usr/X11R6/lib/libXt.so.6.0 usr/X11R6/lib/libXt.so.6
usr/X11R6/lib/libXtst.so.6.1 usr/X11R6/lib/libXtst.so.6
usr/X11R6/lib/libXv.so.1.0 usr/X11R6/lib/libXv.so.1
Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.shlibs
==============================================================================
--- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.shlibs
2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/xlibs.shlibs
2003-05-26 16:56:34 UTC (rev 73)
@@ -1,7 +1,6 @@
libICE 6 xlibs (>> 4.1.0)
libSM 6 xlibs (>> 4.1.0)
libX11 6 xlibs (>> 4.1.0)
-libXcursor 1 xlibs (>> 4.2.99)
libXext 6 xlibs (>> 4.1.0)
libXft 1 xlibs (>> 4.1.0)
libXi 6 xlibs (>> 4.1.0)
@@ -9,7 +8,6 @@
libXmuu 1 xlibs (>> 4.1.0)
libXp 6 xlibs (>> 4.1.0)
libXpm 4 xlibs (>> 4.1.0)
-libXrender 1 xlibs (>> 4.1.0)
libXt 6 xlibs (>> 4.1.0)
libXtst 6 xlibs (>> 4.1.0)
libXTrap 6 xlibs (>> 4.2.0)
Modified: people/ishikawa/TODO
==============================================================================
--- people/ishikawa/TODO 2003-05-26 15:40:41 UTC (rev 72)
+++ people/ishikawa/TODO 2003-05-26 16:56:34 UTC (rev 73)
@@ -16,10 +16,21 @@
* ja.po update
(I get from Kenshi Muto, I'm reviewing now)
- * libXrender separation
+ * libXrender and libXcursor separation
+ - debian/control:
+ remove description about libXrender
+ add Build-Depends: libxcursor-dev, libxrender-dev
+ - patch #003_linux.cf_and_xfree86.cf.diff
+ add `#define HasXftLibrary YES'
+ add `#define BuildXcursorLibrary NO'
+ add `#define HasXcursorLibrary YES'
+ add `#define BuildRenderLibrary NO'
+ add `#define HasRenderLibrary YES'
+ - patch #004_imake_manpage_handling_overhaul:
+ update to adapt #003 change
+ - debian/xlibs* debian/shlibs*:
+ remove libXcursor and libXrender related files
- * libXcursor separation
-
Planed, but not yet
* more generic way to use external lib{Xft2,Xrender,Xcursor} for
merging upstream tree
