xserver-xorg-video-voodoo: Changes to 'debian-experimental'
debian/changelog |8 ++-- debian/control |2 +- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit e6e56f7adb754b99fdac7307110c421af89b6848 Author: Cyril Brulebois Date: Sat Oct 16 22:09:36 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index b13c09a..ec31933 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-voodoo (1:1.2.4-1) UNRELEASED; urgency=low +xserver-xorg-video-voodoo (1:1.2.4-1) experimental; urgency=low [ Christopher James Halse Rogers ] * New upstream release @@ -8,7 +8,7 @@ xserver-xorg-video-voodoo (1:1.2.4-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * Build against Xserver 1.9.1 rc1. - -- Christopher James Halse Rogers Thu, 05 Aug 2010 09:51:21 +1000 + -- Cyril Brulebois Sat, 16 Oct 2010 22:09:35 +0200 xserver-xorg-video-voodoo (1:1.2.3-2) unstable; urgency=low commit cce9d726b6a8c3ff2ae9563544cf4d3bd4818aa9 Author: Cyril Brulebois Date: Sat Oct 16 22:09:23 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index 10020a1..b13c09a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ xserver-xorg-video-voodoo (1:1.2.4-1) UNRELEASED; urgency=low + [ Christopher James Halse Rogers ] * New upstream release - Fix build against Xserver 1.9 * Bump Standards-Version to 3.9.1 (no changes needed). + [ Cyril Brulebois ] + * Build against Xserver 1.9.1 rc1. + -- Christopher James Halse Rogers Thu, 05 Aug 2010 09:51:21 +1000 xserver-xorg-video-voodoo (1:1.2.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 89908d4..2961e8e 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: automake, libtool, xutils-dev, - xserver-xorg-dev (>= 2:1.7.6.901), + xserver-xorg-dev (>= 2:1.9.0.901), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, -- 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/e1p7d8k-0004ny...@alioth.debian.org
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
.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 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 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 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 Date: Sun Jun 13 13:16:34 2010 -0400 COPYING: replace stub file with actual Copyright notices. Signed-off-by: Gaetan Nadon 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 -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
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
ChangeLog| 95 Makefile.in | 674 aclocal.m4 | 8256 --- config.guess | 1526 -- config.h.in | 72 config.sub | 1658 -- configure|23239 --- configure.ac |6 debian/README.source | 73 debian/changelog | 32 debian/control | 19 debian/patches/01_gen_pci_ids.diff | 14 debian/patches/series|1 debian/rules | 20 debian/xserver-xorg-video-voodoo.install |1 debian/xsfbs/repack.sh | 32 debian/xsfbs/xsfbs.mk| 21 debian/xsfbs/xsfbs.sh| 311 depcomp | 589 install-sh | 519 ltmain.sh| 6964 - man/Makefile.in | 426 man/voodoo.man |2 missing | 367 mkinstalldirs| 161 src/Makefile.in | 547 src/voodoo.h |2 src/voodoo_dga.c |9 src/voodoo_driver.c | 61 src/voodoo_hardware.c| 64 src/voodoo_pcirename.h |6 31 files changed, 351 insertions(+), 45416 deletions(-) New commits: commit c7d5df26ecff85056063a26cff8f5352d6a5ca7a Author: Cyril Brulebois Date: Sun Dec 6 00:48:21 2009 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 42f735a..8e45a5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low +xserver-xorg-video-voodoo (1:1.2.3-1) experimental; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. - -- Timo Aaltonen Sat, 05 Dec 2009 01:49:14 +0200 + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 00:48:13 +0100 xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low commit 7775faad4697f84d53e079ed9f2fb2b76afd4852 Author: Timo Aaltonen Date: Sat Dec 5 02:09:33 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index 3aa867f..42f735a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. - -- Timo Aaltonen Tue, 01 Dec 2009 11:03:03 +0200 + -- Timo Aaltonen Sat, 05 Dec 2009 01:49:14 +0200 xserver-xorg-video-voodoo (1:1.2.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index e4b05ea..45411aa 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: automake, libtool, xutils-dev, - xserver-xorg-dev (>= 2:1.5), + xserver-xorg-dev (>= 2:1.7), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, commit 0a1ae687ed0a4cf92618789dd7dc0b968d251531 Author: Timo Aaltonen Date: Tue Dec 1 11:31:08 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index b6aea98..3aa867f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-voodoo (1:1.2.3-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen Tue, 01 Dec 2009 11:03:03 +0200 diff --git a/debian/control b/debian/control index ce45a76..e4b05ea 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.2 +Standards-Version: 3.8.3 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 eda940c9953de472251c275c4390b65ce4df34c6 Author: Timo Aaltonen Date: Tue Dec 1 11:03:27 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index c8348e2..5a36399 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +commit 89250c594f29fbad78f2006c32573ac083cccd73 +Author: Dave Airlie +Date: Thu Jul 30 12:04:30 2009 +1000 + +voodoo: bump for release 1.2.3 + +commit 405bab2048a4077b7fbe456f4f24e0d9b448829f +Author: Dave Airlie +Date: Tue Jul 28 15:22:42 2009 +1000 + +voodoo: change to using ABI version check + +commit 023f464e830185c12de90f38219b34498d3e55d0 +Author: Dave Airlie +Date: Tue Jul 28 13:45:59 2009 +1000 + +voodoo: remove rac/resources inclu
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
debian/changelog | 16 + debian/control |2 debian/copyright | 13 + debian/rules |2 debian/xsfbs/xsfbs-autoreconf.mk | 150 --- debian/xsfbs/xsfbs.mk| 49 +--- debian/xsfbs/xsfbs.sh| 387 +-- 7 files changed, 251 insertions(+), 368 deletions(-) New commits: commit 39f0e5ff85f617c7e8d439e55b2e563983eadc8f Author: Julien Cristau <[EMAIL PROTECTED]> Date: Wed Sep 10 13:10:30 2008 +0100 Build against xserver 1.5. diff --git a/debian/changelog b/debian/changelog index 7a38566..a841dec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-voodoo (1:1.2.0-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau <[EMAIL PROTECTED]> Wed, 10 Sep 2008 13:09:38 +0100 + xserver-xorg-video-voodoo (1:1.2.0-1) unstable; urgency=low [ Brice Goglin ] diff --git a/debian/control b/debian/control index 34000f3..0aadcdd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, dpkg-dev (>= 1.14.17) +Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.5), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, dpkg-dev (>= 1.14.17) Standards-Version: 3.7.3 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 86e7669f5d912824e341ea487a6257ec5433eb90 Author: Julien Cristau <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> 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 [EMAIL PROTECTED](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).
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
.cvsignore | 19 .gitignore | 20 ChangeLog | 50 + Makefile.in| 31 aclocal.m4 | 265 +-- config.guess | 36 - config.h.in|6 config.sub | 52 + configure | 1257 +++-- configure.ac | 17 debian/changelog | 17 debian/control | 10 debian/patches/01_gen_pci_ids.diff | 16 debian/xsfbs/xsfbs.mk | 105 --- debian/xsfbs/xsfbs.sh |7 depcomp| 93 ++ install-sh | 514 ++- ltmain.sh | 277 +--- man/Makefile.am|1 man/Makefile.in|9 missing| 61 + mkinstalldirs |5 src/Makefile.am|1 src/Makefile.in| 32 src/voodoo.h |1 src/voodoo_driver.c| 42 + src/voodoo_hardware.c |9 src/voodoo_pcirename.h | 122 +++ 28 files changed, 2302 insertions(+), 773 deletions(-) New commits: commit 9b8aacaf83b03bcbe97248419048428047cb3ecc Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Mar 21 14:24:01 2008 +0100 debian/control updates * Remove Branden from Uploaders with his permission, and add myself. * Build against xserver 1.5 rc1. * Bump Standards-Version to 3.7.3. * Drop the XS- prefix from Vcs-* control fields. diff --git a/debian/changelog b/debian/changelog index a9ad6f7..d1a9a2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ xserver-xorg-video-voodoo (1:1.2.0-1) UNRELEASED; urgency=low [ Julien Cristau ] * New upstream release. * Refresh patch 01_gen_pci_ids.diff. + * Remove Branden from Uploaders with his permission, and add myself. + * Build against xserver 1.5 rc1. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. -- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 02:28:55 +0200 diff --git a/debian/control b/debian/control index f257ef3..e1e70f4 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: xserver-xorg-video-voodoo Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev -Standards-Version: 3.7.2 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libpciaccess-dev +Standards-Version: 3.7.3 +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 Package: xserver-xorg-video-voodoo Architecture: any commit 0d7ab3aa08bbbd6b81198213124c8df3cac3767e Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Mar 21 14:22:29 2008 +0100 Update changelogs and refresh patch diff --git a/ChangeLog b/ChangeLog index e7abc6e..e4e7990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,53 @@ +commit 7ff6addc069e46060fb0cc8bb8d015d34c90533e +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Mar 19 17:09:04 2008 -0400 + +voodoo 1.2.0 + +commit b5b0845ed8ef7a2fa2e771961c1155f32258392e +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Mar 19 17:07:12 2008 -0400 + +Death to RCS tags. + +commit 8d0a15ff1ee1153175e6049b9cebea0c4f14dd2c +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Wed Mar 19 17:07:10 2008 -0400 + +Fix distcheck + +commit 51b6eec500f23e4c9a012a1ab4fe9b4012bc3703 +Author: Dave Airlie <[EMAIL PROTECTED]> +Date: Mon Mar 10 15:21:01 2008 +1000 + +voodoo: finish pciaccess conversion + +thanks to pcpa for pointing these out + +commit 5d60be68f07479e54b2efeea31e82f858f0d116b +Author: Matthieu Herrb <[EMAIL PROTECTED]> +Date: Sun Mar 9 00:10:07 2008 +0100 + +Makefile.am: nuke RCS Id + +commit 2a2703732fb045f2f87d80eb56c8d9c1a58031f2 +Author: Dave Airlie <[EMAIL PROTECTED]> +Date: Wed Feb 27 14:09:59 2008 +1000 + +oops forgot pcirename file + +commit a24db8c2967b4ff9039712488a1748cc47b50bae +Author: Dave Airlie <[EMAIL PROTECTED
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
debian/changelog |6 ++ debian/copyright |3 +++ 2 files changed, 9 insertions(+) New commits: commit 517879f10904aed8171b5e2cc7b778baa880f04c Author: Brice Goglin <[EMAIL PROTECTED]> Date: Sat Sep 15 02:29:12 2007 +0200 Add upstream URL to debian/copyright diff --git a/debian/changelog b/debian/changelog index 64f9942..4420892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-voodoo (1:1.1.1-5) UNRELEASED; urgency=low + + * Add upstream URL to debian/copyright. + + -- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 02:28:55 +0200 + xserver-xorg-video-voodoo (1:1.1.1-4) experimental; urgency=low * Build and build-dep against Xserver 1.4 diff --git a/debian/copyright b/debian/copyright index c68bf62..791c1bc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,6 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + Alan Cox <[EMAIL PROTECTED]> Permission to use, copy, modify, distribute, and sell this software and its -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit 2395208435914c2665967b73052900c66cb9f339 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Sep 9 21:03:27 2007 -0400 * Build and build-dep against Xserver 1.4 diff --git a/debian/changelog b/debian/changelog index 4eda70e..64f9942 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-voodoo (1:1.1.1-4) experimental; urgency=low + + * Build and build-dep against Xserver 1.4 + + -- David Nusinow <[EMAIL PROTECTED]> Sun, 09 Sep 2007 20:58:52 -0400 + xserver-xorg-video-voodoo (1:1.1.1-3) experimental; urgency=low * Add 01_gen_pci_ids.diff. This patch ships a set of PCI ID's that this diff --git a/debian/control b/debian/control index 31bf150..f257ef3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev +Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
ChangeLog| 206 - Makefile.in | 125 +-- aclocal.m4 | 676 -- config.guess | 32 config.sub | 16 configure| 1119 +++ debian/changelog | 39 - debian/control | 13 debian/patches/01_gen_pci_ids.diff | 18 debian/patches/series|1 debian/rules |6 debian/xserver-xorg-video-voodoo.install |1 debian/xsfbs/xsfbs.mk|9 man/Makefile.in | 92 +- man/voodoo.man |4 src/Makefile.in | 149 ++-- 16 files changed, 1637 insertions(+), 869 deletions(-) New commits: commit 689636508513292f534ec09f997fa9bf9e5e6764 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Aug 19 14:59:09 2007 -0400 Build against xserver 1.3.99.0 and build-depend on that diff --git a/debian/changelog b/debian/changelog index 8f17a26..4eda70e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ xserver-xorg-video-voodoo (1:1.1.1-3) experimental; urgency=low * Add 01_gen_pci_ids.diff. This patch ships a set of PCI ID's that this driver supports so that it can be automatically loaded by the server. + Enable our patch system to support this and add quilt to build-depends + * Build against xserver 1.3.99.0 and build-depend on that - -- David Nusinow <[EMAIL PROTECTED]> Sun, 19 Aug 2007 14:52:00 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Sun, 19 Aug 2007 14:58:47 -0400 xserver-xorg-video-voodoo (1:1.1.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 3ab5c78..31bf150 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev +Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-voodoo XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-voodoo.git commit 7f82c0392fba0c2019db3fd412bc81ec3707d352 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Aug 19 14:58:26 2007 -0400 Add 01_gen_pci_ids.diff. This patch ships a set of PCI ID's that this driver supports so that it can be automatically loaded by the server. + Enable our patch system to support this and add quilt to build-depends + Autoreconf to deal with it because it touches src/Makefile.am diff --git a/Makefile.in b/Makefile.in index 0ef03f8..d40f481 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 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,15 +33,11 @@ # 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 @@ -55,17 +51,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure COPYING ChangeLog TODO 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) $(CON
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
debian/control|2 +- debian/xsfbs/xsfbs.mk |5 - 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit f243db450c6ce7bef33acf6ad414116a4355cbf6 Author: David Nusinow <[EMAIL PROTECTED]> Date: Wed Feb 21 22:09:05 2007 -0500 Generate Provides line automatically diff --git a/debian/control b/debian/control index 2979b8e..1937200 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Standards-Version: 3.7.2 Package: xserver-xorg-video-voodoo Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} -Provides: xserver-xorg-video-1.1 +Provides: ${xviddriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- Voodoo display driver This package provides the driver for 3dfx Voodoo1 and Voodoo2 chipsets. commit dacefd5a6bb9f786c78f35358273e3214c7492e9 Author: David Nusinow <[EMAIL PROTECTED]> Date: Wed Feb 21 21:37:52 2007 -0500 Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index dbb2872..ae767b1 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -354,8 +354,10 @@ # Generate the shlibs.local file. debian/shlibs.local: cat debian/*.shlibs >$@ +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null) SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI)) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) +DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI) ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif @@ -367,6 +369,7 @@ ifeq ($(SERVERABI),) @exit 1 else echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars endif include debian/xsfbs/xsfbs-autoreconf.mk -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
debian/changelog |4 ++-- debian/control|2 +- debian/rules |2 +- debian/xsfbs/xsfbs.mk | 15 +++ 4 files changed, 19 insertions(+), 4 deletions(-) New commits: commit cf23d42aaca2c1ca017418b12d8f086c7e40 Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 20 22:29:02 2007 -0500 Generate server dependencies automatically from the ABI diff --git a/debian/changelog b/debian/changelog index cf03873..32a7cff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ xserver-xorg-video-voodoo (1:1.1.1-1) UNRELEASED; urgency=low * New upstream version - * Bump xserver ABI metadata to 1.1 for use with server 1.2 + * Generate server dependencies automatically from the ABI - -- David Nusinow <[EMAIL PROTECTED]> Sat, 10 Feb 2007 21:23:57 -0500 + -- David Nusinow <[EMAIL PROTECTED]> Tue, 20 Feb 2007 22:27:40 -0500 xserver-xorg-video-voodoo (1:1.1.0-5) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index a44523c..2979b8e 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: xserver-xorg-video-voodoo Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.2.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} Provides: xserver-xorg-video-1.1 Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- Voodoo display driver diff --git a/debian/rules b/debian/rules index f403018..be5d29b 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ install: build cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. -binary-arch: build install +binary-arch: build install serverabi dh_testdir dh_testroot commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb Author: Julien Cristau <[EMAIL PROTECTED]> Date: Sat Feb 17 16:01:41 2007 +0100 Add new "serverabi" rule to generate drivers dependency on the server. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 7b8206e..dbb2872 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -354,6 +354,21 @@ # Generate the shlibs.local file. debian/shlibs.local: cat debian/*.shlibs >$@ +SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI)) +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: +ifeq ($(SERVERABI),) + @echo error: xserver-xorg-dev needs to be installed + @exit 1 +else + echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars +endif + include debian/xsfbs/xsfbs-autoreconf.mk # vim:set noet ai sts=8 sw=8 tw=0: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
.cvsignore | 19 +++ autogen.sh | 12 configure.ac |2 +- debian/changelog |3 ++- man/.cvsignore |2 ++ man/Makefile.am |2 +- src/.cvsignore |6 ++ 7 files changed, 43 insertions(+), 3 deletions(-) New commits: commit 92ce0dc5e315bc3b96ba8d26cf2acc854cb62ec8 Author: Adam Jackson <[EMAIL PROTECTED]> Date: Fri Oct 13 18:51:36 2006 -0400 Bump to 1.1.1 diff --git a/configure.ac b/configure.ac index e3a422c..5c9d152 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # Process this file with autoconf to pro AC_PREREQ(2.57) AC_INIT([xf86-video-voodoo], -1.1.0, +1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-voodoo) commit 3d2a18a636230257e78cb013eadef77ecbdf2496 Author: A Costa <[EMAIL PROTECTED]> Date: Thu Sep 21 22:51:52 2006 +1000 Typo fix (Debian bug #364555). diff --git a/man/voodoo.man b/man/voodoo.man index e170cdb..82a3a3f 100644 --- a/man/voodoo.man +++ b/man/voodoo.man @@ -19,7 +19,7 @@ On the Voodoo 1 the driver uses a shadow the video adapter has only 3D acceleration. Selected portions of the shadow framebuffer are copied out to the Voodoo board at the right time. Because of this, the speed of the driver is very dependent on the CPU. Processors -nowdays are actually rather fast at moving data so we get very good speed +nowadays are actually rather fast at moving data so we get very good speed anyway as the shadow framebuffer is in cached RAM. .PP The Voodoo2 has 16bpp acceleration and the driver provides accelerated commit e6743d920ddb245bd2af6c047dd769ae2deb9a74 Author: Adam Jackson <[EMAIL PROTECTED]> Date: Fri Apr 7 21:58:28 2006 + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. diff --git a/ChangeLog b/ChangeLog index e6c8681..50d6011 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-04-07 Adam Jackson <[EMAIL PROTECTED]> + + * 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 * configure.ac: diff --git a/configure.ac b/configure.ac index 7954a0a..e3a422c 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # Process this file with autoconf to pro AC_PREREQ(2.57) AC_INIT([xf86-video-voodoo], -1.0.0.5, +1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-voodoo) @@ -53,7 +53,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderprot XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff --git a/src/voodoo.h b/src/voodoo.h index 3a99aca..8aa0435 100644 --- a/src/voodoo.h +++ b/src/voodoo.h @@ -1,3 +1,5 @@ +#include + typedef struct { CARD32 m; CARD32 n; @@ -74,11 +76,11 @@ #define FALSE 0 #define VoodooPTR(p) ((VoodooPtr)((p)->driverPrivate)) -#define VERSION 4000 +#define VOODOO_VERSION 4000 #define VOODOO_NAME "Voodoo" #define VOODOO_DRIVER_NAME "voodoo" #define VOODOO_MAJOR_VERSION 1 -#define VOODOO_MINOR_VERSION 0 +#define VOODOO_MINOR_VERSION 1 #define VOODOO_PATCHLEVEL 0 #define PCI_CHIP_VOODOO1 0x0001 diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c index 6c85dcd..6f1f925 100644 --- a/src/voodoo_dga.c +++ b/src/voodoo_dga.c @@ -42,7 +42,6 @@ #include "mibank.h" #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c index f161f8e..f4dcd96 100644 --- a/src/voodoo_driver.c +++ b/src/voodoo_driver.c @@ -50,7 +50,6 @@ #include "mibank.h" #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Version.h" #include "xf86PciInfo.h" #include "xf86Pci.h" @@ -101,7 +100,7 @@ static void VoodooDisplayPowerManagement */ _X_EXPORT DriverRec VOODOO = { - VERSION, + VOODOO_VERSION, VOODOO_DRIVER_NAME, VoodooIdentify, VoodooProbe, @@ -284,7 +283,7 @@ #endif VoodooPCIChipsets,NULL, NULL, NULL, NULL, NULL))) { - pScrn->driverVersion = VERSION; + pScrn->driverVersion = VOODOO_VERSION; pScrn->driverName= VOODOO_DRIVER_NAME; pScrn->name = VOODOO_NAME; pScrn->Probe = Voodoo
xserver-xorg-video-voodoo: Changes to 'debian-experimental'
New branch 'debian-experimental' available with the following commits: commit fc7b5a5d56441e380eec520c5eac307f6aeb965d Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Feb 10 21:25:17 2007 -0500 Prepare drivers for use with xserver 1.2, which has a new ABI (version 1.1) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]