X Strike Force X.Org X11 SVN commit: r436 - in trunk/debian: . patches patches/debian patches/freebsd patches/general
Author: dnusinow
Date: 2005-07-30 11:29:10 -0500 (Sat, 30 Jul 2005)
New Revision: 436
Removed:
trunk/debian/patches/freebsd/820_gnu-freebsd_config.diff
trunk/debian/patches/freebsd/823_gnu-freebsd_xterm.diff
Modified:
trunk/debian/README
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/debian/900_debian_config.diff
trunk/debian/patches/general/058_support_external_Xcursor_Xft_Xrender_libs.diff
trunk/debian/patches/general/099s_selinux_support.diff
trunk/debian/patches/series
trunk/debian/xserver-xorg.config.in
Log:
- Apply various GNU/kFreeBSD updates. Thanks Robert Millan and Aurelien
Jarno. Closes: #318934
- Remove all the old GNU/kFreeBSD support files
- Update 099s to only include SELinux support if we're building for linux
- Also update Build-Depends to not require selinux for hurd and GNU/kFreeBSD
- Allow xlibmesa-dri and friends, as well as xdmx and xserver-xorg to
build on kfreebsd-i386
- Unfuzzy patches not listed above
Modified: trunk/debian/README
===================================================================
--- trunk/debian/README 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/README 2005-07-30 16:29:10 UTC (rev 436)
@@ -111,7 +111,7 @@
550-599 sh{3,4}{,eb} architecture patches
600-649 amd64 architecture patches
800-819 Debian GNU/Hurd patches
- 820-839 Debian GNU/FreeBSD patches
+ 820-839 Debian GNU/kFreeBSD patches
840-859 Debian GNU/NetBSD patches
860-879 Debian OpenBSD patches
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/TODO 2005-07-30 16:29:10 UTC (rev 436)
@@ -5,10 +5,6 @@
To claim an item, put your username after it in [brackets].
-xorg-x11 6.8.2-5 (unstable)
----------------------------
-* Include patches for GNU/kFreeBSD (see #318934) [dnusinow]
-
xorg-x11 6.8.2-6 (unstable)
--------------------------
* Create udeb for Xorg to facilitate gtk frontend for d-i
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/changelog 2005-07-30 16:29:10 UTC (rev 436)
@@ -17,6 +17,15 @@
- Add general/031_disable_libXft1.diff to stop building libXft1, since we
don't ship it anyway.
- Ship extramodes file in xserver-xorg examples
+ - Apply various GNU/kFreeBSD updates. Thanks Robert Millan and Aurelien
+ Jarno. Closes: #318934
+ - Remove all the old GNU/kFreeBSD support files
+ - Update 099s to only include SELinux support if we're building for
+ linux
+ - Also update Build-Depends to not require selinux for hurd and
+ GNU/kFreeBSD
+ - Allow xlibmesa-dri and friends, as well as xdmx and xserver-xorg to
+ build on kfreebsd-i386
Changes by Eugene Konev:
- Do not impose selinux on the whole world out there: move selinux
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/control 2005-07-30 16:29:10 UTC (rev 436)
@@ -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, libselinux1-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, quilt
+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, libselinux1-dev [!kfreebsd-i386 !hurd-i386], 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, quilt
Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1), linux-kernel-headers (<< 2.5.999-test7-bk-15) [sparc]
# Reasons for Build-Depends:
@@ -1971,7 +1971,7 @@
of the GCC 3.3 series; therefore, this package conflicts with those versions.
Package: xdmx
-Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc s390 sh3 sh4 sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc s390 sh3 sh4 sparc
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: xserver-xorg (<= 6.8.1-0.2)
Replaces: xserver-xorg (<= 6.8.1-0.2)
@@ -2231,7 +2231,7 @@
Internet hosts will be allowed inbound access to local X servers.
Package: xlibmesa-dri
-Architecture: alpha amd64 i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 kfreebsd-i386 powerpc sparc
Depends: xlibmesa-gl
Suggests: libglide3
Conflicts: xlibmesa3 (<< 4.2.1-5), xlibmesa3-gl
@@ -2249,7 +2249,7 @@
for the PowerPC and SPARC architectures.
Package: xlibmesa-dri-dbg
-Architecture: alpha amd64 i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 kfreebsd-i386 powerpc sparc
Depends: xlibmesa-dri (= ${Source-Version})
Conflicts: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
Replaces: xlibmesa-gl-dbg (<< 4.3.0), xlibmesa3-gl-dbg (>= 4.2.1-13)
@@ -2365,7 +2365,7 @@
Package: xlibosmesa4
Section: libs
-Architecture: alpha amd64 i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 kfreebsd-i386 powerpc sparc
Depends: xlibmesa-gl (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Mesa off-screen rendering library [X.Org]
Mesa is a 3D graphics library which presents an API intended to be compatible
@@ -2384,7 +2384,7 @@
Package: xlibosmesa4-dbg
Section: libdevel
Priority: extra
-Architecture: alpha amd64 i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 kfreebsd-i386 powerpc sparc
Depends: xlibosmesa4 (= ${Source-Version}), ${misc:Depends}
Description: Mesa off-screen rendering library (unstripped) [X.Org]
This package is useful to provide a backtrace with symbol names in a
@@ -2399,7 +2399,7 @@
Package: xlibosmesa-dev
Section: libdevel
-Architecture: alpha amd64 i386 ia64 powerpc sparc
+Architecture: alpha amd64 i386 ia64 kfreebsd-i386 powerpc sparc
Depends: xlibosmesa4 (= ${Source-Version}), xlibmesa-gl-dev (= ${Source-Version}), libc6-dev | libc-dev
Description: Mesa off-screen rendering library development files [X.Org]
xlibosmesa-dev provides static versions of the libraries provided in
@@ -2515,7 +2515,7 @@
xfonts-base, xfonts-100dpi or xfonts-75dpi, and xfonts-scalable packages.
Package: xserver-xorg
-Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: discover1, mdetect, xresprobe (>= 0.4.13), laptop-detect
Suggests: libglide2 (>> 2001.01.26)
@@ -2541,7 +2541,7 @@
Package: xserver-xorg-dbg
Priority: extra
-Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc sh3 sh4 sparc
Depends: xserver-common (>= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: xserver-xorg, discover1, mdetect, xresprobe, laptop-detect
Conflicts: libxfont-xtt
Modified: trunk/debian/patches/debian/900_debian_config.diff
===================================================================
--- trunk/debian/patches/debian/900_debian_config.diff 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/patches/debian/900_debian_config.diff 2005-07-30 16:29:10 UTC (rev 436)
@@ -21,23 +21,6 @@
# ifdef DebianMaintainer
# ifndef XFree86CustomVersion
-diff -ruN xc-old/config/cf/gnu-freebsd.cf xc/config/cf/gnu-freebsd.cf
---- xc-old/config/cf/gnu-freebsd.cf 2004-10-27 13:52:55.000000000 +0000
-+++ xc/config/cf/gnu-freebsd.cf 2004-10-27 13:53:28.000000000 +0000
-@@ -60,13 +60,7 @@
- #define NormalLibGlu YES
- #define FSUseSyslog YES
-
--/*
-- *
-- *
- #define DebianMaintainer YES
-- *
-- *
-- */
-
- #ifdef DebianMaintainer
- # ifndef XFree86CustomVersion
diff -ruN xc-old/config/cf/gnu.cf xc/config/cf/gnu.cf
--- xc-old/config/cf/gnu.cf 2004-10-27 13:52:55.000000000 +0000
+++ xc/config/cf/gnu.cf 2004-10-27 13:53:28.000000000 +0000
Deleted: trunk/debian/patches/freebsd/820_gnu-freebsd_config.diff
===================================================================
--- trunk/debian/patches/freebsd/820_gnu-freebsd_config.diff 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/patches/freebsd/820_gnu-freebsd_config.diff 2005-07-30 16:29:10 UTC (rev 436)
@@ -1,577 +0,0 @@
-$Id$
-
-Add GNU/FreeBSD build defines to xc/config/cf. They're basically copied
-and adapted from the defines for GNU OS.
-
-Should not be submitted upstream yet; the defines in linux.cf, gnu.cf and
-gnu-freebsd.cf (specialy the last two) share a large amount of common
-lines. I want to split these into a gnu-common.cf file so gnu.cf and
-gnu-freebsd.cf don't get easily outdated.
-
-Also, the debian-specific lines in linux.cf should be moved somewhere
-else. I suggested using site.def.
-
- -- Robert Millan <rmh@debian.org>
-
-This patch modified by Branden Robinson to:
-* update it with the current "Debian section" of linux.cf
-* fix ident strings to not lie about the name of the file
-* comment out the definition of "DebianMaintainer" just like linux.cf
-
-XXX: Examine whether the following defs need to be restored to the file:
-
-#define PamLibraries -lpam -rdynamic -ldl
-#ifndef HasKatmaiSupport
-# define HasKatmaiSupport NO
-#endif
-
-diff -ruN xc-old/config/cf/gfbLib.rules xc/config/cf/gfbLib.rules
---- xc-old/config/cf/gfbLib.rules 1970-01-01 01:00:00.000000000 +0100
-+++ xc/config/cf/gfbLib.rules 2004-10-18 14:49:52.792246264 +0200
-@@ -0,0 +1,180 @@
-+/*
-+ * GNU/Hurd shared library rules
-+ *
-+ * xc/config/cf/gfbLib.rules
-+ */
-+
-+/*
-+ * GNU/FreeBSD shared library rules
-+ * Cloned from GNU (ELF) shared library rules
-+ */
-+
-+#ifndef HasSharedLibraries
-+#define HasSharedLibraries YES
-+#endif
-+#ifndef ForceNormalLib
-+#define ForceNormalLib NO
-+#endif
-+
-+#ifndef SharedOldX
-+#define SharedOldX NO
-+#endif
-+
-+#undef SpecialMalloc
-+#define SpecialMalloc NO
-+
-+#define BaseShLibReqs -lc
-+
-+#ifndef SharedDataSeparation
-+#define SharedDataSeparation NO
-+#endif
-+#ifndef SharedCodeDef
-+#define SharedCodeDef /**/
-+#endif
-+#ifndef SharedLibraryDef
-+#define SharedLibraryDef /**/
-+#endif
-+#ifndef ShLibIncludeFile
-+#define ShLibIncludeFile <gfbLib.tmpl>
-+#endif
-+#ifndef SharedLibraryLoadFlags
-+XCOMM XXX To rpath or not to rpath...
-+XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
-+#define SharedLibraryLoadFlags -shared
-+#endif
-+#ifndef PositionIndependentCFlags
-+#define PositionIndependentCFlags -fPIC
-+#endif
-+#ifndef PositionIndependentCplusplusFlags
-+#define PositionIndependentCplusplusFlags -fPIC
-+#endif
-+#ifndef ExtraLoadFlags
-+#ifdef UseInstalled
-+XCOMM XXX Maybe superfluous.
-+#define ExtraLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
-+#else
-+#define ExtraLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
-+#endif
-+#endif
-+
-+/*
-+ * InstallSharedLibrary - generate rules to install the shared library.
-+ * NOTE: file must be executable, hence "INSTBINFLAGS"
-+ */
-+#ifndef InstallSharedLibrary
-+#define InstallSharedLibrary(libname,rev,dest) @@\
-+install:: Concat(lib,libname.so.rev) @@\
-+ MakeDir($(DESTDIR)dest) @@\
-+ $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-+ @T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
-+ set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
-+ @if $(SOSYMLINK); then (set -x; \
-+ $(RM) Concat($(DESTDIR)dest/lib,libname.so); \ @@\
-+ $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
-+#endif /* InstallSharedLibrary */
-+
-+/*
-+ * InstallSharedLibraryData - generate rules to install the shared library data
-+ */
-+#ifndef InstallSharedLibraryData
-+#define InstallSharedLibraryData(libname,rev,dest)
-+#endif /* InstallSharedLibraryData */
-+
-+
-+/*
-+ * SharedLibraryTarget - generate rules to create a shared library;
-+ * build it into a different name so that we do not hose people by having
-+ * the library gone for long periods.
-+ */
-+#ifndef SharedLibraryTarget
-+#ifdef UseInstalled
-+#define LinkBuildSonameLibrary(lib) true
-+#else
-+#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-+ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-+#endif
-+
-+#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
-+AllTarget(Concat(lib,libname.so.rev)) @@\
-+ @@\
-+Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
-+ $(RM) $@~ @@\
-+ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
-+ (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
-+ LinkBuildSonameLibrary($$SONAME) @@\
-+ $(RM) $@ @@\
-+ $(MV) $@~ $@ @@\
-+ @if $(SOSYMLINK); then (set -x; \ @@\
-+ $(RM) Concat(lib,libname.so); \ @@\
-+ $(LN) $@ Concat(lib,libname.so)); fi @@\
-+ LinkBuildLibrary($@) @@\
-+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
-+ @@\
-+clean:: @@\
-+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
-+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
-+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-+
-+#endif /* SharedLibraryTarget */
-+
-+/*
-+ * SharedDepLibraryTarget - generate rules to create a shared library.
-+ */
-+#ifndef SharedDepLibraryTarget
-+#ifdef UseInstalled
-+#ifndef LinkBuildSonameLibrary
-+#define LinkBuildSonameLibrary(lib) true
-+#endif
-+#else
-+#ifndef LinkBuildSonameLibrary
-+#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-+ cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-+#endif
-+#endif
-+
-+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-+AllTarget(Concat(lib,libname.so.rev)) @@\
-+ @@\
-+Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\
-+ $(RM) $@~ @@\
-+ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
-+ (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
-+ LinkBuildSonameLibrary($$SONAME) @@\
-+ $(RM) $@ @@\
-+ $(MV) $@~ $@ @@\
-+ @if $(SOSYMLINK); then (set -x; \ @@\
-+ $(RM) Concat(lib,libname.so); \ @@\
-+ $(LN) $@ Concat(lib,libname.so)); fi @@\
-+ LinkBuildLibrary($@) @@\
-+ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\
-+ @@\
-+clean:: @@\
-+ @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\
-+ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\
-+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-+
-+#endif /* SharedDepLibraryTarget */
-+
-+#ifndef SharedDepModuleTarget
-+#define SharedDepModuleTarget(name,deps,solist) @@\
-+AllTarget(name) @@\
-+ @@\
-+name: deps @@\
-+ $(RM) $@~ @@\
-+ $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
-+ $(RM) $@ @@\
-+ $(MV) $@~ $@ @@\
-+ @@\
-+clean:: @@\
-+ $(RM) name
-+
-+#endif /* SharedDepModuleTarget */
-+
-+/*
-+ * SharedLibraryDataTarget - generate rules to create shlib data file;
-+ */
-+#ifndef SharedLibraryDataTarget
-+#define SharedLibraryDataTarget(libname,rev,salist)
-+#endif /* SharedLibraryTarget */
-diff -ruN xc-old/config/cf/gfbLib.tmpl xc/config/cf/gfbLib.tmpl
---- xc-old/config/cf/gfbLib.tmpl 1970-01-01 01:00:00.000000000 +0100
-+++ xc/config/cf/gfbLib.tmpl 2004-10-18 14:49:52.793246112 +0200
-@@ -0,0 +1,28 @@
-+/*
-+ * GNU/FreeBSD shared library template
-+ */
-+
-+#ifndef FixupLibReferences
-+#define FixupLibReferences() @@\
-+XMULIBONLY = -lXmu @@\
-+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-+#endif
-+
-+#ifndef XawClientLibs
-+#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-+#endif
-+
-+#define CplusplusLibC
-+
-+#define SharedX11Reqs
-+#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
-+#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
-+#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-+#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
-+#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-+#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
-+#define SharedXiReqs $(LDPRELIB) $(XLIB)
-+#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
-+#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-+#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
-+#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-diff -ruN xc-old/config/cf/gnu-freebsd.cf xc/config/cf/gnu-freebsd.cf
---- xc-old/config/cf/gnu-freebsd.cf 1970-01-01 01:00:00.000000000 +0100
-+++ xc/config/cf/gnu-freebsd.cf 2004-10-18 14:49:52.794245960 +0200
-@@ -0,0 +1,314 @@
-+XCOMM platform: xc/config/cf/gnu-freebsd.cf
-+
-+#ifndef OSName
-+#define OSName DefaultOSName
-+#endif
-+
-+#ifndef OSVendor
-+#define OSVendor /**/
-+#endif
-+#ifndef OSMajorVersion
-+#define OSMajorVersion DefaultOSMajorVersion
-+#endif
-+#ifndef OSMinorVersion
-+#define OSMinorVersion DefaultOSMinorVersion
-+#endif
-+#ifndef OSTeenyVersion
-+#define OSTeenyVersion DefaultOSTeenyVersion
-+#endif
-+XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-+
-+#ifndef DefaultGcc2OptimizeOpt
-+# define DefaultGcc2OptimizeOpt -O2
-+#endif
-+#define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs
-+#define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs
-+#define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs
-+#define SystemManDirectory /usr/share/man
-+#define HasPam YES
-+#define HasTk YES
-+#define TkLibDir /usr/lib
-+#define TkIncDir /usr/include
-+#define TkLibName tk8.4
-+#define XF86SetupUsesStaticTk NO
-+#define HasTcl YES
-+#define TclLibDir /usr/lib
-+#define TclIncDir /usr/include
-+#define TclLibName tcl8.4
-+#define XF86SetupUsesStaticTcl NO
-+/* un-comment this when it is un-broken */
-+/* # define JoystickSupport YES */
-+#define XAppLoadDir EtcX11Directory/app-defaults
-+#define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
-+#define InstallAppDefFiles YES
-+/* the relative symlink created by this rule causes problems for us */
-+#ifdef InstallAppDefFiles
-+# if InstallAppDefFiles
-+# define InstallAppDefaultsLong(file,class) @@\
-+InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-+# else
-+# define InstallAppDefaultsLong(file,class) @@\
-+InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-+# endif
-+#endif /* InstallAppDefFiles */
-+#define SharedLibXdmGreet NO
-+#define LinkGLToUsrInclude NO
-+#define LinkGLToUsrLib NO
-+#define SharedLibFont NO
-+#define HasZlib YES
-+#define SharedLibGlu YES
-+#define NormalLibGlu YES
-+#define FSUseSyslog YES
-+
-+/*
-+ *
-+ *
-+#define DebianMaintainer YES
-+ *
-+ *
-+ */
-+
-+#ifdef DebianMaintainer
-+# ifndef XFree86CustomVersion
-+# define XFree86CustomVersion "Debian"
-+# endif
-+# ifndef BuilderEMailAddr
-+# define BuilderEMailAddr "debian-x@lists.debian.org"
-+# endif
-+# define XFree86Devel YES
-+# define InstallXinitConfig YES
-+# define InstallXdmConfig YES
-+# define InstallFSConfig YES
-+# define DebuggableLibraries YES
-+# define ForceNormalLib YES
-+# define BuildRman NO
-+# define BuildHtmlManPages NO
-+/*
-+ * Debian doesn't use certain parts of the tree when doing
-+ * architecture-specific package builds.
-+ */
-+# ifndef BuildFonts
-+# define BuildFonts YES
-+# endif
-+# ifndef BuildSpecsDocs
-+# define BuildSpecsDocs YES
-+# endif
-+# if BuildSpecsDocs
-+# define BuildAllSpecsDocs YES
-+# endif
-+/*
-+ * The XFree86 Debian package uses a local patch that defines a
-+ * PicLibraryTarget() Imake rule, instead of using upstream's method.
-+ */
-+# define StaticNeedsPicForShared NO
-+# define KernelVersionInBanner YES
-+# define ProjectManSuffix x
-+/* The TT/Meltho fonts are all under non-free licenses. */
-+# define BuildTrueTypeFonts NO
-+# define BuildBethMarduthoFonts NO
-+/*
-+ * The XFree86 Debian package build-depends on external Expat, Fontconfig,
-+ * Freetype, Render, Xcursor, and Xft libraries.
-+ */
-+# define BuildExpatLibrary NO
-+# define HasExpat YES
-+# define ExpatIncDirStandard YES
-+# define BuildFontconfigLibrary NO
-+# define HasFontconfig YES
-+# define UseFontconfig YES
-+# define FontconfigIncDir /usr/include/fontconfig
-+# define BuildFreetype2Library NO
-+# define HasFreetype2 YES
-+# define BuildRenderLibrary NO
-+# define HasRenderLibrary YES
-+# define BuildXcursorLibrary NO
-+# define HasXcursorLibrary YES
-+/* Xlib needs to know the available version of Xcursor. */
-+# define SharedXcursorRev 1
-+# define IconDir Concat(ProjectRoot,/lib/X11/icons)
-+# define BuildXftLibrary NO
-+# define HasXftLibrary YES
-+
-+# ifdef UseInstalled
-+# define RenderLibraryDir /usr
-+# define XftLibraryDir /usr
-+# define XcursorLibraryDir /usr
-+# else
-+/* The XFree86 Debian package uses a special hack to find these libraries. */
-+# define RenderLibraryDir $(TOP)/../../imports
-+# define XftLibraryDir $(TOP)/../../imports
-+# define XcursorLibraryDir $(TOP)/../../imports
-+# endif
-+
-+/*
-+ * We want to be sure that the normal XFree86 X server and the debugging X
-+ * server use the same FreeType2 library. We'd *like* it if we could
-+ * achieve this by both packages dynamically linking against the system's
-+ * FreeType2 library; however, the normal X server package
-+ * (xserver-xorg) *cannot* be built dynamically linked against the
-+ * FreeType2 library when the module loader is enabled because of
-+ * code/design issues. Therefore, we encapsulate XFree86's internal "fork"
-+ * of the FreeType2 library into *both* xserver-xorg and
-+ * xserver-xorg-dbg. When it becomes possible to build the
-+ * module-loading server against an external FreeType2 shared library, we
-+ * can drop this define:
-+ */
-+# define FontLibSharedFreeType NO
-+
-+# define HasLinuxInput NO
-+# define HasXdmAuth YES
-+# define HasLatex YES
-+# ifdef i386Architecture
-+# define HasX86Support YES
-+# define HasMMXSupport YES
-+# define Has3DNowSupport YES
-+# define HasSSESupport YES
-+# endif /* i386Architecture */
-+#endif /* DebianMaintainer */
-+
-+#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
-+ -D_POSIX_SOURCE -D_XOPEN_SOURCE \
-+ -D_BSD_SOURCE -D_SVID_SOURCE
-+
-+XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
-+
-+#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
-+
-+XCOMM Enable this when we have pthreads.
-+#define HasPosixThreads YES
-+#define ThreadedX YES
-+#define HasThreadSafeAPI YES
-+#define ThreadsLibraries -lpthread
-+#define SystemMTDefines -D_REENTRANT
-+
-+#ifndef HasLibCrypt
-+#define HasLibCrypt YES
-+#endif
-+
-+#ifndef BuildXF86RushExt
-+# define BuildXF86RushExt YES
-+#endif
-+
-+#define BuildLibPathVar LD_LIBRARY_PATH
-+#define GccUsesGas YES
-+#define UseGas YES
-+#define GnuCpp YES
-+#define HasDlopen YES
-+#ifndef HasShadowPasswd
-+# define HasShadowPasswd YES
-+#endif
-+#define HasPutenv YES
-+
-+XCOMM Not implemented and will always fail.
-+#define HasShm YES
-+
-+XCOMM #define HasBSD44Sockets YES
-+#define HasSockets YES
-+#define HasSnprintf YES
-+#define HasMkstemp YES
-+#define HasUsableFileMmap YES
-+#ifndef HasNCurses
-+#define HasNCurses YES
-+#endif
-+
-+#define AvoidNullMakeCommand YES
-+#ifndef DebuggableLibraries
-+#define DebuggableLibraries NO
-+#endif
-+#define CompressAllFonts YES
-+#define Malloc0ReturnsNull YES
-+#define NeedConstPrototypes YES
-+#define NeedFunctionPrototypes YES
-+#define NeedNestedPrototypes YES
-+#define NeedVarargsPrototypes YES
-+#ifndef NeedWidePrototypes
-+#define NeedWidePrototypes NO
-+#endif
-+#define SetTtyGroup YES
-+
-+#ifndef UseStaticTermcapLib
-+#define UseStaticTermcapLib NO
-+#endif
-+
-+#define MkdirHierCmd mkdir -p
-+#ifndef CcCmd
-+#define CcCmd gcc
-+#endif
-+#ifndef AsCmd
-+#define AsCmd as
-+#endif
-+#ifndef LdCmd
-+#define LdCmd ld
-+#endif
-+
-+#define AsmDefines -D__ELF__
-+#define CplusplusCmd c++
-+#ifndef TermcapLibrary
-+#if UseStaticTermcapLib
-+#define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
-+#else
-+#define TermcapLibrary -lncurses
-+#endif
-+#endif
-+#ifndef DoLoadableServer
-+#define DoLoadableServer YES
-+#endif
-+#ifndef
-+#define CppCmd /lib/cpp
-+#endif
-+#define YaccCmd bison -y
-+#define LexCmd flex -l
-+#define HasFlex YES
-+#define LexLib -lfl
-+#define PreProcessCmd CcCmd -E
-+#define PostIncDir DefaultGccIncludeDir
-+#define LdCombineFlags -r
-+#ifndef LdPostLib
-+#define LdPostLib /* Never needed */
-+#endif
-+#define HasWChar32 YES
-+#define StandardCppOptions -traditional
-+#define StandardCppDefines StandardDefines
-+
-+#define HasVarRun YES
-+#define VarDbDirectory $(VARDIR)/lib
-+
-+XCOMM i386Architecture
-+#define OptimizedCDebugFlags DefaultGcc2i386Opt
-+#define DefaultGcc2i386Opt -O2
-+#define GNUMachineDefines -D__i386__
-+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+#define HasPlugin YES
-+#define VendorHasX11R6_3libXext YES
-+
-+#ifndef StandardDefines
-+#define StandardDefines GNUMachineDefines GNUSourceDefines
-+#endif
-+
-+#define DlLibrary -rdynamic -ldl
-+
-+#define ServerExtraSysLibs /**/
-+
-+#define ConnectionFlags -DUNIXCONN -DTCPCONN
-+
-+#ifndef StaticLibrary
-+#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-+#endif
-+
-+#define HasGnuMake YES
-+
-+#define MakeNamedTargetSubdir(dir,flags,subname)\
-+ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-+
-+#define ArchitectureDefines -DGNU_ARCHITECTURE
-+
-+#define XserverNeedsSetUID YES
-+
-+#include <gnuLib.rules>
-+
-+XCOMM XXX Might need this if they are not careful with slashes.
-+XCOMM #define DirFailPrefix -
-+
-+#include <xfree86.cf>
-+
-diff -ruN xc-old/config/cf/Imake.cf xc/config/cf/Imake.cf
---- xc-old/config/cf/Imake.cf 2004-08-11 23:14:01.000000000 +0200
-+++ xc/config/cf/Imake.cf 2004-10-18 14:49:52.792246264 +0200
-@@ -253,6 +253,12 @@
- #define KNetBSDArchitecture
- #endif
-
-+#ifdef __GNU_FreeBSD__
-+#define MacroIncludeFile <gnu-freebsd.cf>
-+#define MacroFile gnu-freebsd.cf
-+#define GNUFreeBSDArchitecture
-+#endif
-+
- #ifdef __FreeBSD__
- # define MacroIncludeFile <FreeBSD.cf>
- # define MacroFile FreeBSD.cf
Deleted: trunk/debian/patches/freebsd/823_gnu-freebsd_xterm.diff
===================================================================
--- trunk/debian/patches/freebsd/823_gnu-freebsd_xterm.diff 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/patches/freebsd/823_gnu-freebsd_xterm.diff 2005-07-30 16:29:10 UTC (rev 436)
@@ -1,19 +0,0 @@
-$Id$
-
-GNU/FreeBSD needs the termios.h header included to know what "B38400" is.
-
-This patch by Robert Millan.
-
-Not submitted upstream to XFree86 or Thomas Dickey.
-
-diff -ruN xc-old/programs/xterm/main.c xc/programs/xterm/main.c
---- xc-old/programs/xterm/main.c 2005-07-05 23:06:32.000000000 -0400
-+++ xc/programs/xterm/main.c 2005-07-05 23:13:15.000000000 -0400
-@@ -491,6 +491,7 @@
- * about padding generally store the code in a short, which does not have
- * enough bits for the extended values.
- */
-+#include <termios.h>
- #ifdef B38400 /* everyone should define this */
- #define VAL_LINE_SPEED B38400
- #else /* ...but xterm's used this for a long time */
Modified: trunk/debian/patches/general/058_support_external_Xcursor_Xft_Xrender_libs.diff
===================================================================
--- trunk/debian/patches/general/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/patches/general/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-07-30 16:29:10 UTC (rev 436)
@@ -71,9 +71,10 @@
Not submitted upstream.
-diff -urN xc~/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc~/config/cf/X11.tmpl 2005-06-17 19:01:49.848921146 -0500
-+++ xc/config/cf/X11.tmpl 2005-06-17 19:04:04.778020128 -0500
+Index: xc/config/cf/X11.tmpl
+===================================================================
+--- xc/config/cf/X11.tmpl.orig 2005-07-30 12:06:53.000000000 -0400
++++ xc/config/cf/X11.tmpl 2005-07-30 12:12:47.000000000 -0400
@@ -609,23 +609,29 @@
#ifndef BuildRender
#define BuildRender YES
@@ -311,9 +312,10 @@
#ifdef HasLibpng
/*
-diff -urN xc~/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c
---- xc~/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c 2005-02-28 12:35:18.000000000 -0500
-+++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c 2005-06-16 03:34:23.723478171 -0500
+Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c
+===================================================================
+--- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c 2005-07-30 12:12:47.000000000 -0400
@@ -44,7 +44,7 @@
#include <stddef.h>
#include "mesh.h"
@@ -323,9 +325,10 @@
#define TRUE 1
#define FALSE 0
-diff -urN xc~/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c
---- xc~/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c 2005-02-28 12:35:18.000000000 -0500
-+++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c 2005-06-16 03:34:30.859642071 -0500
+Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c
+===================================================================
+--- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c 2005-07-30 12:12:47.000000000 -0400
@@ -48,7 +48,7 @@
#include "normal.h"
#include "sweep.h"
@@ -337,8 +340,8 @@
#define GLU_TESS_MESH 100112 /* void (*)(GLUmesh *mesh) */
Index: xc/include/extensions/Imakefile
===================================================================
---- xc/include/extensions/Imakefile (revision 140)
-+++ xc/include/extensions/Imakefile (working copy)
+--- xc/include/extensions/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/include/extensions/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -39,7 +39,7 @@
#if BuildXinerama || BuildXineramaLibrary
XINERAMAHEADERS = Xinerama.h panoramiXext.h panoramiXproto.h
@@ -358,9 +361,10 @@
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xvlib.h,$(DRIVERSDKINCLUDEDIR)/extensions)
-diff -ruN xc-old/lib/Imakefile xc/lib/Imakefile
---- xc-old/lib/Imakefile 2004-09-02 01:10:28.000000000 +0000
-+++ xc/lib/Imakefile 2004-10-26 10:44:00.107145664 +0000
+Index: xc/lib/Imakefile
+===================================================================
+--- xc/lib/Imakefile.orig 2005-07-30 12:06:44.000000000 -0400
++++ xc/lib/Imakefile 2005-07-30 12:14:27.000000000 -0400
@@ -102,7 +102,7 @@
#endif
@@ -378,8 +382,8 @@
+XFTBUILDDIR = Xft
#endif
- #if BuildXft1Library
-@@ -146,7 +146,7 @@
+ #if BuildRandRLibrary
+@@ -142,7 +142,7 @@
#endif
#if BuildXcursorLibrary
@@ -388,13 +392,13 @@
#endif
#if BuildXTrapLibrary
-@@ -232,10 +232,10 @@
+@@ -228,10 +228,10 @@
$(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) $(EXPATBUILDDIR) \
$(XVLIBDIR) $(GLXLIBDIR) $(GLULIBDIR) $(GLWLIBDIR) \
$(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
- $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
+ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBBUILDDIR) $(FREETYPE2BUILDDIR) \
- $(FONTCONFIGBUILDDIR) $(XFT1LIBDIR) \
+ $(FONTCONFIGBUILDDIR) \
- $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
- $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR) $(DMXLIBDIR) \
+ $(XFTBUILDDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) $(XTRAPLIBDIR) \
@@ -402,9 +406,10 @@
$(WINDOWSLIBDIR) $(XEVIELIBDIR) $(XFIXESLIBDIR) $(DAMAGELIBDIR) $(COMPOSITELIBDIR)
SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
-diff -urN xc~/lib/Xcomposite/Imakefile xc/lib/Xcomposite/Imakefile
---- xc~/lib/Xcomposite/Imakefile 2005-02-28 12:35:18.000000000 -0500
-+++ xc/lib/Xcomposite/Imakefile 2005-06-16 02:03:10.412769962 -0500
+Index: xc/lib/Xcomposite/Imakefile
+===================================================================
+--- xc/lib/Xcomposite/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/lib/Xcomposite/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -59,7 +59,7 @@
xcomposite.pc: xcomposite.pc.in
@@ -414,9 +419,10 @@
InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig)
-diff -urN xc~/lib/Xcomposite/config-subst xc/lib/Xcomposite/config-subst
---- xc~/lib/Xcomposite/config-subst 1969-12-31 19:00:00.000000000 -0500
-+++ xc/lib/Xcomposite/config-subst 2005-06-16 02:02:12.198432925 -0500
+Index: xc/lib/Xcomposite/config-subst
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xc/lib/Xcomposite/config-subst 2005-07-30 12:12:47.000000000 -0400
@@ -0,0 +1,10 @@
+#!/bin/sh
+script=config-subst.$$
@@ -428,9 +434,10 @@
+ echo "s;@$var@;$val;" >> $script
+done
+sed -f $script
-diff -urN xc~/lib/Xdamage/Imakefile xc/lib/Xdamage/Imakefile
---- xc~/lib/Xdamage/Imakefile 2005-02-28 12:35:18.000000000 -0500
-+++ xc/lib/Xdamage/Imakefile 2005-06-16 02:03:14.860872124 -0500
+Index: xc/lib/Xdamage/Imakefile
+===================================================================
+--- xc/lib/Xdamage/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/lib/Xdamage/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -59,7 +59,7 @@
xdamage.pc: xdamage.pc.in
@@ -440,9 +447,10 @@
InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig)
-diff -urN xc~/lib/Xdamage/config-subst xc/lib/Xdamage/config-subst
---- xc~/lib/Xdamage/config-subst 1969-12-31 19:00:00.000000000 -0500
-+++ xc/lib/Xdamage/config-subst 2005-06-16 02:02:12.201432994 -0500
+Index: xc/lib/Xdamage/config-subst
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xc/lib/Xdamage/config-subst 2005-07-30 12:12:47.000000000 -0400
@@ -0,0 +1,10 @@
+#!/bin/sh
+script=config-subst.$$
@@ -454,9 +462,10 @@
+ echo "s;@$var@;$val;" >> $script
+done
+sed -f $script
-diff -urN xc/lib/Xevie~/Imakefile xc/lib/Xevie/Imakefile
---- xc/lib/Xevie~/Imakefile 2005-02-28 12:35:18.000000000 -0500
-+++ xc/lib/Xevie/Imakefile 2005-06-15 16:28:51.601337553 -0500
+Index: xc/lib/Xevie/Imakefile
+===================================================================
+--- xc/lib/Xevie/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/lib/Xevie/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -64,7 +64,7 @@
xevie.pc: xevie.pc.in
@@ -466,9 +475,10 @@
InstallNonExecFile(xevie.pc,$(USRLIBDIR)/pkgconfig)
-diff -urN xc/lib/Xevie~/config-subst xc/lib/Xevie/config-subst
---- xc/lib/Xevie~/config-subst 1969-12-31 19:00:00.000000000 -0500
-+++ xc/lib/Xevie/config-subst 2005-06-15 16:28:27.530784713 -0500
+Index: xc/lib/Xevie/config-subst
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xc/lib/Xevie/config-subst 2005-07-30 12:12:47.000000000 -0400
@@ -0,0 +1,10 @@
+#!/bin/sh
+script=config-subst.$$
@@ -480,9 +490,10 @@
+ echo "s;@$var@;$val;" >> $script
+done
+sed -f $script
-diff -urN xc~/lib/Xfixes/Imakefile xc/lib/Xfixes/Imakefile
---- xc~/lib/Xfixes/Imakefile 2005-02-28 12:35:18.000000000 -0500
-+++ xc/lib/Xfixes/Imakefile 2005-06-16 02:03:19.922988388 -0500
+Index: xc/lib/Xfixes/Imakefile
+===================================================================
+--- xc/lib/Xfixes/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/lib/Xfixes/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -66,7 +66,7 @@
xfixes.pc: xfixes.pc.in
@@ -492,9 +503,10 @@
InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig)
-diff -urN xc~/lib/Xfixes/config-subst xc/lib/Xfixes/config-subst
---- xc~/lib/Xfixes/config-subst 1969-12-31 19:00:00.000000000 -0500
-+++ xc/lib/Xfixes/config-subst 2005-06-16 02:02:12.208433155 -0500
+Index: xc/lib/Xfixes/config-subst
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xc/lib/Xfixes/config-subst 2005-07-30 12:12:47.000000000 -0400
@@ -0,0 +1,10 @@
+#!/bin/sh
+script=config-subst.$$
@@ -506,9 +518,10 @@
+ echo "s;@$var@;$val;" >> $script
+done
+sed -f $script
-diff -ruN xc-old/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
---- xc-old/lib/Xft1/Imakefile 2004-04-23 18:43:44.000000000 +0000
-+++ xc/lib/Xft1/Imakefile 2004-10-26 10:46:37.519215392 +0000
+Index: xc/lib/Xft1/Imakefile
+===================================================================
+--- xc/lib/Xft1/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/lib/Xft1/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -79,13 +79,13 @@
YFLAGS = -d
@@ -536,9 +549,10 @@
InstallNonExecFileRelated(XftConfig-OBSOLETE,$(CONFDIR),XftConfig)
MANSUFFIX = $(LIBMANSUFFIX)
-diff -ruN xc-old/lib/Xrandr/Imakefile xc/lib/Xrandr/Imakefile
---- xc-old/lib/Xrandr/Imakefile 2004-05-24 19:06:58.000000000 +0000
-+++ xc/lib/Xrandr/Imakefile 2004-10-26 10:46:59.594859384 +0000
+Index: xc/lib/Xrandr/Imakefile
+===================================================================
+--- xc/lib/Xrandr/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/lib/Xrandr/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -21,7 +21,7 @@
#endif
@@ -548,9 +562,10 @@
SRCS = Xrandr.c
OBJS = Xrandr.o
LINTLIBS = $(LINTXLIB)
-diff -urN xc~/programs/Xserver/hw/dmx/dmxpict.c xc/programs/Xserver/hw/dmx/dmxpict.c
---- xc~/programs/Xserver/hw/dmx/dmxpict.c 2005-02-28 12:35:18.000000000 -0500
-+++ xc/programs/Xserver/hw/dmx/dmxpict.c 2005-06-16 03:34:43.956942883 -0500
+Index: xc/programs/Xserver/hw/dmx/dmxpict.c
+===================================================================
+--- xc/programs/Xserver/hw/dmx/dmxpict.c.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/Xserver/hw/dmx/dmxpict.c 2005-07-30 12:12:47.000000000 -0400
@@ -46,8 +46,8 @@
#include "pixmapstr.h"
#include "dixstruct.h"
@@ -562,9 +577,10 @@
#include "picture.h"
#include "picturestr.h"
#include "mipict.h"
-diff -urN xc~/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html xc/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html
---- xc~/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html 2005-02-28 12:35:18.000000000 -0500
-+++ xc/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html 2005-06-16 03:35:26.377917187 -0500
+Index: xc/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html
+===================================================================
+--- xc/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html 2005-07-30 12:12:47.000000000 -0400
@@ -16,8 +16,8 @@
<code>#include "fb.h"</code><br>
<code>#include "pixmapstr.h"</code><br>
@@ -576,9 +592,10 @@
<code>#include "picture.h"</code><br>
<code>#include "picturestr.h"</code><br>
<code>#include "mipict.h"</code><br>
-diff -urN xc~/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c xc/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c
---- xc~/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c 2005-02-28 12:35:18.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c 2005-06-16 03:35:37.818179941 -0500
+Index: xc/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c 2005-07-30 12:12:47.000000000 -0400
@@ -14,7 +14,7 @@
void XAASync(ScreenPtr pScreen);
@@ -588,9 +605,10 @@
#if 1
#define COND(pDraw) \
-diff -urN xc~/programs/Xserver/randr/randr.c xc/programs/Xserver/randr/randr.c
---- xc~/programs/Xserver/randr/randr.c 2005-02-28 12:35:18.000000000 -0500
-+++ xc/programs/Xserver/randr/randr.c 2005-06-16 03:35:54.427561417 -0500
+Index: xc/programs/Xserver/randr/randr.c
+===================================================================
+--- xc/programs/Xserver/randr/randr.c.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/Xserver/randr/randr.c 2005-07-30 12:12:47.000000000 -0400
@@ -42,7 +42,7 @@
#include "randrproto.h"
#include "randrstr.h"
@@ -600,9 +618,10 @@
#include "picturestr.h"
#endif
#include "Xfuncproto.h"
-diff -urN xc~/programs/Xserver/render/glyphstr.h xc/programs/Xserver/render/glyphstr.h
---- xc~/programs/Xserver/render/glyphstr.h 2005-02-28 12:35:18.000000000 -0500
-+++ xc/programs/Xserver/render/glyphstr.h 2005-06-16 03:36:12.995987887 -0500
+Index: xc/programs/Xserver/render/glyphstr.h
+===================================================================
+--- xc/programs/Xserver/render/glyphstr.h.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/Xserver/render/glyphstr.h 2005-07-30 12:12:47.000000000 -0400
@@ -26,7 +26,7 @@
#ifndef _GLYPHSTR_H_
#define _GLYPHSTR_H_
@@ -612,9 +631,10 @@
#include "picture.h"
#include "screenint.h"
-diff -urN xc~/programs/Xserver/render/render.c xc/programs/Xserver/render/render.c
---- xc~/programs/Xserver/render/render.c 2005-02-28 12:35:18.000000000 -0500
-+++ xc/programs/Xserver/render/render.c 2005-06-16 03:37:06.830224324 -0500
+Index: xc/programs/Xserver/render/render.c
+===================================================================
+--- xc/programs/Xserver/render/render.c.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/Xserver/render/render.c 2005-07-30 12:12:47.000000000 -0400
@@ -38,8 +38,8 @@
#include "colormapst.h"
#include "extnsionst.h"
@@ -626,9 +646,10 @@
#include "picturestr.h"
#include "glyphstr.h"
#include "Xfuncproto.h"
-diff -ruN xc-old/programs/x11perf/Imakefile xc/programs/x11perf/Imakefile
---- xc-old/programs/x11perf/Imakefile 2004-08-11 08:05:31.000000000 +0000
-+++ xc/programs/x11perf/Imakefile 2004-10-26 10:30:48.721454576 +0000
+Index: xc/programs/x11perf/Imakefile
+===================================================================
+--- xc/programs/x11perf/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/x11perf/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -12,13 +12,13 @@
#if HasShm
SHMDEFS = -DMITSHM
@@ -645,9 +666,10 @@
XFTDEFS = -DXFT -DXFREE86_FT2
XFTDEPS = XftClientDepLibs
XFTLIBS = XftClientLibs
-diff -ruN xc-old/programs/xclock/Imakefile xc/programs/xclock/Imakefile
---- xc-old/programs/xclock/Imakefile 2004-04-23 19:54:39.000000000 +0000
-+++ xc/programs/xclock/Imakefile 2004-10-26 09:59:37.320950696 +0000
+Index: xc/programs/xclock/Imakefile
+===================================================================
+--- xc/programs/xclock/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/xclock/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -5,7 +5,7 @@
XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.8tsi Exp $
@@ -657,9 +679,10 @@
#endif
#if XClockUseRender
-diff -ruN xc-old/programs/xcursorgen/Imakefile xc/programs/xcursorgen/Imakefile
---- xc-old/programs/xcursorgen/Imakefile 2004-04-23 19:54:41.000000000 +0000
-+++ xc/programs/xcursorgen/Imakefile 2004-10-26 09:59:37.320950696 +0000
+Index: xc/programs/xcursorgen/Imakefile
+===================================================================
+--- xc/programs/xcursorgen/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/xcursorgen/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -6,7 +6,7 @@
DEFAULT_THEME = DefaultCursorTheme
ICONDIR = $(LIBDIR)/icons
@@ -669,9 +692,10 @@
DEPLIBS = $(DEPXLIB)
LOCAL_LIBRARIES = $(XCURSORLIB) $(XRENDERLIB) $(XLIB) $(LIBPNGLIB) \
MathLibrary GzipLibrary
-diff -ruN xc-old/programs/xditview/Imakefile xc/programs/xditview/Imakefile
---- xc-old/programs/xditview/Imakefile 2004-04-23 19:54:42.000000000 +0000
-+++ xc/programs/xditview/Imakefile 2004-10-26 09:59:37.321950544 +0000
+Index: xc/programs/xditview/Imakefile
+===================================================================
+--- xc/programs/xditview/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/xditview/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -7,7 +7,7 @@
@@ -681,9 +705,10 @@
DEPFONTLIBS = XftClientDepLibs
FONTLIBS = XftClientLibs
FONTDEFS = -DUSE_XFT -DXFREE86_FT2
-diff -ruN xc-old/programs/xdpyinfo/Imakefile xc/programs/xdpyinfo/Imakefile
---- xc-old/programs/xdpyinfo/Imakefile 2004-09-02 05:50:38.000000000 +0000
-+++ xc/programs/xdpyinfo/Imakefile 2004-10-26 09:59:37.321950544 +0000
+Index: xc/programs/xdpyinfo/Imakefile
+===================================================================
+--- xc/programs/xdpyinfo/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/xdpyinfo/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -34,7 +34,7 @@
XINPUTLIBS = $(XILIB)
#endif
@@ -693,9 +718,10 @@
XRENDERDEFINES = -DXRENDER
XRENDERDEPLIBS = $(DEPXRENDERLIB)
XRENDERLIBS = $(XRENDERLIB)
-diff -ruN xc-old/programs/xfd/Imakefile xc/programs/xfd/Imakefile
---- xc-old/programs/xfd/Imakefile 2004-04-23 19:54:47.000000000 +0000
-+++ xc/programs/xfd/Imakefile 2004-10-26 09:59:37.321950544 +0000
+Index: xc/programs/xfd/Imakefile
+===================================================================
+--- xc/programs/xfd/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/xfd/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -5,7 +5,7 @@
XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.5tsi Exp $
@@ -705,9 +731,10 @@
#endif
#if XFdUseRender
-diff -ruN xc-old/programs/xlogo/Imakefile xc/programs/xlogo/Imakefile
---- xc-old/programs/xlogo/Imakefile 2004-09-02 05:50:38.000000000 +0000
-+++ xc/programs/xlogo/Imakefile 2004-10-26 09:59:37.321950544 +0000
+Index: xc/programs/xlogo/Imakefile
+===================================================================
+--- xc/programs/xlogo/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/xlogo/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -5,7 +5,7 @@
XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.5tsi Exp $
@@ -717,9 +744,10 @@
#endif
#if BuildXprintLib && BuildXprintClients && BuildXaw
-diff -ruN xc-old/programs/xrandr/Imakefile xc/programs/xrandr/Imakefile
---- xc-old/programs/xrandr/Imakefile 2004-04-23 19:55:03.000000000 +0000
-+++ xc/programs/xrandr/Imakefile 2004-10-26 09:59:37.322950392 +0000
+Index: xc/programs/xrandr/Imakefile
+===================================================================
+--- xc/programs/xrandr/Imakefile.orig 2005-07-26 01:11:33.000000000 -0400
++++ xc/programs/xrandr/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -2,6 +2,7 @@
DEFINES=$(RANDRDEFINES)
@@ -728,9 +756,10 @@
LOCAL_LIBRARIES=$(XRANDRLIB) $(XRENDERLIB) $(XLIB)
SRCS=xrandr.c
-diff -ruN xc-old/programs/xterm/Imakefile xc/programs/xterm/Imakefile
---- xc-old/programs/xterm/Imakefile 2004-08-13 12:57:19.000000000 +0000
-+++ xc/programs/xterm/Imakefile 2004-10-26 09:59:37.322950392 +0000
+Index: xc/programs/xterm/Imakefile
+===================================================================
+--- xc/programs/xterm/Imakefile.orig 2005-07-30 12:06:07.000000000 -0400
++++ xc/programs/xterm/Imakefile 2005-07-30 12:12:47.000000000 -0400
@@ -99,7 +99,7 @@
UTF8SRC = charclass.c precompose.c wcwidth.c xutf8.c
UTF8OBJ = charclass.o precompose.o wcwidth.o xutf8.o
Modified: trunk/debian/patches/general/099s_selinux_support.diff
===================================================================
--- trunk/debian/patches/general/099s_selinux_support.diff 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/patches/general/099s_selinux_support.diff 2005-07-30 16:29:10 UTC (rev 436)
@@ -36,9 +36,9 @@
Index: xc/config/cf/linux.cf
===================================================================
---- xc-old/config/cf/linux.cf 2005-07-21 03:33:06.000000000 +0800
-+++ xc/config/cf/linux.cf 2005-07-21 03:34:00.000000000 +0800
-@@ -1114,3 +1114,57 @@
+--- xc/config/cf/linux.cf.orig 2005-07-30 12:14:56.000000000 -0400
++++ xc/config/cf/linux.cf 2005-07-30 12:21:02.000000000 -0400
+@@ -1114,3 +1114,59 @@
#ifndef XFree86ServerOSDefines
# define XFree86ServerOSDefines
#endif
@@ -46,8 +46,10 @@
+/*
+ * SELinux support
+ */
-+#ifndef HasSELinux
-+# define HasSELinux YES
++#if defined(__linux__)
++# ifndef HasSELinux
++# define HasSELinux YES
++# endif
+#endif
+
+#ifndef SELinuxDefines
@@ -98,8 +100,8 @@
+#endif
Index: xc/programs/xdm/session.c
===================================================================
---- xc-old/programs/xdm/session.c 2005-07-21 03:33:06.000000000 +0800
-+++ xc/programs/xdm/session.c 2005-07-21 03:34:00.000000000 +0800
+--- xc/programs/xdm/session.c.orig 2005-07-30 12:14:55.000000000 -0400
++++ xc/programs/xdm/session.c 2005-07-30 12:14:58.000000000 -0400
@@ -61,6 +61,11 @@
# include <krb5/krb5.h>
#endif
@@ -167,8 +169,8 @@
if (chdir (home) == -1) {
Index: xc/programs/xdm/Imakefile
===================================================================
---- xc-old/programs/xdm/Imakefile 2005-07-21 03:33:06.000000000 +0800
-+++ xc/programs/xdm/Imakefile 2005-07-21 03:34:00.000000000 +0800
+--- xc/programs/xdm/Imakefile.orig 2005-07-30 12:14:43.000000000 -0400
++++ xc/programs/xdm/Imakefile 2005-07-30 12:14:58.000000000 -0400
@@ -200,12 +200,13 @@
XDMCONFIGDIR = XdmConfigurationSubdirectory
SUBDIRS = $(GREET_DIR) $(XDMCONFIGDIR)
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/patches/series 2005-07-30 16:29:10 UTC (rev 436)
@@ -128,8 +128,6 @@
amd64/600_amd64_support.diff -p0
hurd/800_gnu_config.diff -p0
hurd/803_gnu_xterm_openpty.diff -p0
-freebsd/820_gnu-freebsd_config.diff -p0
-freebsd/823_gnu-freebsd_xterm.diff -p0
netbsd/840_netbsd_bsdLib.rules_fix.diff -p0
netbsd/841_netbsd_imake.c_fixes.diff -p0
netbsd/842_netbsd_NetBSD.cf_fixes.diff -p0
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-07-30 15:50:03 UTC (rev 435)
+++ trunk/debian/xserver-xorg.config.in 2005-07-30 16:29:10 UTC (rev 436)
@@ -46,6 +46,9 @@
# get machine architecture
ARCH=$(dpkg --print-installation-architecture)
+# get system name
+SYS=`uname -s || echo unknown`
+
debug_echo () {
# Syntax: debug_echo message ...
if [ -n "$DEBUG_XORG_DEBCONF" ] || [ "$DEBCONF_DEBUG" = "user" ] \
@@ -731,7 +734,7 @@
DRIVER_LIST=${DRIVER_LIST:=ati, chips, fbdev, glint, mga, nv, s3, s3virge, savage, sis, tdfx, trident, vga}
DEFAULT_DRIVER=fbdev
;;
- hurd-i386)
+ *-i386)
DRIVER_LIST=${DRIVER_LIST:=apm, ark, ati, chips, cirrus, cyrix, fbdev, glint, i128, i740, i810, imstt, mga, neomagic, newport, nsc, nv, rendition, s3, s3virge, savage, siliconmotion, sis, tdfx, tga, trident, tseng, vesa, vga, via, vmware}
DEFAULT_DRIVER=vesa
;;
@@ -908,7 +911,7 @@
# use fbcon kernel functions?
case "$ARCH" in
- alpha|hurd-i386|i386|amd64)
+ alpha|*-i386|i386|amd64)
USE_FBDEV=false
;;
*)
@@ -1270,13 +1273,21 @@
USING_DEVFS=
fi
-if [ -n "$USING_DEVFS" ]; then
- MOUSE_PORT_CHOICES="/dev/misc/psaux, /dev/tts/0, /dev/tts/1, /dev/tts/2, /dev/tts/3, /dev/input/mice, /dev/misc/atixl, /dev/gpmdata"
- DEFAULT_PORT="/dev/misc/psaux"
-else
- MOUSE_PORT_CHOICES="/dev/psaux, /dev/ttyS0, /dev/ttyS1, /dev/ttyS2, /dev/ttyS3, /dev/input/mice, /dev/atibm, /dev/sunmouse, /dev/gpmdata"
- DEFAULT_PORT="/dev/psaux"
-fi
+case "$SYS" in
+ Linux)
+ if [ -n "$USING_DEVFS" ]; then
+ MOUSE_PORT_CHOICES="/dev/misc/psaux, /dev/tts/0, /dev/tts/1, /dev/tts/2, /dev/tts/3, /dev/input/mice, /dev/misc/atixl, /dev/gpmdata"
+ DEFAULT_PORT="/dev/misc/psaux"
+ else
+ MOUSE_PORT_CHOICES="/dev/psaux, /dev/ttyS0, /dev/ttyS1, /dev/ttyS2, /dev/ttyS3, /dev/input/mice, /dev/atibm, /dev/sunmouse, /dev/gpmdata"
+ DEFAULT_PORT="/dev/psaux"
+ fi
+ ;;
+ GNU/kFreeBSD)
+ MOUSE_PORT_CHOICES="/dev/cuaa0, /dev/cuaa1, /dev/cuaa2, /dev/cuaa3, /dev/mse0, /dev/psm0, /dev/sysmouse, /dev/ums0, /dev/ums1, /dev/ums2, /dev/ums3"
+ DEFAULT_PORT="/dev/ums0"
+ ;;
+esac
if ! [ "x$XORG_FORCE_PROBE" = "xno" ]; then
# this will exit the loop immediatly
@@ -1339,11 +1350,11 @@
db_get xserver-xorg/config/inputdevice/mouse/port
case "$RET" in
- *psaux)
- MOUSE_PROTOCOL_CHOICES="PS/2, ImPS/2, GlidePointPS/2, NetMousePS/2, NetScrollPS/2, ThinkingMousePS/2, MouseManPlusPS/2, ExplorerPS/2"
+ *psaux|*psm*)
+ MOUSE_PROTOCOL_CHOICES="Auto, PS/2, ImPS/2, GlidePointPS/2, NetMousePS/2, NetScrollPS/2, ThinkingMousePS/2, MouseManPlusPS/2, ExplorerPS/2"
DEFAULT_PROTOCOL="PS/2"
;;
- *ttyS*|*tts/*)
+ *ttyS*|*tts/*|*cuaa*)
MOUSE_PROTOCOL_CHOICES="Auto, Microsoft, MouseSystems, GlidePoint, ThinkingMouse, ValuMouseScroll, MouseMan, Logitech, IntelliMouse, MMSeries, MMHitTab"
DEFAULT_PROTOCOL="Auto"
;;
@@ -1351,7 +1362,7 @@
MOUSE_PROTOCOL_CHOICES="ImPS/2"
DEFAULT_PROTOCOL="ImPS/2"
;;
- *atibm|*atixl|*sunmouse)
+ *atibm|*atixl|*sunmouse|*mse*)
MOUSE_PROTOCOL_CHOICES="BusMouse"
DEFAULT_PROTOCOL="BusMouse"
;;
@@ -1359,6 +1370,14 @@
MOUSE_PROTOCOL_CHOICES="IntelliMouse"
DEFAULT_PROTOCOL="IntelliMouse"
;;
+ *sysmouse)
+ MOUSE_PROTOCOL_CHOICES="SysMouse"
+ DEFAULT_PROTOCOL="SysMouse"
+ ;;
+ *ums*)
+ MOUSE_PROTOCOL_CHOICES="Auto"
+ DEFAULT_PROTOCOL="Auto"
+ ;;
esac
db_subst xserver-xorg/config/inputdevice/mouse/protocol choices $MOUSE_PROTOCOL_CHOICES
if ! expr "$MOUSE_PROTOCOL_CHOICES" : ".*,.*" > /dev/null 2>&1; then
Reply to: