X Strike Force X.Org X11 SVN commit: r427 - in trunk/debian: . patches/general
Author: dnusinow
Date: 2005-07-27 23:10:50 -0500 (Wed, 27 Jul 2005)
New Revision: 427
Added:
trunk/debian/patches/general/031_disable_libXft1.diff
Modified:
trunk/debian/TODO
Log:
- Actually add patch 031_disable_libXft1.diff that I was supposed to add in
the last commit :-)
- TODO list update
- #914 is obsolete. X.Org is a functional upstream and we should treat
them as such. Especially if we keep a fully patched source tree in svn
for upstream to view, as per IRC discussion with Branden, this becomes
easier for upstream to handle. Standard Debian policy is also to go
through the maintainer, so I don't see a need to further beat users
over the head with notices about it.
- I've reviewed the MANIFEST changes and they pass muster for me.
Upstream has made their changes, and the MANIFESTs follow suit.
- Let's keep liboldX around for the remainder of the 6.x series.
- I'd like to review the possibility of moving stuff from Build-Depends
to Build-Depends-Indep, but I think that sort of thing is better served
in the 6.x->7.0 transition, when we should be carefully reviewing all
such things anyway.
- Give timeframe for xterm split-out
- xlibs-static-* has been dealt with essentially. I don't see a point in
splitting out the straggler files if they still deal with static libs.
The newly shlibs that were in this package are now depended on by
xlibs-dev, so we can fully deal with them when we finally get to
killing xlibs-dev for real.
- debian/scripts/vars.amd64 has not been altered from the xfree86 trunk,
and we've had successful reports from amd64 users, so I think we're ok
on this item
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-28 03:49:03 UTC (rev 426)
+++ trunk/debian/TODO 2005-07-28 04:10:50 UTC (rev 427)
@@ -12,33 +12,9 @@
* Update manifest-install-reconcile's data lists so the tool is usable again.
This implies getting valid, up-to-date MANIFEST files for every architecture.
-* Explore moving some of the Build-Depends to Build-Depends-Indep; stuff needed
- only for building fonts and docs should be safely movable there.
-
* Ship the HTML docs in xspecs again. Debian Policy section 12.4 says that we
should ship HTML documentation if possible.
-* Figure out what to do with the straggler headers and libraries in
- xlibs-static-{dev,pic}. Splitting stuff out of this without making it a
- dummy package is bad as it forces false dependencies for the sake of
- upgradability (acceptable in a dummy package, but not otherwise). Also, some
- headers may be present that don't correspond to any of the static objects
- shipped.
-
-* Review the changes to the MANIFEST files between xfree86 4.3.0.dfsg.1-14 and
- xorg-x11, per David Nusinow.
-
-* Ensure the removal of the contents of debian/scripts/vars.amd64 was the right
- thing to do.
-
-* Figure out if patch #914 is really obsolete or not.
-
-* Decide whether xlibs-static-pic needs to become a dummy package, since all the
- formerly static-only libraries now build shared and static versions like
- regular libraries.
-
-* Decide whether to build liboldX or not.
-
* Finalize all library build/versioning/arrangement decisions as much as
possible before uploading to unstable, so we don't wreak havoc on the entire
world via dpkg-shlibdeps.
@@ -57,7 +33,7 @@
unspecified future
------------------
-* Split out xterm and ship Thomas Dickey's version as upstream
+* Split out xterm and ship Thomas Dickey's version as upstream (7.0 or sooner)
* Grab fix for xfree86 extension library manpage generation from freedesktop.org
xorg CVS HEAD (2005-05-14):
@@ -78,4 +54,7 @@
* Use ucf to handle xorg.conf instead of Branden's own md5summy thing.
+* Explore moving some of the Build-Depends to Build-Depends-Indep; stuff needed
+ only for building fonts and docs should be safely movable there. (7.0)
+
# vim:set ai et sts=4 sw=4 tw=80:
Added: trunk/debian/patches/general/031_disable_libXft1.diff
===================================================================
--- trunk/debian/patches/general/031_disable_libXft1.diff 2005-07-28 03:49:03 UTC (rev 426)
+++ trunk/debian/patches/general/031_disable_libXft1.diff 2005-07-28 04:10:50 UTC (rev 427)
@@ -0,0 +1,24 @@
+Index: trunk/xc/lib/Imakefile
+===================================================================
+--- trunk.orig/xc/lib/Imakefile 2005-07-26 01:11:33.000000000 -0400
++++ trunk/xc/lib/Imakefile 2005-07-27 23:45:36.000000000 -0400
+@@ -121,10 +121,6 @@
+ XFTLIBDIR = Xft
+ #endif
+
+-#if BuildXft1Library
+-XFT1LIBDIR = Xft1
+-#endif
+-
+ #if BuildRandRLibrary
+ RANDRLIBDIR = Xrandr
+ #endif
+@@ -233,7 +229,7 @@
+ $(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
+ $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
+ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
+- $(FONTCONFIGBUILDDIR) $(XFT1LIBDIR) \
++ $(FONTCONFIGBUILDDIR) \
+ $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
+ $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR) $(DMXLIBDIR) \
+ $(WINDOWSLIBDIR) $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) $(COMPOSITELIBDIR)
Reply to: