tizen 2.3.1 releasetizen_2.4_mobile_releasetizen_2.3.1_releasesubmit/tizen_2.4/20151028.065530submit/tizen_2.3.1/20150915.084025accepted/tizen/2.4/mobile/20151029.025309tizen_2.4tizen_2.3.1accepted/tizen_2.4_mobile

24 files changed, 24 insertions, 4851 deletions

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..53c1215
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved 

+

+Permission is hereby granted, free of charge, to any person obtaining a

+copy of this software and associated documentation files (the "Software"),

+to deal in the Software without restriction, including without limitation

+the rights to use, copy, modify, merge, publish, distribute, sublicense,

+and/or sell copies of the Software, and to permit persons to whom the

+Software is furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice (including the next

+paragraph) shall be included in all copies or substantial portions of the

+Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+DEALINGS IN THE SOFTWARE.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index b09a1ab..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,73 +0,0 @@
-------------------------------------------------------
-Quick Guide To Patching This Package For The Impatient
-------------------------------------------------------
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with "dpkg-source -x"
-3. Run the "patch" target in debian/rules
-4. Create a new patch with "quilt new" (see quilt(1))
-5. Edit all the files you want to include in the patch with "quilt edit" 
-   (see quilt(1)).
-6. Write the patch with "quilt refresh" (see quilt(1))
-7. Run the "clean" target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to 
-debian/patches and add the name of the patch to debian/patches/series.
-
-------------------------------------
-Guide To The X Strike Force Packages
-------------------------------------
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-just need to be pulled into git.debian.org in a "upstream-*" branch.
-Otherwise, the upstream sources are manually installed in the Debian
-git repository.
-
-The .orig.tar.gz upstream source file could be generated using this
-"upstream-*" branch in the Debian git repository but it is actually
-copied from upstream tarballs directly.
-
-Due to X.org being highly modular, packaging all X.org applications
-as their own independent packages would have created too many Debian
-packages. For this reason, some X.org applications have been grouped
-into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
-x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
-Most packages, including the X.org server itself and all libraries
-and drivers are, however maintained independently.
-
-The Debian packaging is added by creating the "debian-*" git branch
-which contains the aforementioned "upstream-*" branch plus the debian/
-repository files.
-When a patch has to be applied to the Debian package, two solutions
-are involved:
-* If the patch is available in one of the upstream branches, it
-  may be git'cherry-picked into the Debian repository. In this
-  case, it appears directly in the .diff.gz.
-* Otherwise, the patch is added to debian/patches/ which is managed
-  with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the "debian-*" branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 49e8697..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,268 +0,0 @@
-xutils-dev (1:7.5-1slp2+2) unstable; urgency=low
-
-  * Remove a dependency with x11proto-core-dev
-    - Header files in xproto were copied into X11 directory
-    - imake, lndir and makedepend module use header files in X11 directory
-  * Git: 165.213.180.234:slp/pkgs/xorg/util/xutils-dev
-  * Tag: xutils-dev_7.5-1slp2+2
-
- -- Sung-Jin Park <sj76.park@samsung.com>  Wed, 16 Mar 2011 18:49:42 +0900
-
-xutils-dev (1:7.5-1slp2+1) unstable; urgency=low
-
-  * [X11R7.6] Upgrade the package
-  * Git: 165.213.180.234:slp/pkgs/xorg/util/xutils-dev
-  * Tag: xutils-dev_7.5-1slp2+1
-
- -- SooChan Lim <sc1.lim@samsung.com>  Mon, 03 Jan 2011 16:40:42 +0900
-
-xutils-dev (1:7.5+4) unstable; urgency=low
-
-  [ Robert Hooker ]
-  * util-macros 1.10.0.
-
-  [ Julien Cristau ]
-  * Bump Standards-Version to 3.9.0.
-  * Drop Conflicts/Replaces/Provides on imake, makedepend, xorg-build-macros
-    and xmkmf.  These packages are only in old ubuntu releases, and upgrades
-    from dapper to maverick are not supported AFAIK.
-
- -- Julien Cristau <jcristau@debian.org>  Sun, 11 Jul 2010 14:41:22 +0100
-
-xutils-dev (1:7.5+3) unstable; urgency=low
-
-  * util-macros 1.7.0.
-  * imake 1.0.3.
-  * Drop 01_netbsd_imake.c_fixes.diff.  Doesn't apply, and Debian/NetBSD seems
-    dead.
-  * Rediff 04_xutils-dev-debian.diff.
-  * Update imake section in debian/copyright from upstream COPYING.
-
- -- Julien Cristau <jcristau@debian.org>  Tue, 11 May 2010 14:31:01 +0200
-
-xutils-dev (1:7.5+2) unstable; urgency=low
-
-  [ Julien Cristau ]
-  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
-    good reason.  Thanks, Colin Watson!
-  * Remove myself from Uploaders
-
-  [ Brice Goglin ]
-  * util-macros 1.5.0, closes: #568335.
-
- -- Brice Goglin <bgoglin@debian.org>  Sun, 07 Feb 2010 11:41:23 +0100
-
-xutils-dev (1:7.5+1) unstable; urgency=low
-
-  * Add watch files and debian/rules target to download tarballs.
-  * New upstream releases:
-    - makedepend 1.0.2
-    - util-macros 1.4.2
-    - xorg-cf-files 1.0.3
-  * Drop 07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff, applied upstream.
-  * Update debian/copyright from util-macros/COPYING.
-
- -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 15:41:40 +0000
-
-xutils-dev (1:7.5~1) unstable; urgency=low
-
-  * util-macros 1.3.0.
-  * debian/rules: make sure we bail if one install command fails.
-  * Drop obsolete Pre-Depends on x11-common.  Bump Standards-Version to 3.8.3.
-
- -- Julien Cristau <jcristau@debian.org>  Fri, 11 Sep 2009 22:49:22 +0200
-
-xutils-dev (1:7.4+5) unstable; urgency=low
-
-  * Don't call dh_makeshlibs, silences lintian warning.
-  * Fix patches 01 and 02 to apply with -p1, to silence lintian.
-  * util-macros 1.2.2.
-  * Adjust debian/rules to parse space-separated DEB_BUILD_OPTIONS (policy
-    3.8), move building each subdir to its own rule, and allow building in
-    parallel.  Also call dh_install with --fail-missing to avoid building a
-    broken package.
-  * Bump Standards-Version to 3.8.2 due to the above change and the addition
-    of README.source from xsfbs.
-
- -- Julien Cristau <jcristau@debian.org>  Sun, 02 Aug 2009 15:10:23 +0200
-
-xutils-dev (1:7.4+4) unstable; urgency=low
-
-  * util-macros 1.2.1.
-
- -- Julien Cristau <jcristau@debian.org>  Fri, 19 Dec 2008 13:34:41 +0100
-
-xutils-dev (1:7.4+3) unstable; urgency=low
-
-  * Add a mention of xorg-macros in the long description, so apt-cache search
-    can find them.  Thanks, Eric Anholt!
-
- -- Julien Cristau <jcristau@debian.org>  Fri, 18 Jul 2008 20:01:34 +0200
-
-xutils-dev (1:7.4+2) unstable; urgency=low
-
-  * Extend 05_xaw_without_xp.diff to disable Xp from Xaw on hurd-i386
-    and try to disable it for kfreebsd-i386 as well.
-    Thanks Samuel Thibault, closes: #483093.
-  * Add myself to Uploaders.
-
- -- Brice Goglin <bgoglin@debian.org>  Fri, 13 Jun 2008 07:26:55 +0200
-
-xutils-dev (1:7.4+1) unstable; urgency=low
-
-  [ Timo Aaltonen ]
-  * debian/control:
-    - C/R/P: imake, makedepend, xorg-build-macros, xmkmf
-      Change from ubuntu to help upgrades from their earlier releases.
-
-  [ Julien Cristau ]
-  * util-macros 1.1.6.
-  * Add myself to Uploaders, remove Fabio and Branden with their permission.
-  * Bump Standards-Version to 3.7.3 (no changes).
-  * Add Vcs-* control fields.
-
- -- Julien Cristau <jcristau@debian.org>  Sat, 08 Mar 2008 02:57:06 +0100
-
-xutils-dev (1:7.2.ds2-1) unstable; urgency=low
-
-  [ Julien Cristau ]
-  * [xorg-cf-files] Add patch from upstream git to define GNUArchitecture on
-    GNU/kFreeBSD.  Thanks, Robert Millan (closes: #357582).
-
-  [ Brice Goglin ]
-  * [imake] Fix typo in 02_mkdirhier_rewrite.diff.
-    Thanks, A. Costa (closes: #306690).
-
-  [ Julien Cristau ]
-  * Update makedepend to 1.0.1.
-  * Upload to unstable.
-
- -- Julien Cristau <jcristau@debian.org>  Mon, 09 Apr 2007 03:55:00 +0200
-
-xutils-dev (1:7.2.ds-1) experimental; urgency=low
-
-  * Update util-macros to 1.1.5 (X11R7.2).
-  * autoreconf everything.
-
- -- Julien Cristau <jcristau@debian.org>  Sat, 17 Feb 2007 18:05:53 +0100
-
-xutils-dev (1:7.1.ds-6) unstable; urgency=high
-
-  * Add 06_font_path.diff. This fixes X11.tmpl so that imake-using apps will
-    install fonts to /usr/share/fonts/X11 and encodings to
-    /usr/share/fonts/X11/encodings, just like the xfonts packages. Thanks
-    Géraud Meyer for reporting the bug and Julien Cristau for finding the fix.
-    Closes: #403765
-
- -- David Nusinow <dnusinow@debian.org>  Tue, 19 Dec 2006 20:56:23 -0500
-
-xutils-dev (1:7.1.ds-5) unstable; urgency=low
-
-  * Remove obsolete qualifier about imake and old gcc conflict from long
-    package description. Thanks Kevin B. McCarty. Closes: #362141
-  * Add util-macros 1.1.2 to allow building docbook docs
-
- -- David Nusinow <dnusinow@debian.org>  Mon,  4 Dec 2006 19:06:35 -0500
-
-xutils-dev (1:7.1.ds-4) unstable; urgency=low
-
-  * Autoreconf to fix manpage suffix bugs on all platforms I'm aware of.
-    Thanks Robert Millan. Closes: #363483
-
- -- David Nusinow <dnusinow@debian.org>  Sat, 14 Oct 2006 12:23:58 -0400
-
-xutils-dev (1:7.1.ds-3) unstable; urgency=low
-
-  * New upstream release of util-macros (1.1.1). This makes our manpage
-    section patch obsolete.
-
- -- David Nusinow <dnusinow@debian.org>  Mon, 28 Aug 2006 21:10:13 +0000
-
-xutils-dev (1:7.1.ds-2) unstable; urgency=low
-
-  * Upload to unstable
-
- -- David Nusinow <dnusinow@debian.org>  Wed,  9 Aug 2006 21:48:23 +0000
-
-xutils-dev (1:7.1.ds-1) experimental; urgency=low
-
-  [ David Nusinow ]
-  * Re-version the package to upstream katamari release version. The ds is for
-    Debian Source, because bundling these apps together is a Debianism. The
-    apps in this package will all be from X11R7.1
-  * Update gccmakedep to 1.0.2
-  * Update imake to 1.0.2
-  * Update util-macros to 1.0.2
-  * Update xorg-cf-files to 1.0.2
-  * Add a series number for the xaw_without_xp patch
-  * Add 06_linux_manpage_suffixes.diff which now creates manpages without the
-    x suffix on linux
-    + Make use of this fix in this package by autoreconf'ing with the macros
-      containing this fix installed
-  * Move depends on xorg-x11 to pre-depends
-  * Bump standards version to 3.7.2.0
-  * Correct the mkdirhier manpage rewrite patch so that the manpage suffix is
-    correct
-  * Stop trying to put the debugging symbols somewhere. We're not going to
-    ship them unless there's a compelling reason to do so
-  * Run dh_install with --list-missing
-  * Bump debhelper compatibility to 5
-
-  [ Andres Salomon ]
-  * Update util-macros to 1.1.0.
-  * Update 06_linux_manpage_suffixes.diff for utils-macros 1.1.0.
-  * Test for -obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
-    idempotency fix.
-
- -- Andres Salomon <dilinger@debian.org>  Sun, 23 Jul 2006 21:49:56 -0400
-
-xutils-dev (1:1.0.2-3) unstable; urgency=low
-
-  * debian/patches/xaw-without-xp: update the templates to not pull in
-    libXp as a dependency of libXaw, since libxaw8 is being dropped and
-    this is therefore no longer the case.  Thanks to Daniel Schepler.
-    Closes: #363267.
-
- -- David Nusinow <dnusinow@debian.org>  Tue, 18 Apr 2006 19:53:55 -0400
-
-xutils-dev (1:1.0.2-2) unstable; urgency=low
-
-  * Add 03_xutils-dev-FHS.diff and 04_xutils-dev-debian.diff from Eugene Konev
-    and Steve Langasek. These should allow imake-using apps to build as in the
-    past. Thanks to both of them. (closes: #362886)
-
- -- David Nusinow <dnusinow@debian.org>  Sun, 16 Apr 2006 10:29:53 -0400
-
-xutils-dev (1:1.0.2-1) unstable; urgency=low
-
-  * Include missed .cf files. Thanks Giacomo Boffi and Russ Allbery.
-    (closes: #362439, #362678)
-
- -- David Nusinow <dnusinow@debian.org>  Sat, 15 Apr 2006 19:09:22 -0400
-
-xutils-dev (1:1.0.1-4) unstable; urgency=low
-
-  * Add x11proto-core-dev to build-depends. Thanks Lamont. (closes: #362177)
-
- -- David Nusinow <dnusinow@debian.org>  Thu, 13 Apr 2006 00:06:15 -0400
-
-xutils-dev (1:1.0.1-3) unstable; urgency=low
-
-  * Upload to unstable
-
- -- David Nusinow <dnusinow@debian.org>  Tue,  4 Apr 2006 19:36:30 -0400
-
-xutils-dev (1:1.0.1-2) experimental; urgency=low
-
-  * Port patches from trunk
-    + netbsd/841_netbsd_imake.c_fixes.diff
-    + general/099u_mkdirhier_rewrite.diff
-
- -- David Nusinow <dnusinow@debian.org>  Tue, 28 Feb 2006 23:42:18 -0500
-
-xutils-dev (1:1.0.1-1) experimental; urgency=low
-
-  [ David Nusinow ]
-  * First modular upload to Debian
-
- -- David Nusinow <dnusinow@debian.org>  Thu, 23 Feb 2006 20:30:18 -0500
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100755
index bc235f7..0000000
--- a/debian/control
+++ /dev/null
@@ -1,36 +0,0 @@
-Source: xutils-dev
-Section: x11
-Priority: optional
-Maintainer: Sung-Jin Park <sj76.park@samsung.com>, Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Sung-Jin Park <sj76.park@samsung.com>, SooChan Lim <sc1.lim@samsung.com>, David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Brice Goglin <bgoglin@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt
-Standards-Version: 3.9.0
-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git
-
-Package: xutils-dev
-Architecture: any
-Pre-Depends: x11-common (>= 1:7.0.0)
-Depends: ${shlibs:Depends}, ${misc:Depends}
-#Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
-Conflicts: xorg-build-macros (<= 1.0.1-1), util-macros-dev
-#Conflicts: imake (<= 1:1.0.1-1), makedepend (<= 1:1.0.0-1), xorg-build-macros (<= 1.0.1-1), xmkmf (<= 0.99.0-6), util-macros-dev
-Replaces: xorg-build-macros (<= 1.0.1-1), util-macros-dev
-#Replaces: imake (<= 1:1.0.1-1), makedepend (<= 1:1.0.0-1), xorg-build-macros (<= 1.0.1-1), xmkmf (<= 0.99.0-6), util-macros-dev
-Provides: xorg-build-macros
-#Provides: imake, makedepend, xorg-build-macros, xmkmf
-Description: X Window System utility programs for development
- xutils-dev provides a set of utility programs shipped with the X Window System
- that do not require the X libraries; many of these programs are useful
- even on a system that does not have any X clients or X servers installed.
- .
- The programs in this package include:
-  - ccmakedep, a version of makedepend which "does it right"
-  - imake, a C preprocessor interface to the make utility;
-  - lndir, a tool that creates a shadow directory of symbolic links to
-    another directory tree;
-  - makedepend, a tool to create dependencies in makefiles;
-  - makeg, a tool for making debuggable executables.
- .
- This package also contains xorg-macros.m4, a set of macros used in configure
- scripts of X.Org packages.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 0cfd573..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,171 +0,0 @@
-gccmakedep:
-
-  XFree86 code without an explicit copyright is covered by the following copy-
-  right/license:
-  
-  Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is fur-
-  nished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-  NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-  NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of the XFree86 Project shall not
-  be used in advertising or otherwise to promote the sale, use or other deal-
-  ings in this Software without prior written authorization from the XFree86
-  Project.
-
-imake:
-  Copyright (c) 1985, 1986, 1987, 1989, 1993, 1994, 1996, 1998 The Open Group
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-
-  Except as contained in this notice, the name of The Open Group shall
-  not be used in advertising or otherwise to promote the sale, use or
-  other dealings in this Software without prior written authorization
-  from The Open Group.
-
-  Copyright © 1999, 2000, 2003 by The XFree86 Project, Inc.  All Rights Reserved.
-
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the "Software"),
-  to deal in the Software without restriction, including without limitation
-  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-  and/or sell copies of the Software, and to permit persons to whom the
-  Software is furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-  THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-  OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-
-  Except as contained in this notice, the name of the XFree86 Project shall
-  not be used in advertising or otherwise to promote the sale, use or other
-  dealings in this Software without prior written authorization from the
-  XFree86 Project.
-
-lndir:
-
-  Copyright (c) 1990, 1998 The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-
-makedpend:
-
-  Copyright (c) 1993, 1994, 1998 The Open Group
-  
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-  
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-  Except as contained in this notice, the name of The Open Group shall not be
-  used in advertising or otherwise to promote the sale, use or other dealings
-  in this Software without prior written authorization from The Open Group.
-
-util-macros:
-  Copyright 2005 Red Hat, Inc.
-  
-  Permission to use, copy, modify, distribute, and sell this software
-  and its documentation for any purpose is hereby granted without
-  fee, provided that the above copyright notice appear in all copies
-  and that both that copyright notice and this permission notice
-  appear in supporting documentation, and that the name of Red Hat
-  not be used in advertising or publicity pertaining to distribution
-  of the software without specific, written prior permission.  Red
-  Hat makes no representations about the suitability of this software
-  for any purpose.  It is provided "as is" without express or implied
-  warranty.
-  
-  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  
-  ----------------------------------------------------------------------------
-  
-  Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
-  
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the "Software"),
-  to deal in the Software without restriction, including without limitation
-  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-  and/or sell copies of the Software, and to permit persons to whom the
-  Software is furnished to do so, subject to the following conditions:
-  
-  The above copyright notice and this permission notice (including the next
-  paragraph) shall be included in all copies or substantial portions of the
-  Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  DEALINGS IN THE SOFTWARE.
diff --git a/debian/patches/02_mkdirhier_rewrite.diff b/debian/patches/02_mkdirhier_rewrite.diff
deleted file mode 100644
index d2f5d88..0000000
--- a/debian/patches/02_mkdirhier_rewrite.diff
+++ /dev/null
@@ -1,314 +0,0 @@
-$Id: 099u_mkdirhier_rewrite.diff 480 2005-08-02 20:14:26Z branden $
-
-Reimplement mkdirhier; see Debian #141347 and #232357 for some reasons why.
-
-This shell script and manpage by Branden Robinson.
-
-Not submitted upstream to XFree86 or X.Org.
-
-Index: a/imake/mkdirhier
-===================================================================
---- a/imake/mkdirhier	(revision 309)
-+++ b/imake/mkdirhier	(working copy)
-@@ -1,67 +1,94 @@
- #!/bin/sh
--# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $
--# Courtesy of Paul Eggert
- 
--newline='
--'
--IFS=$newline
-+# Copyright 2005 Branden Robinson.
- 
--case ${1--} in
---*) echo >&2 "mkdirhier: usage: mkdirhier directory ..."; exit 1
--esac
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following condition:
-+#
-+#     The above copyright notice and this permission notice shall be
-+#     included in all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- 
--status=
-+# I rewrote Paul Eggert's script in POSIX shell because it was a little
-+# odd, and did not confine itself to puritantical pre-POSIX conventions.
-+# For example, in one place it used:
-+#   case ${1--} in
-+#   -*)
-+# to test for $1 being null, presumably due to fears that test -n and -z
-+# will not be available.  Yet later in the script, test -n was used.
-+#
-+# This seemed quite silly.  I decided to rewrite it since I am arrgoant
-+# enough to think I know what I'm doing in POSIX shell.
-+#
-+# If someone needs a pre-POSIX version of mkdirhier, they'll probably need to
-+# turn to someone else, as I have no idea where such a thing is specified.
- 
--for directory
--do
--	case $directory in
--	'')
--		echo >&2 "mkdirhier: empty directory name"
--		status=1
--		continue;;
--	*"$newline"*)
--		echo >&2 "mkdirhier: directory name contains a newline: \`\`$directory''"
--		status=1
--		continue;;
--	///*) prefix=/;; # See Posix 2.3 "path".
--	//*) prefix=//;;
--	/*) prefix=/;;
--	-*) prefix=./;;
--	*) prefix=
--	esac
-+set -e
- 
--	IFS=/
--	set x $directory
--	case $2 in
--	    */*)	# IFS parsing is broken
--		IFS=' '
--		set x `echo $directory | tr / ' '`
--		;;
--	esac
--	IFS=$newline
--	shift
-+PROGNAME=${0##*/}
-+STATUS=0
- 
--	for filename
--	do
--		path=$prefix$filename
--		prefix=$path/
--		shift
-+usage() {
-+    cat <<EOF
-+usage: $PROGNAME DIRECTORY ...
-+Create each directory DIRECTORY, also creating intermediate directories in the
-+specified hierarchy as necessary.
- 
--		test -d "$path" || {
--			paths=$path
--			for filename
--			do
--				if [ -n "$filename" -a "$filename" != "." ]; then
--					path=$path/$filename
--					paths=$paths$newline$path
--				fi
--			done
-+Note: Use "mkdir -p" instead of "$PROGNAME" if the system supports it.
-+EOF
-+}
- 
--			mkdir $paths || status=$?
-+makedir () {
-+    FUNC_STATUS=0
-+    # Does the desired directory already exist?
-+    if ! [ -d "$1" ]; then
-+        # Is a directory hierarchy specified (i.e., are any slashes in the
-+        # argument)?
-+        PARENT=${1%/*}
-+        if [ -n "$PARENT" ] && [ "$PARENT" != "$1" ]; then
-+            # Yes; does the desired directory's immediate parent exist?
-+            if ! [ -d "$PARENT" ]; then
-+                # No; push it onto the stack.  If that fails, return
-+                # immediately, as we know later calls will also fail.  E.g., if
-+                # we are asked to create /usr/bin/foo/bar/baz/quux and
-+                # /usr/bin/foo fails, we don't have to even try anything deeper
-+                # in the hierarchy.
-+                if ! makedir "$PARENT"; then
-+                    return $FUNC_STATUS
-+                fi
-+            fi
-+        fi
-+        mkdir "$1" || FUNC_STATUS=$?
-+    fi
-+    return $FUNC_STATUS
-+}
- 
--			break
--		}
--	done
--  done
-+if [ -z "$1" ]; then
-+    usage >&2
-+    exit 64
-+fi
- 
--exit $status
-+while [ -n "$1" ]; do
-+    ARG="$1"
-+    makedir "$ARG" || \
-+    {
-+        STATUS=$?
-+        echo "$PROGNAME: could not create directory \"$ARG\"" >&2
-+    }
-+    shift
-+done
-+
-+exit $STATUS
-+
-+# vim:set ai et sts=4 sw=4 tw=80:
-Index: a/imake/mkdirhier.man
-===================================================================
---- a/imake/mkdirhier.man	(revision 309)
-+++ b/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
--.\" 
--.\" Permission to use, copy, modify, distribute, and sell this software and its
--.\" documentation for any purpose is hereby granted without fee, provided that
--.\" the above copyright notice appear in all copies and that both that
--.\" copyright notice and this permission notice appear in supporting
--.\" documentation.
--.\" 
--.\" The above copyright notice and this permission notice shall be included in
--.\" all copies or substantial portions of the Software.
--.\" 
-+.\" Copyright 2005 Branden Robinson.
-+.\"
-+.\" Permission is hereby granted, free of charge, to any person obtaining a
-+.\" copy of this software and associated documentation files (the "Software"),
-+.\" to deal in the Software without restriction, including without limitation
-+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+.\" and/or sell copies of the Software, and to permit persons to whom the
-+.\" Software is furnished to do so, subject to the following condition:
-+.\"
-+.\"     The above copyright notice and this permission notice shall be
-+.\"     included in all copies or substantial portions of the Software.
-+.\"
- .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- .\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
--.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
--.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
--.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
--.\" SOFTWARE.
--.\" 
--.\" Except as contained in this notice, the name of The Open Group shall not 
--.\" be used in advertising or otherwise to promote the sale, use or other 
--.\" dealing in this Software without prior written authorization from The 
--.\" Open Group.
--.\"
--.\" $XFree86: xc/config/util/mkdirhier.man,v 1.2 2001/01/27 18:19:55 dawes Exp $
--.\"
--.TH MKDIRHIER 1 __xorgversion__
-+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+.\" SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+.\" DEALINGS IN THE SOFTWARE.
-+.TH mkdirhier 1  __xorgversion__
- .SH NAME
--mkdirhier \- makes a directory hierarchy
-+mkdirhier \- create a directory hierarchy
- .SH SYNOPSIS
- .B mkdirhier
--directory ...
-+.I directory
-+\&...
- .SH DESCRIPTION
--The
--.I mkdirhier
--command creates the specified directories. Unlike
--.I mkdir
--if any of the parent directories of the specified directory
--do not exist, it creates them as well.
-+.B mkdirhier
-+creates the specified directories.
-+Unlike some versions of
-+.BR mkdir ,
-+if any of the parent directories of the specified directory do not exist,
-+.B mkdirhier
-+creates them as well.
-+.PP
-+.B mkdirhier
-+is a wrapper for
-+.BR mkdir ;
-+systems with
-+.BR mkdir (__osmansuffix__)
-+implementations conformant with the Single Unix Specification may simply
-+use
-+.B mkdir \-p
-+instead \(em this includes all systems using the GNU Core Utilities'
-+version of
-+.BR mkdir .
-+.SH DIAGNOSTICS
-+If
-+.B mkdirhier
-+is not supplied with any arguments, a usage message is printed.
-+.PP
-+.B mkdirhier
-+prefixes its diagnostic messages with the name under which it was invoked,
-+followed by a colon (\(oq:\(cq) so that its messages can be distinguished
-+from others.
-+.TP
-+.B could not create directory \(dq\fIdirectory\fP\(dq
-+indicates that there was a failure while creating
-+.IR directory .
-+This message will likely be preceded by a diagnostic message from
-+.BR mkdir .
-+.SH "EXIT STATUS"
-+.TP
-+.B 64
-+.B mkdirhier
-+was not given any directory names to create.
-+.PP
-+.B mkdirhier
-+otherwise exits with the exit status of the last
-+.B mkdir
-+command that failed.
-+.SH BUGS
-+.B mkdirhier
-+does not create all the requested directories as an atomic operation;
-+therefore, it is is susceptible to race conditions.
-+For example, if
-+.B mkdirhier
-+is directed to create a hierarchy
-+.I a/b/c/d
-+and any of
-+.IR a/ ,
-+.IR b/ ,
-+or
-+.I c/
-+do not yet exist, any of the newly-created directories can be removed
-+and/or replaced by a symbolic link to another location in the window of
-+time after
-+.B mkdirhier
-+creates a directory and the directory immediately below it.
-+This means that failures can be provoked (since
-+.B mkdir
-+will fail to create a directory in a directory that does not already
-+exist),
-+or directories may be created in unexpected locations.
-+The same limitation holds for multiple directory arguments to
-+.BR mkdirhier ;
-+given two arguments
-+.I a/b/c/d
-+and
-+.IR a/b/c/f ,
-+it is possible for the directory hierarchy
-+.I a/b/c
-+to be disrupted in the time between the processing of the two arguments.
-+To avoid these problems, use
-+.B mkdir \-p
-+instead, or do not use
-+.B mkdirhier
-+to create directories in parts of the filesystem where untrusted users can
-+manipulate them.
- .SH "SEE ALSO"
--mkdir(1)
-+.BR mkdir (__osmansuffix__)
diff --git a/debian/patches/03_xutils-dev-FHS.diff b/debian/patches/03_xutils-dev-FHS.diff
deleted file mode 100644
index f8de8bb..0000000
--- a/debian/patches/03_xutils-dev-FHS.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: xutils-dev-1.0.2/xorg-cf-files/linux.cf
-===================================================================
---- 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
- 
-+#ifndef ProjectRoot
-+# define ProjectRoot   /usr
-+#endif
-+#ifndef ManDirectoryRoot
-+# define ManDirectoryRoot      /usr/share/man
-+#endif
-+#ifndef AlternateUsrLibDir
-+# define AlternateUsrLibDir NO
-+#endif
-+#ifndef AlternateIncRoot
-+# define AlternateIncRoot NO
-+#endif
-+
- #ifndef LinuxBinUtilsMajorVersion
- # define LinuxBinUtilsMajorVersion	DefaultLinuxBinUtilsMajorVersion
- #endif
diff --git a/debian/patches/04_xutils-dev-debian.diff b/debian/patches/04_xutils-dev-debian.diff
deleted file mode 100644
index f387c4f..0000000
--- a/debian/patches/04_xutils-dev-debian.diff
+++ /dev/null
@@ -1,2667 +0,0 @@
-Index: xutils-dev/xorg-cf-files/bsdLib.rules
-===================================================================
---- xutils-dev.orig/xorg-cf-files/bsdLib.rules
-+++ xutils-dev/xorg-cf-files/bsdLib.rules
-@@ -13,6 +13,12 @@
- #define UseElfFormat NO
- #endif
- 
-+#if NetBSDDistribution == NetBSDDebian
-+# ifndef SharedOldX
-+#  define SharedOldX NO
-+# endif
-+#endif /* Debian */
-+
- #if !UseElfFormat
- /* a.out shared libs */
- #ifndef HasSharedLibraries
-@@ -91,6 +97,34 @@
- 
- #endif /* SharedDepLibraryTarget */
- 
-+/*
-+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
-+ */
-+#ifndef SharedDepCplusplusLibraryTarget
-+#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
-+AllTarget(Concat(lib,libname.so.rev))					@@\
-+									@@\
-+Concat(lib,libname.so.rev):  deplist					@@\
-+	$(RM) $@~							@@\
-+	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
-+		(cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-+		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
-+		LinkBuildSonameLibrary($$SONAME)			@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+	$(RM) Concat(lib,libname.so)					@@\
-+	$(LN) $@ Concat(lib,libname.so)					@@\
-+	LinkBuildLibrary($@)						@@\
-+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-+									@@\
-+clean::									@@\
-+	@SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
-+	set -x; $(RM) $$SONAME						@@\
-+	$(RM) Concat(lib,libname.so)					@@\
-+	$(RM) Concat(lib,libname.so.rev)
-+
-+#endif /* SharedDepCplusplusLibraryTarget */
-+
- #ifndef SharedDepModuleTarget
- #define SharedDepModuleTarget(name,deps,solist)				@@\
- AllTarget(name)								@@\
-Index: xutils-dev/xorg-cf-files/gnu.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/gnu.cf
-+++ xutils-dev/xorg-cf-files/gnu.cf
-@@ -17,16 +17,231 @@
- #ifndef OSTeenyVersion
- #define OSTeenyVersion		DefaultOSTeenyVersion
- #endif
--XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
- 
--#define GNUSourceDefines      -D_POSIX_C_SOURCE=199309L \
--                              -D_POSIX_SOURCE -D_XOPEN_SOURCE \
--                              -D_BSD_SOURCE -D_SVID_SOURCE
-+#ifndef HasGhostScript
-+# define HasGhostScript YES
-+#endif
-+#ifndef BuildPDFdocs
-+# define BuildPDFdocs NO
-+#endif
-+
-+#ifndef GnuBinUtilsMajorVersion
-+# define GnuBinUtilsMajorVersion	DefaultGnuBinUtilsMajorVersion
-+#endif
- 
--XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
-+XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-+XCOMM libc:	(GnuCLibMajorVersion./**/GnuCLibMinorVersion./**/GnuCLibTeenyVersion)
-+XCOMM binutils:	(GnuBinUtilsMajorVersion)
- 
--#define XawI18nDefines        -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
-+#define HasDevRandom		NO
-+#define PollDevRandom		NO
- 
-+/* Path setup. */
-+# ifndef NothingOutsideProjectRoot
-+#  define NothingOutsideProjectRoot	NO
-+# endif
-+# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
-+#  define SystemManDirectory	/usr/share/man
-+# endif
-+
-+/* Default GCC options. */
-+# ifndef DefaultGcc2OptimizeOpt
-+#  define DefaultGcc2OptimizeOpt	-O2
-+# endif
-+
-+# define HasPam			YES
-+
-+# if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
-+#  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)
-+/* the relative symlink created by this rule causes problems for us */
-+# define InstallAppDefFiles	YES
-+# 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 */
-+# endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */
-+
-+# define SharedLibXdmGreet	NO
-+# define LinkGLToUsrInclude	NO
-+# define LinkGLToUsrLib		NO
-+# define FSUseSyslog		YES
-+
-+# define DriverManSuffix       4x
-+# define DriverManDir          $(MANSOURCEPATH)4
-+
-+# define MiscManSuffix         7x
-+# define MiscManDir            $(MANSOURCEPATH)7
-+
-+# define ProjectManSuffix	x
-+
-+# define DebianMaintainer      YES
-+
-+# ifdef DebianMaintainer
-+
-+#  ifndef XorgCustomVersion
-+#   define XorgCustomVersion		"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 SharedLibFont			NO
-+#  define SharedLibGlu			YES
-+#  define NormalLibGlu			YES
-+#  define BuildFontCache		YES
-+
-+#  define BuildAllSpecsDocs		NO
-+#  ifndef BuildSpecsDocs
-+#   define BuildSpecsDocs		YES
-+#  endif
-+#  define SpecsDocDirs			BDF CTEXT FSProtocol GL ICCCM ICE PM \
-+					Render SM X11 XDMCP XIM XLFD XProtocol \
-+					Xaw Xext Xi Xmu Xserver Xt Xv XvMC \
-+					i18n rstart xfs xterm xtrans
-+#  define XkbServerDefines		-DNOISY
-+#  define BuildHtmlManPages		NO
-+
-+#  define DontPreprocessManPages	NO
-+
-+/* We have a local patch that defines PicLibraryTarget(), instead of upstream's
-+ * method. */
-+#  define StaticNeedsPicForShared	NO
-+
-+/* Some libraries changed compilation method from static to shared and they do not
-+ * ship header files.
-+ * Temporary revert the build to static until all the changes will be investigated
-+ * properly
-+ */
-+#  define SharedLibXau                  YES
-+#  define SharedLibXdmcp                YES
-+#  define NormalOldX                    NO
-+#  define DebugOldX                     NO
-+#  define SharedOldX                    NO
-+#  define SharedLibDmx                  YES
-+#  define SharedLibGLw                  NO
-+#  define SharedLibFont                 NO
-+#  define SharedLibFontEnc              NO
-+#  define SharedLibXfontcache           NO
-+#  define BuildFreetypeDlModule         NO
-+
-+#  define KernelVersionInBanner		YES
-+
-+/* We don't want XRX. */
-+#  define BuildPlugin			NO
-+
-+/* The TT/Meltho fonts are all under non-free licences, except for BitStream
-+ * Vera, which is provided by an external package anyway. */
-+#  define BuildTrueTypeFonts		NO
-+#  define BuildBethMarduthoFonts	NO
-+
-+#  define MakeDllModules		YES
-+
-+/* All the following are fulfilled by Build-Depends. */
-+#  define BuildRman			NO
-+#  define RmanCmd			/usr/bin/rman
-+#  define RmanOptions			/**/
-+#  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
-+#  define BuildExpatLibrary		NO
-+#  define HasExpat			YES
-+#  define ExpatIncDirStandard		YES
-+#  define BuildFontconfigLibrary	NO
-+#  define HasFontconfig			YES
-+#  define UseFontconfig			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 BuildXftLibrary		NO
-+#  define HasXftLibrary			YES
-+#  define BuildFreetype2Library		NO
-+#  define HasFreetype2			YES
-+#  define FontLibSharedFreeType		NO
-+#  define HasLatex			YES
-+#  define HasGroffHtml			YES
-+
-+/*
-+ * The XFree86 Debian package no longer builds the Xprt server, in favor
-+ * of a separate xprint package.  We do still build the library,
-+ * but only when we're not building servers only, so it gets built in the
-+ * normal build, but not -dbg (as it requires libXt headers).
-+ */
-+#  define XprtServer			NO
-+#  define BuildXprintLib		!BuildServersOnly
-+
-+#  ifdef UseInstalled
-+#   define RenderLibraryDir		/usr
-+#   define XftLibraryDir		/usr
-+#   define XcursorLibraryDir		/usr
-+#  else /* We have a special hack to find these. */
-+#   define RenderLibraryDir		$(TOP)/../../imports
-+#   define XftLibraryDir		$(TOP)/../../imports
-+#   define XcursorLibraryDir		$(TOP)/../../imports
-+#  endif
-+
-+/* Wraphelp.c magic is supplied via a custom patch. */
-+#  define HasXdmAuth			YES
-+
-+#  define HasGlide2			NO
-+#  define HasGlide3			NO
-+
-+/* Enable extended instruction set support. */
-+#  ifdef i386Architecture
-+#   define HasX86Support		YES
-+#   define HasMMXSupport		YES
-+#   define Has3DNowSupport		YES
-+#   define HasSSESupport		YES
-+#  endif /* i386Architecture */
-+# endif /* DebianMaintainer */
-+
-+#ifndef BinUtilsMajorVersion
-+# define BinUtilsMajorVersion	GnuBinUtilsMajorVersion
-+#endif
-+
-+#ifndef GnuLocaleDefines
-+# define GnuLocaleDefines	/**/
-+#endif
-+
-+#ifndef  GnuAdditionalIncludes
-+# define GnuAdditionalIncludes	/**/
-+#endif
-+
-+#ifndef GnuGnuSourceDefines
-+# ifdef UseInstalled
-+#  define GnuGnuSourceDefines	/**/
-+# else
-+#  define GnuGnuSourceDefines	-D_GNU_SOURCE
-+# endif
-+#endif
-+
-+# define GnuSourceDefines	-D_POSIX_C_SOURCE=199309L \
-+				-D_POSIX_SOURCE -D_XOPEN_SOURCE \
-+				-D_BSD_SOURCE -D_SVID_SOURCE \
-+				GnuAdditionalIncludes GnuGnuSourceDefines \
-+				GnuLocaleDefines
-+# define XawI18nDefines		-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
- #define HasPosixThreads         YES
- #define ThreadedX               YES
- #define HasThreadSafeAPI        YES
-@@ -36,35 +251,132 @@
- #ifndef HasLibCrypt
- #define HasLibCrypt             YES
- #endif
-+/* netscape wraps select but not poll as of communicator 4.72 */
-+# ifndef HasPoll
-+#  define HasPoll		NO
-+# endif
-+
-+#ifndef InstallXloadSetGID
-+#define InstallXloadSetGID	NO
-+#endif
-+
-+#ifndef BuildIPv6
-+#define BuildIPv6		NO
-+#endif
-+
-+#ifndef HasLinuxInput
-+# define HasLinuxInput NO
-+#endif
-+
-+#ifndef JoystickSupport
-+# define JoystickSupport	NO
-+#endif
-+#ifndef HasLinuxJoystick
-+# define HasLinuxJoystick	NO
-+#endif
-+
-+#define LibtoolMinorVersions	YES
-+
-+#ifndef HasMTRRSupport
-+# define HasMTRRSupport	NO
-+#endif
-+
-+#ifndef XF86INT10_BUILD
-+# define XF86INT10_BUILD	X86EMU_GENERIC
-+#endif
-+
-+#ifndef BuildXF86DRI
-+#  define BuildXF86DRI	NO
-+#endif
-+
-+#ifndef HasAgpGart
-+# define HasAgpGart	NO
-+#endif
-+
-+#ifndef HasSSESupport
-+#  if defined(i386Architecture)
-+#    define HasSSESupport		YES
-+#  endif
-+#endif
-+
-+#ifndef HasMMXSupport
-+#  if defined(i386Architecture)
-+#    define HasMMXSupport		YES
-+#  endif
-+#endif
-+
-+#ifndef Has3DNowSupport
-+#  if defined(i386Architecture)
-+#    define Has3DNowSupport		YES
-+#  endif
-+#endif
- 
- #ifndef BuildXF86RushExt
- # define BuildXF86RushExt	YES
- #endif
- 
-+#ifndef LinuxFBDevSupport
-+# define LinuxFBDevSupport	NO
-+#endif
-+
-+#define SourceDefines		GnuSourceDefines
-+
- #define BuildLibPathVar		LD_LIBRARY_PATH
- #define GccUsesGas		YES
- #define UseGas			YES
- #define GnuCpp			YES
-+#ifndef HasDlopen
- #define HasDlopen		YES
-+#endif
-+#define HasWeakSymbols		YES
- #ifndef HasShadowPasswd
- #  define HasShadowPasswd	YES
- #endif
- #define HasPutenv		YES
--
--XCOMM Not implemented and will always fail.
- #ifndef HasShm
--# define HasShm			YES
-+#define HasShm			YES
-+#endif
-+
-+#ifndef HasSecureRPC
-+# define HasSecureRPC		YES
- #endif
- 
- #define HasBSD44Sockets		YES
- #define HasSockets		YES
-+#ifndef HasSnprintf
- #define HasSnprintf		YES
-+#endif
- #define HasMkstemp		YES
-+#ifndef HasGetresuid
-+#define HasGetresuid		YES
-+#endif
-+#ifndef HasUsableFileMmap
- #define HasUsableFileMmap	YES
-+#endif
- #ifndef HasNCurses
- #define HasNCurses		YES
- #endif
- 
-+#ifndef HasGroff
-+#define HasGroff		YES
-+#endif
-+
-+#ifndef HasZlib
-+#define HasZlib			YES
-+#endif
-+
-+#ifndef HasLibpng
-+#define HasLibpng		YES
-+#endif
-+
-+#ifndef HasExpat
-+# define HasExpat		YES
-+#endif
-+
-+#ifndef HasFreetype2
-+# define HasFreetype2		YES
-+#endif
-+
- #define AvoidNullMakeCommand	YES
- #ifndef DebuggableLibraries
- #define DebuggableLibraries	NO
-@@ -84,32 +396,64 @@
- #define UseStaticTermcapLib	NO
- #endif
- 
-+#ifndef HasCookieMaker
-+#define HasCookieMaker		YES
-+#define MkCookieCmd		mcookie
-+#endif
-+
-+#ifndef BourneShell
-+/*
-+ * This will cause builds/installs to terminate on errors, as on other
-+ * platforms.
-+ */
-+#define BourneShell		/bin/sh -e
-+#endif
-+
- #define MkdirHierCmd		mkdir -p
-+
-+#ifndef DoLoadableServer
-+# define DoLoadableServer	YES
-+#endif
-+
-+
- #ifndef CcCmd
- #define CcCmd			gcc
-+#   define CplusplusCmd		c++
- #endif
- #ifndef AsCmd
--#define AsCmd			as
-+#   define AsCmd		CcCmd -c -x assembler
- #endif
-+#  define AsmDefines		-D__ELF__
- #ifndef LdCmd
--#define LdCmd			ld
-+#   define LdCmd		CcCmd -nostdlib
-+#  endif
-+#  ifndef GnuUsesNcurses
-+#    define GnuUsesNcurses	YES
- #endif
--
--#define AsmDefines		-D__ELF__
--#define CplusplusCmd		c++
- #ifndef TermcapLibrary
- #if UseStaticTermcapLib
-+#    if GnuUsesNcurses
- #define TermcapLibrary		StaticLibrary(/usr/lib,ncurses)
- #else
-+#     define TermcapLibrary	StaticLibrary(/usr/lib/termcap,termcap)
-+#    endif
-+#   else
-+#    if GnuUsesNcurses
- #define TermcapLibrary		-lncurses
-+#    else
-+#     define TermcapLibrary	-ltermcap
- #endif
- #endif
--#ifndef DoLoadableServer
--#define DoLoadableServer	YES
- #endif
-+
-+/*
-+ * Some older distros still need /lib/cpp.  There's probably a better
-+ * test, but this handles the older Red Hat releases at least.
-+ */
- #ifndef CppCmd
--#define CppCmd			/lib/cpp
-+# define CppCmd		cpp
- #endif
-+
- #define YaccCmd			bison -y
- #define LexCmd			flex -l
- #define HasFlex			YES
-@@ -125,50 +469,68 @@
- #define StandardCppDefines	StandardDefines
- 
- #define HasVarRun		YES
-+#ifndef VarDbDirectory
- #define VarDbDirectory		$(VARDIR)/lib
-+#endif
-+
-+#ifndef OSXInputDrivers
-+# define OSXInputDrivers1	/**/
-+# define OSXInputDrivers2	/**/
-+# define OSXInputDrivers	OSXInputDrivers1 OSXInputDrivers2
-+#endif
- 
--XCOMM i386Architecture
--#define OptimizedCDebugFlags	DefaultGcc2i386Opt
--#define GNUMachineDefines	-D__i386__
-+#define HasPlugin			YES
-+#define VendorHasX11R6_3libXext	YES	/* XC or XFree86 >= 3.3.1 */
-+
-+#ifdef i386Architecture
-+# ifndef OptimizedCDebugFlags
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
-+# endif
-+# define GnuMachineDefines	-D__i386__
- #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
- #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
--#define HasPlugin		YES
--#define VendorHasX11R6_3libXext	YES
-+#endif /* i386Architecture */
- 
- #ifndef StandardDefines
--#define StandardDefines		GNUMachineDefines GNUSourceDefines
-+# define StandardDefines	-DGnu GnuMachineDefines GnuSourceDefines
- #endif
- 
-+#ifndef DlLibrary
- #define DlLibrary		-rdynamic -ldl
-+#endif
- 
- #define ServerExtraSysLibs	/**/
- 
--#define ConnectionFlags		-DUNIXCONN -DTCPCONN
--
--/* Some of these man page defaults are overriden in the above OS sections */
--#ifndef ManSuffix
--# define ManSuffix	1x
-+#ifndef PamLibraries
-+#define PamLibraries		-lpam DlLibrary
- #endif
--#ifndef ManDir
--# define ManDir		$(MANSOURCEPATH)1
--#endif
--#ifndef LibManSuffix
--# define LibManSuffix	3x
--#endif
--#ifndef LibmanDir
--# define LibmanDir	$(MANSOURCEPATH)3
-+
-+#ifndef PamMiscLibraries
-+#define PamMiscLibraries	-lpam_misc
- #endif
--#ifndef FileManSuffix
--# define FileManSuffix	5x
-+
-+#ifndef HasDECnet
-+#define HasDECnet		NO
- #endif
--#ifndef FileManDir
--# define FileManDir	$(MANSOURCEPATH)5
-+#if HasDECnet
-+# define ConnectionFlags	-DUNIXCONN -DTCPCONN -DDNETCONN
-+# define ExtraLibraries		-ldnet
-+#else
-+#define ConnectionFlags		-DUNIXCONN -DTCPCONN
- #endif
- 
- #ifndef StaticLibrary
- #define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
- #endif
- 
-+#ifndef LinkGLToUsrLib
-+# define LinkGLToUsrLib		YES
-+#endif
-+# ifndef LinkGLToUsrInclude
-+# define LinkGLToUsrInclude	YES
-+#endif
-+
-+
- #define HasGnuMake	YES
- 
- #define MakeNamedTargetSubdir(dir,flags,subname)\
-@@ -176,12 +538,16 @@
- 
- #define ArchitectureDefines	-DGNU_ARCHITECTURE
- 
--#define XserverNeedsSetUID	YES
-+#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
-+#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
- 
--#include <gnuLib.rules>
--
--XCOMM XXX Might need this if they are not careful with slashes.
--XCOMM #define DirFailPrefix -
-+#ifndef BuildDmx
-+#define BuildDmx	YES
-+#endif
- 
-+#include <gnuLib.rules>
- #include <xorg.cf>
- 
-+#ifndef XFree86ServerOSDefines
-+# define XFree86ServerOSDefines
-+#endif
-Index: xutils-dev/xorg-cf-files/gnuLib.rules
-===================================================================
---- xutils-dev.orig/xorg-cf-files/gnuLib.rules
-+++ xutils-dev/xorg-cf-files/gnuLib.rules
-@@ -17,7 +17,6 @@
- #define ForceNormalLib NO
- #endif
- 
--XCOMM XXX To rpath or not to rpath...
- #ifndef UseRpath
- #define UseRpath NO
- #endif
-@@ -26,10 +25,13 @@
- #define SharedOldX NO
- #endif
- 
--#undef SpecialMalloc
-+#ifndef SpecialMalloc
- #define SpecialMalloc NO
-+#endif
- 
-+# ifndef BaseShLibReqs
- #define BaseShLibReqs   -lc
-+# endif
- 
- #ifndef SharedDataSeparation
- #define SharedDataSeparation NO
-@@ -45,7 +47,7 @@
- #endif
- #ifndef RpathLoadFlags
- #if UseRpath
--#define RpathLoadFlags -Wl,-rpath=$(USRLIBDIRPATH)
-+#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
- #else
- #define RpathLoadFlags /**/
- #endif
-@@ -54,7 +56,7 @@
- #define LibraryRpathLoadFlags RpathLoadFlags
- #endif
- #ifndef SharedLibraryLoadFlags
--#define SharedLibraryLoadFlags -shared LibraryRpathLoadFlags
-+#  define SharedLibraryLoadFlags -shared
- #endif
- #ifndef PositionIndependentCFlags
- #define PositionIndependentCFlags -fPIC
-@@ -63,12 +65,13 @@
- #define PositionIndependentCplusplusFlags -fPIC
- #endif
- #ifndef ExtraLoadFlags
--#ifdef UseInstalled
--XCOMM XXX Maybe superfluous.
--#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
--#else
--#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
-+#  define ExtraLoadFlags RpathLoadFlags
-+# endif
-+# ifndef HardCodeLibdirFlag
-+#  define HardCodeLibdirFlag RpathLoadFlags
- #endif
-+# if !defined(ShlibGlobalsFlags)
-+#  define ShlibGlobalsFlags -Wl,-Bsymbolic
- #endif
- 
- /*
-@@ -87,6 +90,26 @@
- 	  $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
- #endif /* InstallSharedLibrary */
- 
-+# ifndef InstallSharedLibtoolLibrary
-+
-+#  define SetRevisions(rev) V=`expr rev : '\([^:]*\)'`; \		@@\
-+		R=`expr rev : '.*:\([^:]*\):'`; \			@@\
-+		A=`expr rev : '.*:\([^:]*\)'`; \			@@\
-+		MAJ=`expr $$V - $$A`; \					@@\
-+		MIN=$$A.$$R
-+
-+#  define	InstallSharedLibtoolLibrary(libname,rev,dest)		@@\
-+install:: Concat(lib,libname.so) 					@@\
-+	MakeDir($(DESTDIR)dest)						@@\
-+	@set +e; SetRevisions(rev); \					@@\
-+		set -xe; \						@@\
-+		$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\
-+		$(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \	@@\
-+		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\
-+		$(RM) Concat($(DESTDIR)dest/lib,libname.so); \		@@\
-+		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so)
-+# endif /* InstallSharedLibrary */
-+
- /*
-  * InstallSharedLibraryData - generate rules to install the shared library data
-  */
-@@ -106,9 +129,9 @@
- 									@@\
- Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
- 	$(RM) $@~							@@\
--	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \		@@\
--		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
--		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
-+	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; (set -x; \	@@\
-+		cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs) || exit 1; \ @@\
-+		(set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \		@@\
- 		LinkBuildSonameLibrary($$SONAME)			@@\
- 	$(RM) $@							@@\
- 	$(MV) $@~ $@							@@\
-@@ -125,6 +148,38 @@
- 
- #endif /* SharedLibraryTarget */
- 
-+
-+# ifndef SharedLibtoolLibraryTarget
-+#  define SharedLibtoolLibraryTarget(libname,rev,solist,down,up)	@@\
-+AllTarget(Concat(lib,libname.so))					@@\
-+									@@\
-+Concat(lib,libname.so):  solist $(EXTRALIBRARYDEPS)			@@\
-+	$(RM) $@~							@@\
-+	@set +e; SetRevisions(rev); set -e; \				@@\
-+		SONAME=$@.$$MAJ; \					@@\
-+		(set -x; \						@@\
-+		$(RM) $@.$$MAJ.$$MIN~; \				@@\
-+		cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs) || exit 1; \ @@\
-+		(set -x; \						@@\
-+		$(RM) $$SONAME; $(LN) $@.$$MAJ.$$MIN $$SONAME); \	@@\
-+		LinkBuildSonameLibrary($$SONAME); \			@@\
-+		(set -x; \						@@\
-+		$(RM) $@.$$MAJ.$$MIN; \					@@\
-+		$(MV) $@.$$MAJ.$$MIN~ $@.$$MAJ.$$MIN; \			@@\
-+	  	$(RM) $@; \						@@\
-+	  	$(LN) $@.$$MAJ.$$MIN $@); \				@@\
-+		LinkBuildLibraryInline($@.$$MAJ.$$MIN); \		@@\
-+		LinkBuildLibraryInline($@)				@@\
-+									@@\
-+clean::									@@\
-+	@set +e; SetRevisions(rev); \					@@\
-+		set -xe; \						@@\
-+		$(RM) Concat(lib,libname.so.$$MAJ); \			@@\
-+		$(RM) Concat(lib,libname.so.$$MAJ.$$MIN)		@@\
-+	$(RM) Concat(lib,libname.so)
-+
-+# endif /* SharedLibtoolLibraryTarget */
-+
- /*
-  * SharedDepLibraryTarget - generate rules to create a shared library.
-  */
-@@ -153,6 +208,34 @@
- 
- #endif /* SharedDepLibraryTarget */
- 
-+/*
-+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
-+ */
-+#ifndef SharedDepCplusplusLibraryTarget
-+#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-+AllTarget(Concat(lib,libname.so.rev))					@@\
-+									@@\
-+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
-+	$(RM) $@~							@@\
-+	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \		@@\
-+		(cd down; $(CXX) -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=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
-+	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
-+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-+
-+#endif /* SharedDepCplusplusLibraryTarget */
-+
- #ifndef SharedDepModuleTarget
- #define SharedDepModuleTarget(name,deps,solist)				@@\
- AllTarget(name)								@@\
-@@ -168,6 +251,23 @@
- 
- #endif /* SharedDepModuleTarget */
- 
-+# ifndef SharedDriModuleTarget
-+#  define SharedDriModuleTarget(name,deps,solist)			@@\
-+AllTarget(name)								@@\
-+									@@\
-+name: deps								@@\
-+	$(RM) $@~ $@.map						@@\
-+	@(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map)	@@\
-+	$(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
-+	$(RM) $@ $@.map							@@\
-+	$(MV) $@~ $@							@@\
-+									@@\
-+clean::									@@\
-+	$(RM) name							@@\
-+	$(RM) name.map
-+
-+# endif /* SharedDriModuleTarget */
-+
- /*
-  * SharedLibraryDataTarget - generate rules to create shlib data file;
-  */
-Index: xutils-dev/xorg-cf-files/gnuLib.tmpl
-===================================================================
---- xutils-dev.orig/xorg-cf-files/gnuLib.tmpl
-+++ xutils-dev/xorg-cf-files/gnuLib.tmpl
-@@ -1,8 +1,9 @@
--XCOMM
--XCOMM  GNU Hurd shared library template
--XCOMM
--XCOMM $XFree86: xc/config/cf/gnuLib.tmpl,v 1.5 2003/05/29 21:56:57 herrb Exp $
--XCOMM
-+XCOMM $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
-+XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
-+
-+/*
-+ * GNU/Hurd shared library template
-+ */
- 
- #ifndef FixupLibReferences
- #define FixupLibReferences()						@@\
-@@ -14,15 +15,71 @@
- #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
- #endif
- 
--#define SharedX11Reqs
-+#if ThreadedX
-+# ifndef SharedThreadReqs
-+#   define SharedThreadReqs -lpthread
-+# endif
-+#else
-+# ifndef SharedThreadReqs
-+#   define SharedThreadReqs
-+# endif
-+#endif
-+
-+#define SharedX11Reqs	  SharedThreadReqs
- #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
- #define SharedOldXReqs	$(LDPRELIB) $(XONLYLIB)
--#define SharedXtReqs	$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
-+#define SharedXtReqs	  $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) SharedThreadReqs
- #define SharedXaw6Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
- #define SharedXaw7Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
- #define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
- #define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
-+#define SharedXmuuReqs	  $(LDPRELIB) $(XONLYLIB)
- #define SharedXextReqs	$(LDPRELIB) $(XONLYLIB)
- #define SharedXiReqs	$(LDPRELIB) $(XLIB)
-+#define SharedXpReqs	  $(LDPRELIB) $(XLIB)
-+#define SharedXpmReqs	  $(LDPRELIB) $(XLIB)
-+#define SharedXrandrReqs  $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-+#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
- #define SharedXtstReqs	$(LDPRELIB) $(XLIB)
-+#define SharedXvReqs	  $(LDPRELIB) $(XLIB)
- #define SharedSMReqs	$(LDPRELIB) $(ICELIB)
-+#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
-+#define SharedFontencReqs $(LDPRELIB) GzipLibrary
-+
-+#if GlxUseBuiltInDRIDriver
-+#define ExtraSharedGLReqs /**/
-+#else
-+#define ExtraSharedGLReqs -ldl
-+#endif
-+#define SharedGLReqs	  $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
-+#ifndef SharedGLUReqs
-+#define SharedGLUReqs	  $(LDPRELIB) $(XLIB) $(GLXLIB)
-+#endif
-+#define SharedDPSReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-+#define SharedDPSTKReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
-+#define SharedpsresReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
-+
-+#define SharedXResReqs	  $(LDPRELIB) $(XLIB)
-+#define SharedXfontcacheReqs	$(LDPRELIB) $(XLIB)
-+#define SharedXineramaReqs	$(LDPRELIB) $(XLIB)
-+#define SharedXssReqs	$(LDPRELIB) $(XLIB)
-+#define SharedXvMCReqs	$(LDPRELIB) $(XLIB)
-+#define SharedXxf86dgaReqs	$(LDPRELIB) $(XLIB)
-+#define SharedXxf86miscReqs	$(LDPRELIB) $(XLIB)
-+#define SharedXxf86vmReqs	$(LDPRELIB) $(XLIB)
-+#define SharedxkbfileReqs	$(LDPRELIB) $(XONLYLIB)
-+#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
-+
-+#ifndef SharedXReqs
-+# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs
-+#endif
-+
-+#ifndef SharedXmReqs
-+# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc
-+#endif
-+
-+#ifndef SharedTtReqs
-+# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) SharedThreadReqs
-+#endif
-+
-+#define NoMessageCatalog
-Index: xutils-dev/xorg-cf-files/Imake.rules
-===================================================================
---- xutils-dev.orig/xorg-cf-files/Imake.rules
-+++ xutils-dev/xorg-cf-files/Imake.rules
-@@ -2722,6 +2722,20 @@
- 
- 
- /*
-+ * Rule to build libXXX_pic.a from PIC objects for a library
-+ */
-+#ifndef PicLibraryTarget
-+#define	PicLibraryTarget(libname,objlist)				@@\
-+AllTarget(LibraryTargetNameSuffix(libname,_pic))			@@\
-+									@@\
-+LibraryTargetNameSuffix(libname,_pic): objlist $(EXTRALIBRARYDEPS)	@@\
-+	RemoveFile($@)							@@\
-+	MakeLibrary($@,objlist)						@@\
-+	RanLibrary($@)							@@\
-+	_LinkBuildLibrary($@)
-+#endif /* PicLibraryTarget */
-+
-+/*
-  * SubdirLibraryRule -
-  */
- #ifndef SubdirLibraryRule
-Index: xutils-dev/xorg-cf-files/Imake.tmpl
-===================================================================
---- xutils-dev.orig/xorg-cf-files/Imake.tmpl
-+++ xutils-dev/xorg-cf-files/Imake.tmpl
-@@ -902,37 +902,82 @@
- #define ManSourcePath $(MANPATH)/man
- #endif
- #ifndef ManDir
--#define ManDir $(MANSOURCEPATH)$(MANSUFFIX)
-+#define ManDir $(MANSOURCEPATH)$(MANSECT)
- #endif
--#ifndef LibmanDir
--#define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX)
-+#ifndef ManSuffix
-+#define ManSuffix $(MANSECT)$(PROJECTMANSUFFIX)
-+#endif
-+#ifndef SyscallManDir
-+#define SyscallManDir $(MANSOURCEPATH)$(SYSCALLMANSECT)
-+#endif
-+#ifndef SyscallManSuffix
-+#define SyscallManSuffix $(SYSCALLMANSECT)$(PROJECTMANSUFFIX)
-+#endif
-+#ifndef LibManDir
-+#define LibManDir $(MANSOURCEPATH)$(LIBMANSECT)
-+#endif
-+#ifndef LibManSuffix
-+#define LibManSuffix $(LIBMANSECT)$(PROJECTMANSUFFIX)
-+#endif
-+#ifndef DriverManDir
-+#define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSECT)
-+#endif
-+#ifndef DriverManSuffix
-+#define DriverManSuffix $(DRIVERMANSECT)$(PROJECTMANSUFFIX)
- #endif
- #ifndef FileManDir
--#define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX)
-+#define FileManDir $(MANSOURCEPATH)$(FILEMANSECT)
-+#endif
-+#ifndef FileManSuffix
-+#define FileManSuffix $(FILEMANSECT)$(PROJECTMANSUFFIX)
-+#endif
-+#ifndef GameManDir
-+#define GameManDir $(MANSOURCEPATH)$(GAMEMANSECT)
-+#endif
-+#ifndef GameManSuffix
-+#define GameManSuffix $(GAMEMANSECT)$(PROJECTMANSUFFIX)
- #endif
- #ifndef MiscManDir
--#define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX)
-+#define MiscManDir $(MANSOURCEPATH)$(MISCMANSECT)
- #endif
--#ifndef DriverManDir
--#define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX)
-+#ifndef MiscManSuffix
-+#define MiscManSuffix $(MISCMANSECT)$(PROJECTMANSUFFIX)
- #endif
--#ifndef AppLoadDefs
--#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
-+#ifndef AdmManDir
-+#define AdmManDir $(MANSOURCEPATH)$(ADMMANSECT)
-+#endif
-+#ifndef AdmManSuffix
-+#define AdmManSuffix $(ADMMANSECT)$(PROJECTMANSUFFIX)
- #endif
- #ifndef AppManDefs
--#define AppManDefs -D__appmansuffix__=$(MANSUFFIX)
-+#define AppManDefs -D__appmansuffix__=$(MANSECT)$(PROJECTMANSUFFIX)
-+#endif
-+#ifndef ManDefs
-+#define ManDefs -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT)
-+#endif
-+#ifndef SyscallManDefs
-+#define SyscallManDefs -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT)
- #endif
- #ifndef LibManDefs
--#define LibManDefs -D__libmansuffix__=$(LIBMANSUFFIX)
-+#define LibManDefs -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT)
-+#endif
-+#ifndef DriverManDefs
-+#define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT)
- #endif
- #ifndef FileManDefs
--#define FileManDefs -D__filemansuffix__=$(FILEMANSUFFIX)
-+#define FileManDefs -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT)
-+#endif
-+#ifndef GameManDefs
-+#define GameManDefs -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT)
- #endif
- #ifndef MiscManDefs
--#define MiscManDefs -D__miscmansuffix__=$(MISCMANSUFFIX)
-+#define MiscManDefs -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT)
- #endif
--#ifndef DriverManDefs
--#define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSUFFIX)
-+#ifndef AdmManDefs
-+#define AdmManDefs -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT)
-+#endif
-+#ifndef AppLoadDefs
-+#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
- #endif
- #ifndef AdminManDefs
- #define AdminManDefs -D__adminmansuffix__=$(ADMINMANSUFFIX)
-@@ -963,6 +1008,21 @@
- #endif
- #endif
- 
-+#ifndef IconDir
-+# if !NothingOutsideProjectRoot
-+#  define IconDir       "/usr/share/icons"
-+#  ifndef XcursorPath
-+#   define XcursorPath  "~/.icons:/usr/share/icons:/usr/share/pixmaps"
-+#  endif
-+# else
-+#  define IconDir       Concat(ProjectRoot,/lib/X11/icons)
-+# endif
-+#endif
-+
-+#ifndef XcursorPath
-+# define XcursorPath    Concat(~/.icons:/usr/share/icons:/usr/share/pixmaps:,IconDir)
-+#endif
-+
- #ifndef LogDirectory
- #if HasVarDirectory
- #define LogDirectory $(VARDIR)/log
-@@ -1609,32 +1669,50 @@
- #ifndef SHsuf
- #define SHsuf sh
- #endif
--#ifndef ManSuffix
--#define ManSuffix	n		/* use just one tab or cpp will die */
-+#ifndef ManSection
-+#define ManSection	1		/* use just one tab or cpp will die */
- #endif
--#ifndef LibManSuffix
--#define LibManSuffix	3		/* use just one tab or cpp will die */
-+#ifndef SyscallManSection
-+#define SyscallManSection	2	/* use just one tab or cpp will die */
- #endif
--#ifndef FileManSuffix
-+#ifndef LibManSection
-+#define LibManSection	3		/* use just one tab or cpp will die */
-+#endif
-+#ifndef DriverManSection
- #if SystemV || SystemV4 || defined(OSF1Architecture)
--#define FileManSuffix	4		/* use just one tab or cpp will die */
-+#define DriverManSection	7	/* use just one tab or cpp will die */
- #else
--#define FileManSuffix	5		/* use just one tab or cpp will die */
-+#define DriverManSection	4	/* use just one tab or cpp will die */
- #endif
- #endif
--#ifndef MiscManSuffix
-+#ifndef FileManSection
- #if SystemV || SystemV4 || defined(OSF1Architecture)
--#define MiscManSuffix	5		/* use just one tab or cpp will die */
-+#define FileManSection	4		/* use just one tab or cpp will die */
- #else
--#define MiscManSuffix	7		/* use just one tab or cpp will die */
-+#define FileManSection	5		/* use just one tab or cpp will die */
- #endif
- #endif
--#ifndef DriverManSuffix
-+#ifndef GameManSection
-+#define GameManSection	6		/* use just one tab or cpp will die */
-+#endif
-+#ifndef MiscManSection
- #if SystemV || SystemV4 || defined(OSF1Architecture)
--#define DriverManSuffix	7		/* use just one tab or cpp will die */
-+#define MiscManSection	5		/* use just one tab or cpp will die */
- #else
--#define DriverManSuffix	4		/* use just one tab or cpp will die */
-+#define MiscManSection	7		/* use just one tab or cpp will die */
-+#endif
-+#endif
-+#ifndef AdmManSection
-+#define AdmManSection	8		/* use just one tab or cpp will die */
- #endif
-+#ifndef ManSrcSection
-+#define ManSrcSection	s		/* use just one tab or cpp will die */
-+#endif
-+#ifndef ManNewSection
-+#define ManNewSection	n		/* use just one tab or cpp will die */
-+#endif
-+#ifndef ProjectManSuffix
-+#define ProjectManSuffix	X11	/* use just one tab or cpp will die */
- #endif
- #ifndef AdminManSuffix
- #if SystemV || SystemV4
-@@ -1763,9 +1841,15 @@
-           MANPATH = ManPath		/* top of manual page tree */
-     MANSOURCEPATH = ManSourcePath	/* prefix for man page sources */
-            MANDIR = ManDir		/* man pages for commands */
--        LIBMANDIR = LibmanDir		/* man pages for library routines */
-+    SYSCALLMANDIR = SyscallManDir   	/* man pages for system calls */
-+        LIBMANDIR = LibManDir		/* man pages for library routines */
-+     DRIVERMANDIR = DriverManDir	/* man pages for drivers */
-        FILEMANDIR = FileManDir		/* man pages for config files */
-+       GAMEMANDIR = GameManDir		/* man pages for game commands */
-        MISCMANDIR = MiscManDir		/* man pages for miscellaneous files */
-+        ADMMANDIR = AdmManDir		/* man pages for administrative commands */
-+	  ICONDIR = IconDir		/* Xcursor cursors/icon directory */
-+      XCURSORPATH = XcursorPath		/* Xcursor cursors path */
-      DRIVERMANDIR = DriverManDir	/* man pages for drivers */
-      LOGDIRECTORY = LogDirectory	/* OS location of log files */
- #ifdef VarRunDirectory
-@@ -1872,15 +1956,30 @@
-              PERL = PerlCmd
-          PERLOPTS = PerlOptions
-      PERLENVSETUP = PerlEnvSetup
-+
-+          MANSECT = ManSection		/* section for command man pages */
-+   SYSCALLMANSECT = SyscallManSection	/* section for system call man pages */
-+       LIBMANSECT = LibManSection	/* section for library man pages */
-+    DRIVERMANSECT = DriverManSection	/* section for driver man pages */
-+      FILEMANSECT = FileManSection	/* section for file format man pages */
-+      GAMEMANSECT = GameManSection	/* section for game command man pages */
-+      MISCMANSECT = MiscManSection	/* section for misc man pages */
-+       ADMMANSECT = AdmManSection	/* section for administrative command man pages */
-+       MANSRCSECT = ManSrcSection	/* section for man page source */
-+       MANNEWSECT = ManNewSection	/* section for preprocessed man source */
-+ PROJECTMANSUFFIX = ProjectManSuffix	/* man page suffix for the X11 distribution */
-         MANSUFFIX = ManSuffix		/* suffix for command man pages */
-+ SYSCALLMANSUFFIX = SyscallManSuffix	/* suffix for system call man pages */
-      LIBMANSUFFIX = LibManSuffix	/* suffix for library man pages */
-+  DRIVERMANSUFFIX = DriverManSuffix	/* suffix for driver man pages */
-     FILEMANSUFFIX = FileManSuffix	/* suffix for file format man pages */
-+    GAMEMANSUFFIX = GameManSuffix	/* suffix for game command man pages */
-     MISCMANSUFFIX = MiscManSuffix	/* suffix for misc man pages */
--  DRIVERMANSUFFIX = DriverManSuffix	/* suffix for driver man pages */
-+     ADMMANSUFFIX = AdmManSuffix	/* suffix for administrative command man pages */
-    ADMINMANSUFFIX = AdminManSuffix	/* suffix for admin command man pages */
-      MANSRCSUFFIX = ManSrcSuffix	/* suffix for man page source */
-      MANNEWSUFFIX = ManNewSuffix	/* suffix for preprocessed man source */
--          MANDEFS = AppLoadDefs AppManDefs FileManDefs LibManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs $(XORGMANDEFS) $(VENDORMANDEFS)
-+          MANDEFS = AppLoadDefs FileManDefs LibManDefs ManDefs SyscallManDefs GameManDefs MiscManDefs AdmManDefs MiscManDefs DriverManDefs AdminManDefs ProjectManDefs XConfigFileManDefs XConfigDirManDefs XLogFileManDefs XServerManDefs AppManDefs $(XORGMANDEFS) $(VENDORMANDEFS)
- 
-    COMPRESSMANCMD = CompressManCmd
- 
-Index: xutils-dev/xorg-cf-files/Library.tmpl
-===================================================================
---- xutils-dev.orig/xorg-cf-files/Library.tmpl
-+++ xutils-dev/xorg-cf-files/Library.tmpl
-@@ -37,6 +37,14 @@
- #define DoExtraLib NO
- #endif
- 
-+#ifndef DoPicLib
-+# if DoNormalLib && !DoSharedLib && !StaticNeedsPicForShared
-+#  define DoPicLib YES
-+# else
-+#  define DoPicLib NO
-+# endif
-+#endif
-+
- #ifndef HasSharedData
- #define HasSharedData NO
- #endif
-@@ -53,7 +61,7 @@
- #endif
- 
- #ifndef LibraryCplusplusOptions
--# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
-+# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions)
- #  define LibraryCplusplusOptions SharedLibraryCplusplusOptions
- # else
- #  define LibraryCplusplusOptions DefaultCplusplusOptions
-@@ -85,14 +93,14 @@
- 
- #ifndef CplusplusSource
- # ifndef LibraryCcCmd
--#  if DoSharedLib && defined(SharedLibraryCcCmd)
-+#  if (DoSharedLib || DoPicLib) && defined(SharedLibraryCcCmd)
- #   define LibraryCcCmd SharedLibraryCcCmd
- #  else
- #   define LibraryCcCmd CcCmd
- #  endif
- # endif
- # ifndef LibraryCCOptions
--#  if DoSharedLib && defined(SharedLibraryCCOptions)
-+#  if (DoSharedLib || DoPicLib) && defined(SharedLibraryCCOptions)
- #   define LibraryCCOptions SharedLibraryCCOptions
- #  else
- #   define LibraryCCOptions DefaultCCOptions
-@@ -121,7 +129,7 @@
- #else
- # ifndef CrossCompileDir
- #  ifndef LibraryCplusplusCmd
--#   if DoSharedLib && defined(SharedLibraryCplusplusCmd)
-+#   if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd)
- #    define LibraryCplusplusCmd SharedLibraryCplusplusCmd
- #   else
- #    define LibraryCplusplusCmd CplusplusCmd
-@@ -129,7 +137,7 @@
- #  endif
- # else
- #  ifndef CrossLibraryCplusplusCmd
--#   if DoSharedLib && defined(SharedLibraryCplusplusCmd)
-+#   if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd)
- #    define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd))
- #   else
- #    define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd))
-@@ -138,7 +146,7 @@
- # endif
- 
- # ifndef LibraryCplusplusOptions
--#  if DoSharedLib && defined(SharedLibraryCplusplusOptions)
-+#  if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions)
- #   define LibraryCplusplusOptions SharedLibraryCplusplusOptions
- #  else
- #   define LibraryCplusplusOptions DefaultCplusplusOptions
-@@ -204,14 +212,14 @@
- # define _NormalObjCplusplusCompile(options) $(_NULLCMD_)
- # define _NormalCleanDir() $(_NULLCMD_)
- #else
--# if DoSharedLib && SeparateSharedCompile
-+# if (DoSharedLib || DoPicLib) && SeparateSharedCompile
- #  define _NormalLibMkdir() _LibMkdir(unshared)
- #  define _NormalObjCompile(options) UnsharedLibObjCompile(options)
- #  define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options)
- #  define _NormalCleanDir() LibCleanDir(unshared)
- # else
- #  define _NormalLibMkdir() $(_NULLCMD_)
--#  if !DoSharedLib &&  defined(IncludeSharedObjectInNormalLib)
-+#  if (!DoSharedLib && !DoPicLib) &&  defined(IncludeSharedObjectInNormalLib)
- #   define _NormalObjCompile(options) NormalRelocLibObjCompile(options)
- #  else
- #   define _NormalObjCompile(options) NormalLibObjCompile(options)
-@@ -221,7 +229,7 @@
- # endif
- #endif
- 
--#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile)
-+#if !DoSharedLib && !DoPicLib || (DoNormalLib && !SeparateSharedCompile)
- # define _SharedObjCompile(options) $(_NULLCMD_)
- # define _SharedObjCplusplusCompile(options) $(_NULLCMD_)
- #else
-@@ -517,6 +525,12 @@
- InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
- #   endif
- #  endif
-+#  if DoPicLib
-+PicLibraryTarget($(LIBNAME),$(OBJS))
-+#   if !defined(LibInstall) || LibInstall
-+InstallLibrary($(LIBNAME)_pic,$(USRLIBDIR))
-+#   endif
-+#  endif
- #  if DoExtraLib && defined(ExtraLibRules)
- ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS))
- #   if !defined(LibInstall) || LibInstall
-Index: xutils-dev/xorg-cf-files/linux.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/linux.cf
-+++ xutils-dev/xorg-cf-files/linux.cf
-@@ -107,31 +107,48 @@
- XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
- XCOMM binutils:	(LinuxBinUtilsMajorVersion)
- 
-+/* Linux >= 2.0 supports /dev/random, which is poll()able */
-+#if OSMajorVersion >= 2
-+# define HasDevRandom		YES
-+# define PollDevRandom		YES
-+#endif
-+
- #if LinuxDistribution == LinuxDebian
-+
-+/* Path setup. */
-+# ifndef NothingOutsideProjectRoot
-+#  define NothingOutsideProjectRoot	NO
-+# endif
- # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
- #  define SystemManDirectory	/usr/share/man
- # endif
-+
-+/* Default GCC options. */
-+# ifndef DefaultGcc2OptimizeOpt
-+#  define DefaultGcc2OptimizeOpt	-O2
-+# endif
-+
- # define HasPam			YES
--/* un-comment this when it is un-broken */
--/* # define JoystickSupport YES */
-+
- # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
- #  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)
- /* the relative symlink created by this rule causes problems for us */
--# if defined(InstallAppDefFiles) && InstallAppDefFiles
--#  define InstallAppDefaultsLong(file,class)				@@\
-+# define InstallAppDefFiles	YES
-+# ifdef InstallAppDefFiles
-+#  if InstallAppDefFiles
-+#   define InstallAppDefaultsLong(file,class)				@@\
- InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
--# else
--#  define InstallAppDefaultsLong(file,class)				@@\
-+#  else
-+#   define InstallAppDefaultsLong(file,class)				@@\
- InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-+#  endif
- # endif /* InstallAppDefFiles */
- # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */
-+
- # define SharedLibXdmGreet	NO
- # define LinkGLToUsrInclude	NO
- # define LinkGLToUsrLib		NO
--# define SharedLibFont		NO
--# define SharedLibGlu		YES
--# define NormalLibGlu		YES
- # define FSUseSyslog		YES
- 
- # define BuildLibGlxWithoutPIC  NO
-@@ -142,15 +159,12 @@
- # define MiscManSuffix         7x
- # define MiscManDir            $(MANSOURCEPATH)7
- 
--/*
-- *
-- *
-+# define ProjectManSuffix	x
-+
- # define DebianMaintainer	YES
-- *
-- *
-- */
- 
- # ifdef DebianMaintainer
-+
- #  ifndef XorgCustomVersion
- #   define XorgCustomVersion		"Debian"
- #  endif
-@@ -158,47 +172,138 @@
- #   define BuilderEMailAddr		"debian-x@lists.debian.org"
- #  endif
- #  define XFree86Devel			YES
--#  define BuildAllSpecsDocs		YES
- #  define InstallXinitConfig		YES
- #  define InstallXdmConfig		YES
- #  define InstallFSConfig		YES
- #  define DebuggableLibraries		YES
- #  define ForceNormalLib		YES
--#  define BuildSpecsDocs		YES
--#  define SpecsDocDirs			CTEXT GL ICCCM X11 Xext Xv i18n xterm
--#  define BuildRman			NO
-+#  define SharedLibFont			NO
-+#  define SharedLibGlu			YES
-+#  define NormalLibGlu			YES
-+#  define BuildFontCache		YES
-+
-+#  define BuildAllSpecsDocs		NO
-+#  ifndef BuildSpecsDocs
-+#   define BuildSpecsDocs		YES
-+#  endif
-+#  define SpecsDocDirs			BDF CTEXT FSProtocol GL ICCCM ICE PM \
-+				Render SM X11 XDMCP XIM XLFD XProtocol \
-+				Xaw Xext Xi Xmu Xserver Xt Xv XvMC \
-+				i18n rstart xfs xterm xtrans
-+#  define XkbServerDefines		-DNOISY
- #  define BuildHtmlManPages		NO
-+#  define DontPreprocessManPages	NO
- 
--/* we build-depend on libfreetype6-dev (FreeType 2.x) */
--#   define BuildFreetype2Library	NO
--#   define HasFreetype2			YES
--/* m68k has no 2.4 kernel yet */
--#   ifndef Mc68020Architecture
--#    define HasLinuxInput		YES
--#   endif
--#   define HasXdmAuth			YES
--#   define HasLatex			YES
--/* at present, glide2 only works on i386 */
--#   if defined(__linux__) && defined(i386Architecture)
--#    define HasGlide2			YES
--#    define Glide2IncDir		/usr/include/glide
--#   endif /* __linux__ && i386Architecture */
--/* at present, glide3 only works on alpha, amd64, i386 and ia64 */
--#   if defined(__linux__) && (defined(i386Architecture) || \
--       defined(AlphaArchitecture) || defined(ia64Architecture) || \
--       defined(AMD64Architecture))
--#    define HasGlide3			YES
--#    define Glide3IncDir		/usr/include/glide3
--#   endif /* __linux__ && (i386Architecture || AlphaArchitecture || \
--             ia64Architecture || AMD64Architecture) */
--/* extended instruction set support */
--#   ifdef i386Architecture
-+/* We have a local patch that defines PicLibraryTarget(), instead of
-+ * upstream's method. */
-+#  define StaticNeedsPicForShared	NO
-+
-+/* Some libraries changed compilation method from static to shared and they do not
-+ * ship header files.
-+ * Temporary revert the build to static until all the changes will be investigated
-+ * properly
-+ */
-+#  define SharedLibXau			YES
-+#  define SharedLibXdmcp		YES
-+#  define NormalOldX			NO
-+#  define DebugOldX			NO
-+#  define SharedOldX			NO
-+#  define SharedLibDmx			YES
-+#  define SharedLibGLw			NO
-+#  define SharedLibFont			NO
-+#  define SharedLibFontEnc		NO
-+#  define SharedLibXfontcache		NO
-+#  define BuildFreetypeDlModule		NO
-+
-+#  define KernelVersionInBanner		YES
-+
-+/* We don't want XRX. */
-+#  define BuildPlugin		NO
-+
-+/* The TT/Meltho fonts are all under non-free licences, except for BitStream
-+ * Vera, which is provided by an external package anyway. */
-+#  define BuildTrueTypeFonts		NO
-+#  define BuildBethMarduthoFonts	NO
-+
-+#  define MakeDllModules		YES
-+
-+/* All the following are fulfilled by Build-Depends. */
-+#  define BuildRman			NO
-+#  define RmanCmd			/usr/bin/rman
-+#  define RmanOptions			/**/
-+#  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
-+#  define BuildExpatLibrary		NO
-+#  define HasExpat			YES
-+#  define ExpatIncDirStandard		YES
-+#  define BuildFontconfigLibrary	NO
-+#  define HasFontconfig			YES
-+#  define UseFontconfig			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 BuildXftLibrary		NO
-+#  define HasXftLibrary			YES
-+#  define BuildFreetype2Library		NO
-+#  define HasFreetype2			YES
-+#  define FontLibSharedFreeType		NO
-+#  define HasLatex			YES
-+
-+/*
-+ * The XFree86 Debian package no longer builds the Xprt server, in favor
-+ * of a separate xprint package.  We do still build the library,
-+ * but only when we're not building servers only, so it gets built in the
-+ * normal build, but not -dbg (as it requires libXt headers).
-+ */
-+#  define XprtServer			NO
-+#  define BuildXprintLib		!BuildServersOnly
-+
-+#  ifdef UseInstalled
-+#   define RenderLibraryDir		/usr
-+#   define XftLibraryDir		/usr
-+#   define XcursorLibraryDir		/usr
-+#  else /* We have a special hack to find these. */
-+#   define RenderLibraryDir		$(TOP)/../../imports
-+#   define XftLibraryDir		$(TOP)/../../imports
-+#   define XcursorLibraryDir		$(TOP)/../../imports
-+#  endif
-+
-+/* Wraphelp.c magic is supplied via a custom patch. */
-+#  define HasXdmAuth			YES
-+
-+#  ifdef LinuxArchitecture
-+/* Glide2 only works on i386. */
-+#  ifdef i386Architecture
-+#   define HasGlide2			YES
-+#   define Glide2IncDir		/usr/include/glide
-+#  endif /* i386Architecture */
-+/* Glide3 only works on alpha, amd64, i386 and ia64. */
-+#  if defined(i386Architecture) || defined(AlphaArchitecture) || \
-+      defined(ia64Architecture) || defined(AMD64Architecture)
-+#   define HasGlide3			YES
-+#   define Glide3IncDir		/usr/include/glide3
-+#  endif /* i386Architecture || AlphaArchitecture || ia64Architecture ||
-+            AMD64Architecture */
-+#  endif /* LinuxArchitecture */
-+
-+/* Enable extended instruction set support. */
-+#  ifdef i386Architecture
- #   define HasX86Support		YES
--#    define HasMMXSupport		YES
--#    define Has3DNowSupport		YES
--/* 2.4 is not yet the official (or predominant) kernel in unstable */
--#    define HasSSESupport		NO
--#   endif /* i386Architecture */
-+#   define HasMMXSupport       YES
-+#   define Has3DNowSupport     YES
-+#   define HasSSESupport       YES
-+#  endif /* i386Architecture */
- # endif /* DebianMaintainer */
- #endif /* LinuxDebian */
- 
-@@ -591,7 +696,7 @@
- #define MkdirHierCmd		mkdir -p
- 
- #ifndef HaveLib64
--# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
-+# if defined (s390xArchitecture)
- #  define HaveLib64	YES
- # else
- #  define HaveLib64	NO
-@@ -725,10 +830,10 @@
- # if UseElfFormat
- #  ifdef AlphaArchitecture
- #   define CcCmd		gcc -b alpha-linux
-+#   define CplusplusCmd		c++ -b alpha-linux
- #   define AsCmd		CcCmd -c -x assembler
- #   define LdCmd		CcCmd -nostdlib -Wl,"-m elf64alpha"
- #   define AsmDefines		-D__ELF__
--#   define CplusplusCmd		c++ -b alpha-linux
- #  endif /* AlphaArchitecture */
- #  ifdef HPArchitecture
- #   define CcCmd		gcc
-@@ -740,10 +845,10 @@
- #  endif /* HPArchitecture */
- #  ifdef i386Architecture
- #   define CcCmd		gcc -b i486-linux
-+#   define CplusplusCmd		c++ -b i486-linux
- #   define AsCmd		CcCmd -c -x assembler
- #   define LdCmd		CcCmd -nosdlib -Wl,"-m elf_i386"
- #   define AsmDefines		-D__ELF__
--#   define CplusplusCmd		c++ -b i486-linux
- #  endif /* i386Architecture */
- #  ifdef ia64Architecture
- #   define CcCmd		gcc
-@@ -754,10 +859,10 @@
- #  endif /* ia64Architecture */
- #  ifdef Mc68020Architecture
- #   define CcCmd		gcc -b m68k-linux
-+#   define CplusplusCmd		c++ -b m68k-linux
- #   define AsCmd		CcCmd -c -x assembler
- #   define LdCmd		CcCmd -nostdlib -W,l"-m m68kelf"
- #   define AsmDefines		-D__ELF__
--#   define CplusplusCmd		c++ -b m68k-linux
- #  endif /* Mc68020Architecture */
- #  ifdef AMD64Architecture
- #   define CcCmd                 gcc
-@@ -770,7 +875,7 @@
- #  define CcCmd			gcc
- #  define AsCmd			CcCmd -c -x assembler
- #  define LdCmd			CcCmd -nostdlib
--#  define AsmDefines		-DUSE_GAS
-+#  define AsmDefines		-DUSE_GAS -D__ELF__
- # endif
- #endif
- 
-@@ -837,7 +942,7 @@
- 
- #ifdef AlphaArchitecture
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	DefaultGcc2AxpOpt
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__alpha__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -850,7 +955,7 @@
- #ifdef Arm32Architecture
- # define DefaultCCOptions
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	-O3
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__arm__ -D__arm32__ -U__arm -Uarm
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -858,7 +963,9 @@
- #endif /* Arm32Achitecture */
- 
- #ifdef HPArchitecture
--# define OptimizedCDebugFlags	-O2  GccAliasingArgs
-+# ifndef OptimizedCDebugFlags
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
-+# endif
- # define LinuxMachineDefines	-D__hppa__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
- # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-@@ -866,7 +973,7 @@
- 
- #ifdef i386Architecture
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__i386__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -875,7 +982,7 @@
- 
- #ifdef ia64Architecture
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	-O2  GccAliasingArgs
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__ia64__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -884,7 +991,7 @@
- 
- #ifdef Mc68020Architecture
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	-O2  GccAliasingArgs
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__mc68000__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -903,7 +1010,7 @@
- #ifdef Ppc64Architecture
- # define DefaultCCOptions	-mminimal-toc
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	DefaultGcc2Ppc64Opt
-+#  define OptimizedCDebugFlags	DefaultGcc2Ppc64Opt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__powerpc64__ -D__powerpc__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -913,7 +1020,7 @@
- #ifdef PpcArchitecture
- # define DefaultCCOptions	
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	DefaultGcc2PpcOpt
-+#  define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__powerpc__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -922,7 +1029,7 @@
- 
- #ifdef s390Architecture
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	-O2 -fomit-frame-pointer GccAliasingArgs
-+#  define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__s390__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -930,16 +1037,17 @@
- #endif /* s390Architecture */
- 
- #ifdef s390xArchitecture
--/*#define DefaultCCOptions	-fsigned-char */
--#define OptimizedCDebugFlags	-O3 -fomit-frame-pointer
-+# ifndef OptimizedCDebugFlags
-+#  define OptimizedCDebugFlags DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
-+# endif
- #define LinuxMachineDefines	-D__s390x__
--#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
-+#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
- #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
- #endif /* s390xArchitecture */
- 
- #ifdef SparcArchitecture
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	-O2  GccAliasingArgs
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__sparc__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -970,7 +1078,7 @@
- #  endif
- # endif
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	-O2 SuperHArchOptFlags SuperHEndianFlags  GccAliasingArgs
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs
- # endif
- # define LinuxMachineDefines	-D__sh__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -982,7 +1090,7 @@
- 
- #ifdef AMD64Architecture
- # ifndef OptimizedCDebugFlags
--#  define OptimizedCDebugFlags	DefaultGcc2AMD64Opt
-+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- # define LinuxMachineDefines   -D__amd64__
- # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-@@ -1023,26 +1131,6 @@
- # define ConnectionFlags	-DUNIXCONN -DTCPCONN
- #endif
- 
--/* Some of these man page defaults are overriden in the above OS sections */
--#ifndef ManSuffix
--# define ManSuffix	1x
--#endif
--#ifndef ManDir
--# define ManDir		$(MANSOURCEPATH)1
--#endif
--#ifndef LibManSuffix
--# define LibManSuffix	3x
--#endif
--#ifndef LibmanDir
--# define LibmanDir	$(MANSOURCEPATH)3
--#endif
--#ifndef FileManSuffix
--# define FileManSuffix	5x
--#endif
--#ifndef FileManDir
--# define FileManDir	$(MANSOURCEPATH)5
--#endif
--
- #ifndef StaticLibrary
- # define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
- #endif
-@@ -1087,3 +1175,59 @@
- #ifndef XFree86ServerOSDefines
- # define XFree86ServerOSDefines
- #endif
-+
-+/*
-+ *     SELinux support
-+ */
-+#if defined(__linux__)
-+# ifndef HasSELinux
-+#  define HasSELinux YES
-+# endif
-+#endif
-+
-+#ifndef SELinuxDefines
-+# if HasSELinux
-+#  define SELinuxDefines -DHAVE_SELINUX
-+# else
-+#  define SELinuxDefines /**/
-+# endif
-+#endif
-+
-+#ifndef SELinuxIncludeFlags
-+# if HasSELinux
-+#   define SELinuxIncludeFlags -I/usr/include/selinux
-+# else
-+#   define SELinuxIncludeFlags /**/
-+# endif
-+#endif
-+
-+#ifndef SELinuxCompileFlags
-+# define SELinuxCompileFlags /**/
-+#endif
-+
-+#ifndef SELinuxLoadFlags
-+# define SELinuxLoadFlags SELinuxCompileFlags
-+#endif
-+
-+#ifndef SELinuxLibraries
-+# if HasSELinux
-+#  define SELinuxLibraries -lselinux
-+# else
-+#  define SELinuxLibraries /**/
-+# endif
-+#endif
-+
-+#if HasSELinux
-+# ifndef SELINUX_LDFLAGS
-+   SELINUX_LDFLAGS = SELinuxLoadFlags
-+# endif
-+# ifndef SELINUX_INCLUDES
-+   SELINUX_INCLUDES = SELinuxIncludeFlags
-+# endif
-+# ifndef SELINUX_CFLAGS
-+   SELINUX_CFLAGS = SELinuxCompileFlags SELinuxDefines
-+# endif
-+# ifndef SELINUX_LIBS
-+   SELINUX_LIBS = SELinuxLibraries
-+# endif
-+#endif
-Index: xutils-dev/xorg-cf-files/NetBSD.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/NetBSD.cf
-+++ xutils-dev/xorg-cf-files/NetBSD.cf
-@@ -18,12 +18,178 @@
- #define OSTeenyVersion		DefaultOSTeenyVersion
- #endif
- 
-+#ifndef NetBSDDistribution
-+#define NetBSDDistribution	DefaultNetBSDDistribution
-+/*
-+  Add "#define NetBSDDistribution NetBSD<mumble>" to your site.def or host.def.
-+  Currently only NetBSDDebian will be autodetected.
-+  Valid values are:
-+    NetBSDUnknown    (0)
-+    NetBSDNative     (1)
-+    NetBSDDebian     (2)
-+*/
-+#endif
-+
-+#ifndef NetBSDDistName
-+# define NetBSDDistName		DefaultNetBSDDistName
-+#endif
- 
- #ifndef OSVendor
--#define	OSVendor		The NetBSD Foundation, Inc.
-+#define OSVendor		The NetBSD Foundation, Inc.
- #endif
-+
-+#ifndef NetBSDBinUtilsMajorVersion
-+# define NetBSDBinUtilsMajorVersion	DefaultNetBSDBinUtilsMajorVersion
-+#endif
-+
- XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
- 
-+/* Defines for Debian GNU/NetBSD */
-+
-+#if NetBSDDistribution == NetBSDDebian
-+# 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 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		YES
-+#   define HasXdmAuth			YES
-+#   define HasLatex			YES
-+/* Enable extended instruction set support. */
-+#   ifdef i386Architecture
-+#    define HasX86Support		YES
-+#    define HasMMXSupport		YES
-+#    define Has3DNowSupport		YES
-+#    define HasSSESupport		YES
-+#   endif /* i386Architecture */
-+# endif /* DebianMaintainer */
-+#endif /* NetBSDDebian */
-+
- /*
-  * C library features
-  */
-@@ -93,8 +259,12 @@
- 
- #define HasUsableFileMmap	YES
- 
--#define HasVarRun		YES
-+#if NetBSDDistribution == NetBSDDebian
-+#define VarDbDirectory		$(VARDIR)/lib
-+#else /* Debian */
- #define HasVarDb		YES
-+#endif /* Debian */
-+#define HasVarRun		YES
- 
- #define HasShadowPasswd		NO
- 
-@@ -207,6 +377,8 @@
- 
- #if UseElfFormat
- #define DlLibrary		-rdynamic /* no -ldl yet */
-+#define HasPlugin		YES
-+#define VendorHasX11R6_3libXext	YES
- #else
- #define DlLibrary		/**/
- #endif
-@@ -336,7 +508,11 @@
- /* NetBSD doesn't have gperf in the base install */
- #define DontRebuildGperfOutput	YES
- 
--/* 
-+#if NetBSDDistribution == NetBSDDebian
-+#define HasPerl			YES
-+#endif
-+
-+/*
-  * NetBSD doesn't have perl in default system
-  * you may override this in host.def if you installed perl from the packages
-  */
-@@ -355,7 +531,13 @@
- /*
-  * Make & install Features
-  */
-+
-+#if NetBSDDistribution == NetBSDDebian
-+#define HasBsdMake		NO
-+#else
- #define HasBsdMake		YES
-+#endif
-+
- #define CompressAllFonts	YES
- #define GzipFontCompression	YES
- #define DefaultUserPath		/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR)
-@@ -463,6 +645,8 @@
- 									@@\
- .EXEC:
- 
-+#if NetBSDDistribution != NetBSDDebian /* Debian uses ProjectManSuffix */
-+
- /*
-  * Man pages need to be formatted when installed, so override the default
-  * imake rules.
-@@ -552,6 +736,8 @@
- 									@@\
- InstallManPageAliasesBase(file,destdir,aliases)
- 
-+#endif /* NetBSDDistribution != NetBSDDebian */
-+
- /*
-  * Shared libraries supported starting in 1.0 on a.out platforms,
-  * and on all ELF platforms.
-Index: xutils-dev/xorg-cf-files/sco5.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/sco5.cf
-+++ xutils-dev/xorg-cf-files/sco5.cf
-@@ -69,7 +69,7 @@
- #endif
- 
- #ifndef UseExportLists
--# define UseExportLists		YES
-+# define UseExportLists		NO
- #endif
- 
- #define StandardDefines		-DSYSV -Di386 -DSCO325 -D__SCO__
-Index: xutils-dev/xorg-cf-files/usl.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/usl.cf
-+++ xutils-dev/xorg-cf-files/usl.cf
-@@ -159,7 +159,7 @@
- #endif
- 
- #ifndef UseExportLists
--# define UseExportLists		YES
-+# define UseExportLists		NO
- #endif
- 
- #define GencatFlags		-m
-Index: xutils-dev/xorg-cf-files/X11.tmpl
-===================================================================
---- xutils-dev.orig/xorg-cf-files/X11.tmpl
-+++ xutils-dev/xorg-cf-files/X11.tmpl
-@@ -45,7 +45,7 @@
- # if defined XorgVersionString
- #   define XOrgReleaseString	Release XorgVersionString
- # else
--#   define XOrgReleaseString	Release 6.8
-+#   define XOrgReleaseString	Release 6.9
- # endif
- #endif
- 
-@@ -614,23 +614,29 @@
- #ifndef BuildRender
- #define BuildRender		YES
- #endif
-+#ifndef HasRenderLibrary
-+#define HasRenderLibrary	NO
-+#endif
- #ifndef BuildRenderLibrary
--#define BuildRenderLibrary	(XdmxServer || !BuildServersOnly)
-+#define BuildRenderLibrary	(XdmxServer || (!HasRenderLibrary && BuildLibraries))
-+#endif
-+#ifndef HasXftLibrary
-+#define HasXftLibrary		NO
- #endif
- #ifndef BuildXftLibrary
--#define BuildXftLibrary		BuildRenderLibrary
-+#define BuildXftLibrary		((BuildRenderLibrary || HasRenderLibrary) && BuildLibraries)
- #endif
- #ifndef BuildXft1Library
- #define BuildXft1Library	BuildRenderLibrary
- #endif
- #ifndef UseFontconfig
--#define UseFontconfig		BuildXftLibrary
-+#define UseFontconfig		(BuildXftLibrary || HasXftLibrary)
- #endif
- #ifndef BuildFontconfigLibrary
- #define BuildFontconfigLibrary	(UseFontconfig && !HasFontconfig)
- #endif
- #ifndef UseFreetype2
--#define UseFreetype2		(BuildXftLibrary || BuildXft1Library || \
-+#define UseFreetype2		(BuildXftLibrary || HasXftLibrary || BuildXft1Library || \
- 				 UseFontconfig || BuildFreeType)
- #endif
- #ifndef InstallFontconfigLibrary
-@@ -700,8 +706,12 @@
- #define BuildXkbcomp		BuildClients
- #endif
- 
-+#ifndef HasXcursorLibrary
-+#define HasXcursorLibrary	NO
-+#endif
-+
- #ifndef BuildXcursorLibrary
--#define BuildXcursorLibrary	BuildRenderLibrary
-+#define BuildXcursorLibrary	((BuildRenderLibrary || HasRenderLibrary) && !HasXcursorLibrary && BuildLibraries)
- #endif
- 
- #ifndef BuildXcursorgen
-@@ -1170,7 +1180,7 @@
- #endif
- 
- #ifndef RenderDefines
--#if BuildRender
-+#if BuildRender || HasRenderLibrary
- #define RenderDefines -DRENDER
- #else
- #define RenderDefines /**/
-@@ -2668,6 +2678,7 @@
- ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
- #endif
- 
-+#if BuildRenderLibrary
-     XRENDERLIBSRC = $(LIBSRC)/Xrender
- #if SharedLibXrender
- #ifndef SharedXrenderRev
-@@ -2678,6 +2689,42 @@
- ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
- #endif
- 
-+#ifdef UseInstalled
-+XRENDERINCDIR=$(INCDIR)
-+#else
-+XRENDERINCDIR=$(BUILDINCDIR)
-+#endif
-+
-+XRENDERINCLUDES = -I$(XRENDERINCDIR)
-+
-+#else /* BuildRenderLibrary */
-+
-+#if HasRenderLibrary
-+
-+#ifndef RenderLibraryDir
-+#define RenderLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef RenderLibraryLibDir
-+#define RenderLibraryLibDir RenderLibraryDir/LibDirName
-+#endif
-+
-+#ifndef RenderLibraryIncDir
-+#define RenderLibraryIncDir RenderLibraryDir/include
-+#endif
-+
-+XRENDERDIR = RenderLibraryDir
-+XRENDERLIBDIR = RenderLibraryLibDir
-+XRENDERINCDIR = RenderLibraryIncDir
-+XRENDERLIB = -L$(XRENDERLIBDIR) -lXrender
-+DEPXRENDERLIB =
-+
-+XRENDERINCLUDES = -I$(XRENDERINCDIR)
-+
-+#endif /* HasRenderLibrary */
-+
-+#endif /* else BuildRenderLibrary */
-+
-     XRANDRLIBSRC = $(LIBSRC)/Xrandr
- #if SharedLibXrandr
- #ifndef SharedXrandrRev
-@@ -2728,6 +2775,7 @@
- ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir)
- #endif
- 
-+#if BuildXcursorLibrary
-    XCURSORLIBSRC = $(LIBSRC)/Xcursor
- #if SharedLibXcursor
- #ifndef SharedXcursorRev
-@@ -2738,6 +2786,41 @@
- ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
- #endif
- 
-+#ifdef UseInstalled
-+XCURSORINCDIR=$(INCDIR)
-+#else
-+XCURSORINCDIR=$(BUILDINCDIR)
-+#endif
-+
-+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
-+
-+#else /* BuildXcursorLibrary */
-+
-+#if HasXcursorLibrary
-+
-+#ifndef XcursorLibraryDir
-+#define XcursorLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef XcursorLibraryLibDir
-+#define XcursorLibraryLibDir XcursorLibraryDir/LibDirName
-+#endif
-+
-+#ifndef XcursorLibraryIncDir
-+#define XcursorLibraryIncDir XcursorLibraryDir/include
-+#endif
-+
-+XCURSORDIR = XcursorLibraryDir
-+XCURSORLIBDIR = XcursorLibraryLibDir
-+XCURSORINCDIR = XcursorLibraryIncDir
-+XCURSORLIB = -L$(XCURSORLIBDIR) -lXcursor
-+
-+XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
-+
-+#endif /* HasXcursorLibrary */
-+
-+#endif /* else BuildXcursorLibrary */
-+
-    APPLEWMLIBSRC = $(LIBSRC)/apple
- #if SharedLibAppleWM
- #ifndef SharedAppleWMRev
-@@ -3543,6 +3626,7 @@
- 
- #endif /* UseExpat */
- 
-+#if BuildXftLibrary
- #ifndef SharedLibXft1
- #define SharedLibXft1 HasSharedLibraries
- #endif
-@@ -3555,6 +3639,18 @@
- #ifndef ProfileLibXft1
- #define ProfileLibXft1		NO
- #endif
-+#else
-+#undef  SharedLibXft
-+#define SharedLibXft		NO
-+#undef  NormalLibXft
-+#define NormalLibXft		NO
-+#undef  DebugLibXft
-+#define DebugLibXft		NO
-+#undef  ProfileLibXft
-+#define ProfileLibXft		NO
-+#endif
-+
-+#if BuildXftLibrary
-           XFT1LIBSRC = $(LIBSRC)/Xft1
- #if SharedLibXft1
- #ifndef SharedXft1Rev
-@@ -3609,6 +3705,42 @@
- #define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
- #endif
- 
-+XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
-+
-+#else /* BuildXftLibrary */
-+
-+#if HasXftLibrary
-+
-+#ifndef XftLibraryDir
-+#define XftLibraryDir /usr/X11R6
-+#endif
-+
-+#ifndef XftLibraryLibDir
-+#define XftLibraryLibDir XftLibraryDir/LibDirName
-+#endif
-+
-+#ifndef XftLibraryIncDir
-+#define XftLibraryIncDir XftLibraryDir/include
-+#endif
-+
-+XFTDIR = XftLibraryDir
-+XFTLIBDIR = XftLibraryLibDir
-+XFTINCDIR = XftLibraryIncDir
-+XFTLIB = -L$(XFTLIBDIR) -lXft
-+
-+#ifndef XftClientDepLibs
-+#define XftClientDepLibs FontconfigClientDepLibs $(DEPXRENDERLIB)
-+#endif
-+#ifndef XftClientLibs
-+#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
-+#endif
-+
-+XFTINCLUDES= -I$(XFTINCDIR) $(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
-+
-+#endif /* HasXftLibrary */
-+
-+#endif /* else BuildXftLibrary */
-+
- #if UseFontconfig
- 
- #if BuildFontconfigLibrary
-@@ -3724,8 +3856,6 @@
- 
- #endif /* UseFontconfig */
- 
--XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES)
--
- #ifdef HasLibpng
- 
- /*
-Index: xutils-dev/xorg-cf-files/xfree86.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/xfree86.cf
-+++ xutils-dev/xorg-cf-files/xfree86.cf
-@@ -100,6 +100,13 @@
- #define XVendorManNameString XFree86
- #endif
- 
-+VENDORMANNAME = XVendorManNameString
-+VENDORMANVERSION = XVendorManVersionString
-+
-+#ifndef VendorManDefs
-+#define VendorManDefs -D__vendorversion__="\"Version $(VENDORMANVERSION)\" $(VENDORMANNAME)"
-+#endif
-+
- /*
-  * This enables some settings for developers.
-  */
-@@ -116,6 +123,15 @@
- # endif
- #endif
- 
-+/*
-+ * No XF86Server for the S/390 platform.
-+ */
-+#ifdef s390Architecture
-+# ifndef XF86Server
-+#  define XF86Server		NO
-+# endif
-+#endif
-+
- #ifndef BuildDebug
- # define BuildDebug 		YES
- #endif
-@@ -233,6 +249,11 @@
- #define GlideDriver /**/
- #endif
- 
-+/* The tdfx DRI driver can only be built if glide3 is available. */
-+#ifndef HasGlide3
-+#define HasGlide3 NO
-+#endif
-+
- /*
-  * There are three parameters that determine where and how the Matrox HAL
-  * library is used:
-@@ -372,15 +393,17 @@
- #  /* Don't build the nsc driver on IA64 */
- #  ifndef ia64Architecture
- #   define NscDriver		nsc
-+#   define ViaDriver		via
- #  else
- #   define NscDriver		/**/
-+#   define ViaDriver		/**/
- #  endif
- #  define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
- 				neomagic i740 tdfx savage \
- 				cirrus vmware tseng trident chips apm \
- 				GlideDriver i128 NscDriver \
- 				ati i810 AgpGartDrivers DevelDrivers ark \
--				cyrix siliconmotion via \
-+				cyrix siliconmotion ViaDriver \
- 				fbdev vesa vga \
- 				dummy XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
-@@ -485,8 +508,11 @@
- 				vga dummy fbdev vesa
- # endif
- 
--/* DRI tdfx driver needs Glide, which is not available for AMD64 */
--# define TdfxDriDriver		/**/
-+# if HasGlide3
-+#  define TdfxDriDriver		tdfx
-+# else
-+#  define TdfxDriDriver		/**/
-+#endif
- 
- # define DevelDRIDrivers	/**/
- 
-@@ -579,9 +605,9 @@
-     * require changes (or even removal) for things like endianness, etc.  Move
-     * those known to work into the main XF86CardDrivers #define.
-     */
--#   define DevelDrivers		apm ark chips cirrus i128 i740 i810 imstt \
--				neomagic newport nv rendition s3virge savage \
--				siliconmotion tga trident vmware dummy
-+#   define DevelDrivers		apm ark chips cirrus i128 i740 imstt \
-+				neomagic nv rendition s3virge savage \
-+				siliconmotion trident dummy
- #  else
- #   define DevelDrivers		/* */
- #  endif
-@@ -872,8 +898,14 @@
- 				savage nv cirrus DevelDrivers siliconmotion  \
- 				vga XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
-+# if HasGlide3
-+#  define TdfxDriDriver		tdfx
-+# else
-+#  define TdfxDriDriver		/**/
-+# endif
- # ifndef DriDrivers
--#  define DriDrivers		gamma tdfx mga r128 radeon r200 /*sis*/
-+#  define DriDrivers		gamma tdfx mga r128 radeon r200 /*sis*/ \
-+				TdfxDriDriver
- # endif
- #endif
- 
-@@ -968,8 +1000,13 @@
- 				DevelDrivers vga \
- 				XF86OSCardDrivers XF86ExtraCardDrivers
- # endif
-+# if HasGlide3
-+#  define TdfxDriDriver		tdfx
-+# else
-+#  define TdfxDriDriver		/**/
-+# endif
- # ifndef DriDrivers
--#  define DriDrivers		gamma tdfx mga r128 radeon r200
-+#  define DriDrivers		gamma TdfxDriDriver mga r128 radeon r200
- # endif
- #endif
- 
-@@ -1066,7 +1103,7 @@
- #  define TdfxDriDriver		/**/
- # endif
- # ifndef DriDrivers
--#  define DriDrivers		gamma tdfx mga r128 radeon r200
-+#  define DriDrivers		gamma TdfxDriDriver mga r128 radeon r200
- # endif
- #endif
- 
-@@ -1745,7 +1782,7 @@
- #endif
- #ifndef BuildScanpci
- # if SystemV || SystemV4 || \
--    (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \
-+    defined(LinuxArchitecture) || \
-     defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \
-     defined(OS2Architecture) || defined(GNUMachArchitecture) || \
-     (defined(KFreeBSDArchitecture) && defined(i386Architecture))
-@@ -1943,10 +1980,6 @@
- # define UseRgbTxt	YES
- #endif
- 
--#ifndef ManSuffix
--# define ManSuffix	1
--#endif
--
- /*
-  * GNU Compiler stuff
-  */
-@@ -2010,33 +2043,39 @@
- # define GccAliasingArgs      /* */
- #endif
- 
-+#if HasGcc2
-+# ifndef DefaultGcc2OptimizeOpt
-+#  define DefaultGcc2OptimizeOpt -O2
-+# endif
-+#endif
-+
- #if HasGcc2 && defined(i386Architecture)
- # ifndef DefaultGcc2i386Opt
--#  define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
-+#  define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(AMD64Architecture)
- # ifndef DefaultGcc2AMD64Opt
--#  define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs
-+#  define DefaultGcc2AMD64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(AlphaArchitecture)
- # ifndef DefaultGcc2AxpOpt
--#  define DefaultGcc2AxpOpt -O2 GccAliasingArgs
-+#  define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(Ppc64Architecture)
- # ifndef DefaultGcc2Ppc64Opt
--#  define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
-+#  define DefaultGcc2Ppc64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(PpcArchitecture)
- # ifndef DefaultGcc2PpcOpt
--#  define DefaultGcc2PpcOpt -O2 GccAliasingArgs
-+#  define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
-Index: xutils-dev/xorg-cf-files/xorg.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/xorg.cf
-+++ xutils-dev/xorg-cf-files/xorg.cf
-@@ -262,6 +262,11 @@
- #define GlideDriver /**/
- #endif
- 
-+/* The tdfx DRI driver can only be built if glide3 is available. */
-+#ifndef HasGlide3
-+#define HasGlide3 NO
-+#endif
-+
- /*
-  * There are three parameters that determine where and how the Matrox HAL
-  * library is used:
-@@ -425,7 +430,13 @@
-    /* SiS is 64-bit unclean as of this writing. */
- #   define i386DRIDrivers /**/
- #  endif
--#  define DriDrivers		i386DRIDrivers mga r128 radeon r200 tdfx
-+#  if HasGlide3
-+#   define TdfxDriDriver   tdfx
-+#  else
-+#   define TdfxDriDriver   /**/
-+#  endif
-+#  define DriDrivers       i386DRIDrivers mga r128 radeon r200 \
-+               TdfxDriDriver
- # endif
- #endif /* i386Architecture || ia64Architecture */
- 
-@@ -461,8 +472,13 @@
- # endif
- 
- /* SiS is 64-bit unclean as of this writing. */
-+#  if HasGlide3
-+#   define TdfxDriDriver   tdfx
-+#  else
-+#   define TdfxDriDriver   /**/
-+#  endif
- # ifndef DriDrivers
--#  define DriDrivers		i915 mga r128 radeon r200 tdfx
-+#  define DriDrivers       i915 mga r128 radeon r200 TdfxDriDriver
- # endif
- #endif /*AMD64Arcitecture*/
- 
-@@ -602,8 +618,13 @@
-  *  Glide is available for Alpha, therefore build tdfx DRM module.
-  *  SiS is 64-bit unclean as of this writing. 
-  */  
-+#  if HasGlide3
-+#   define TdfxDriDriver   tdfx
-+#  else
-+#   define TdfxDriDriver   /**/
-+#  endif
- # ifndef DriDrivers
--#  define DriDrivers		tdfx mga r128 radeon r200
-+#  define DriDrivers       TdfxDriDriver mga r128 radeon r200
- # endif
- #endif /* AlphaArchitecture */
- 
-@@ -767,7 +788,7 @@
- # endif
- # define TdfxDriDriver		/**/
- # ifndef DriDrivers
--#  define DriDrivers		r128
-+#  define DriDrivers		r128 TdfxDriDriver
- # endif
- #endif /* Ppc64Architecture */
- 
-@@ -1480,10 +1501,6 @@
- # define UseRgbTxt	YES
- #endif
- 
--#ifndef ManSuffix
--# define ManSuffix	1
--#endif
--
- /*
-  * GNU Compiler stuff
-  */
-@@ -1557,37 +1574,37 @@
- 
- #if HasGcc2 && defined(i386Architecture)
- # ifndef DefaultGcc2i386Opt
--#  define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs
-+#  define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(AMD64Architecture)
- # ifndef DefaultGcc2AMD64Opt
--#  define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs
-+#  define DefaultGcc2AMD64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(AlphaArchitecture)
- # ifndef DefaultGcc2AxpOpt
--#  define DefaultGcc2AxpOpt -O2 GccAliasingArgs
-+#  define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(Ppc64Architecture)
- # ifndef DefaultGcc2Ppc64Opt
--#  define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
-+#  define DefaultGcc2Ppc64Opt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(MipsArchitecture)
- # ifndef DefaultGcc2MipsOpt
--#  define DefaultGcc2MipsOpt -O2 GccAliasingArgs
-+#  define DefaultGcc2MipsOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
- #if HasGcc2 && defined(PpcArchitecture)
- # ifndef DefaultGcc2PpcOpt
--#  define DefaultGcc2PpcOpt -O2 GccAliasingArgs
-+#  define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt GccAliasingArgs
- # endif
- #endif
- 
-Index: xutils-dev/xorg-cf-files/xorgversion.def
-===================================================================
---- xutils-dev.orig/xorg-cf-files/xorgversion.def
-+++ xutils-dev/xorg-cf-files/xorgversion.def
-@@ -1,5 +1,5 @@
- #define XORG_VERSION_MAJOR 6
--#define XORG_VERSION_MINOR 8
--#define XORG_VERSION_PATCH 99
--#define XORG_VERSION_SNAP 903
--#define XORG_DATE "03 December 2005 + cvs"
-+#define XORG_VERSION_MINOR 9
-+#define XORG_VERSION_PATCH 0
-+#define XORG_VERSION_SNAP  0
-+#define XORG_DATE "21 December 2005"
diff --git a/debian/patches/05_xaw_without_xp.diff b/debian/patches/05_xaw_without_xp.diff
deleted file mode 100644
index 34e3801..0000000
--- a/debian/patches/05_xaw_without_xp.diff
+++ /dev/null
@@ -1,69 +0,0 @@
----
- xorg-cf-files/FreeBSD.cf |   10 ++++++++++
- xorg-cf-files/gnu.cf     |   10 ++++++++++
- xorg-cf-files/linux.cf   |   10 ++++++++++
- 3 files changed, 30 insertions(+)
-
-Index: xutils-dev/xorg-cf-files/linux.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/linux.cf	2008-06-01 18:36:51.000000000 +0200
-+++ xutils-dev/xorg-cf-files/linux.cf	2008-06-01 18:36:51.000000000 +0200
-@@ -1153,6 +1153,16 @@
- #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
- #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
- 
-+#ifndef ExtraXawClientLibs
-+# define ExtraXawClientLibs /**/
-+#endif
-+#ifndef ExtraXawClientDepLibs
-+# define ExtraXawClientDepLibs /**/
-+#endif
-+#ifndef ExtraXawReqs
-+# define ExtraXawReqs /**/
-+#endif
-+
- #if HaveLib64
- # ifndef LibDirName
- #  define LibDirName		lib64
-Index: xutils-dev/xorg-cf-files/gnu.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/gnu.cf	2008-06-01 18:36:51.000000000 +0200
-+++ xutils-dev/xorg-cf-files/gnu.cf	2008-06-01 18:36:51.000000000 +0200
-@@ -541,6 +541,16 @@
- #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
- #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
- 
-+#ifndef ExtraXawClientLibs
-+# define ExtraXawClientLibs /**/
-+#endif
-+#ifndef ExtraXawClientDepLibs
-+# define ExtraXawClientDepLibs /**/
-+#endif
-+#ifndef ExtraXawReqs
-+# define ExtraXawReqs /**/
-+#endif
-+
- #ifndef BuildDmx
- #define BuildDmx	YES
- #endif
-Index: xutils-dev/xorg-cf-files/FreeBSD.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/FreeBSD.cf	2008-06-01 18:43:49.000000000 +0200
-+++ xutils-dev/xorg-cf-files/FreeBSD.cf	2008-06-01 18:44:03.000000000 +0200
-@@ -570,6 +570,16 @@
- #endif
- #endif
- 
-+#ifndef ExtraXawClientLibs
-+# define ExtraXawClientLibs /**/
-+#endif
-+#ifndef ExtraXawClientDepLibs
-+# define ExtraXawClientDepLibs /**/
-+#endif
-+#ifndef ExtraXawReqs
-+# define ExtraXawReqs /**/
-+#endif
-+
- /*
-  * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4
-  */
diff --git a/debian/patches/06_font_path.diff b/debian/patches/06_font_path.diff
deleted file mode 100644
index 015841b..0000000
--- a/debian/patches/06_font_path.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: xutils-dev/xorg-cf-files/X11.tmpl
-===================================================================
---- xutils-dev.orig/xorg-cf-files/X11.tmpl	2006-12-19 20:55:05.000000000 -0500
-+++ xutils-dev/xorg-cf-files/X11.tmpl	2006-12-19 20:56:03.000000000 -0500
-@@ -1512,10 +1512,10 @@
- #define DocPdfDir $(DOCDIR)/PDF
- #endif
- #ifndef FontDir
--#define FontDir $(LIBDIR)/fonts
-+#define FontDir /usr/share/fonts/X11
- #endif
- #ifndef FontEncDir
--#define FontEncDir $(LIBDIR)/fonts/encodings
-+#define FontEncDir /usr/share/fonts/X11/encodings
- #endif
- #ifndef AdmDir
- #define AdmDir /usr/adm
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3ed579a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-02_mkdirhier_rewrite.diff
-03_xutils-dev-FHS.diff
-04_xutils-dev-debian.diff
-05_xaw_without_xp.diff
-06_font_path.diff
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 7c33d4d..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules for the Debian xutils package.
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
-# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusinow@debian.org>
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# set this to the name of the main shlib's binary package
-PACKAGE = xutils-dev
-
-include debian/xsfbs/xsfbs.mk
-
-# This package contains multiple modules as shipped by upstream. Each module is # contained in a subdirectory in the root dir of the package. You must list each
-# subdirectory explicitly so that the build system knows what to build
-SUBDIRS="gccmakedep imake lndir makedepend util-macros xorg-cf-files"
-
-CFLAGS += -Wall -g
-CFLAGS += -I$(CURDIR)
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	confflags += --build=$(DEB_HOST_GNU_TYPE)
-#	confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
-	confflags += --build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-#	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-
-build: genscripts patch build-stamp
-build-stamp:
-	dh_testdir
-	for FILE in "$(SUBDIRS)"; do \
-		test -d "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) || mkdir "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE); \
-		(cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && \
-		../"$$FILE"/configure --prefix=/usr --mandir=\$${prefix}/share/man \
-		             --infodir=\$${prefix}/share/info $(confflags) \
-		             CFLAGS="$(CFLAGS)" && \
-		$(MAKE)) || exit 1; \
-	done
-
-	touch build-stamp
-
-clean: xsfclean
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	rm -f config.cache config.log config.status
-	rm -f */config.cache */config.log */config.status
-	rm -f conftest* */conftest*
-	rm -rf autom4te.cache */autom4te.cache
-	rm -rf *-obj-*
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	for FILE in "$(SUBDIRS)"; do \
-		cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install ; \
-		cd ..; \
-	done
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-
-	dh_installdocs
-	dh_install --sourcedir=debian/tmp --list-missing
-	dh_installchangelogs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_makeshlibs
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/watch.gccmakedep b/debian/watch.gccmakedep
deleted file mode 100644
index 391df7f..0000000
--- a/debian/watch.gccmakedep
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://xorg.freedesktop.org/releases/individual/util/ gccmakedep-(.*)\.tar\.gz
diff --git a/debian/watch.imake b/debian/watch.imake
deleted file mode 100644
index 5b35e31..0000000
--- a/debian/watch.imake
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://xorg.freedesktop.org/releases/individual/util/ imake-(.*)\.tar\.gz
diff --git a/debian/watch.lndir b/debian/watch.lndir
deleted file mode 100644
index 0d91bee..0000000
--- a/debian/watch.lndir
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://xorg.freedesktop.org/releases/individual/util/ lndir-(.*)\.tar\.gz
diff --git a/debian/watch.makedepend b/debian/watch.makedepend
deleted file mode 100644
index 690c777..0000000
--- a/debian/watch.makedepend
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://xorg.freedesktop.org/releases/individual/util/ makedepend-(.*)\.tar\.gz
diff --git a/debian/watch.util-macros b/debian/watch.util-macros
deleted file mode 100644
index d546666..0000000
--- a/debian/watch.util-macros
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://xorg.freedesktop.org/releases/individual/util/ util-macros-(.*)\.tar\.gz
diff --git a/debian/watch.xorg-cf-files b/debian/watch.xorg-cf-files
deleted file mode 100644
index 01f16cf..0000000
--- a/debian/watch.xorg-cf-files
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://xorg.freedesktop.org/releases/individual/util/ xorg-cf-files-(.*)\.tar\.gz
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
deleted file mode 100755
index 5935cc9..0000000
--- a/debian/xsfbs/repack.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if ! [ -d debian/prune ]; then
-	exit 0
-fi
-
-if [ "x$1" != x--upstream-version ]; then
-	exit 1
-fi
-
-version="$2"
-filename="$3"
-
-if [ -z "$version" ] || ! [ -f "$filename" ]; then
-	exit 1
-fi
-
-dir="$(pwd)"
-tempdir="$(mktemp -d)"
-
-cd "$tempdir"
-tar xf "$dir/$filename"
-cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
-
-tar czf "$dir/$filename" *
-cd "$dir"
-rm -rf "$tempdir"
-echo "Done pruning upstream tarball"
-
-exit 0
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
deleted file mode 100755
index 3c59c20..0000000
--- a/debian/xsfbs/xsfbs.mk
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/usr/bin/make -f
-
-# Debian X Strike Force Build System (XSFBS): Make portion
-
-# Copyright 1996 Stephen Early
-# Copyright 1997 Mark Eichin
-# Copyright 1998-2005, 2007 Branden Robinson
-# Copyright 2005 David Nusinow
-#
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# Originally by Stephen Early <sde1000@debian.org>
-# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us>
-# Modified by Adam Heath <doogie@debian.org>
-# Modified by Branden Robinson <branden@debian.org>
-# Modified by Fabio Massimo Di Nitto <fabbione@fabbione.net>
-# Modified by David Nusinow <dnusinow@debian.org>
-# Acknowledgements to Manoj Srivastava.
-
-# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
-export DH_OPTIONS
-
-# force quilt to not use ~/.quiltrc and to use debian/patches
-QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
-
-# Set up parameters for the upstream build environment.
-
-# Determine (source) package name from Debian changelog.
-SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \
-                        | grep '^Source:' | awk '{print $$2}')
-
-# Determine package version from Debian changelog.
-SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \
-                        | grep '^Version:' | awk '{print $$2}')
-
-# Determine upstream version number.
-UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//')
-
-# Determine the source version without the epoch for make-orig-tar-gz
-NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
-
-# Figure out who's building this package.
-BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
-
-# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the codename of a release in the Debian part of the
-# version number.  Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
-
-# Set up parameters for the Debian build environment.
-
-# Determine our architecture.
-BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-# Work around some old-time dpkg braindamage.
-BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH))
-# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy.
-ifdef DEB_HOST_ARCH
- ARCH:=$(DEB_HOST_ARCH)
-else
- # dpkg-cross sets the ARCH environment variable; if set, use it.
- ifdef ARCH
-  ARCH:=$(ARCH)
- else
-  ARCH:=$(BUILD_ARCH)
- endif
-endif
-
-# $(STAMP_DIR) houses stamp files for complex targets.
-STAMP_DIR:=stampdir
-
-# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
-# their files.
-DEBTREEDIR:=$(CURDIR)/debian/tmp
-
-# All "important" targets have four lines:
-#   1) A target name that is invoked by a package-building tool or the user.
-#      This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart.
-#   2) A line delcaring 1) as a phony target (".PHONY:").
-#   3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may
-#   depend on other targets.
-#   4) A line declaring 3) as a member of the $(stampdir_targets) variable; the
-#   "$(STAMP_DIR)/" prefix is omitted.
-#
-# This indirection is needed so that the "stamp" files that signify when a rule
-# is done can be located in a separate "stampdir".  Recall that make has no way
-# to know when a goal has been met for a phony target (like "build" or
-# "install").
-#
-# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@"
-# so that the target will not be run again.  Removing the file will make Make
-# run the target over.
-
-# All phony targets should be declared as dependencies of .PHONY, even if they
-# do not have "($STAMP_DIR)/"-prefixed counterparts.
-
-# Define a harmless default rule to keep things from going nuts by accident.
-.PHONY: default
-default:
-
-# Set up the $(STAMP_DIR) directory.
-.PHONY: stampdir
-stampdir_targets+=stampdir
-stampdir: $(STAMP_DIR)/stampdir
-$(STAMP_DIR)/stampdir:
-	mkdir $(STAMP_DIR)
-	>$@
-
-# Set up the package build directory as quilt expects to find it.
-.PHONY: prepare
-stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
-	>$@
-
-.PHONY: logdir
-stampdir_targets+=logdir
-logdir: $(STAMP_DIR)/logdir
-$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
-	mkdir -p $(STAMP_DIR)/log
-	>$@
-
-# Apply all patches to the upstream source.
-.PHONY: patch
-stampdir_targets+=patch
-patch: $(STAMP_DIR)/patch
-$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
-	if ! [ `which quilt` ]; then \
-		echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
-		exit 1; \
-	fi; \
-	if $(QUILT) next >/dev/null 2>&1; then \
-	  echo -n "Applying patches..."; \
-	  if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
-	    cat $(STAMP_DIR)/log/patch; \
-	    echo "successful."; \
-	  else \
-	    cat $(STAMP_DIR)/log/patch; \
-	    echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
-	    exit 1; \
-	  fi; \
-	else \
-	  echo "No patches to apply"; \
-	fi; \
-	>$@
-
-# Revert all patches to the upstream source.
-.PHONY: unpatch
-unpatch: $(STAMP_DIR)/logdir
-	rm -f $(STAMP_DIR)/patch
-	@echo -n "Unapplying patches..."; \
-	if $(QUILT) applied >/dev/null 2>/dev/null; then \
-	  if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
-	    cat $(STAMP_DIR)/log/unpatch; \
-	    echo "successful."; \
-	  else \
-	    cat $(STAMP_DIR)/log/unpatch; \
-	    echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
-	    exit 1; \
-	  fi; \
-	else \
-	  echo "nothing to do."; \
-	fi
-
-# Clean the generated maintainer scripts.
-.PHONY: cleanscripts
-cleanscripts:
-	rm -f $(STAMP_DIR)/genscripts
-	rm -f debian/*.config \
-	      debian/*.postinst \
-	      debian/*.postrm \
-	      debian/*.preinst \
-	      debian/*.prerm
-
-# Clean the package build tree.
-.PHONY: xsfclean
-xsfclean: cleanscripts unpatch
-	dh_testdir
-	rm -rf .pc
-	rm -rf $(STAMP_DIR)
-	dh_clean
-
-# Remove files from the upstream source tree that we don't need, or which have
-# licensing problems.  It must be run before creating the .orig.tar.gz.
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-.PHONY: prune-upstream-tree
-prune-upstream-tree:
-	# Ensure we're in the correct directory.
-	dh_testdir
-	grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
-
-# Verify that there are no offsets or fuzz in the patches we apply.
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-.PHONY: patch-audit
-patch-audit: prepare unpatch
-	@echo -n "Auditing patches..."; \
-	>$(STAMP_DIR)/log/patch; \
-	FUZZY=; \
-	while [ -n "$$($(QUILT) next)" ]; do \
-	  RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
-	  case "$$RESULT" in \
-	    succeeded) \
-	      echo "fuzzy patch: $$($(QUILT) top)" \
-	        | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
-	      FUZZY=yes; \
-	      ;; \
-	    FAILED) \
-	      echo "broken patch: $$($(QUILT) next)" \
-	        | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
-	      exit 1; \
-	      ;; \
-	  esac; \
-	done; \
-	if [ -n "$$FUZZY" ]; then \
-	  echo "there were fuzzy patches; please fix."; \
-	  exit 1; \
-	else \
-	  echo "done."; \
-	fi
-
-# Generate the maintainer scripts.
-.PHONY: genscripts
-stampdir_targets+=genscripts
-genscripts: $(STAMP_DIR)/genscripts
-$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
-	for FILE in debian/*.config.in \
-	            debian/*.postinst.in \
-	            debian/*.postrm.in \
-	            debian/*.preinst.in \
-	            debian/*.prerm.in; do \
-	  if [ -e "$$FILE" ]; then \
-	    MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \
-	    sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \
-	      | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \
-	    cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \
-	    sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \
-	      | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
-	    sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-	        -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-	      <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
-	    rm $$MAINTSCRIPT.tmp; \
-	  fi; \
-	done
-	# Validate syntax of generated shell scripts.
-	#sh debian/scripts/validate-posix-sh debian/*.config \
-	#                                    debian/*.postinst \
-	#                                    debian/*.postrm \
-	#                                    debian/*.preinst \
-	#                                    debian/*.prerm
-	>$@
-
-# Compute dependencies for drivers
-#
-VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
-INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
-
-# these two can be removed post-squeeze
-VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
-
-ifeq ($(PACKAGE),)
-PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
-endif
-
-.PHONY: serverabi
-serverabi: install
-ifeq ($(VIDEODEP),)
-	@echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
-	@exit 1
-else
-	echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
-	echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
-	# the following is there for compatibility...
-	echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
-	echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
-	echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
-endif
-
-# vim:set noet ai sts=8 sw=8 tw=0:
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
deleted file mode 100644
index 813fd8d..0000000
--- a/debian/xsfbs/xsfbs.sh
+++ /dev/null
@@ -1,622 +0,0 @@
-# This is the X Strike Force shell library for X Window System package
-# maintainer scripts.  It serves to define shell functions commonly used by
-# such packages, and performs some error checking necessary for proper operation
-# of those functions.  By itself, it does not "do" much; the maintainer scripts
-# invoke the functions defined here to accomplish package installation and
-# removal tasks.
-
-# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
-# skip past this library by scanning forward in this file to the string
-# "GOBSTOPPER".
-
-SOURCE_VERSION=@SOURCE_VERSION@
-OFFICIAL_BUILD=@OFFICIAL_BUILD@
-
-# Use special abnormal exit codes so that problems with this library are more
-# easily tracked down.
-SHELL_LIB_INTERNAL_ERROR=86
-SHELL_LIB_THROWN_ERROR=74
-SHELL_LIB_USAGE_ERROR=99
-
-# old -> new variable names
-if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then
-  DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE"
-fi
-if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then
-  DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF"
-fi
-
-# initial sanity checks
-if [ -z "$THIS_PACKAGE" ]; then
-  cat >&2 <<EOF
-Error: package maintainer script attempted to use shell library without
-definining \$THIS_PACKAGE shell variable.  Please report the package name,
-version, and the text of this error message to the Debian Bug Tracking System.
-Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for
-instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the
-"doc-debian" package, or install the "reportbug" package and use the command of
-the same name to file a report against version $SOURCE_VERSION of this package.
-EOF
-  exit $SHELL_LIB_USAGE_ERROR
-fi
-
-if [ -z "$THIS_SCRIPT" ]; then
-  cat >&2 <<EOF
-Error: package maintainer script attempted to use shell library without
-definining \$THIS_SCRIPT shell variable.  Please report the package name,
-version, and the text of this error message to the Debian Bug Tracking System.
-Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for
-instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the
-"doc-debian" package, or install the "reportbug" package and use the command of
-the same name to file a report against version $SOURCE_VERSION of the
-"$THIS_PACKAGE" package.
-EOF
-  exit $SHELL_LIB_USAGE_ERROR
-fi
-
-if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
-  RECONFIGURE="true"
-else
-  RECONFIGURE=
-fi
-
-if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then
-  FIRSTINST="yes"
-fi
-
-if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then
-  UPGRADE="yes"
-fi
-
-trap "message;\
-      message \"Received signal.  Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\
-      message;\
-      exit 1" HUP INT QUIT TERM
-
-reject_nondigits () {
-  # syntax: reject_nondigits [ operand ... ]
-  #
-  # scan operands (typically shell variables whose values cannot be trusted) for
-  # characters other than decimal digits and barf if any are found
-  while [ -n "$1" ]; do
-    # does the operand contain anything but digits?
-    if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then
-      # can't use die(), because it wraps message() which wraps this function
-      echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \
-           "possibly malicious garbage \"$1\"" >&2
-      exit $SHELL_LIB_THROWN_ERROR
-    fi
-    shift
-  done
-}
-
-reject_unlikely_path_chars () {
-  # syntax: reject_unlikely_path_chars [ operand ... ]
-  #
-  # scan operands (typically shell variables whose values cannot be trusted) for
-  # characters unlikely to be seen in a path and which the shell might
-  # interpret and barf if any are found
-  while [ -n "$1" ]; do
-    # does the operand contain any funny characters?
-    if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then
-      # can't use die(), because I want to avoid forward references
-      echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \
-           "encountered possibly malicious garbage \"$1\"" >&2
-      exit $SHELL_LIB_THROWN_ERROR
-    fi
-    shift
-  done
-}
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the
-# event the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while
-# the script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then
-  DEFCOLUMNS=80
-fi
-
-message () {
-  # pretty-print messages of arbitrary length
-  reject_nondigits "$COLUMNS"
-  echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2
-}
-
-observe () {
-  # syntax: observe message ...
-  #
-  # issue observational message suitable for logging someday when support for
-  # it exists in dpkg
-  if [ -n "$DEBUG_XORG_PACKAGE" ]; then
-    message "$THIS_PACKAGE $THIS_SCRIPT note: $*"
-  fi
-}
-
-warn () {
-  # syntax: warn message ...
-  #
-  # issue warning message suitable for logging someday when support for
-  # it exists in dpkg; also send to standard error
-  message "$THIS_PACKAGE $THIS_SCRIPT warning: $*"
-}
-
-die () {
-  # syntax: die message ...
-  #
-  # exit script with error message
-  message "$THIS_PACKAGE $THIS_SCRIPT error: $*"
-  exit $SHELL_LIB_THROWN_ERROR
-}
-
-internal_error () {
-  # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message
-  message "internal error: $*"
-  if [ -n "$OFFICIAL_BUILD" ]; then
-    message "Please report a bug in the $THIS_SCRIPT script of the" \
-            "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \
-            "Tracking System.  Include all messages above that mention the" \
-            "$THIS_PACKAGE package.  Visit " \
-            "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \
-            "instructions, read the file" \
-            "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \
-            "package, or install the reportbug package and use the command of" \
-            "the same name to file a report."
-  fi
-  exit $SHELL_LIB_INTERNAL_ERROR
-}
-
-usage_error () {
-  message "usage error: $*"
-  message "Please report a bug in the $THIS_SCRIPT script of the" \
-          "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \
-          "Tracking System.  Include all messages above that mention the" \
-          "$THIS_PACKAGE package.  Visit " \
-          "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \
-          "instructions, read the file" \
-          "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \
-          "package, or install the reportbug package and use the command of" \
-          "the same name to file a report."
-  exit $SHELL_LIB_USAGE_ERROR
-}
-
-font_update () {
-  # run $UPDATECMDS in $FONTDIRS
-
-  local dir cmd shortcmd x_font_dir_prefix
-
-  x_font_dir_prefix="/usr/share/fonts/X11"
-
-  if [ -z "$UPDATECMDS" ]; then
-    usage_error "font_update() called but \$UPDATECMDS not set"
-  fi
-  if [ -z "$FONTDIRS" ]; then
-    usage_error "font_update() called but \$FONTDIRS not set"
-  fi
-
-  reject_unlikely_path_chars "$UPDATECMDS"
-  reject_unlikely_path_chars "$FONTDIRS"
-
-  for dir in $FONTDIRS; do
-    if [ -d "$x_font_dir_prefix/$dir" ]; then
-      for cmd in $UPDATECMDS; do
-        if which "$cmd" > /dev/null 2>&1; then
-          shortcmd=${cmd##*/}
-          observe "running $shortcmd in $dir font directory"
-	  cmd_opts=
-          if [ "$shortcmd" = "update-fonts-alias" ]; then
-            cmd_opts=--x11r7-layout
-          fi
-          if [ "$shortcmd" = "update-fonts-dir" ]; then
-            cmd_opts=--x11r7-layout
-          fi
-          if [ "$shortcmd" = "update-fonts-scale" ]; then
-            cmd_opts=--x11r7-layout
-          fi
-          $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \
-                              "failed; font directory data may not" \
-                              "be up to date"
-        else
-          warn "$cmd not found; not updating corresponding $dir font" \
-               "directory data"
-        fi
-      done
-    else
-      warn "$dir is not a directory; not updating font directory data"
-    fi
-  done
-}
-
-remove_conffile_prepare () {
-  # syntax: remove_conffile_prepare filename official_md5sum ...
-  #
-  # Check a conffile "filename" against a list of canonical MD5 checksums.
-  # If the file's current MD5 checksum matches one of the "official_md5sum"
-  # operands provided, then prepare the conffile for removal from the system.
-  # We defer actual deletion until the package is configured so that we can
-  # roll this operation back if package installation fails.
-  #
-  # Call this function from a preinst script in the event $1 is "upgrade" or
-  # "install" and verify $2 to ensure the package is being upgraded from a
-  # version (or installed over a version removed-but-not-purged) prior to the
-  # one in which the conffile was obsoleted.
-
-  local conffile current_checksum
-
-  # validate arguments
-  if [ $# -lt 2 ]; then
-    usage_error "remove_conffile_prepare() called with wrong number of" \
-                "arguments; expected at least 2, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  conffile="$1"
-  shift
-
-  # does the conffile even exist?
-  if [ -e "$conffile" ]; then
-    # calculate its checksum
-    current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//')
-    # compare it to each supplied checksum
-    while [ -n "$1" ]; do
-      if [ "$current_checksum" = "$1" ]; then
-        # we found a match; move the confffile and stop looking
-        observe "preparing obsolete conffile $conffile for removal"
-        mv "$conffile" "$conffile.$THIS_PACKAGE-tmp"
-        break
-      fi
-      shift
-    done
-  fi
-}
-
-remove_conffile_lookup () {
-  # syntax: remove_conffile_lookup package filename
-  #
-  # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal
-  # if it matches the actual file's md5sum.
-  #
-  # Call this function when you would call remove_conffile_prepare but only
-  # want to check against dpkg's status database instead of known checksums.
-
-  local package conffile old_md5sum
-
-  # validate arguments
-  if [ $# -ne 2 ]; then
-    usage_error "remove_conffile_lookup() called with wrong number of" \
-                "arguments; expected 1, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  package="$1"
-  conffile="$2"
-
-  if ! [ -e "$conffile" ]; then
-    return
-  fi
-  old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \
-    awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')"
-  if [ -n "$old_md5sum" ]; then
-    remove_conffile_prepare "$conffile" "$old_md5sum"
-  fi
-}
-
-remove_conffile_commit () {
-  # syntax: remove_conffile_commit filename
-  #
-  # Complete the removal of a conffile "filename" that has become obsolete.
-  #
-  # Call this function from a postinst script after having used
-  # remove_conffile_prepare() in the preinst.
-
-  local conffile
-
-  # validate arguments
-  if [ $# -ne 1 ]; then
-    usage_error "remove_conffile_commit() called with wrong number of" \
-                "arguments; expected 1, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  conffile="$1"
-
-  # if the temporary file created by remove_conffile_prepare() exists, remove it
-  if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
-    observe "committing removal of obsolete conffile $conffile"
-    rm "$conffile.$THIS_PACKAGE-tmp"
-  fi
-}
-
-remove_conffile_rollback () {
-  # syntax: remove_conffile_rollback filename
-  #
-  # Roll back the removal of a conffile "filename".
-  #
-  # Call this function from a postrm script in the event $1 is "abort-upgrade"
-  # or "abort-install" is  after having used remove_conffile_prepare() in the
-  # preinst.
-
-  local conffile
-
-  # validate arguments
-  if [ $# -ne 1 ]; then
-    usage_error "remove_conffile_rollback() called with wrong number of" \
-                "arguments; expected 1, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  conffile="$1"
-
-  # if the temporary file created by remove_conffile_prepare() exists, move it
-  # back
-  if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
-    observe "rolling back removal of obsolete conffile $conffile"
-    mv "$conffile.$THIS_PACKAGE-tmp" "$conffile"
-  fi
-}
-
-replace_conffile_with_symlink_prepare () {
-  # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \
-  # official_md5sum ...
-  #
-  # Check a conffile "oldfilename" against a list of canonical MD5 checksums.
-  # If the file's current MD5 checksum matches one of the "official_md5sum"
-  # operands provided, then prepare the conffile for removal from the system.
-  # We defer actual deletion until the package is configured so that we can
-  # roll this operation back if package installation fails. Otherwise copy it
-  # to newfilename and let dpkg handle it through conffiles mechanism.
-  #
-  # Call this function from a preinst script in the event $1 is "upgrade" or
-  # "install" and verify $2 to ensure the package is being upgraded from a
-  # version (or installed over a version removed-but-not-purged) prior to the
-  # one in which the conffile was obsoleted.
-
-  local conffile current_checksum
-
-  # validate arguments
-  if [ $# -lt 3 ]; then
-    usage_error "replace_conffile_with_symlink_prepare() called with wrong" \
-                " number of arguments; expected at least 3, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  oldconffile="$1"
-  shift
-  newconffile="$1"
-  shift
-
-  remove_conffile_prepare "$_oldconffile" "$@"
-  # If $oldconffile still exists, then md5sums didn't match.
-  # Copy it to new one.
-  if [ -f "$oldconffile" ]; then
-    cp "$oldconffile" "$newconffile"
-  fi
-
-}
-
-replace_conffile_with_symlink_commit () {
-  # syntax: replace_conffile_with_symlink_commit oldfilename
-  #
-  # Complete the removal of a conffile "oldfilename" that has been
-  # replaced by a symlink.
-  #
-  # Call this function from a postinst script after having used
-  # replace_conffile_with_symlink_prepare() in the preinst.
-
-  local conffile
-
-  # validate arguments
-  if [ $# -ne 1 ]; then
-    usage_error "replace_conffile_with_symlink_commit() called with wrong" \
-                "number of arguments; expected 1, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  conffile="$1"
-
-  remove_conffile_commit "$conffile"
-}
-
-replace_conffile_with_symlink_rollback () {
-  # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename
-  #
-  # Roll back the replacing of a conffile "oldfilename" with symlink to
-  # "newfilename".
-  #
-  # Call this function from a postrm script in the event $1 is "abort-upgrade"
-  # or "abort-install" and verify $2 to ensure the package failed to upgrade
-  # from a version (or install over a version removed-but-not-purged) prior
-  # to the one in which the conffile was obsoleted.
-  # You should have  used replace_conffile_with_symlink_prepare() in the
-  # preinst.
-
-  local conffile
-
-  # validate arguments
-  if [ $# -ne 2 ]; then
-    usage_error "replace_conffile_with_symlink_rollback() called with wrong" \
-                "number of arguments; expected 2, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  oldconffile="$1"
-  newconffile="$2"
-
-  remove_conffile_rollback "$_oldconffile"
-  if [ -f "$newconffile" ]; then
-    rm "$newconffile"
-  fi
-}
-
-run () {
-  # syntax: run command [ argument ... ]
-  #
-  # Run specified command with optional arguments and report its exit status.
-  # Useful for commands whose exit status may be nonzero, but still acceptable,
-  # or commands whose failure is not fatal to us.
-  #
-  # NOTE: Do *not* use this function with db_get or db_metaget commands; in
-  # those cases the return value of the debconf command *must* be checked
-  # before the string returned by debconf is used for anything.
-
-  local retval
-
-  # validate arguments
-  if [ $# -lt 1 ]; then
-    usage_error "run() called with wrong number of arguments; expected at" \
-                "least 1, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  "$@" || retval=$?
-
-  if [ ${retval:-0} -ne 0 ]; then
-    observe "command \"$*\" exited with status $retval"
-  fi
-}
-
-make_symlink_sane () {
-  # syntax: make_symlink_sane symlink target
-  #
-  # Ensure that the symbolic link symlink exists, and points to target.
-  #
-  # If symlink does not exist, create it and point it at target.
-  #
-  # If symlink exists but is not a symbolic link, back it up.
-  #
-  # If symlink exists, is a symbolic link, but points to the wrong location, fix
-  # it.
-  #
-  # If symlink exists, is a symbolic link, and already points to target, do
-  # nothing.
-  #
-  # This function wouldn't be needed if ln had an -I, --idempotent option.
-
-  # Validate arguments.
-  if [ $# -ne 2 ]; then
-    usage_error "make_symlink_sane() called with wrong number of arguments;" \
-      "expected 2, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  # We could just use the positional parameters as-is, but that makes things
-  # harder to follow.
-  local symlink target
-
-  symlink="$1"
-  target="$2"
-
-  if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then
-      observe "link from $symlink to $target already exists"
-  else
-    observe "creating symbolic link from $symlink to $target"
-    mkdir -p "${target%/*}" "${symlink%/*}"
-    ln -s -b -S ".dpkg-old" "$target" "$symlink"
-  fi
-}
-
-migrate_dir_to_symlink () {
-  # syntax: migrate_dir_to_symlink old_location new_location
-  #
-  # Per Debian Policy section 6.5.4, "A directory will never be replaced by a
-  # symbolic link to a directory or vice versa; instead, the existing state
-  # (symlink or not) will be left alone and dpkg will follow the symlink if
-  # there is one."
-  #
-  # We have to do it ourselves.
-  #
-  # This function moves the contents of old_location, a directory, into
-  # new_location, a directory, then makes old_location a symbolic link to
-  # new_location.
-  #
-  # old_location need not exist, but if it does, it must be a directory (or a
-  # symlink to a directory).  If it is not, it is backed up.  If new_location
-  # exists already and is not a directory, it is backed up.
-  #
-  # This function should be called from a package's preinst so that other
-  # packages unpacked after this one --- but before this package's postinst runs
-  # --- are unpacked into new_location even if their payloads contain
-  # old_location filespecs.
-
-  # Validate arguments.
-  if [ $# -ne 2 ]; then
-    usage_error "migrate_dir_to_symlink() called with wrong number of"
-                "arguments; expected 2, got $#"
-    exit $SHELL_LIB_USAGE_ERROR
-  fi
-
-  # We could just use the positional parameters as-is, but that makes things
-  # harder to follow.
-  local new old
-
-  old="$1"
-  new="$2"
-
-  # Is old location a symlink?
-  if [ -L "$old" ]; then
-    # Does it already point to new location?
-    if [ "$(readlink "$old")" = "$new" ]; then
-      # Nothing to do; migration has already been done.
-      observe "migration of $old to $new already done"
-      return 0
-    else
-      # Back it up.
-      warn "backing up symbolic link $old as $old.dpkg-old"
-      mv -b "$old" "$old.dpkg-old"
-    fi
-  fi
-
-  # Does old location exist, but is not a directory?
-  if [ -e "$old" ] && ! [ -d "$old" ]; then
-      # Back it up.
-      warn "backing up non-directory $old as $old.dpkg-old"
-      mv -b "$old" "$old.dpkg-old"
-  fi
-
-  observe "migrating $old to $new"
-
-  # Is new location a symlink?
-  if [ -L "$new" ]; then
-    # Does it point the wrong way, i.e., back to where we're migrating from?
-    if [ "$(readlink "$new")" = "$old" ]; then
-      # Get rid of it.
-      observe "removing symbolic link $new which points to $old"
-      rm "$new"
-    else
-      # Back it up.
-      warn "backing up symbolic link $new as $new.dpkg-old"
-      mv -b "$new" "$new.dpkg-old"
-    fi
-  fi
-
-  # Does new location exist, but is not a directory?
-  if [ -e "$new" ] && ! [ -d "$new" ]; then
-    warn "backing up non-directory $new as $new.dpkg-old"
-    mv -b "$new" "$new.dpkg-old"
-  fi
-
-  # Create new directory if it does not yet exist.
-  if ! [ -e "$new" ]; then
-    observe "creating $new"
-    mkdir -p "$new"
-  fi
-
-  # Copy files in old location to new location.  Back up any filenames that
-  # already exist in the new location with the extension ".dpkg-old".
-  observe "copying files from $old to $new"
-  if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then
-    die "error(s) encountered while copying files from $old to $new"
-  fi
-
-  # Remove files at old location.
-  observe "removing $old"
-  rm -r "$old"
-
-  # Create symlink from old location to new location.
-  make_symlink_sane "$old" "$new"
-}
-
-# vim:set ai et sw=2 ts=2 tw=80:
-
-# GOBSTOPPER: The X Strike Force shell library ends here.
diff --git a/debian/xutils-dev.install b/debian/xutils-dev.install
deleted file mode 100644
index d31a410..0000000
--- a/debian/xutils-dev.install
+++ /dev/null
@@ -1,149 +0,0 @@
-usr/share/man/man1/gccmakedep.1
-usr/share/man/man1/imake.1
-usr/share/man/man1/makeg.1
-usr/share/man/man1/xmkmf.1
-usr/share/man/man1/ccmakedep.1
-usr/share/man/man1/mergelib.1
-usr/share/man/man1/revpath.1
-usr/share/man/man1/mkdirhier.1
-usr/share/man/man1/cleanlinks.1
-usr/share/man/man1/mkhtmlindex.1
-usr/share/man/man1/lndir.1
-usr/share/man/man1/makedepend.1
-usr/share/aclocal/xorg-macros.m4
-usr/bin/gccmakedep
-usr/bin/imake
-usr/bin/revpath
-usr/bin/makeg
-usr/bin/xmkmf
-usr/bin/ccmakedep
-usr/bin/mergelib
-usr/bin/mkdirhier
-usr/bin/cleanlinks
-usr/bin/mkhtmlindex
-usr/bin/lndir
-usr/bin/makedepend
-usr/lib/X11/config
-usr/lib/X11/config/host.def
-usr/lib/X11/config/date.def
-usr/lib/X11/config/version.def
-usr/lib/X11/config/Imake.rules
-usr/lib/X11/config/Motif.rules
-usr/lib/X11/config/OpenBSDLib.rules
-usr/lib/X11/config/Win32.rules
-usr/lib/X11/config/X11.rules
-usr/lib/X11/config/bsdiLib.rules
-usr/lib/X11/config/bsdLib.rules
-usr/lib/X11/config/cde.rules
-usr/lib/X11/config/cross.rules
-usr/lib/X11/config/cygwin.rules
-usr/lib/X11/config/mingw.rules
-usr/lib/X11/config/darwinLib.rules
-usr/lib/X11/config/gnuLib.rules
-usr/lib/X11/config/hpLib.rules
-usr/lib/X11/config/ibmLib.rules
-usr/lib/X11/config/lnxLib.rules
-usr/lib/X11/config/lnxdoc.rules
-usr/lib/X11/config/necLib.rules
-usr/lib/X11/config/noop.rules
-usr/lib/X11/config/nto.rules
-usr/lib/X11/config/oldlib.rules
-usr/lib/X11/config/os2.rules
-usr/lib/X11/config/os2Lib.rules
-usr/lib/X11/config/osfLib.rules
-usr/lib/X11/config/scoLib.rules
-usr/lib/X11/config/sequentLib.rules
-usr/lib/X11/config/sgiLib.rules
-usr/lib/X11/config/sunLib.rules
-usr/lib/X11/config/sv3Lib.rules
-usr/lib/X11/config/sv4Lib.rules
-usr/lib/X11/config/QNX4.rules
-usr/lib/X11/config/xf86.rules
-usr/lib/X11/config/Imake.tmpl
-usr/lib/X11/config/Library.tmpl
-usr/lib/X11/config/Motif.tmpl
-usr/lib/X11/config/OpenBSDLib.tmpl
-usr/lib/X11/config/Server.tmpl
-usr/lib/X11/config/ServerLib.tmpl
-usr/lib/X11/config/Threads.tmpl
-usr/lib/X11/config/WinLib.tmpl
-usr/lib/X11/config/X11.tmpl
-usr/lib/X11/config/bsdiLib.tmpl
-usr/lib/X11/config/bsdLib.tmpl
-usr/lib/X11/config/cde.tmpl
-usr/lib/X11/config/cygwin.tmpl
-usr/lib/X11/config/mingw.tmpl
-usr/lib/X11/config/darwinLib.tmpl
-usr/lib/X11/config/hpLib.tmpl
-usr/lib/X11/config/gnuLib.tmpl
-usr/lib/X11/config/ibmLib.tmpl
-usr/lib/X11/config/lnxLib.tmpl
-usr/lib/X11/config/lnxdoc.tmpl
-usr/lib/X11/config/necLib.tmpl
-usr/lib/X11/config/os2Lib.tmpl
-usr/lib/X11/config/osfLib.tmpl
-usr/lib/X11/config/sgiLib.tmpl
-usr/lib/X11/config/sunLib.tmpl
-usr/lib/X11/config/sv3Lib.tmpl
-usr/lib/X11/config/sv4Lib.tmpl
-usr/lib/X11/config/xf86.tmpl
-usr/lib/X11/config/xorg.tmpl
-usr/lib/X11/config/cross.def
-usr/lib/X11/config/site.def
-usr/lib/X11/config/xf86site.def
-usr/lib/X11/config/xorgsite.def
-usr/lib/X11/config/xorgversion.def
-usr/lib/X11/config/Imake.cf
-usr/lib/X11/config/Amoeba.cf
-usr/lib/X11/config/DGUX.cf
-usr/lib/X11/config/dmx.cf
-usr/lib/X11/config/DragonFly.cf
-usr/lib/X11/config/FreeBSD.cf
-usr/lib/X11/config/Mips.cf
-usr/lib/X11/config/NetBSD.cf
-usr/lib/X11/config/OpenBSD.cf
-usr/lib/X11/config/Oki.cf
-usr/lib/X11/config/cygwin.cf
-usr/lib/X11/config/mingw.cf
-usr/lib/X11/config/Win32.cf
-usr/lib/X11/config/apollo.cf
-usr/lib/X11/config/bsd.cf
-usr/lib/X11/config/bsdi.cf
-usr/lib/X11/config/convex.cf
-usr/lib/X11/config/cray.cf
-usr/lib/X11/config/fujitsu.cf
-usr/lib/X11/config/generic.cf
-usr/lib/X11/config/gnu.cf
-usr/lib/X11/config/hp.cf
-usr/lib/X11/config/ibm.cf
-usr/lib/X11/config/isc.cf
-usr/lib/X11/config/linux.cf
-usr/lib/X11/config/luna.cf
-usr/lib/X11/config/macII.cf
-usr/lib/X11/config/mach.cf
-usr/lib/X11/config/minix.cf
-usr/lib/X11/config/moto.cf
-usr/lib/X11/config/ncr.cf
-usr/lib/X11/config/nec.cf
-usr/lib/X11/config/nto.cf
-usr/lib/X11/config/os2.cf
-usr/lib/X11/config/osf1.cf
-usr/lib/X11/config/pegasus.cf
-usr/lib/X11/config/sco.cf
-usr/lib/X11/config/sco5.cf
-usr/lib/X11/config/sequent.cf
-usr/lib/X11/config/sgi.cf
-usr/lib/X11/config/sony.cf
-usr/lib/X11/config/sun.cf
-usr/lib/X11/config/svr3.cf
-usr/lib/X11/config/svr4.cf
-usr/lib/X11/config/ultrix.cf
-usr/lib/X11/config/usl.cf
-usr/lib/X11/config/lynx.cf
-usr/lib/X11/config/x386.cf
-usr/lib/X11/config/QNX4.cf
-usr/lib/X11/config/darwin.cf
-usr/lib/X11/config/xfree86.cf
-usr/lib/X11/config/xorg.cf
-usr/share/pkgconfig
-usr/share/util-macros
diff --git a/packaging/xorg-x11-xutils-dev.spec b/packaging/xorg-x11-xutils-dev.spec
index fe8cb47..5f4959e 100644
--- a/packaging/xorg-x11-xutils-dev.spec
+++ b/packaging/xorg-x11-xutils-dev.spec
@@ -2,7 +2,7 @@ Name:	 xorg-x11-xutils-dev
 Summary: X.Org build utilities
 Version: 7.7
 Release: 1
-License: MIT/X11
+License: MIT
 Group:   Development/System
 URL:     http://www.x.org
 Source: %{name}-%{version}.tar.gz
@@ -36,6 +36,8 @@ Description: %{summary}
 
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp -af COPYING %{buildroot}/usr/share/license/%{name}
 # Install all xutils
 {
    for xutil in %{DEF_SUBDIRS} ; do
@@ -54,4 +56,5 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_datadir}/aclocal/*
 %{_datadir}/pkgconfig/*
+/usr/share/license/%{name}