xserver-xorg-video-vesa: Changes to 'debian-unstable'
.cvsignore | 19
ChangeLog | 369 ++
Makefile.in | 21
aclocal.m4 | 195 -
autogen.sh | 12
config.guess | 667 ++--
config.h.in | 12
config.sub | 230 +
configure | 8023 ++++++++++++++++++++++++++------------------------
configure.ac | 10
debian/changelog | 22
debian/control | 14
debian/rules | 4
debian/xsfbs/xsfbs.mk | 28
ltmain.sh | 174 -
man/.cvsignore | 2
man/Makefile.in | 20
mkinstalldirs | 89
src/.cvsignore | 6
src/Makefile.in | 19
src/vesa.c | 133
src/vesa.h | 10
22 files changed, 5721 insertions(+), 4358 deletions(-)
New commits:
commit 7b2690d5b34672ed93f40c23562583aac61492dc
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 03:12:40 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index fa37d43..fed6e63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,68 +1,349 @@
-2006-06-03 Daniel Stone <daniel@freedesktop.org>
+commit 9bbe1c49b9d22736eded05909e144cc6e03050b4
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Mon Jan 15 17:31:18 2007 -0800
- * configure.ac:
- Bump to 1.2.1.
+ Correct '#ifdef' to '#ifndef'. Oops.
- * src/vesa.c:
- Don't call VBEGetSetDACPaletteFormat when running in direct colour or
- YUV modes. (David Sterratt)
+commit 824ccaab986e1c2be6229350731b43f8831ebef7
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Mon Jan 15 13:16:52 2007 -0800
-2006-05-19 Adam Jackson <ajax@freedesktop.org>
+ Add conditional support for pci-rework branch.
+
+ To build VESA driver for use with pci-rework Xserver, add
+ --enable-pciacces to the configure command line. Otherwise, the
+ "traditional" VESA driver will be built.
- * configure.ac:
- * src/vesa.h:
- Bump to 1.2.0
+commit 7f4f198b21bc1df254912adb9592339b21d121f5
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Nov 30 16:04:26 2006 -0500
-2006-05-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bump to 1.3.0
- * src/vesa.c: (VESAScreenInit), (VESACloseScreen):
- * src/vesa.h:
- Fix ShadowFB support to work with recent miext/shadow changes from
- bug #5460.
+commit 7777730e7749fe6921e76a4a1738e0e2a0b16376
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Nov 30 16:03:35 2006 -0500
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+ Fix shadow support yet again.
- * configure.ac:
- * src/vesa.c:
- * src/vesa.h:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+commit 7664016db9869d57d4279a9cb32a6ae0086c5b28
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Oct 13 18:48:08 2006 -0400
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bump to 1.2.2
- * configure.ac:
- Update package version for X11R7 release.
+commit 3b07dd7f43be7c1263f80eb279605a89c860dc4b
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat Jun 3 09:46:27 2006 +0000
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Don't call VBEGetSetDACPaletteFormat when running in direct colour or YUV
+ modes. (David Sterratt) Bump to 1.2.1.
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit a7315a314fa647a427805dc51f29558f6c607faa
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri May 19 19:10:12 2006 +0000
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bump to 1.2.0
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit 2f586dac58dfa30246c7d404a3b08f6e287e5975
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu May 18 21:14:44 2006 +0000
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Fix ShadowFB support to work with recent miext/shadow changes from bug
+ #5460.
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit 4129d5a0c0648afcf36b004e7f7b5b2de9b7ac27
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 21:47:15 2006 +0000
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+commit fba272fcbedd2c03760646f587144ab4c111c7df
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:04 2005 +0000
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+ Update package version for X11R7 release.
- * configure.ac:
- Only build dlloader modules by default.
+commit 1bfb30439eccfa39a021cf84b630fe8b2a51bf3c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:56 2005 +0000
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Stub COPYING files
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 6eae0ead000939ee39967e580d9d356fa00bc236
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Dec 19 09:07:51 2005 +0000
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Typo fixes, mailing list & url updates, and other changes to prepare for
+ X11R6.9 & 7.0 releases.
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+commit 14a6c4cb9adde5f5f6009bd4eb30f6649eeea540
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:21 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit a7f95952dcc8319051118db938d0341bf5479a6e
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:40 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 7ddc236e517ddae2660523a63c3d060029121e3d
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:36 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 45d73281a9efe09292eab995c9796eb613edd6d1
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:11 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit ea8c88acd1cc1962cf8360144d4ea1c4b222ba17
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:06 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 62a4b6d0ec9b2ace7660cefd7d4aef6162c0d54d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:14 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 415fa60ef3a042851e93de5842312a8a695131b8
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:22 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 10f025468598dafe646013cddafc43d90f6cbf0c
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:31:21 2005 +0000
+
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit e559685ed6f0e5ab2d947ea02dea11129623a37d
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:22 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 0eb288746f85c73e7ae21838dfc52f177b963b29
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:57 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 4e79cb7dd2d91af9777f4bea952c962c4e6c3a24
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Wed Oct 26 21:36:25 2005 +0000
+
+ Don't try to restore savedPal in CloseScreen if savedPal is NULL, to avoid
+ segfault.
+
+commit 1ec47d75f37e1ab13145981524fc0c5bd6caae97
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:06 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 12cd0de9c963f61347ffde4513d5ed7deced79cc
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:55 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 849b2b280720536ba318a3fb79b34b0eb920245d
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:37 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 08beda07409160136c8fbe846144731af699a66f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:08 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit ff8c7b0b4d3c6789d9ff8d37e84f9c5a445c3515
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Aug 26 07:39:03 2005 +0000
+
+ Wrap afb calls in #ifdef USE_AFB. (Debian #015)
+
+commit 58313d626fbd332209f28e345aa8bdcc47113729
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Aug 26 06:55:35 2005 +0000
+
+ Wrap afb calls in #ifdef USE_AFB. (Debian #015)
+
+commit 0a3e6b28c75312d42ed5dc5db3d31262d7ec3b75
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:55 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 3251a5e09646f88a80b40385d2bb8e5417bdc388
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Aug 10 14:07:25 2005 +0000
+
+ Don\'t lose existing CFLAGS in all the input drivers and some of the video
+ drivers
+
+commit ab1ec5ee5b02d4cd3faf7ae5338fa4081ec1257c
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:46 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 dfe2847e4720793b4ff80d717aba31079a065392
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 13 21:51:06 2005 +0000
+
+ add Makefile.am
+
+commit 8100f70d79c0d1a405eeb576898a182cef8d4c3b
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 13 21:50:33 2005 +0000
+
+ add Makefile.am
+
+commit be230c6144ff1dd12b0d7acce4a2a478c0be3527
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 13 21:46:36 2005 +0000
+
+ Build system for vesa video driver
+
+commit af35fdc8d552424cc74872aac364e48f42d5e409
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:30:06 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit b3ef5c7885d59f81847e2e7394683c91617b5cc1
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:17:00 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 9f2b6b63add7822dea966f489f496c7a2edfa19c
+Author: Egbert Eich <eich@suse.de>
+Date: Mon May 9 17:40:51 2005 +0000
+
+ VBE Set Mode (0x02) to not clear the screen causes problems on some BIOSes.
+ This fix adds an option to disable it (Bugzilla #3246).
+
+commit 0b142fd735496c72ead409e1f89caa1da8d80f6e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:32 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 16af3cc966b0f79388e9a8a68f75f62f6c30a756
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date: Sat Dec 4 00:43:10 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 160cc48048a4944d0a8d0b8a42c22bae61de0319
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Sep 17 03:04:54 2004 +0000
+
+ Bug #1192: Remove cfb support from drivers where its use is an option.
+ Delete xf24_32bpp, as s3virge was the last user. Fix up some comments
+ to refer to fb rather than cfb.
+
+commit 09f88863a0bdf236200107631ff93f27bb03f6f4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Aug 11 19:52:13 2004 +0000
+
+ Fix vesa.c's shadow symbol list.
+
+commit 088edb719db194dd352c09ae3fa799e4653de9e6
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Aug 3 02:44:21 2004 +0000
+
+ Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
+ DoLoadableServer NO builds work again.
+
+commit a6a753d5a5c1c167670a4144c7ace39d688fd1e5
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:55 2004 +0000
+
+ Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+ framebuffer formats except cfb and the overlay modes should work, and
+ r128 and radeon need to be loaded from the ati driver (both issues to
+ be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+ drivers. elfloader users shouldn't be affected.
+
+commit 03b2fd85a09d9787d1895cdb7e418e7543288fd9
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:24:10 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 283c0359be82bfac45781ad06d2ff0965daef73e
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:52:54 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit fd59c1875f4f249cf42b46cfa763a1d221463f74
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:41 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 3837d4b3421a71c631b6f17813c747446bf49246
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:28 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit acd0b5c42b504749bb6bd3f0c416fc838fc31b05
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:55 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 11f19e03e7d229b3828513d464288c4aad99d26d
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 617431e758a198202ba5f54347492e9b25084c07
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:43 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 1d3328676ee5e2435332c28888b9bc9ff15a68ee
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 53bc9c90fed82c0bab644acdc30114fe3a390652
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
commit 28ae2a16d4f1d1f633fd61badddea47339ced7c3
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Apr 30 03:12:01 2007 +0200
Miscellaneous fixed in debian/control and debian/rules.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add XS-Vcs-*.
* Add a link to www.X.org and a reference to the xf86-video-vesa
module in the long description.
* Remove Fabio from uploaders with his permission. He's always welcome back.
diff --git a/debian/changelog b/debian/changelog
index a55828c..94add15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
xserver-xorg-video-vesa (1:1.3.0-3) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-vesa.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 14:40:25 +0300
+ [ Brice Goglin ]
+ * Install the upstream changelog.
+ * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+ (needed to let xsfbs get access to serverminver).
+ * Add XS-Vcs-*.
+ * Add a link to www.X.org and a reference to the xf86-video-vesa
+ module in the long description.
+ * Remove Fabio from uploaders with his permission. He's always welcome back.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Mon, 30 Apr 2007 03:11:08 +0200
xserver-xorg-video-vesa (1:1.3.0-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 21ed5c5..cb13bea 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-vesa
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>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
Standards-Version: 3.6.1
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vesa
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vesa.git
Package: xserver-xorg-video-vesa
Architecture: any
@@ -20,8 +22,8 @@ Description: X.Org X server -- VESA display driver
badly.
.
More information about X.Org can be found at:
+ <URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
- This module can be found as the module 'driver/xf86-video-vesa' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-vesa driver module.
diff --git a/debian/rules b/debian/rules
index 5606fc2..a12ce10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
dh_link
dh_strip
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver -> serverminver rename
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
.PHONY: serverabi
serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
else
commit 31fc511b1dc45bdb886af04b35adb9d83c293e00
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:45:13 2007 -0500
Autoreconf
diff --git a/Makefile.in b/Makefile.in
index 1dbc700..72d8e4e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
- config.sub depcomp install-sh ltmain.sh missing
+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -66,7 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
SOURCES =
@@ -129,6 +129,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
INCLUDES = @INCLUDES@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -156,22 +157,21 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_FALSE = @PCIACCESS_FALSE@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PCIACCESS_TRUE = @PCIACCESS_TRUE@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
-SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
-ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -188,24 +188,31 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
moduledir = @moduledir@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
diff --git a/aclocal.m4 b/aclocal.m4
index c578d51..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1397,18 +1397,6 @@ freebsd1*)
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -1564,7 +1552,7 @@ linux*oldld* | linux*aout* | linux*coff*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1578,27 +1566,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -1610,7 +1581,7 @@ linux*)
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1619,7 +1590,7 @@ knetbsd*-gnu)
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -2327,7 +2298,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -2381,11 +2352,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3133,7 +3104,7 @@ case $host_os in
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3292,7 +3263,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3394,7 +3365,7 @@ case $host_os in
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -4305,9 +4276,6 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
-gcc_ver=\`gcc -dumpversion\`
-
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4441,11 +4409,11 @@ striplib=$lt_striplib
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4457,7 +4425,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4537,7 +4505,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -4662,7 +4630,7 @@ hpux*) # Its linker distinguishes data from code symbols
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4935,7 +4903,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -4978,7 +4946,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -5021,7 +4989,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5232,7 +5200,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5373,6 +5341,9 @@ ifelse([$1],[CXX],[
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5543,7 +5514,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -5569,12 +5540,13 @@ EOF
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5904,7 +5876,7 @@ _LT_EOF
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6006,7 +5978,7 @@ _LT_EOF
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6373,7 +6345,6 @@ do
done
done
done
-IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6406,7 +6377,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
done
])
SED=$lt_cv_path_SED
-AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
@@ -6615,7 +6585,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.1
+ [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -6761,18 +6731,17 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
-AC_CHECK_FILE(
- [$prefix/share/X11/sgml/defs.ent],
- [DEFS_ENT_PATH=$prefix/share/X11/sgml],
- [DEFS_ENT_PATH=]
-)
+XORG_SGML_PATH=$prefix/share/sgml
Reply to: