.gitignore | 70 +++++++++- COPYING | 52 ++++++- ChangeLog | 337 -------------------------------------------------- Makefile.am | 12 + configure.ac | 14 +- debian/README.source | 2 debian/changelog | 24 +++ debian/control | 10 - debian/rules | 10 - debian/xsfbs/xsfbs.mk | 35 +++-- man/.cvsignore | 2 man/Makefile.am | 41 ++---- src/.cvsignore | 6 src/voodoo_dga.c | 1 src/voodoo_driver.c | 1 src/voodoo_hardware.c | 1 16 files changed, 201 insertions(+), 417 deletions(-)
New commits: commit 96caf170761cba43e4dde6db7f3b69c83dec9461 Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Thu Aug 5 10:03:26 2010 +1000 Add changelog entry for 1.2.4-1 diff --git a/debian/changelog b/debian/changelog index d41abf8..10020a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-voodoo (1:1.2.4-1) UNRELEASED; urgency=low + + * New upstream release + - Fix build against Xserver 1.9 + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Christopher James Halse Rogers <r...@ubuntu.com> Thu, 05 Aug 2010 09:51:21 +1000 + xserver-xorg-video-voodoo (1:1.2.3-2) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index b2ca707..89908d4 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git commit e58d315815dca51b6fcecdeceb267fc8a7cb19e1 Author: Dave Airlie <airl...@redhat.com> Date: Mon Jul 5 14:39:03 2010 +1000 voodoo 1.2.4 diff --git a/configure.ac b/configure.ac index cdcf752..086c710 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-voodoo], - 1.2.3, + 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-voodoo) commit 180ca72baaa7b384cc6a11694bfd9559e1e071f0 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Jun 13 13:16:34 2010 -0400 COPYING: replace stub file with actual Copyright notices. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/COPYING b/COPYING index 7f33cbf..9694c64 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,48 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. + Copyright (c) 2000-2002 Ghozlane Toumi <gto...@laposte.net> -Please submit updated COPYING files to the Xorg bugzilla: +Relicensed from GPL to the X license by consent of the author -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +Other code Alan Cox (c) Copyright 2004 Red Hat Inc. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Red Hat, Alan Cox and Ghozlane Toumi +not be used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. Th authors make no +representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. + +THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL RICHARD HECKER BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +THIS SOFTWARE IS NOT DESIGNED FOR USE IN SAFETY CRITICAL SYSTEMS OF +ANY KIND OR FORM. + +Copyright 2007 George Sapountzis + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS 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. -http://lists.freedesktop.org/mailman/listinfo/xorg commit 00216334c95b4e055243a1f363071054c9493e47 Author: Adam Jackson <a...@redhat.com> Date: Tue May 18 13:15:40 2010 -0400 Remove mibank.h reference Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c index 622c1f9..5b960e8 100644 --- a/src/voodoo_dga.c +++ b/src/voodoo_dga.c @@ -38,7 +38,6 @@ #endif #include "fb.h" -#include "mibank.h" #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c index 7ea8e05..ca7ba71 100644 --- a/src/voodoo_driver.c +++ b/src/voodoo_driver.c @@ -45,7 +45,6 @@ #endif #include "fb.h" -#include "mibank.h" #include "micmap.h" #include "mipointer.h" #include "xf86.h" diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c index 60f9dc9..25859c7 100644 --- a/src/voodoo_hardware.c +++ b/src/voodoo_hardware.c @@ -39,7 +39,6 @@ #endif #include "fb.h" -#include "mibank.h" #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" commit 2820da541566f9923785a0b8aeef89461c9c838f Author: Mikhail Gusarov <dotted...@debian.org> Date: Fri May 7 18:59:00 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index 1d29078..b2ca707 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,5 @@ Description: X.Org X server -- Voodoo display driver . 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 package is built from the X.org xf86-video-voodoo driver module. commit 65ad8ba45ed8f394ba5f084a1834d58854d0662c Author: Cyril Brulebois <k...@debian.org> Date: Wed May 5 04:16:00 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 3056289..d41abf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-voodoo (1:1.2.3-2) UNRELEASED; urgency=low +xserver-xorg-video-voodoo (1:1.2.3-2) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -12,7 +12,7 @@ xserver-xorg-video-voodoo (1:1.2.3-2) UNRELEASED; urgency=low * Add myself to Uploaders. * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). - -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:01:27 +0100 + -- Cyril Brulebois <k...@debian.org> Wed, 05 May 2010 04:15:54 +0200 xserver-xorg-video-voodoo (1:1.2.3-1) experimental; urgency=low commit 43fb82defd95b74f659b5e6921053a2aa61168f4 Author: Cyril Brulebois <k...@debian.org> Date: Wed May 5 04:15:25 2010 +0200 Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). diff --git a/debian/changelog b/debian/changelog index f723adf..3056289 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-voodoo (1:1.2.3-2) UNRELEASED; urgency=low ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:01:27 +0100 diff --git a/debian/control b/debian/control index 650134c..1d29078 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git commit 007612d6151df5bd430c7a5359637352a2591ff3 Author: Cyril Brulebois <k...@debian.org> Date: Wed May 5 04:15:17 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 76bc518..f723adf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-video-voodoo (1:1.2.3-2) UNRELEASED; urgency=low * Update to new xsfbs, replace deprecated ${xserver:Depends} with ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. + * Add myself to Uploaders. -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:01:27 +0100 diff --git a/debian/control b/debian/control index f4b1f4a..650134c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-voodoo Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org> +Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 9a18906ce89cb454429b27cbf8eb0612954e1921 Author: Cyril Brulebois <k...@debian.org> Date: Wed May 5 04:14:40 2010 +0200 Update to new xsfbs, replace deprecated ${xserver:Depends} with ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. diff --git a/debian/changelog b/debian/changelog index 4896727..76bc518 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ xserver-xorg-video-voodoo (1:1.2.3-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + -- Julien Cristau <jcris...@debian.org> Sat, 23 Jan 2010 02:01:27 +0100 xserver-xorg-video-voodoo (1:1.2.3-1) experimental; urgency=low diff --git a/debian/control b/debian/control index e3f6482..f4b1f4a 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: automake, libtool, xutils-dev, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, @@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo. Package: xserver-xorg-video-voodoo Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} Provides: ${xviddriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-voodoo Conflicts: xserver-xorg-driver-voodoo commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <k...@debian.org> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <jcris...@debian.org> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze 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-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <jcris...@debian.org> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <k...@debian.org> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit b25008a95f00bf825bdb761ed4a75a3063dea5d8 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sat Mar 27 10:04:41 2010 -0400 config: remove TODO from EXTRA_DIST Automake always distributes TODO file. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/Makefile.am b/Makefile.am index b1ea619..4c278ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,6 @@ SUBDIRS = src man MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = TODO .PHONY: ChangeLog INSTALL INSTALL: commit 1364c0320f1ca002da1c2088dc93c648c6a96342 Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 23 01:46:29 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 7277f80..f835330 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Remove myself from Uploaders -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:14 +0200 diff --git a/debian/control b/debian/control index 45411aa..e3f6482 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-voodoo Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Julien Cristau <jcris...@debian.org>, Brice Goglin <bgog...@debian.org> +Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin <bgog...@debian.org> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit 335b77746d9cdb3a13ec8b59eccf87f0058fe937 Author: Julien Cristau <jcris...@debian.org> Date: Sat Jan 16 16:48:41 2010 +0000 Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! diff --git a/debian/changelog b/debian/changelog index 42f735a..7277f80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:14 +0200 xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 40826eb..526b28f 100755 --- a/debian/rules +++ b/debian/rules @@ -37,12 +37,12 @@ build-stamp: dh_testdir autoreconf -vfi - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: @@ -54,7 +54,7 @@ clean: rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f aclocal.m4 config.guess config.sub config.h.in configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs rm -f $$(find -name Makefile.in) @@ -67,7 +67,7 @@ install: build dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install serverabi commit 9348f9e55bc58f1509def899e11c6f122007c7fe Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri Jan 15 15:11:35 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> diff --git a/man/Makefile.am b/man/Makefile.am index f0eb29b..8f2454b 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,27 +1,24 @@ # # 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 -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation. -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE OPEN GROUP 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. -# -# Except as contained in this notice, the name of the copyright holders shall -# not be used in advertising or otherwise to promote the sale, use or -# other dealings in this Software without prior written authorization -# from the copyright holders. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS 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. # drivermandir = $(DRIVER_MAN_DIR) commit 86fbcb7d61988eeec3c0bd9e1e9ac3fb54a5ecc5 Author: Gaetan Nadon <mems...@videotron.ca> Date: Tue Dec 15 22:01:02 2009 -0500 configure.ac: remove unused sdkdir=$(pkg-config...) statement The sdkdir variable isn't use, so remove the statement. Acked-by: Dan Nicholson <dbn.li...@gmail.com> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index ff45bbc..cdcf752 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,6 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. commit b8d32fc5400d09112c8c60e6fe133ed13c655ace Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Nov 23 09:25:06 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index 3480a8f..b1ea619 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src man +MAINTAINERCLEANFILES = ChangeLog INSTALL EXTRA_DIST = TODO .PHONY: ChangeLog INSTALL commit 0af6d01ee363a18ef1840b9f0d81c0bf43d09d6f Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Oct 28 14:41:41 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Automake 'foreign' option is specified in configure.ac. Remove from Makefile.am diff --git a/Makefile.am b/Makefile.am index 5bae444..3480a8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ # 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. -AUTOMAKE_OPTIONS = foreign SUBDIRS = src man EXTRA_DIST = TODO commit e415a5c73e578271cb6b2153c9f99c64ca3b4951 Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Oct 28 14:09:10 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/Makefile.am b/Makefile.am index 873f62d..5bae444 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,9 +22,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man EXTRA_DIST = TODO -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 5d32455..ff45bbc 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit e50f2d6ae0ef0d0ca61c10a3bade2449a6ef2771 Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Oct 26 12:54:23 2009 -0400 Several driver modules do not have a ChangeLog target in Makefile.am #23814 The git generated ChangeLog replaces the hand written one. Update configure.ac to xorg-macros level 1.3. Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros Update Makefile.am to add ChangeLog target if missing Remove ChangeLog from EXTRA_DIST or *CLEAN variables This is a pre-req for the INSTALL_CMD diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 50d6011..0000000 --- a/ChangeLog +++ /dev/null @@ -1,48 +0,0 @@ -2006-04-07 Adam Jackson <a...@freedesktop.org> - - * configure.ac: - * src/voodoo.h: - * src/voodoo_dga.c: - * src/voodoo_driver.c: - * src/voodoo_hardware.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. - -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Remove extraneous AC_MSG_RESULT. - -2005-11-29 Adam Jackson <a...@freedesktop.org> - - * configure.ac: - Only build dlloader modules by default. - -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC2 release. - -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. diff --git a/Makefile.am b/Makefile.am index a52b854..873f62d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,3 +22,9 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man EXTRA_DIST = TODO +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 7cac538..5d32455 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL @@ -86,9 +92,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=voodoo AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([ Makefile src/Makefile commit 9e19c3d33622a2526f91e52051669aa28711893f Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Oct 22 12:34:18 2009 -0400 .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. diff --git a/.gitignore b/.gitignore index 2df4a8d..264459c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,78 @@ -Makefile -Makefile.in -*.la -*.lo +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile config.guess config.h config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno config.sub configure +configure.scan depcomp +.deps/ +INSTALL install-sh +.libs/ libtool +libtool.m4 ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing -stamp-h1 +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for xf86-video-voodoo +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# commit e76eebb0fb264a6627820930dd476bbfbdd250ca Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Sep 7 11:12:13 2009 -0400 xf86-video-voodoo: Remove unused .cvsignore file #23776 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/man/.cvsignore b/man/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/man/.cvsignore -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1ognwz-0002f7...@alioth.debian.org