xserver-xorg-video-s3: Changes to 'debian-unstable'
.gitignore | 20
ChangeLog | 304 +++++-
Makefile.in | 126 +-
aclocal.m4 | 196 ++--
autogen.sh | 12
compile | 142 ++
config.guess | 667 +++++++-------
config.h.in | 9
config.sub | 230 +++-
configure | 1570 +++++++++------------------------
configure.ac | 2
debian/changelog | 21
debian/control | 12
debian/patches/01_enable_new_mmio.diff | 23
debian/patches/series | 1
debian/rules | 4
debian/xsfbs/xsfbs.mk | 28
ltmain.sh | 12
mkinstalldirs | 89 +
src/.cvsignore | 6
src/Makefile.am | 10
src/Makefile.in | 140 +-
src/s3.h | 6
src/s3_accel.c | 2
src/s3_reg.h | 2
src/s3_video.c | 2
26 files changed, 1808 insertions(+), 1828 deletions(-)
New commits:
commit b31e9377bb6f3abe26411a7c5b03194ab952ef20
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 13:33:56 2007 +0200
autoreconf
diff --git a/compile b/compile
new file mode 100755
index 0000000..1b1d232
--- /dev/null
+++ b/compile
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
commit 76ba4148075c709ea5b05ebfa0788906eec2da1a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 13:30:58 2007 +0200
Update upstream ChangeLog
diff --git a/ChangeLog b/ChangeLog
index e9e18a8..7e041ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,60 +1,282 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 9465c594e919bd2ac3e41ac96e72a432daf81fa7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Jan 9 19:33:45 2007 -0800
- * configure.ac:
- * src/s3.h:
- Bump to 0.4.1 for Xv changes.
+ Was previously done in monolith Imakefile as:
+ SpecialCObjectRule(s3_video,$(_NOOP_), -DS3_NEWMMIO)
+
+ Needed to get definitions of GET_PSTREAM_*, GET_SSTREAM_*, etc.
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 3470935b099daed7ed2a31791267b9087672f3f7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Jan 9 19:30:36 2007 -0800
- * src/s3_video.c: (S3PutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ renamed: .cvsignore -> .gitignore
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 658f0fcdb9d6494c99dcb9bf61b8f8d3ba830618
+Author: Alex Deucher <alex@t41p.(none)>
+Date: Mon Nov 27 14:20:10 2006 -0500
- * configure.ac:
- * src/s3.h:
- * src/s3_IBMRGB.c:
- * src/s3_Ti.c:
- * src/s3_Trio64DAC.c:
- * src/s3_bios.c:
- * src/s3_cursor.c:
- * src/s3_dga.c:
- * src/s3_driver.c:
- * src/s3_video.c:
- Unlibcwrap. Bump server version requirement. Bump to 0.4.0.
+ bump version for release
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d4ce4d3f91690a61511b2d13943e5d0073917377
+Author: Evgeny M. Zubok <zoubok@mail.ru>
+Date: Sat Nov 25 23:35:28 2006 -0500
- * configure.ac:
- Update package version for X11R7 release.
+ full fix for older cards.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 1f2426bf8aad082f6f232d3b8c497acdd9892810
+Author: Evgeny M. Zubok <zoubok@mail.ru>
+Date: Thu Nov 23 13:36:04 2006 -0500
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Make S3 driver work again. Bug 7112.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 921ff3112b0fa7ca95e9ef16d4ac980f86138594
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:39:50 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bump to 0.4.1 for Xv changes.
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0dd4f7377699b4d31a0cf34cc95a0bc8ae9a9391
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:11:42 2006 +0000
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit df44e7c257fdf15aa30c6b49d3a6116c01e396e4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 19:51:30 2006 +0000
- * configure.ac:
- Only build dlloader modules by default.
+ Unlibcwrap. Bump server version requirement. Bump to 0.4.0.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6adde374f8c1a1fd6573262d83e2810e5193c538
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:01 2005 +0000
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Update package version for X11R7 release.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c5d01fca0fb8c72dd69766eae41659bf4e6cb50e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:54 2005 +0000
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Stub COPYING files
+
+commit 18c0c40ce5f8142db7b12835f3c4dadcbbd063d5
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:18 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit d992241a8afda96025bae85fcc6d26132c5372ae
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:34 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 8d185b334f89baccc9d1ba288c43099d420162bd
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:09 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit a8e40603f6f12adc12c85c3f6e2e16df661381ab
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:30:02 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit be33c9a629feb4795006550e916cb1f27b4da69f
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:17 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 610b28959e0222e652c826aebae4de4bd08b60da
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 74b42054bf14a29df6629b4f3b295dd4f1f448ed
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:54 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit fe34c3a53ea040fb07de1edb0d0b5efba271c2ad
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:04 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 8af9770f05b485d9016a2f46a65423075091bc9b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:04 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 527b5f01b56106ee43e1fdfec34a8da4a9cd250f
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:48 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 1304f6f06236eac7fc8b1c426ee3c67c88a9e4e5
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:44 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 7a4f0abfbb2d38e58b402d64c73c5e8b8f7ceed5
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 18:46:49 2005 +0000
+
+ Build system for s3
+
+commit f53881d942bcd463127d2e5bef18e6e422d361c4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:29:58 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit b826671f9e2dc702ab8537deb33f51fa7ede9c57
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Jul 1 22:43:12 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit 807527511814ff314c16d3c611d58a10d21c3369
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:55 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 74df74c1f8b49e71e495af5ccad77600fd783f23
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:29 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 0147cb45138ccd06477dc7f973ae20c1405f2bf5
+Author: Alex Deucher <agd5f@yahoo.com>
+Date: Sun Oct 17 20:29:32 2004 +0000
+
+ - Add interlaced support to S3 driver (bug 332, Leo Savernik)
+ - EmulateWheelTimeout (bug 323, Mathias Fröhlich)
+ - single button double-click (bug 322, Rob Brown)
+
+commit b66a0081cec6427604758371907ac6c7dca532a3
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Sep 17 03:04:53 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 73537025414eb20771ee2337cf60016daafc0fc9
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Aug 16 09:13:14 2004 +0000
+
+ Bug #1087: Make sure all the *Weak symbols are documented in the import
+ list, so the loader knows not to complain about unresolved symbols when
+ an optional module isn't loaded. This typically manifests as warnings
+ about fbdevHW symbols when the user isn't using the framebuffer
+ console.
+
+commit c431a14b6be0d9071b0fc95121260b33ab598f75
+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 d5c13acdc525296f3dd7b7fc99737be2423c1a01
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:54 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 1c466ae7996c3b3e7d3dba87458a056452bd3601
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:23:31 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit b1069acf6e9345c44f2a3cf7378590162e947042
+Author: Egbert Eich <eich@suse.de>
+Date: Wed May 26 16:24:09 2004 +0000
+
+ Fixing setting of physical framebuffer base for several drivers. C&T
+ driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
+ driver: improved support for lowres double scan modes.
+
+commit 143b16b20caba7c6f61784752b2ce766441ce170
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:43:14 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit c690296c3a9ea42e3beb8b97b2fe4654b5f0b7f7
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:31 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 55979da7b2d78bc8a2e85d0544d49801640e2617
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:23 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 05d3ef930b8b6dfde1eb4a272ad97e44625d9faf
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:54 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit ce44f2000de918df33fa355aaccf3f4aaa82762c
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:23 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 44cec492e6684d44e3ddcee0570bf3c72b9e07e3
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Thu Dec 4 22:03:18 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit 22ef8a01ef4b9d7d9ce62e3646a8309f0d789e1f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:38 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 7a758184cd0a922e87909ccc54375a52bed792b8
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit b8772dfb095f92bdedafae787f74a099182a4594
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
commit 7cb87bb8d42920d512035d3de5e8eebb6fde65f0
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 13:28:22 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-s3
module in the long description.
diff --git a/debian/changelog b/debian/changelog
index b4ef8d5..c12e84c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
xserver-xorg-video-s3 (1:0.5.0-2) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-s3.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 14:13:31 +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-s3
+ module in the long description.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 13:27:31 +0200
xserver-xorg-video-s3 (1:0.5.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 1411470..446bc2f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ 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>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, quilt
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, quilt
Standards-Version: 3.7.2.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-s3
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3.git
Package: xserver-xorg-video-s3
Architecture: any
@@ -19,8 +21,8 @@ Description: X.Org X server -- legacy S3 display driver
xserver-xorg-video-s3virge and xserver-xorg-driver-savage, respectively.
.
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-s3' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
+ This package is built from the X.org xf86-video-s3 driver module.
diff --git a/debian/rules b/debian/rules
index bb3564e..0c8e35b 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 --exclude=s3_drv.la
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 7c07ce960c894bdd579c6989e37ce9f07ef03417
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 23:45:01 2007 -0500
Autoreconf
diff --git a/Makefile.in b/Makefile.in
index 936bdf9..d4f2b23 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.9.6 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 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.
@@ -33,11 +33,15 @@
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -51,17 +55,17 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure COPYING ChangeLog config.guess \
+ $(top_srcdir)/configure COPYING ChangeLog compile config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(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
+ configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -69,13 +73,10 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -93,6 +94,8 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -127,7 +130,6 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -141,10 +143,11 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -161,13 +164,13 @@ STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -179,7 +182,6 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -208,11 +210,8 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src
all: config.h
@@ -256,7 +255,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ $(MAKE) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -278,6 +277,7 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
+uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -310,7 +310,8 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -412,22 +413,23 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -441,7 +443,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -449,8 +451,6 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -458,7 +458,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -533,7 +533,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -603,20 +603,12 @@ info-am:
install-data-am:
-install-dvi: install-dvi-recursive
-
install-exec-am:
-install-html: install-html-recursive
-
install-info: install-info-recursive
install-man:
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -637,26 +629,24 @@ ps: ps-recursive
ps-am:
-uninstall-am:
+uninstall-am: uninstall-info-am
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am clean clean-generic clean-libtool clean-recursive \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
+ distclean-recursive distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/aclocal.m4 b/aclocal.m4
index 7dc269a..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005 Free Software Foundation, Inc.
# This file 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.
@@ -11,11 +11,6 @@
Reply to: