xfs: Changes to 'debian-unstable'
ChangeLog | 463 +++++++++++++++++-
INSTALL | 237 +++++++++
Makefile.am | 27 -
Makefile.in | 112 ++--
acinclude.m4 | 47 +
aclocal.m4 | 51 +-
config.guess | 32 -
config.h.in | 79 ---
config.sub | 44 +
configure | 192 ++++++-
configure.ac | 35 +
debian/changelog | 15
debian/control | 6
debian/copyright | 3
debian/patches/01_xfs_fixes.diff | 504 --------------------
debian/patches/03_configurable_config_location.diff | 11
debian/patches/series | 1
debian/rules | 2
depcomp | 33 -
difs/fontinfo.c | 5
difs/main.c | 6
include/os.h | 2
include/servermd.h | 11
install-sh | 228 ++++-----
os/config.c | 40 +
os/xfstrans.c | 4
xfs-config.h.in | 82 +++
xfs.man | 430 ++++++++++-------
28 files changed, 1652 insertions(+), 1050 deletions(-)
New commits:
commit c0d83459b818ea4693acb757ffce95e073b5760b
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Mar 11 20:34:33 2008 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ebb1f15..030a323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xfs (1:1.0.6-1) UNRELEASED; urgency=low
+xfs (1:1.0.6-1) unstable; urgency=low
* New upstream release.
+ Drop 03_configurable_config_location.diff, applied upstream.
@@ -9,8 +9,10 @@ xfs (1:1.0.6-1) UNRELEASED; urgency=low
* Add Vcs-Git and Vcs-Browser fields.
* Add the upstream URL to debian/copyright.
* Bump Standards-Version: to 3.7.3, no change needed.
+ * Add myself to Uploaders, and remove Branden and Fabio with their
+ permission.
- -- Brice Goglin <bgoglin@debian.org> Tue, 11 Mar 2008 20:15:35 +0100
+ -- Brice Goglin <bgoglin@debian.org> Tue, 11 Mar 2008 20:16:06 +0100
xfs (1:1.0.5-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 54effe1..1e4fc88 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfs
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Uploaders: David Nusinow <dnusinow@debian.org>, , Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libxfont-dev (>= 1:1.0.0-1), xtrans-dev (>= 1.0.0-1), quilt
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xfs
commit 55135b1c91ded3cfa6f6f9ed748488d9a17a4048
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Mar 11 20:34:26 2008 +0100
Misc fixes to debian/control and debian/copyright
diff --git a/debian/changelog b/debian/changelog
index 8ad742e..ebb1f15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ xfs (1:1.0.6-1) UNRELEASED; urgency=low
* Fix LSB header in xfs.init: don't stop in the S runlevel. Thanks, Petter
Reinholdtsen (closes: #470113).
* Install the upstream ChangeLog.
+ * Add Vcs-Git and Vcs-Browser fields.
+ * Add the upstream URL to debian/copyright.
+ * Bump Standards-Version: to 3.7.3, no change needed.
- -- Brice Goglin <bgoglin@debian.org> Tue, 11 Mar 2008 20:08:00 +0100
+ -- Brice Goglin <bgoglin@debian.org> Tue, 11 Mar 2008 20:15:35 +0100
xfs (1:1.0.5-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index fba6017..54effe1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,9 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
Build-Depends: debhelper (>= 4.0.0), pkg-config, libfs-dev (>= 2:1.0.0-1), libxfont-dev (>= 1:1.0.0-1), xtrans-dev (>= 1.0.0-1), quilt
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xfs
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xfs.git
Package: xfs
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 2836b5a..06e92bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/app/
+
Copyright (c) 1988 X Consortium
Permission is hereby granted, free of charge, to any person obtaining
commit c3d09d6a66db2055a95c73e0aba9b07156b12eed
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Mar 11 20:34:16 2008 +0100
Install the upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..8902469
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,451 @@
+commit 8337bcb5650581874510514cce7d9df89db54d5c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 6 17:06:25 2008 -0500
+
+ xfs 1.0.6
+
+commit f253f56e9ff33e7424317be7fa54a60eec4053a8
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Feb 5 21:57:21 2008 +0100
+
+ Install config file in $(sysconfdir) by default instead of $(libdir)
+
+commit 71c2acc3d0fecc5c6c3d63cfae8f38ee2ce72d9d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jan 9 16:08:54 2008 -0800
+
+ List multiple config files in man page if specified in --with-default-config-file
+
+commit 5a5d003bfc400471693f88a16d2ed6ed98ca8111
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 7 18:04:36 2008 -0800
+
+ Add xfsinfo & fslsfonts to See Also section of man page
+
+commit 9d19ae3b4d6fcaa01bcb88b9fde644aec3f191b1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 7 15:08:33 2008 -0800
+
+ Remove another extraneous + from man page
+
+commit c398fae4cf2119f467970a0af4b408948aff12ef
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 4 15:56:31 2008 -0800
+
+ Add hooks for checking sources with tools like sparse & lint
+
+commit 04e94c3d22e6115f40bcced43e78a336613789a9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 4 15:55:53 2008 -0800
+
+ Remove duplicated section & extra + in xfs.man
+
+commit bc3d7ac63b801b22214ce5d04fa0a585a6223fee
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 3 17:12:58 2008 -0800
+
+ Rename autoconf-generated header to xfs-config.h to avoid clash with os/config.h
+
+commit c0b33d044edc89ec882ac425c91a79cd738167a4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 3 16:47:59 2008 -0800
+
+ Add --with-default-config-file configure option
+
+ Allow specifying multiple files, using the first one found at runtime.
+
+commit c7b49319ac3ba99002074021f0cd493aa122439a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 3 13:58:18 2008 -0800
+
+ xfs.man: Replace Speedo with TrueType, fix typos
+
+commit cfbf2d673d0b764f6f5aa3d802c4796c94b407d0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 3 13:10:01 2008 -0800
+
+ Use PACKAGE_VERSION_* to set default VENDOR_RELEASE version string
+
+commit 33f185cc94d11279aa3c08ebebf8461225dad4be
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:37:15 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit ec8bfac7c5ab048d86bd60ec97526300ef41d2a9
+Author: David Nusinow <dnusinow@debian.org>
+Date: Wed Oct 3 21:37:46 2007 -0400
+
+ Perform massive manpage cleanup and reformatting.
+
+ Add "FUTURE DIRECTIONS" section.
+
+ This patch by Branden Robinson, forward ported by David Nusinow and
+ probably a few others.
+
+commit 0bd59b5938059c7ff5501b928ebe80ecea27f008
+Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Mon Oct 1 21:55:52 2007 +0200
+
+ Bump to 1.0.5
+
+commit ec3ca8fd4c599f41e6f977ce912805ac8ac74f32
+Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Mon Oct 1 21:53:41 2007 +0200
+
+ Fix for heap overwrite in swap_char2b() CVE-2007-4568.
+
+commit 380fb68316f13012ff7cb2ac4addc2626fa2dad0
+Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
+Date: Mon Oct 1 21:51:40 2007 +0200
+
+ fix for integer overflows in build_range(). CVE-4568.
+
+commit 63596c80ec1c406a35780f45ea43d8004b020869
+Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
+Date: Wed Jun 20 13:31:40 2007 -0300
+
+ Document catalogue:<dir> feature
+
+commit 2037244c4a758d4010da55128fc2b7902f2bc8ad
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Nov 30 19:55:47 2006 +0200
+
+ bump to 1.0.4
+
+commit 311483ff1bea8ae31671b5bd6033a27dd0f315a4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Nov 20 10:58:35 2006 -0800
+
+ Add *~ to .gitignore to skip emacs/patch droppings
+
+commit 2e81fe0c9eeac502e19d7f9696e29d4847f8a8e0
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Nov 20 10:58:10 2006 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit 19bc6ee23c7137c8d182738e850621586ba43659
+Author: J.P. Larocque <piranha-fdo-bz@thoughtcrime.us>
+Date: Mon Nov 20 10:57:28 2006 -0800
+
+ Bug 7317: xfs doesn't build on some GLIBC based systems: _XOPEN_SOURCE undefined
+
+ Bug 7317: <https://bugs.freedesktop.org/show_bug.cgi?id=7317>
+
+commit 20014d1c8fa416306f5be60d4cd225cc6132d532
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Oct 13 17:51:32 2006 -0400
+
+ Bump to 1.0.3
+
+commit d68ce54e725aa332c0c74e1aa2e7e59b079fb5fe
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Sep 25 18:01:48 2006 -0400
+
+ Substitute config dir into man page.
+
+commit ced4cd44bd177b9579c457a2f108a09e8bbb7eb9
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Apr 26 23:40:40 2006 +0000
+
+ Bump to 1.0.2
+
+commit 099e52769a0601bca9d731209465d6205cd63fc9
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Mar 14 03:41:28 2006 +0000
+
+ Check for alloc error was reversed, causing memory leak, NULL pointer
+ dereference (if fsalloc actually failed), and failure to rebuild cache.
+ (Coverity ids #560 & #127).
+
+commit 03a3384fe8985419d8ec9507458a8808dafa2758
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:50 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit c34fccfa706811aa2d177afd07cc96e7094b10ef
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:44 2005 +0000
+
+ Stub COPYING files
+
+commit 7cd4bd5a4044fbbcd7b05b5d4c11542353d85e52
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:07 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit e9ed66a84780a87d1f102b3960007aba9d7d2ed7
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:22 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 7d6e0e69cde9b41061eb591d418d3ceab4e5f9a3
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:23 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 932e1834195eb85b291b29bac4719cd02830dcc4
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:42 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 02640671a2ef2c5240d87f96f1b3518ac0026a6d
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:35:00 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit c23ac3c68be607d8b050b4a50bfe441737c9fed8
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:52 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit e3edf1412eacc3efb3bc6d949406474e1f4aacff
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:36 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit dc896313209b1fc91cfd8f9ed15d7a26d4cdb450
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:09:21 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit af24389ccccdf82a8224299f808acf07443ce98b
+Author: Kean Johnson <kean@armory.com>
+Date: Tue Nov 8 06:33:33 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit 75cca7507a37ea2e65a7ff541560047b54da369e
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:05:18 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 3bca148d9c5d9af5af31c6d4ce6a731fc46ff3b3
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:54 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit be42526a6087c63f618bfeb13c7f3b46068528fe
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:22 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit bc6cbdd5925ffc52abbf0da1834405b8fbe49ee1
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 22:28:18 2005 +0000
+
+ Add 's|XCOMM|\#|g' to sed rules for man page processing
+
+commit 91cc5c0c1d36059e6e0792a80b4443b8bb6c0c14
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:45 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 68de46d260d44841aab5ecce9d31cf24ccd533f8
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 20:25:29 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 216412edcbf15a9ae918c2066f93680355fc9b0b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Jul 30 19:32:32 2005 +0000
+
+ Add -D flags to clear more compiler warnings (Stefan Dirsch)
+
+commit 6890ec2cd680eed48c64f9e91fa4b0c8508f4b96
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:34 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 9a118fcc0ce0e202d31fcf579daf0dc03fc2f6bb
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Thu Jul 28 22:43:18 2005 +0000
+
+ Thu Jul 28 18:29:06 2005 Søren Sandmann <sandmann@redhat.com>
+ Fix double free when there no valid paths.
+
+commit 9c9f67e12450035b7997c2c3bb3700ea51d8b3d2
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Thu Jul 28 22:28:21 2005 +0000
+
+ Add flags to make xfs actually load fonts
+
+commit fc670eef6a29564aeddcb2e8f6b6a3fdb791b7f5
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Thu Jul 28 20:46:54 2005 +0000
+
+ Create and install a config file Fix xfs DEFAULT_CONFIG_FILE
+
+commit b7901095f14ec2ea00f1cbeb57952957e9f0d5aa
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 27 22:48:39 2005 +0000
+
+ Add -D_XOPEN_SOURCE on Linux
+
+commit cedf6178e2c2becfd40a9ed309714d3957ee7d1f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Jul 20 19:31:56 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit f0c7ea00ce16c6f4d7d23fe3f87af335b1bdc591
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Jul 16 23:29:38 2005 +0000
+
+ x11perf/Makefile.am: xinit/Makefile.am: xvidtune/Makefile.am:
+ - Replace $< with portable macro xinit/Makefile.am: xinit/configure.ac:
+ xvidtune/Makefile.am: xvidtune/configure.ac:
+ - Use more portable cpp invocations for pre-processing files
+ xfs/configure.ac:
+ - Add XTRANS_CONNECTION_FLAGS so xtrans transport type defines are set
+ correctly
+
+commit 2dd92fea669cdd34b15cf75455ca7766b5cf9c93
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Jul 16 20:52:25 2005 +0000
+
+ Mark variables modified in signal handlers as volatile (part of Sun bug id
+ 4496504)
+
+commit f638b9c31aab9b90b8b9b4dbea79f8a588037498
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Thu Jul 14 22:40:15 2005 +0000
+
+ Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch
+
+commit 61c45e7ae8cdcead33392c0a2affc63a00b284c3
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 12 18:49:12 2005 +0000
+
+ Add include files to sources, so it will distcheck
+
+commit 2ac8a668c645746430031f7f2776e98dc0cf0b98
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 12 18:45:48 2005 +0000
+
+ - lib/lbxutil/lbxutil.pc.in: link to lbxutil, not Xfixes
+ - symlink.sh: add xedit.h, add xedit/lis/mp directory, add xfs
+ - xc/programs/xedit: include "lisp/../xedit.h" instead of xedit/xedit.h
+ - Change include of "foo.h" to <X11/.../foo.h> in various places in
+ xc/programs/lbxproxy and xc/programs/xfs
+ - add build system for xfs
+ - add forgotten lbxproxytrans.c file
+
+commit 465a53c5deee64fcdc768b5c8a9123ee56a39dd5
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date: Thu Jun 9 15:52:02 2005 +0000
+
+ Replace <X11/Xtrans.h> with <X11/Xtrans/Xtrans.h>
+ Copy Xtrans.h to exports/include/X11/Xtrans only
+
+commit 2203407e26a173410b8a96368266f0e860381987
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 22 20:49:50 2005 +0000
+
+ Bug #3069: Drop the BuildLowMem hack, it doesn't compile and isn't useful.
+
+commit 9971dd3529c07022231fd722cb593f6609dd9d70
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon Jul 26 22:44:25 2004 +0000
+
+ Fix opening of log file with '-user nobody'. Problem reported by Oleg
+ Safiullin and Mike Pechkin.
+
+commit 956b25ecaa203291b5abdfc43451ae34da4ebdc7
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:48 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 54409026c1afcd67c2d548a9efc606e29d47715f
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:35:23 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 4b40ae3860584b4c4078941f45c6dfe223d2154c
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:13:08 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 73d09b90af9e6b5aa389939f913f9f9a826e9269
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:24 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 9cd7676755000e0bf926cab806d8a5b10ce8efab
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:24:07 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 32d7dc13777fee72c185b64bafc64f6525c474c5
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Mon Feb 23 20:35:41 2004 +0000
+
+ Import most of XFree86 4.4RC3. This import excludes files which have the
+ new license. If we want to, later we can import 4.4RC3 again and pick
+ up the files that have the new license, but for now the vendor branch
+ is "pure."
+
+commit 86cae258ef5b7de939d2b4af5669992815145f61
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:09:12 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 8e1ac4fe2b5d9e31a37469fb462eb728457ccfb5
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:29:13 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 491f741a1b34f20831a30fa017e422154127d54f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 58396f7f075f465fe9fb7580af16c96ad0a88738
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ Initial revision
+
+commit db757f1d2a5a951ec26aa4ed64134d8113089fd0
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:53 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/debian/changelog b/debian/changelog
index cd540d1..8ad742e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xfs (1:1.0.6-1) UNRELEASED; urgency=low
+ Refresh 01_xfs_fixes.diff, partially applied upstream.
* Fix LSB header in xfs.init: don't stop in the S runlevel. Thanks, Petter
Reinholdtsen (closes: #470113).
+ * Install the upstream ChangeLog.
- -- Brice Goglin <bgoglin@debian.org> Tue, 11 Mar 2008 19:50:04 +0100
+ -- Brice Goglin <bgoglin@debian.org> Tue, 11 Mar 2008 20:08:00 +0100
xfs (1:1.0.5-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 1a41a2a..a257b2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ binary-arch: build install
dh_installdocs
dh_install --sourcedir=debian/tmp --list-missing
dh_installman
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_installexamples
dh_installinit
dh_link
commit c308a9121543a441648e51a3f161030381503c15
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Mar 11 19:51:32 2008 +0100
New upstream release
diff --git a/INSTALL b/INSTALL
index e69de29..d3c5b40 100644
--- a/INSTALL
+++ b/INSTALL
@@ -0,0 +1,237 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff --git a/Makefile.in b/Makefile.in
index 387aee6..db3abd2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,18 +57,19 @@ host_triplet = @host@
bin_PROGRAMS = xfs$(EXEEXT)
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/Makefile.in $(srcdir)/xfs-config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
config.guess config.sub depcomp install-sh missing \
mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
+CONFIG_HEADER = xfs-config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
"$(DESTDIR)$(configdir)"
@@ -131,9 +132,12 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CONFIG_FILE_DESC = @CONFIG_FILE_DESC@
+CONFIG_FILE_PATH = @CONFIG_FILE_PATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
+DEFAULT_CONFIG_FILE = @DEFAULT_CONFIG_FILE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
@@ -156,6 +160,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINT_FLAGS = @LINT_FLAGS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -228,9 +234,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
configdir = $(sysconfdir)/X11/fs
FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
-AM_CFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \
- -DDEFAULT_CONFIG_FILE=\"$(configdir)/config\" $(FONT_FLAGS) \
- -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
+AM_CPPFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" \
+ $(FONT_FLAGS) -D_BSD_SOURCE -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
LDADD = $(XFS_LIBS)
xfs_SOURCES = \
@@ -299,7 +304,7 @@ FSERRORS = /var/log/xfs.log
FONTDIR = $(libdir)/X11/fonts
FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
config_DATA = config
-EXTRA_DIST = xfs.def config.cpp $(appman_PRE)
+EXTRA_DIST = xfs.def config.cpp $(appman_PRE) ChangeLog
CLEANFILES = config $(appman_DATA)
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
@@ -321,10 +326,16 @@ MAN_SUBSTS = \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+ -e 's|__configfiledesc__|$(CONFIG_FILE_DESC)|g' \
+ -e 's|__configfilepath__|$(CONFIG_FILE_PATH)|g' \
-e 's|XCOMM|\#|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
-all: config.h
+MAINTAINERCLEANFILES = ChangeLog
+@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+all: xfs-config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
@@ -363,22 +374,22 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-config.h: stamp-h1
+xfs-config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+stamp-h1: $(srcdir)/xfs-config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(SHELL) ./config.status xfs-config.h
+$(srcdir)/xfs-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
distclean-hdr:
- -rm -f config.h stamp-h1
+ -rm -f xfs-config.h stamp-h1
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -871,37 +882,36 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
Reply to: