xutils-dev: Changes to 'debian-unstable'
debian/README.source | 24
debian/changelog | 13
debian/control | 2
debian/patches/04_xutils-dev-debian.diff | 293 -
debian/versions | 5
debian/xutils-dev.lintian-overrides | 1
xorg-cf-files/ChangeLog | 160
xorg-cf-files/INSTALL | 121
xorg-cf-files/Imake.cf | 13
xorg-cf-files/Imake.tmpl | 2
xorg-cf-files/Makefile.am | 1
xorg-cf-files/Makefile.in | 53
xorg-cf-files/NetBSD.cf | 11
xorg-cf-files/README | 7
xorg-cf-files/aclocal.m4 | 206 -
xorg-cf-files/compile | 2
xorg-cf-files/config.guess | 201 -
xorg-cf-files/config.sub | 51
xorg-cf-files/configure | 621 +--
xorg-cf-files/configure.ac | 3
xorg-cf-files/install-sh | 366 +-
xorg-cf-files/linux.cf | 9
xorg-cf-files/missing | 6
xorg-cf-files/os2def.db | 5095 -------------------------------
xorg-cf-files/sun.cf | 42
xorg-cf-files/xfree86.cf | 6
xorg-cf-files/xorg.cf | 12
27 files changed, 1211 insertions(+), 6115 deletions(-)
New commits:
commit d082ea34a5b94702f0abd3016fba0755fad1cadd
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jan 26 11:55:35 2016 +0100
Add a lintian override for extra-license-file usr/lib/X11/config/bsd.cf.
diff --git a/debian/changelog b/debian/changelog
index bfd461b..b11affe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xutils-dev (1:7.7+5) UNRELEASED; urgency=medium
* Update 04_xutils-dev-debian.diff for new xorg-cf-files.
* Remove reference to xsfbs in README.source.
* Bump Standards-Version to 3.9.6 (no changes).
+ * Add a lintian override for extra-license-file
+ usr/lib/X11/config/bsd.cf.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 26 Jan 2016 11:02:24 +0100
diff --git a/debian/xutils-dev.lintian-overrides b/debian/xutils-dev.lintian-overrides
new file mode 100644
index 0000000..13c51c0
--- /dev/null
+++ b/debian/xutils-dev.lintian-overrides
@@ -0,0 +1 @@
+extra-license-file usr/lib/X11/config/bsd.cf
commit b38d1db1cc03e296a7e167a4836dcd2765c1c60c
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jan 26 11:37:06 2016 +0100
Bump Standards-Version to 3.9.6 (no changes).
diff --git a/debian/changelog b/debian/changelog
index b5642af..bfd461b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xutils-dev (1:7.7+5) UNRELEASED; urgency=medium
- Uses gzip -n to not save the timestamps. (Closes: #789964).
* Update 04_xutils-dev-debian.diff for new xorg-cf-files.
* Remove reference to xsfbs in README.source.
+ * Bump Standards-Version to 3.9.6 (no changes).
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 26 Jan 2016 11:02:24 +0100
diff --git a/debian/control b/debian/control
index 2d1759b..d660a95 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
quilt,
x11proto-core-dev (>= 7.0.17),
autoconf,
-Standards-Version: 3.9.2
+Standards-Version: 3.9.6
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xutils-dev.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xutils-dev.git
commit 2904bf35cb44b915cf95df44db6a78f558118417
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jan 26 11:32:28 2016 +0100
Remove reference to xsfbs in README.source.
diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
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
index bc1ff5e..b5642af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xutils-dev (1:7.7+5) UNRELEASED; urgency=medium
- Adds support for OpenRISC 1000 (or1k) (Closes: #760419).
- Uses gzip -n to not save the timestamps. (Closes: #789964).
* Update 04_xutils-dev-debian.diff for new xorg-cf-files.
+ * Remove reference to xsfbs in README.source.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 26 Jan 2016 11:02:24 +0100
commit 6e099efe86f994164e2db2ad9398d0063c64ec92
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jan 26 11:23:19 2016 +0100
Update debian/versions
diff --git a/debian/versions b/debian/versions
index 98d3a9f..609f895 100644
--- a/debian/versions
+++ b/debian/versions
@@ -9,6 +9,8 @@ squeeze. As the most useful, util-macros comes first.
util-macros | Debian
------------------------
+1.19.0 | 1:7.7+3
+1.18.0 | 1:7.7+2
1.17.1 | 1:7.7+1
1.17.0 | 1:7.7~1
1.15.0 | 1:7.6+5
@@ -21,11 +23,13 @@ util-macros | Debian
gccmakedep | Debian
------------------------
+1.0.3 | 1:7.7+3
1.0.2 | 1:7.5+4
imake | Debian
------------------------
+1.0.7 | 1:7.7+3
1.0.6 | 1:7.7+1
1.0.5 | 1:7.7~1
1.0.4 | 1:7.5+5
@@ -46,6 +50,7 @@ makedepend | Debian
xorg-cf-files | Debian
------------------------
+1.0.6 | 1:7.7+5
1.0.5 | 1:7.7+1
1.0.4 | 1:7.6+1
1.0.3 | 1:7.5+4
commit abc6d61739ca7c17930855861dfaa80b32353d39
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jan 26 11:18:40 2016 +0100
Update 04_xutils-dev-debian.diff for new xorg-cf-files.
diff --git a/debian/changelog b/debian/changelog
index cc04024..bc1ff5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xutils-dev (1:7.7+5) UNRELEASED; urgency=medium
* xorg-cf-files 1.0.6.
- Adds support for OpenRISC 1000 (or1k) (Closes: #760419).
- Uses gzip -n to not save the timestamps. (Closes: #789964).
+ * Update 04_xutils-dev-debian.diff for new xorg-cf-files.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 26 Jan 2016 11:02:24 +0100
diff --git a/debian/patches/04_xutils-dev-debian.diff b/debian/patches/04_xutils-dev-debian.diff
index c8731a3..121bffa 100644
--- a/debian/patches/04_xutils-dev-debian.diff
+++ b/debian/patches/04_xutils-dev-debian.diff
@@ -1,8 +1,6 @@
-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 @@ XCOMM $XFree86: xc/config/cf/bsdLib.rule
+--- a/xorg-cf-files/bsdLib.rules
++++ b/xorg-cf-files/bsdLib.rules
+@@ -13,6 +13,12 @@
#define UseElfFormat NO
#endif
@@ -15,7 +13,7 @@ Index: xutils-dev/xorg-cf-files/bsdLib.rules
#if !UseElfFormat
/* a.out shared libs */
#ifndef HasSharedLibraries
-@@ -91,6 +97,34 @@ clean:: @@\
+@@ -91,6 +97,34 @@
#endif /* SharedDepLibraryTarget */
@@ -50,11 +48,9 @@ Index: xutils-dev/xorg-cf-files/bsdLib.rules
#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 @@ XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.
+--- a/xorg-cf-files/gnu.cf
++++ b/xorg-cf-files/gnu.cf
+@@ -17,16 +17,231 @@
#ifndef OSTeenyVersion
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
@@ -292,7 +288,7 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
#define HasPosixThreads YES
#define ThreadedX YES
#define HasThreadSafeAPI YES
-@@ -36,35 +251,132 @@ XCOMM XXXMB: What about _GNU_SOURCE, see
+@@ -36,35 +251,132 @@
#ifndef HasLibCrypt
#define HasLibCrypt YES
#endif
@@ -428,7 +424,7 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
#define AvoidNullMakeCommand YES
#ifndef DebuggableLibraries
#define DebuggableLibraries NO
-@@ -84,32 +396,64 @@ XCOMM Not implemented and will always fa
+@@ -84,32 +396,64 @@
#define UseStaticTermcapLib NO
#endif
@@ -501,7 +497,7 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
#define YaccCmd bison -y
#define LexCmd flex -l
#define HasFlex YES
-@@ -125,50 +469,68 @@ XCOMM Not implemented and will always fa
+@@ -125,50 +469,68 @@
#define StandardCppDefines StandardDefines
#define HasVarRun YES
@@ -593,7 +589,7 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
#define HasGnuMake YES
#define MakeNamedTargetSubdir(dir,flags,subname)\
-@@ -176,12 +538,16 @@ XCOMM i386Architecture
+@@ -176,12 +538,16 @@
#define ArchitectureDefines -DGNU_ARCHITECTURE
@@ -615,10 +611,8 @@ Index: xutils-dev/xorg-cf-files/gnu.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
+--- a/xorg-cf-files/gnuLib.rules
++++ b/xorg-cf-files/gnuLib.rules
@@ -17,7 +17,6 @@
#define ForceNormalLib NO
#endif
@@ -627,7 +621,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
#ifndef UseRpath
#define UseRpath NO
#endif
-@@ -26,10 +25,13 @@ XCOMM XXX To rpath or not to rpath...
+@@ -26,10 +25,13 @@
#define SharedOldX NO
#endif
@@ -642,7 +636,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
#ifndef SharedDataSeparation
#define SharedDataSeparation NO
-@@ -45,7 +47,7 @@ XCOMM XXX To rpath or not to rpath...
+@@ -45,7 +47,7 @@
#endif
#ifndef RpathLoadFlags
#if UseRpath
@@ -651,7 +645,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
#else
#define RpathLoadFlags /**/
#endif
-@@ -54,7 +56,7 @@ XCOMM XXX To rpath or not to rpath...
+@@ -54,7 +56,7 @@
#define LibraryRpathLoadFlags RpathLoadFlags
#endif
#ifndef SharedLibraryLoadFlags
@@ -660,7 +654,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
#endif
#ifndef PositionIndependentCFlags
#define PositionIndependentCFlags -fPIC
-@@ -63,12 +65,13 @@ XCOMM XXX To rpath or not to rpath...
+@@ -63,12 +65,13 @@
#define PositionIndependentCplusplusFlags -fPIC
#endif
#ifndef ExtraLoadFlags
@@ -679,7 +673,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
#endif
/*
-@@ -87,6 +90,26 @@ install:: Concat(lib,libname.so.rev)
+@@ -87,6 +90,26 @@
$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
#endif /* InstallSharedLibrary */
@@ -706,7 +700,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
/*
* InstallSharedLibraryData - generate rules to install the shared library data
*/
-@@ -106,9 +129,9 @@ AllTarget(Concat(lib,libname.so.rev))
+@@ -106,9 +129,9 @@
@@\
Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\
$(RM) $@~ @@\
@@ -719,7 +713,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
LinkBuildSonameLibrary($$SONAME) @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
-@@ -125,6 +148,38 @@ clean:: @@\
+@@ -125,6 +148,38 @@
#endif /* SharedLibraryTarget */
@@ -758,7 +752,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
/*
* SharedDepLibraryTarget - generate rules to create a shared library.
*/
-@@ -153,6 +208,34 @@ clean:: @@\
+@@ -153,6 +208,34 @@
#endif /* SharedDepLibraryTarget */
@@ -793,7 +787,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
#ifndef SharedDepModuleTarget
#define SharedDepModuleTarget(name,deps,solist) @@\
AllTarget(name) @@\
-@@ -168,6 +251,23 @@ clean:: @@\
+@@ -168,6 +251,23 @@
#endif /* SharedDepModuleTarget */
@@ -817,10 +811,8 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
/*
* 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
+--- a/xorg-cf-files/gnuLib.tmpl
++++ b/xorg-cf-files/gnuLib.tmpl
@@ -1,8 +1,9 @@
-XCOMM
-XCOMM GNU Hurd shared library template
@@ -836,7 +828,7 @@ Index: xutils-dev/xorg-cf-files/gnuLib.tmpl
#ifndef FixupLibReferences
#define FixupLibReferences() @@\
-@@ -14,15 +15,71 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLI
+@@ -14,15 +15,71 @@
#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
#endif
@@ -910,11 +902,9 @@ Index: xutils-dev/xorg-cf-files/gnuLib.tmpl
+#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 @@ LibraryTargetName(libname): objlist1 obj
+--- a/xorg-cf-files/Imake.rules
++++ b/xorg-cf-files/Imake.rules
+@@ -2722,6 +2722,20 @@
/*
@@ -935,11 +925,9 @@ Index: xutils-dev/xorg-cf-files/Imake.rules
* 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 @@ TCLIBDIR = TclLibDir
+--- a/xorg-cf-files/Imake.tmpl
++++ b/xorg-cf-files/Imake.tmpl
+@@ -902,37 +902,82 @@
#define ManSourcePath $(MANPATH)/man
#endif
#ifndef ManDir
@@ -1037,7 +1025,7 @@ Index: xutils-dev/xorg-cf-files/Imake.tmpl
#endif
#ifndef AdminManDefs
#define AdminManDefs -D__adminmansuffix__=$(ADMINMANSUFFIX)
-@@ -963,6 +1008,21 @@ TCLIBDIR = TclLibDir
+@@ -963,6 +1008,21 @@
#endif
#endif
@@ -1059,7 +1047,7 @@ Index: xutils-dev/xorg-cf-files/Imake.tmpl
#ifndef LogDirectory
#if HasVarDirectory
#define LogDirectory $(VARDIR)/log
-@@ -1609,32 +1669,50 @@ TCLIBDIR = TclLibDir
+@@ -1609,32 +1669,50 @@
#ifndef SHsuf
#define SHsuf sh
#endif
@@ -1123,7 +1111,7 @@ Index: xutils-dev/xorg-cf-files/Imake.tmpl
#endif
#ifndef AdminManSuffix
#if SystemV || SystemV4
-@@ -1763,9 +1841,15 @@ TCLIBDIR = TclLibDir
+@@ -1763,9 +1841,15 @@
MANPATH = ManPath /* top of manual page tree */
MANSOURCEPATH = ManSourcePath /* prefix for man page sources */
MANDIR = ManDir /* man pages for commands */
@@ -1140,7 +1128,7 @@ Index: xutils-dev/xorg-cf-files/Imake.tmpl
DRIVERMANDIR = DriverManDir /* man pages for drivers */
LOGDIRECTORY = LogDirectory /* OS location of log files */
#ifdef VarRunDirectory
-@@ -1872,15 +1956,30 @@ CXXEXTRA_INCLUDES = CplusplusExtraInclud
+@@ -1872,15 +1956,30 @@
PERL = PerlCmd
PERLOPTS = PerlOptions
PERLENVSETUP = PerlEnvSetup
@@ -1173,11 +1161,9 @@ Index: xutils-dev/xorg-cf-files/Imake.tmpl
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 @@ XCOMM $XFree86: xc/config/cf/Library.tmp
+--- a/xorg-cf-files/Library.tmpl
++++ b/xorg-cf-files/Library.tmpl
+@@ -37,6 +37,14 @@
#define DoExtraLib NO
#endif
@@ -1192,7 +1178,7 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
#ifndef HasSharedData
#define HasSharedData NO
#endif
-@@ -53,7 +61,7 @@ SHLIBGLOBALSFLAGS = ShlibGlobalsFlags
+@@ -53,7 +61,7 @@
#endif
#ifndef LibraryCplusplusOptions
@@ -1201,7 +1187,7 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# define LibraryCplusplusOptions SharedLibraryCplusplusOptions
# else
# define LibraryCplusplusOptions DefaultCplusplusOptions
-@@ -85,14 +93,14 @@ SHLIBGLOBALSFLAGS = ShlibGlobalsFlags
+@@ -85,14 +93,14 @@
#ifndef CplusplusSource
# ifndef LibraryCcCmd
@@ -1218,7 +1204,7 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# define LibraryCCOptions SharedLibraryCCOptions
# else
# define LibraryCCOptions DefaultCCOptions
-@@ -121,7 +129,7 @@ CLIBDEBUGFLAGS = LibraryDebugOpt
+@@ -121,7 +129,7 @@
#else
# ifndef CrossCompileDir
# ifndef LibraryCplusplusCmd
@@ -1227,7 +1213,7 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# define LibraryCplusplusCmd SharedLibraryCplusplusCmd
# else
# define LibraryCplusplusCmd CplusplusCmd
-@@ -129,7 +137,7 @@ CLIBDEBUGFLAGS = LibraryDebugOpt
+@@ -129,7 +137,7 @@
# endif
# else
# ifndef CrossLibraryCplusplusCmd
@@ -1236,7 +1222,7 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(SharedLibraryCplusplusCmd))
# else
# define CrossLibraryCplusplusCmd Concat3(CrossCompileDir,/,StripPath(CplusplusCmd))
-@@ -138,7 +146,7 @@ CLIBDEBUGFLAGS = LibraryDebugOpt
+@@ -138,7 +146,7 @@
# endif
# ifndef LibraryCplusplusOptions
@@ -1245,7 +1231,7 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# define LibraryCplusplusOptions SharedLibraryCplusplusOptions
# else
# define LibraryCplusplusOptions DefaultCplusplusOptions
-@@ -204,14 +212,14 @@ LIB_MT_DEFINES = LibraryMTDefines
+@@ -204,14 +212,14 @@
# define _NormalObjCplusplusCompile(options) $(_NULLCMD_)
# define _NormalCleanDir() $(_NULLCMD_)
#else
@@ -1262,7 +1248,7 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# define _NormalObjCompile(options) NormalRelocLibObjCompile(options)
# else
# define _NormalObjCompile(options) NormalLibObjCompile(options)
-@@ -221,7 +229,7 @@ LIB_MT_DEFINES = LibraryMTDefines
+@@ -221,7 +229,7 @@
# endif
#endif
@@ -1271,7 +1257,7 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# define _SharedObjCompile(options) $(_NULLCMD_)
# define _SharedObjCplusplusCompile(options) $(_NULLCMD_)
#else
-@@ -517,6 +525,12 @@ DebuggedLibraryTarget($(LIBNAME),$(OBJS)
+@@ -517,6 +525,12 @@
InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
# endif
# endif
@@ -1284,11 +1270,9 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# 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 operating system: OSName (OSMajor
+--- a/xorg-cf-files/linux.cf
++++ b/xorg-cf-files/linux.cf
+@@ -107,31 +107,48 @@
XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
XCOMM binutils: (LinuxBinUtilsMajorVersion)
@@ -1346,7 +1330,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# define FSUseSyslog YES
# define BuildLibGlxWithoutPIC NO
-@@ -142,15 +159,12 @@ InstallNamedTargetNoClobber(install,file
+@@ -142,15 +159,12 @@
# define MiscManSuffix 7x
# define MiscManDir $(MANSOURCEPATH)7
@@ -1365,7 +1349,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# ifndef XorgCustomVersion
# define XorgCustomVersion "Debian"
# endif
-@@ -158,47 +172,138 @@ InstallNamedTargetNoClobber(install,file
+@@ -158,47 +172,138 @@
# define BuilderEMailAddr "debian-x@lists.debian.org"
# endif
# define XFree86Devel YES
@@ -1537,7 +1521,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif /* DebianMaintainer */
#endif /* LinuxDebian */
-@@ -591,11 +696,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -591,11 +696,7 @@
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
@@ -1549,7 +1533,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
#endif
#if UseElfFormat
-@@ -725,10 +826,10 @@ InstallNamedTargetNoClobber(install,file
+@@ -725,10 +826,10 @@
# if UseElfFormat
# ifdef AlphaArchitecture
# define CcCmd gcc -b alpha-linux
@@ -1561,7 +1545,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif /* AlphaArchitecture */
# ifdef HPArchitecture
# define CcCmd gcc
-@@ -740,10 +841,10 @@ InstallNamedTargetNoClobber(install,file
+@@ -740,10 +841,10 @@
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
@@ -1573,7 +1557,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif /* i386Architecture */
# ifdef ia64Architecture
# define CcCmd gcc
-@@ -754,10 +855,10 @@ InstallNamedTargetNoClobber(install,file
+@@ -754,10 +855,10 @@
# endif /* ia64Architecture */
# ifdef Mc68020Architecture
# define CcCmd gcc -b m68k-linux
@@ -1585,7 +1569,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif /* Mc68020Architecture */
# ifdef AMD64Architecture
# define CcCmd gcc
-@@ -770,7 +871,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -770,7 +871,7 @@
# define CcCmd gcc
# define AsCmd CcCmd -c -x assembler
# define LdCmd CcCmd -nostdlib
@@ -1594,7 +1578,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
#endif
-@@ -837,7 +938,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -837,7 +938,7 @@
#ifdef AlphaArchitecture
# ifndef OptimizedCDebugFlags
@@ -1603,7 +1587,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__alpha__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -850,7 +951,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -850,7 +951,7 @@
#ifdef Arm32Architecture
# define DefaultCCOptions
# ifndef OptimizedCDebugFlags
@@ -1612,7 +1596,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -858,7 +959,9 @@ InstallNamedTargetNoClobber(install,file
+@@ -858,7 +959,9 @@
#endif /* Arm32Achitecture */
#ifdef HPArchitecture
@@ -1623,7 +1607,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# define LinuxMachineDefines -D__hppa__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-@@ -866,7 +969,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -866,7 +969,7 @@
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -1632,7 +1616,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -875,7 +978,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -875,7 +978,7 @@
#ifdef ia64Architecture
# ifndef OptimizedCDebugFlags
@@ -1641,7 +1625,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__ia64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -884,7 +987,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -884,7 +987,7 @@
#ifdef Mc68020Architecture
# ifndef OptimizedCDebugFlags
@@ -1650,7 +1634,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__mc68000__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -903,7 +1006,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -912,7 +1015,7 @@
#ifdef Ppc64Architecture
# define DefaultCCOptions -mminimal-toc
# ifndef OptimizedCDebugFlags
@@ -1659,7 +1643,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-@@ -913,7 +1016,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -922,7 +1025,7 @@
#ifdef PpcArchitecture
# define DefaultCCOptions
# ifndef OptimizedCDebugFlags
@@ -1668,7 +1652,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__powerpc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -922,7 +1025,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -931,7 +1034,7 @@
#ifdef s390Architecture
# ifndef OptimizedCDebugFlags
@@ -1677,7 +1661,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__s390__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -930,16 +1033,17 @@ InstallNamedTargetNoClobber(install,file
+@@ -939,16 +1042,17 @@
#endif /* s390Architecture */
#ifdef s390xArchitecture
@@ -1699,7 +1683,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__sparc__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -970,7 +1074,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -979,7 +1083,7 @@
# endif
# endif
# ifndef OptimizedCDebugFlags
@@ -1708,7 +1692,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__sh__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -982,7 +1086,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -991,7 +1095,7 @@
#ifdef AMD64Architecture
# ifndef OptimizedCDebugFlags
@@ -1717,7 +1701,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__amd64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -991,7 +1095,7 @@
+@@ -1000,7 +1104,7 @@
#ifdef AArch64Architecture
# ifndef OptimizedCDebugFlags
@@ -1726,7 +1710,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
# endif
# define LinuxMachineDefines -D__aarch64__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -1032,26 +1136,6 @@
+@@ -1041,26 +1145,6 @@
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
@@ -1753,7 +1737,7 @@ Index: xutils-dev/xorg-cf-files/linux.cf
#ifndef StaticLibrary
# define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
#endif
-@@ -1096,3 +1180,59 @@ InstallNamedTargetNoClobber(install,file
+@@ -1105,3 +1189,59 @@
#ifndef XFree86ServerOSDefines
# define XFree86ServerOSDefines
#endif
@@ -1813,11 +1797,9 @@ Index: xutils-dev/xorg-cf-files/linux.cf
+ 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 @@ XCOMM platform: $XFree86: xc/config/cf/
+--- a/xorg-cf-files/NetBSD.cf
++++ b/xorg-cf-files/NetBSD.cf
+@@ -18,12 +18,178 @@
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
@@ -1997,7 +1979,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
/*
* C library features
*/
-@@ -93,8 +259,12 @@ XCOMM operating system: OSName (OSMajor
+@@ -93,8 +259,12 @@
#define HasUsableFileMmap YES
@@ -2011,7 +1993,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
#define HasShadowPasswd NO
-@@ -207,6 +377,8 @@ XCOMM operating system: OSName (OSMajor
+@@ -207,6 +377,8 @@
#if UseElfFormat
#define DlLibrary -rdynamic /* no -ldl yet */
@@ -2020,7 +2002,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
#else
#define DlLibrary /**/
#endif
-@@ -336,6 +508,10 @@ XCOMM operating system: OSName (OSMajor
+@@ -336,6 +508,10 @@
/* NetBSD doesn't have gperf in the base install */
#define DontRebuildGperfOutput YES
@@ -2031,7 +2013,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
/*
* 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 @@ XCOMM operating system: OSName (OSMajor
+@@ -355,7 +531,13 @@
/*
* Make & install Features
*/
@@ -2045,7 +2027,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
#define CompressAllFonts YES
#define GzipFontCompression YES
#define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR)
-@@ -463,6 +645,8 @@ dirs: .EXEC @@\
+@@ -463,6 +645,8 @@
@@\
.EXEC:
@@ -2054,7 +2036,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
/*
* Man pages need to be formatted when installed, so override the default
* imake rules.
-@@ -552,6 +736,8 @@ InstallHtmlManPageAliases(file,aliases,s
+@@ -552,6 +736,8 @@
@@\
InstallManPageAliasesBase(file,destdir,aliases)
@@ -2063,11 +2045,9 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
/*
* 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 @@ XCOMM $XdotOrg: xc/config/cf/sco5.cf,v 1
+--- a/xorg-cf-files/sco5.cf
++++ b/xorg-cf-files/sco5.cf
+@@ -69,7 +69,7 @@
#endif
#ifndef UseExportLists
@@ -2076,11 +2056,9 @@ Index: xutils-dev/xorg-cf-files/sco5.cf
#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 @@ XCOMM operating system: OSName (OSMajorV
+--- a/xorg-cf-files/usl.cf
++++ b/xorg-cf-files/usl.cf
+@@ -159,7 +159,7 @@
#endif
#ifndef UseExportLists
@@ -2089,11 +2067,9 @@ Index: xutils-dev/xorg-cf-files/usl.cf
#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
-@@ -614,23 +614,29 @@ XORGRELSTRING = XorgManVersionString
+--- a/xorg-cf-files/X11.tmpl
++++ b/xorg-cf-files/X11.tmpl
+@@ -614,23 +614,29 @@
#ifndef BuildRender
#define BuildRender YES
#endif
@@ -2127,7 +2103,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
UseFontconfig || BuildFreeType)
#endif
#ifndef InstallFontconfigLibrary
-@@ -700,8 +706,12 @@ XORGRELSTRING = XorgManVersionString
+@@ -700,8 +706,12 @@
#define BuildXkbcomp BuildClients
#endif
@@ -2141,7 +2117,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
#endif
#ifndef BuildXcursorgen
-@@ -1170,7 +1180,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
+@@ -1170,7 +1180,7 @@
#endif
#ifndef RenderDefines
@@ -2150,7 +2126,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
#define RenderDefines -DRENDER
#else
#define RenderDefines /**/
-@@ -2669,6 +2679,7 @@ SharedDSLibReferences(GLW,GLw,$(GLWIDGET
+@@ -2669,6 +2679,7 @@
ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
#endif
@@ -2158,7 +2134,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
XRENDERLIBSRC = $(LIBSRC)/Xrender
#if SharedLibXrender
#ifndef SharedXrenderRev
-@@ -2679,6 +2690,42 @@ SharedLibReferences(XRENDER,Xrender,$(XR
+@@ -2679,6 +2690,42 @@
ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
#endif
@@ -2201,7 +2177,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
XRANDRLIBSRC = $(LIBSRC)/Xrandr
#if SharedLibXrandr
#ifndef SharedXrandrRev
-@@ -2729,6 +2776,7 @@ SharedLibReferences(XEVIE,Xevie,$(XEVIEL
+@@ -2729,6 +2776,7 @@
ProjectUnsharedLibReferences(XEVIE,Xevie,$(XEVIELIBSRC),XBuildLibDir)
#endif
@@ -2209,7 +2185,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
XCURSORLIBSRC = $(LIBSRC)/Xcursor
#if SharedLibXcursor
#ifndef SharedXcursorRev
-@@ -2739,6 +2787,41 @@ SharedLibReferences(XCURSOR,Xcursor,$(XC
+@@ -2739,6 +2787,41 @@
ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
#endif
@@ -2251,7 +2227,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
APPLEWMLIBSRC = $(LIBSRC)/apple
#if SharedLibAppleWM
#ifndef SharedAppleWMRev
-@@ -3544,6 +3627,7 @@ EXPATDEFINES = -DEXPAT
+@@ -3544,6 +3627,7 @@
#endif /* UseExpat */
@@ -2259,7 +2235,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
#ifndef SharedLibXft1
#define SharedLibXft1 HasSharedLibraries
#endif
-@@ -3556,6 +3640,18 @@ EXPATDEFINES = -DEXPAT
+@@ -3556,6 +3640,18 @@
#ifndef ProfileLibXft1
#define ProfileLibXft1 NO
#endif
@@ -2278,7 +2254,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
XFT1LIBSRC = $(LIBSRC)/Xft1
#if SharedLibXft1
#ifndef SharedXft1Rev
-@@ -3610,6 +3706,42 @@ ProjectUnsharedLibReferences(XFT,Xft,$(X
+@@ -3610,6 +3706,42 @@
#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
#endif
@@ -2321,7 +2297,7 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
#if UseFontconfig
#if BuildFontconfigLibrary
-@@ -3725,8 +3857,6 @@ FONTCONFIGDEFINES = -DFONTCONFIG
+@@ -3725,8 +3857,6 @@
#endif /* UseFontconfig */
@@ -2330,11 +2306,9 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
#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 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17
+--- a/xorg-cf-files/xfree86.cf
++++ b/xorg-cf-files/xfree86.cf
+@@ -100,6 +100,13 @@
#define XVendorManNameString XFree86
#endif
@@ -2348,7 +2322,7 @@ Index: xutils-dev/xorg-cf-files/xfree86.cf
/*
* This enables some settings for developers.
*/
-@@ -116,6 +123,15 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17
+@@ -116,6 +123,15 @@
# endif
#endif
@@ -2364,7 +2338,7 @@ Index: xutils-dev/xorg-cf-files/xfree86.cf
#ifndef BuildDebug
# define BuildDebug YES
#endif
-@@ -233,6 +249,11 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17
+@@ -233,6 +249,11 @@
#define GlideDriver /**/
#endif
@@ -2376,7 +2350,7 @@ Index: xutils-dev/xorg-cf-files/xfree86.cf
/*
* There are three parameters that determine where and how the Matrox HAL
* library is used:
-@@ -372,15 +393,17 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17
Reply to: