COPYING | 8 -
ChangeLog | 224 +++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 10 --
configure.ac | 12 +-
debian/changelog | 9 +
debian/control | 15 +++
debian/rules | 9 +
debian/xsfbs/repack.sh | 32 +++++++
debian/xsfbs/xsfbs.mk | 29 ++----
debian/xsfbs/xsfbs.sh | 66 --------------
man/Makefile.am | 2
man/glide.man | 2
src/Makefile.am | 2
src/glide_driver.c | 8 -
14 files changed, 319 insertions(+), 109 deletions(-)
New commits:
commit d6f26ba2bc0d4c022b9dea2b75e7c3ee53ebbdbb
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Apr 12 12:17:46 2009 +0100
Allow parallel builds.
diff --git a/debian/changelog b/debian/changelog
index 427acc8..be241a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
* New upstream release.
* Bump build-dep on xutils-dev to >= 1:7.4+4.
* Build against xserver 1.6.
+ * Allow parallel builds.
-- Julien Cristau <jcris...@debian.org> Sun, 12 Apr 2009 12:12:29 +0100
diff --git a/debian/rules b/debian/rules
index 28e275e..cc98542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,14 @@
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -37,7 +38,7 @@ build-stamp:
autoreconf -vfi
- test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+ mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
commit d07dfcd942873a03741a9c91decb19146e758e19
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Apr 12 12:15:48 2009 +0100
Build against xserver 1.6.
diff --git a/debian/changelog b/debian/changelog
index f6c64f8..427acc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
* New upstream release.
* Bump build-dep on xutils-dev to >= 1:7.4+4.
+ * Build against xserver 1.6.
-- Julien Cristau <jcris...@debian.org> Sun, 12 Apr 2009 12:12:29 +0100
diff --git a/debian/control b/debian/control
index 7e67878..ed274be 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Brice Goglin <bgog...@debian.org>
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.4),
+ xserver-xorg-dev (>= 2:1.6),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-randr-dev,
commit 40da34e82540adca138b9130db3a6cfa64027fef
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Apr 12 12:15:26 2009 +0100
Bump build-dep on xutils-dev to >= 1:7.4+4.
diff --git a/debian/changelog b/debian/changelog
index 7bc243a..f6c64f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump build-dep on xutils-dev to >= 1:7.4+4.
-- Julien Cristau <jcris...@debian.org> Sun, 12 Apr 2009 12:12:29 +0100
diff --git a/debian/control b/debian/control
index 4ce22e6..7e67878 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
automake,
autoconf,
libtool,
- xutils-dev,
+ xutils-dev (>= 1:7.4+4),
libglide2-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide
commit 505d22817d3994bd5a4c640785ac517e89ec3008
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Apr 12 12:14:44 2009 +0100
debian/control: wrap Build-Depends
diff --git a/debian/control b/debian/control
index 950dfb5..4ce22e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,20 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Brice Goglin <bgog...@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4),
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev,
dpkg-dev (>= 1.14.17), automake, autoconf, libtool, xutils-dev, libglide2-dev
+Build-Depends:
+ debhelper (>= 5),
+ pkg-config,
+ xserver-xorg-dev (>= 2:1.4),
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ dpkg-dev (>= 1.14.17),
+ automake,
+ autoconf,
+ libtool,
+ xutils-dev,
+ libglide2-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-glide
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-glide.git
commit 42741743b91f5f6576a2ff964d2f083f1f1add4e
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Apr 12 12:13:24 2009 +0100
update/add changelogs
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..7a29dd1
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,224 @@
+commit e20cb5035996b392b010f2b52aa14d004868825a
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Feb 25 01:23:03 2009 +0200
+
+ Bump to 1.0.2
+
+commit 542f21b2465c80d78aa154fa75d61c793342f3d8
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Feb 25 01:17:52 2009 +0200
+
+ Use XORG_CHANGELOG and CHANGELOG_CMD to generate the ChangeLog file
+
+ Require at least xorg-macros 1.2 for XORG_CHANGELOG.
+
+commit 65c779a41c3ae1c66b7de2ecbd5904a25009f5ca
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Feb 25 01:12:33 2009 +0200
+
+ Make ChangeLog a .PHONY target
+
+commit e9a6a763f3b08dce0a8815ce0e7bbe3843fe08d2
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Feb 25 01:11:03 2009 +0200
+
+ Add UTF-8 copyright symbol to copyright statements
+
+commit 0cdda109b9fc3deb5ad860f144d3061551ad6058
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Feb 25 01:09:52 2009 +0200
+
+ Rename entity to entityIndex to fix build failure
+
+ Regression introduced in commit 62922e27c80ac392fc35a347b2c8163fcec7decf.
+
+commit 7703441867c3d80eb89fca466c30cef024fd39bc
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Jan 9 16:28:20 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
+commit 62922e27c80ac392fc35a347b2c8163fcec7decf
+Author: Adam Jackson <a...@redhat.com>
+Date: Sun Nov 23 20:07:24 2008 -0500
+
+ Use "no" bus, not ISA.
+
+commit ce31b3e87032253ef8c77a8738014b8e981f01e5
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Jun 18 07:53:55 2008 +0300
+
+ Bump to 1.0.1
+
+commit ff45582f61a34b9bfa2833c4098f9618156a5752
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Jun 18 07:06:05 2008 +0300
+
+ Remove redefinition of NULL
+
+commit 07576fbeb79bc3ae199ae13de3cb09e216efca0e
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Jun 18 07:05:38 2008 +0300
+
+ Remove unused MIN and MAX macros
+
+commit a8a63bee3d5b73fd261d5d543332ee8ee8199071
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Jun 18 04:01:08 2008 +0300
+
+ Generate the ChangeLog file from git history
+
+commit e86333b890407033431041febe216319ab319a76
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Jun 18 02:46:40 2008 +0300
+
+ Add generated glide.4 to .gitignore
+
+commit 7a2b55e4ce5817a39829db478d42a860d2649e80
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Jun 18 02:43:48 2008 +0300
+
+ Remove RCS tags
+
+commit 838ad3bc77dcbc1b481ae891bc4f314b421a82d8
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Wed Jun 18 00:55:32 2008 +0300
+
+ Add license and copyright information to COPYING
+
+commit 39e0cf20ca7be389009a3598d1e6e5c3751c0cf0
+Merge: 3db677c eca9f6d
+Author: James Cloos <cl...@jhcloos.com>
+Date: Mon Sep 3 06:06:54 2007 -0400
+
+ Merge branch 'master' of
ssh://git.freedesktop.org/git/xorg/driver/xf86-video-glide
+
+commit 3db677c4d9bd52b40197dad6e96956a437787b77
+Author: James Cloos <cl...@jhcloos.com>
+Date: Mon Sep 3 05:52:32 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit eca9f6d16e6f919c719c45c9161eb8f205c4e1df
+Author: Brice Goglin <bgog...@debian.org>
+Date: Thu Aug 30 04:41:28 2007 +0300
+
+ Move build time information from the man page to a README
+
+commit 3a3b11dcf342ce6cba7317fb56f8bac619d65ff2
+Author: Brice Goglin <bgog...@debian.org>
+Date: Sat Aug 25 03:16:39 2007 +0300
+
+ Check for glide.h presence in configure
+
+commit 58a6efb43e64d02fc0430df2ff459f7f14786fe3
+Author: Brice Goglin <bgog...@debian.org>
+Date: Tue Aug 7 10:52:50 2007 +0200
+
+ Define GLIDE_*_VERSION* using PACKAGE_VERSION_*
+
+commit d4a7e2b6db58723cfd840b9b86db4a16ecda7ace
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Sat Mar 10 17:10:00 2007 +0200
+
+ Rename .cvsignore to .gitignore
+
+commit 91684920c528f485fef04ddc260e842d4e5f4361
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Sat Mar 10 16:35:18 2007 +0200
+
+ Use system include dir by default for glide.h
+
+commit 41034f5df4d2d276834f14756a5980c8d53db8bd
+Author: Guillem Jover <guil...@hadrons.org>
+Date: Fri Feb 9 04:00:53 2007 +0200
+
+ Modularize xf86-video-glide
+
+commit 102f8f06f91f207e195558d2297443a5b89fa557
+Author: Adam Jackson <a...@nwnk.net>
+Date: Mon Dec 19 16:25:53 2005 +0000
+
+ Stub COPYING files
+
+commit 59cc1984e27c3273cdd29bd7f7070fae8882afc7
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Mon Nov 21 10:49:13 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 3543730a41ee2e2ead3d53fc7ede183c3fa97f45
+Author: Adam Jackson <a...@nwnk.net>
+Date: Mon Jul 11 02:29:47 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit af8d8cff1136fb4bf1083723e5e047d7b836e4c3
+Author: Adam Jackson <a...@nwnk.net>
+Date: Sat Jun 25 21:16:54 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 9e65e081d775b3c56e2c2dbac67512a74a9ed2d6
+Author: Daniel Stone <dan...@fooishbar.org>
+Date: Wed Apr 20 12:25:23 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 4b4b6cbc1bc8a68fe42b1f97c389817320b6b6fa
+Author: Markus Kuhn <markus.k...@cl.cam.ac.uk>
+Date: Sat Dec 4 00:43:08 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 8a9d5ba0d4903e37116d4fa2cca2edbcaf1f0078
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Wed Jun 16 09:23:04 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit aed6abaee9518abda1964c68ca0b25c2b6360a8a
+Author: Egbert Eich <e...@suse.de>
+Date: Fri Apr 23 19:33:02 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 532d3636f31d45fef7b1b0ba8bc3cc61e429c90e
+Author: Egbert Eich <e...@suse.de>
+Date: Sun Mar 14 08:33:20 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit bd31dbb2e3ad9c69df80dd2a6f35092869533e36
+Author: Egbert Eich <e...@suse.de>
+Date: Wed Mar 3 12:12:18 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 165b5bd933379a8759f1024d1a0061cc80adfdae
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 13:35:52 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit aae439e34ae5f8becc2358222ffdbe2584cb82d1
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 09:23:18 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 14789a39b4bf2695b938e505c4d069f2ef9d47d1
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit c5aeaa75075f2bace017bd6a55384f5bb8766eab
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index 3c233cc..7bc243a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 12 Apr 2009 12:12:29 +0100
+
xserver-xorg-video-glide (1.0.1-1) unstable; urgency=low
* First xserver-xorg-driver-glide release.
commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Feb 25 21:31:03 2009 +0100
xsfbs: repack.sh needs to be executable
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755
commit e20cb5035996b392b010f2b52aa14d004868825a
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Feb 25 01:23:03 2009 +0200
Bump to 1.0.2
diff --git a/configure.ac b/configure.ac
index c6fedd8..f257c78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glide],
- 1.0.1,
+ 1.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glide)
commit 542f21b2465c80d78aa154fa75d61c793342f3d8
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Feb 25 01:17:52 2009 +0200
Use XORG_CHANGELOG and CHANGELOG_CMD to generate the ChangeLog file
Require at least xorg-macros 1.2 for XORG_CHANGELOG.
diff --git a/Makefile.am b/Makefile.am
index edff7fa..95892da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,10 +26,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- ( GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && \
- mv .changelog.tmp ChangeLog; \
- rm -f .changelog.tmp ) || \
- ( touch ChangeLog; \
- echo 'git directory not found: installing possibly empty changelog.'
>&2 )
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index f6a5e55..c6fedd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,11 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION],
+ [AC_FATAL([must install xorg-macros 1.2 or later before running
autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -81,6 +86,7 @@ AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([
Makefile
commit 65c779a41c3ae1c66b7de2ecbd5904a25009f5ca
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Feb 25 01:12:33 2009 +0200
Make ChangeLog a .PHONY target
diff --git a/Makefile.am b/Makefile.am
index 7044ec9..edff7fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,8 @@ SUBDIRS = src man
EXTRA_DIST = README ChangeLog
MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog
+
ChangeLog:
( GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && \
mv .changelog.tmp ChangeLog; \
commit e9a6a763f3b08dce0a8815ce0e7bbe3843fe08d2
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Feb 25 01:11:03 2009 +0200
Add UTF-8 copyright symbol to copyright statements
diff --git a/COPYING b/COPYING
index fcde660..2985acd 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright 1997-2003 by The XFree86 Project, Inc.
+Copyright © 1997-2003 by The XFree86 Project, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -20,8 +20,8 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-Copyright 2005 Adam Jackson.
-Copyright 2007 Guillem Jover.
+Copyright © 2005 Adam Jackson.
+Copyright © 2007 Guillem Jover.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -42,7 +42,7 @@ 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.
-Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+Copyright © 2005 Sun Microsystems, Inc. All rights reserved.
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
diff --git a/Makefile.am b/Makefile.am
index 1edd0a7..7044ec9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 2005 Adam Jackson.
+# Copyright © 2005 Adam Jackson.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
diff --git a/configure.ac b/configure.ac
index 11f70e5..f6a5e55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-# Copyright 2005 Adam Jackson.
-# Copyright 2007 Guillem Jover.
+# Copyright © 2005 Adam Jackson.
+# Copyright © 2007 Guillem Jover.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
diff --git a/man/Makefile.am b/man/Makefile.am
index bdb85f3..c068904 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright © 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
diff --git a/src/Makefile.am b/src/Makefile.am
index 9542fbb..383a62d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 2005 Adam Jackson.
+# Copyright © 2005 Adam Jackson.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
commit 0cdda109b9fc3deb5ad860f144d3061551ad6058
Author: Guillem Jover <guil...@hadrons.org>
Date: Wed Feb 25 01:09:52 2009 +0200
Rename entity to entityIndex to fix build failure
Regression introduced in commit 62922e27c80ac392fc35a347b2c8163fcec7decf.
diff --git a/src/glide_driver.c b/src/glide_driver.c
index 12cdcd7..fac93b2 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -390,9 +390,9 @@ GLIDEProbe(DriverPtr drv, int flags)
GlideDevice = xf86SetIntOption(dev->options, "GlideDevice", 0);
if (GlideDevice == sst)
{
- int entity;
+ int entityIndex;
/* Match */
- entity = xf86ClaimNoSlot(drv, 0, dev, TRUE);
+ entityIndex = xf86ClaimNoSlot(drv, 0, dev, TRUE);
pScrn = NULL;
/* Allocate a ScrnInfoRec and claim the slot */
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
- local dir ldsoconf
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line not already present?
- if ! fgrep -qsx "$dir" "$ldsoconf"; then
- observe "adding $dir directory to $ldsoconf"
- echo "$dir" >> "$ldsoconf"
- fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
- # syntax: deregister_x_lib_dir_with_ld_so
- #
- # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
- # libraries, if and only if no shared libaries remain there.
- #
- # Call this function from the postrm script of a package that places a shared
- # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
- # invoking ldconfig.
-
- local dir ldsoconf fgrep_status cmp_status
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # are there any shared objects in the directory?
- if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
- # glob expansion produced nothing, so no shared libraries are present
- observe "removing $dir directory from $ldsoconf"
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
- "cmp exited with status $cmp_status" ;;
- esac
- fi
- fi
-}
-
make_symlink_sane () {
# syntax: make_symlink_sane symlink target
#
commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Feb 1 01:31:31 2009 +0100
xsfbs: add a repack script for uscan
This will automatically prune upstream tarballs
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 0000000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+ exit 0
+fi
+
+if [ "x$1" != x--upstream-version ]; then
+ exit 1
+fi
+
+version="$2"
+filename="$3"
+
+if [ -z "$version" ] || ! [ -f "$filename" ]; then
+ exit 1
+fi
+
+dir="$(pwd)"
+tempdir="$(mktemp -d)"
+
+cd "$tempdir"
+tar xf "$dir/$filename"
+cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf "$dir/$filename" *
+cd "$dir"
+rm -rf "$tempdir"
+echo "Done pruning upstream tarball"
+
+exit 0
commit 7703441867c3d80eb89fca466c30cef024fd39bc
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 9 16:28:20 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/glide.man b/man/glide.man
index ad39b3e..9f82a31 100644
--- a/man/glide.man
+++ b/man/glide.man
@@ -274,6 +274,6 @@ $ xinit -- +xinerama
.SH FILES
glide_drv.o
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Author: Henrik Harmsen.
commit 62922e27c80ac392fc35a347b2c8163fcec7decf
Author: Adam Jackson <a...@redhat.com>
Date: Sun Nov 23 20:07:24 2008 -0500
Use "no" bus, not ISA.
diff --git a/src/glide_driver.c b/src/glide_driver.c
index 1f6bdae..12cdcd7 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -392,12 +392,12 @@ GLIDEProbe(DriverPtr drv, int flags)
{
int entity;
/* Match */
- entity = xf86ClaimIsaSlot(drv, 0, dev, TRUE);
+ entity = xf86ClaimNoSlot(drv, 0, dev, TRUE);
pScrn = NULL;
/* Allocate a ScrnInfoRec and claim the slot */
- if ((pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, NULL,
- NULL, NULL, NULL, NULL))) {
+ if ((pScrn = xf86AllocateScreen(drv, 0))) {
+ xf86AddEntityToScreen(pScrn, entityIndex);
/* I'm not going to "claim" the glide device since no other driver
than this can drive it */
/* (A glide device is not a PCI device) */
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed
's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$logn...@$$(cat
/etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null
2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*"
>/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
