X Strike Force X.Org X11 SVN commit: r2250 - trunk/util/xutils-dev/debian/patches
Author: dnusinow
Date: 2006-05-29 22:52:23 -0400 (Mon, 29 May 2006)
New Revision: 2250
Modified:
trunk/util/xutils-dev/debian/patches/01_netbsd_imake.c_fixes.diff
trunk/util/xutils-dev/debian/patches/02_mkdirhier_rewrite.diff
trunk/util/xutils-dev/debian/patches/03_xutils-dev-FHS.diff
trunk/util/xutils-dev/debian/patches/04_xutils-dev-debian.diff
trunk/util/xutils-dev/debian/patches/xaw-without-xp
Log:
Update patches for new versions
Modified: trunk/util/xutils-dev/debian/patches/01_netbsd_imake.c_fixes.diff
===================================================================
--- trunk/util/xutils-dev/debian/patches/01_netbsd_imake.c_fixes.diff 2006-05-30 02:42:45 UTC (rev 2249)
+++ trunk/util/xutils-dev/debian/patches/01_netbsd_imake.c_fixes.diff 2006-05-30 02:52:23 UTC (rev 2250)
@@ -3,11 +3,11 @@
Patch to imake.c for Debian/NetBSD support by Joel Baker
<lucifer@lightbearer.com>.
-Index: imake-1.0.1/imake.c
+Index: imake/imake.c
===================================================================
---- imake-1.0.1/imake.c.orig 2005-10-18 19:41:20.000000000 -0400
-+++ imake-1.0.1/imake.c 2005-10-18 22:41:29.000000000 -0400
-@@ -1076,6 +1076,10 @@
+--- imake/imake.c.orig 2006-05-29 22:37:55.000000000 -0400
++++ imake/imake.c 2006-05-29 22:44:50.000000000 -0400
+@@ -1087,6 +1087,10 @@
fprintf (inFile, "%s\n", "#define LinuxWare 11");
fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
@@ -18,7 +18,7 @@
#ifdef CROSSCOMPILE
if (CrossCompiling) {
fprintf (inFile, "%s\n",
-@@ -1097,6 +1101,8 @@
+@@ -1108,6 +1112,8 @@
if (lstat (debian, &sb) == 0) {
fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxDebian");
fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
@@ -27,7 +27,7 @@
/* You could also try to get the version of the Debian distrib by looking
* at the content of /etc/debian_version */
return;
-@@ -1105,6 +1111,8 @@
+@@ -1116,6 +1122,8 @@
fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Unknown");
Modified: trunk/util/xutils-dev/debian/patches/02_mkdirhier_rewrite.diff
===================================================================
--- trunk/util/xutils-dev/debian/patches/02_mkdirhier_rewrite.diff 2006-05-30 02:42:45 UTC (rev 2249)
+++ trunk/util/xutils-dev/debian/patches/02_mkdirhier_rewrite.diff 2006-05-30 02:52:23 UTC (rev 2250)
@@ -6,10 +6,10 @@
Not submitted upstream to XFree86 or X.Org.
-Index: imake-1.0.1/mkdirhier
+Index: imake/mkdirhier
===================================================================
---- imake-1.0.1/mkdirhier (revision 309)
-+++ imake-1.0.1/mkdirhier (working copy)
+--- imake/mkdirhier (revision 309)
++++ imake/mkdirhier (working copy)
@@ -1,67 +1,94 @@
#!/bin/sh
-# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $
@@ -161,10 +161,10 @@
+exit $STATUS
+
+# vim:set ai et sts=4 sw=4 tw=80:
-Index: imake-1.0.1/mkdirhier.man
+Index: imake/mkdirhier.man
===================================================================
---- imake-1.0.1/mkdirhier.man (revision 309)
-+++ imake-1.0.1/mkdirhier.man (working copy)
+--- imake/mkdirhier.man (revision 309)
++++ imake/mkdirhier.man (working copy)
@@ -1,42 +1,111 @@
-.\" $Xorg: mkdirhier.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
-.\" Copyright (c) 1993, 1994, 1998 The Open Group
Modified: trunk/util/xutils-dev/debian/patches/03_xutils-dev-FHS.diff
===================================================================
--- trunk/util/xutils-dev/debian/patches/03_xutils-dev-FHS.diff 2006-05-30 02:42:45 UTC (rev 2249)
+++ trunk/util/xutils-dev/debian/patches/03_xutils-dev-FHS.diff 2006-05-30 02:52:23 UTC (rev 2250)
@@ -1,7 +1,7 @@
-Index: xutils-dev-1.0.2/xorg-cf-files-1.0.1/linux.cf
+Index: xutils-dev-1.0.2/xorg-cf-files/linux.cf
===================================================================
---- xutils-dev-1.0.2.orig/xorg-cf-files-1.0.1/linux.cf 2006-04-16 16:53:09.000000000 +0800
-+++ xutils-dev-1.0.2/xorg-cf-files-1.0.1/linux.cf 2006-04-16 16:54:41.000000000 +0800
+--- xutils-dev-1.0.2.orig/xorg-cf-files/linux.cf 2006-04-16 16:53:09.000000000 +0800
++++ xutils-dev-1.0.2/xorg-cf-files/linux.cf 2006-04-16 16:54:41.000000000 +0800
@@ -86,6 +86,19 @@
# define BuildPDFdocs NO
#endif
Modified: trunk/util/xutils-dev/debian/patches/04_xutils-dev-debian.diff
===================================================================
--- trunk/util/xutils-dev/debian/patches/04_xutils-dev-debian.diff 2006-05-30 02:42:45 UTC (rev 2249)
+++ trunk/util/xutils-dev/debian/patches/04_xutils-dev-debian.diff 2006-05-30 02:52:23 UTC (rev 2250)
@@ -1,7 +1,7 @@
-Index: xutils-dev/xorg-cf-files-1.0.1/bsdLib.rules
+Index: xutils-dev/xorg-cf-files/bsdLib.rules
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/bsdLib.rules 2006-04-15 19:08:48.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/bsdLib.rules 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/bsdLib.rules 2006-05-29 22:42:58.000000000 -0400
++++ xutils-dev/xorg-cf-files/bsdLib.rules 2006-05-29 22:52:10.000000000 -0400
@@ -13,6 +13,12 @@
#define UseElfFormat NO
#endif
@@ -50,10 +50,10 @@
#ifndef SharedDepModuleTarget
#define SharedDepModuleTarget(name,deps,solist) @@\
AllTarget(name) @@\
-Index: xutils-dev/xorg-cf-files-1.0.1/gnu.cf
+Index: xutils-dev/xorg-cf-files/gnu.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/gnu.cf 2006-04-15 19:08:48.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/gnu.cf 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/gnu.cf 2006-05-29 22:43:00.000000000 -0400
++++ xutils-dev/xorg-cf-files/gnu.cf 2006-05-29 22:52:10.000000000 -0400
@@ -17,16 +17,231 @@
#ifndef OSTeenyVersion
#define OSTeenyVersion DefaultOSTeenyVersion
@@ -615,10 +615,10 @@
+#ifndef XFree86ServerOSDefines
+# define XFree86ServerOSDefines
+#endif
-Index: xutils-dev/xorg-cf-files-1.0.1/gnuLib.rules
+Index: xutils-dev/xorg-cf-files/gnuLib.rules
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/gnuLib.rules 2006-04-15 19:08:48.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/gnuLib.rules 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/gnuLib.rules 2006-05-29 22:24:15.000000000 -0400
++++ xutils-dev/xorg-cf-files/gnuLib.rules 2006-05-29 22:52:11.000000000 -0400
@@ -17,7 +17,6 @@
#define ForceNormalLib NO
#endif
@@ -817,10 +817,10 @@
/*
* SharedLibraryDataTarget - generate rules to create shlib data file;
*/
-Index: xutils-dev/xorg-cf-files-1.0.1/gnuLib.tmpl
+Index: xutils-dev/xorg-cf-files/gnuLib.tmpl
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/gnuLib.tmpl 2006-04-15 19:08:48.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/gnuLib.tmpl 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/gnuLib.tmpl 2006-05-29 22:24:15.000000000 -0400
++++ xutils-dev/xorg-cf-files/gnuLib.tmpl 2006-05-29 22:52:11.000000000 -0400
@@ -1,8 +1,9 @@
-XCOMM
-XCOMM GNU Hurd shared library template
@@ -910,19 +910,10 @@
+#endif
+
+#define NoMessageCatalog
-Index: xutils-dev/xorg-cf-files-1.0.1/Imake.rules
+Index: xutils-dev/xorg-cf-files/Imake.rules
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/Imake.rules 2006-04-15 19:08:49.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/Imake.rules 2006-04-16 10:28:42.000000000 -0400
-@@ -1,7 +1,7 @@
- XCOMM ---------------------------------------------------------------------
- XCOMM Imake rules for building libraries, programs, scripts, and data files
- XCOMM rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
--XCOMM rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.8 2005/02/01 22:27:00 ajax Exp $
-+XCOMM rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $
- XCOMM
- XCOMM
- XCOMM
+--- xutils-dev.orig/xorg-cf-files/Imake.rules 2006-05-29 22:43:03.000000000 -0400
++++ xutils-dev/xorg-cf-files/Imake.rules 2006-05-29 22:52:11.000000000 -0400
@@ -2722,6 +2722,20 @@
@@ -944,19 +935,10 @@
* SubdirLibraryRule -
*/
#ifndef SubdirLibraryRule
-Index: xutils-dev/xorg-cf-files-1.0.1/Imake.tmpl
+Index: xutils-dev/xorg-cf-files/Imake.tmpl
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/Imake.tmpl 2006-04-16 10:24:34.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/Imake.tmpl 2006-04-16 10:28:42.000000000 -0400
-@@ -1,7 +1,7 @@
- XCOMM ----------------------------------------------------------------------
- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
- XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
--XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.9 2005/01/24 06:37:31 daniels Exp $
-+XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $
- XCOMM
- XCOMM
- XCOMM
+--- xutils-dev.orig/xorg-cf-files/Imake.tmpl 2006-05-29 22:43:07.000000000 -0400
++++ xutils-dev/xorg-cf-files/Imake.tmpl 2006-05-29 22:52:11.000000000 -0400
@@ -902,37 +902,82 @@
#define ManSourcePath $(MANPATH)/man
#endif
@@ -1191,10 +1173,10 @@
COMPRESSMANCMD = CompressManCmd
-Index: xutils-dev/xorg-cf-files-1.0.1/Library.tmpl
+Index: xutils-dev/xorg-cf-files/Library.tmpl
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/Library.tmpl 2006-04-15 19:08:49.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/Library.tmpl 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/Library.tmpl 2006-05-29 22:24:15.000000000 -0400
++++ xutils-dev/xorg-cf-files/Library.tmpl 2006-05-29 22:52:11.000000000 -0400
@@ -37,6 +37,14 @@
#define DoExtraLib NO
#endif
@@ -1302,16 +1284,10 @@
# if DoExtraLib && defined(ExtraLibRules)
ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS))
# if !defined(LibInstall) || LibInstall
-Index: xutils-dev/xorg-cf-files-1.0.1/linux.cf
+Index: xutils-dev/xorg-cf-files/linux.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/linux.cf 2006-04-16 10:28:11.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/linux.cf 2006-04-16 10:28:42.000000000 -0400
-@@ -1,4 +1,4 @@
--XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.24 2005/03/06 01:05:00 branden Exp $
-+XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $
- XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-
-
+--- xutils-dev.orig/xorg-cf-files/linux.cf 2006-05-29 22:46:00.000000000 -0400
++++ xutils-dev/xorg-cf-files/linux.cf 2006-05-29 22:52:11.000000000 -0400
@@ -107,31 +107,48 @@
XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
XCOMM binutils: (LinuxBinUtilsMajorVersion)
@@ -1825,10 +1801,10 @@
+ SELINUX_LIBS = SELinuxLibraries
+# endif
+#endif
-Index: xutils-dev/xorg-cf-files-1.0.1/NetBSD.cf
+Index: xutils-dev/xorg-cf-files/NetBSD.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/NetBSD.cf 2006-04-15 19:08:49.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/NetBSD.cf 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/NetBSD.cf 2006-05-29 22:24:15.000000000 -0400
++++ xutils-dev/xorg-cf-files/NetBSD.cf 2006-05-29 22:52:11.000000000 -0400
@@ -18,12 +18,178 @@
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
@@ -2077,17 +2053,10 @@
/*
* Shared libraries supported starting in 1.0 on a.out platforms,
* and on all ELF platforms.
-Index: xutils-dev/xorg-cf-files-1.0.1/sco5.cf
+Index: xutils-dev/xorg-cf-files/sco5.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/sco5.cf 2006-04-15 19:08:49.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/sco5.cf 2006-04-16 10:28:42.000000000 -0400
-@@ -1,5 +1,5 @@
- XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.15 2003/12/19 02:05:37 dawes Exp $
--XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.5 2004/09/02 01:10:28 kem Exp $
-+XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1.9 2005/12/20 22:30:48 alanc Exp $
-
- /*
- * This is for SCO Open Server 5.0.6A or later. You must have the
+--- xutils-dev.orig/xorg-cf-files/sco5.cf 2006-05-29 22:43:06.000000000 -0400
++++ xutils-dev/xorg-cf-files/sco5.cf 2006-05-29 22:52:11.000000000 -0400
@@ -69,7 +69,7 @@
#endif
@@ -2097,10 +2066,10 @@
#endif
#define StandardDefines -DSYSV -Di386 -DSCO325 -D__SCO__
-Index: xutils-dev/xorg-cf-files-1.0.1/usl.cf
+Index: xutils-dev/xorg-cf-files/usl.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/usl.cf 2006-04-15 19:08:48.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/usl.cf 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/usl.cf 2006-05-29 22:24:15.000000000 -0400
++++ xutils-dev/xorg-cf-files/usl.cf 2006-05-29 22:52:11.000000000 -0400
@@ -159,7 +159,7 @@
#endif
@@ -2110,18 +2079,10 @@
#endif
#define GencatFlags -m
-Index: xutils-dev/xorg-cf-files-1.0.1/X11.tmpl
+Index: xutils-dev/xorg-cf-files/X11.tmpl
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/X11.tmpl 2006-04-15 19:08:49.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/X11.tmpl 2006-04-16 10:28:42.000000000 -0400
-@@ -1,6 +1,6 @@
- XCOMM ----------------------------------------------------------------------
- XCOMM X Window System Build Parameters and Rules
--XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.52 2005/09/22 23:54:18 alanc Exp $
-+XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.54 2005/12/14 23:41:52 alanc Exp $
- XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
- XCOMM
- XCOMM
+--- xutils-dev.orig/xorg-cf-files/X11.tmpl 2006-05-29 22:43:05.000000000 -0400
++++ xutils-dev/xorg-cf-files/X11.tmpl 2006-05-29 22:52:11.000000000 -0400
@@ -45,7 +45,7 @@
# if defined XorgVersionString
# define XOrgReleaseString Release XorgVersionString
@@ -2188,7 +2149,7 @@
#define RenderDefines -DRENDER
#else
#define RenderDefines /**/
-@@ -2660,6 +2670,7 @@
+@@ -2668,6 +2678,7 @@
ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
#endif
@@ -2196,7 +2157,7 @@
XRENDERLIBSRC = $(LIBSRC)/Xrender
#if SharedLibXrender
#ifndef SharedXrenderRev
-@@ -2670,6 +2681,42 @@
+@@ -2678,6 +2689,42 @@
ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
#endif
@@ -2239,7 +2200,7 @@
XRANDRLIBSRC = $(LIBSRC)/Xrandr
#if SharedLibXrandr
#ifndef SharedXrandrRev
-@@ -2720,6 +2767,7 @@
+@@ -2728,6 +2775,7 @@
ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir)
#endif
@@ -2247,7 +2208,7 @@
XCURSORLIBSRC = $(LIBSRC)/Xcursor
#if SharedLibXcursor
#ifndef SharedXcursorRev
-@@ -2730,6 +2778,41 @@
+@@ -2738,6 +2786,41 @@
ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
#endif
@@ -2289,7 +2250,7 @@
APPLEWMLIBSRC = $(LIBSRC)/apple
#if SharedLibAppleWM
#ifndef SharedAppleWMRev
-@@ -3535,6 +3618,7 @@
+@@ -3543,6 +3626,7 @@
#endif /* UseExpat */
@@ -2297,7 +2258,7 @@
#ifndef SharedLibXft1
#define SharedLibXft1 HasSharedLibraries
#endif
-@@ -3547,6 +3631,18 @@
+@@ -3555,6 +3639,18 @@
#ifndef ProfileLibXft1
#define ProfileLibXft1 NO
#endif
@@ -2316,7 +2277,7 @@
XFT1LIBSRC = $(LIBSRC)/Xft1
#if SharedLibXft1
#ifndef SharedXft1Rev
-@@ -3601,6 +3697,42 @@
+@@ -3609,6 +3705,42 @@
#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
#endif
@@ -2359,7 +2320,7 @@
#if UseFontconfig
#if BuildFontconfigLibrary
-@@ -3716,8 +3848,6 @@
+@@ -3724,8 +3856,6 @@
#endif /* UseFontconfig */
@@ -2368,10 +2329,10 @@
#ifdef HasLibpng
/*
-Index: xutils-dev/xorg-cf-files-1.0.1/xfree86.cf
+Index: xutils-dev/xorg-cf-files/xfree86.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/xfree86.cf 2006-04-15 19:08:48.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/xfree86.cf 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/xfree86.cf 2006-05-29 22:24:15.000000000 -0400
++++ xutils-dev/xorg-cf-files/xfree86.cf 2006-05-29 22:52:11.000000000 -0400
@@ -100,6 +100,13 @@
#define XVendorManNameString XFree86
#endif
@@ -2565,16 +2526,10 @@
# endif
#endif
-Index: xutils-dev/xorg-cf-files-1.0.1/xorg.cf
+Index: xutils-dev/xorg-cf-files/xorg.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/xorg.cf 2006-04-15 19:08:49.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/xorg.cf 2006-04-16 10:28:42.000000000 -0400
-@@ -1,4 +1,4 @@
--XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.44 2005/01/27 03:50:46 ajax Exp $
-+XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $
- /*
- * This configuration file contains all of the configuration
- * information for the Xorg based X Servers.
+--- xutils-dev.orig/xorg-cf-files/xorg.cf 2006-05-29 22:43:03.000000000 -0400
++++ xutils-dev/xorg-cf-files/xorg.cf 2006-05-29 22:52:11.000000000 -0400
@@ -262,6 +262,11 @@
#define GlideDriver /**/
#endif
@@ -2696,10 +2651,10 @@
# endif
#endif
-Index: xutils-dev/xorg-cf-files-1.0.1/xorgversion.def
+Index: xutils-dev/xorg-cf-files/xorgversion.def
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/xorgversion.def 2006-04-15 19:08:49.000000000 -0400
-+++ xutils-dev/xorg-cf-files-1.0.1/xorgversion.def 2006-04-16 10:28:42.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/xorgversion.def 2006-05-29 22:24:15.000000000 -0400
++++ xutils-dev/xorg-cf-files/xorgversion.def 2006-05-29 22:52:11.000000000 -0400
@@ -1,5 +1,5 @@
#define XORG_VERSION_MAJOR 6
-#define XORG_VERSION_MINOR 8
Modified: trunk/util/xutils-dev/debian/patches/xaw-without-xp
===================================================================
--- trunk/util/xutils-dev/debian/patches/xaw-without-xp 2006-05-30 02:42:45 UTC (rev 2249)
+++ trunk/util/xutils-dev/debian/patches/xaw-without-xp 2006-05-30 02:52:23 UTC (rev 2250)
@@ -1,7 +1,7 @@
-Index: xutils-dev/xorg-cf-files-1.0.1/linux.cf
+Index: xutils-dev/xorg-cf-files/linux.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files-1.0.1/linux.cf 2006-04-18 14:09:37.000000000 -0700
-+++ xutils-dev/xorg-cf-files-1.0.1/linux.cf 2006-04-18 14:33:56.000000000 -0700
+--- xutils-dev.orig/xorg-cf-files/linux.cf 2006-04-18 14:09:37.000000000 -0700
++++ xutils-dev/xorg-cf-files/linux.cf 2006-04-18 14:33:56.000000000 -0700
@@ -1153,6 +1153,16 @@
#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
Reply to: