xserver-xorg-video-savage: Changes to 'debian-experimental'
ChangeLog | 397 +++ configure.ac | 24 + debian/README.source | 24 - debian/changelog | 54 debian/compat |2 debian/control | 24 + debian/rules | 103 debian/watch |1 debian/xsfbs/repack.sh | 32 -- debian/xsfbs/xsfbs.mk | 285 -- debian/xsfbs/xsfbs.sh | 622 - src/Makefile.am|2 src/compat-api.h | 105 src/savage_accel.c |9 src/savage_bci.h |7 src/savage_common.h|6 src/savage_cursor.c| 10 src/savage_dga.c | 31 +- src/savage_dri.c | 479 + src/savage_dri.h |6 src/savage_dripriv.h |6 src/savage_driver.c| 183 ++ src/savage_driver.h| 42 +-- src/savage_drm.h | 12 src/savage_exa.c | 25 - src/savage_hwmc.c | 16 - src/savage_i2c.c | 16 - src/savage_pciids.h| 55 src/savage_regs.h |6 src/savage_sarea.h | 12 src/savage_shadow.c|6 src/savage_streams.h |7 src/savage_vbe.c | 35 +- src/savage_vbe.h |6 src/savage_video.c | 88 +++--- src/savage_xaa.c | 17 - 36 files changed, 1166 insertions(+), 1589 deletions(-) New commits: commit 3299a36b373cc6d3237b79ef42908e63f822edd1 Author: Maarten Lankhorst Date: Wed Jul 18 13:42:47 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index e68bc48..bb7137f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.6-1) UNRELEASED; urgency=low + + * New upstream release + + -- Maarten Lankhorst Wed, 18 Jul 2012 13:42:19 +0200 + xserver-xorg-video-savage (1:2.3.4-1) unstable; urgency=low * New upstream release commit 03e24e57a11ed176c845ab9c2e5308dceab08d26 Author: Maarten Lankhorst Date: Wed Jul 18 13:42:38 2012 +0200 Bump changelog diff --git a/ChangeLog b/ChangeLog index eda84db..ac40aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +commit cb27a7a072c6e087a2e272d84c1d569dc717da8b +Author: Dave Airlie +Date: Tue Jul 17 16:05:09 2012 +1000 + +xf86-video-savage: bump to version 2.3.6 + +Signed-off-by: Dave Airlie + +commit d7edd7c545473d5ed80c9a46c1405042267a7293 +Author: Dave Airlie +Date: Mon Jul 16 03:39:32 2012 +0100 + +savage: make build with no xaa server. + +This fixes savage build against the no XAA server. + +Signed-off-by: Dave Airlie + +commit 508e0742b7d1ac1e4ff6b648d19bfa062c535d61 +Author: Dave Airlie +Date: Mon Jul 2 12:29:41 2012 +0100 + +savage: bump to 2.3.5 + +Signed-off-by: Dave Airlie + +commit 430b956b49b6c883189074ce13bc234545b714e0 +Author: Dave Airlie +Date: Wed Jun 6 11:24:31 2012 +0100 + +savage: i2c drop xf86Screens usage. + +Signed-off-by: Dave Airlie + +commit a2714fb09e1e0badbb3e98e24d4b1ed92003bdb9 +Author: Dave Airlie +Date: Wed Jun 6 11:22:29 2012 +0100 + +savage: port to new compat API + +Signed-off-by: Dave Airlie + +commit de22eab9a21df80fe965dc37d21ba3ac2b9f5fd0 +Author: Tormod Volden +Date: Wed Feb 15 22:20:37 2012 +0100 + +Refactor BIOS modes retrieval to call VBEGetVBEInfo only once + +Otherwise, calling it twice would trigger a VBE bug when using +xserver 1.12. + +Signed-off-by: Tormod Volden + commit 63dd44674a28263c5d8d6aec8b72e95f94d3fe6c Author: Alan Coopersmith Date: Fri Mar 23 19:46:12 2012 -0700 commit cb27a7a072c6e087a2e272d84c1d569dc717da8b Author: Dave Airlie Date: Tue Jul 17 16:05:09 2012 +1000 xf86-video-savage: bump to version 2.3.6 Signed-off-by: Dave Airlie diff --git a/configure.ac b/configure.ac index 5e4fbe2..2b99314 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-savage], -[2.3.5], +[2.3.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-savage]) AC_CONFIG_SRCDIR([Makefile.am]) commit d7edd7c545473d5ed80c9a46c1405042267a7293 Author: Dave Airlie Date: Mon Jul 16 03:39:32 2012 +0100 savage: make build with no xaa server. This fixes savage build against the no XAA server. Signed-off-by: Dave Airlie diff --git a/configure.ac b/configure.ac index ca60e76..5e4fbe2 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,24 @@ if test "$DRI" = yes; then AC_DEFINE(SAVAGEDRI_DEVEL,1,[Enable developmental DRI driver support]) fi +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then +save_CFLAGS=$CFLAGS +
xserver-xorg-video-savage: Changes to 'debian-experimental'
.gitignore | 78 + COPYING | 118 -- ChangeLog | 229 Makefile.am | 12 ++ configure.ac| 50 +-- debian/changelog|7 + debian/control |2 debian/copyright| 71 +++- man/Makefile.am | 59 - man/savage.man |1 src/savage_driver.c |3 src/savage_exa.c|4 src/savage_video.c | 13 ++ 13 files changed, 569 insertions(+), 78 deletions(-) New commits: commit ba66ab62be50188fa306b7be23bdecb06e95011b Author: Cyril Brulebois Date: Sun Dec 5 18:33:42 2010 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 32b37ff..8bbbccc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-savage (1:2.3.2-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.2-1) experimental; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. - -- Cyril Brulebois Sun, 05 Dec 2010 18:16:48 +0100 + -- Cyril Brulebois Sun, 05 Dec 2010 18:33:38 +0100 xserver-xorg-video-savage (1:2.3.1-3) experimental; urgency=low commit f7812a7a73ef8b39dc6e490a1e63121b09cf8baa Author: Cyril Brulebois Date: Sun Dec 5 18:19:49 2010 +0100 Update debian/copyright from upstream COPYING. diff --git a/debian/copyright b/debian/copyright index e17bb32..4bcafb4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,76 @@ This package was downloaded from http://xorg.freedesktop.org/releases/individual/driver/ Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. +Copyright (c) 2003-2006, X.Org Foundation + +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 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, +FITESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 holder(s) +and author(s) 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 holder(s) and author(s). + +Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. +Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved. + +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, sub license, +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 NON-INFRINGEMENT. IN NO EVENT SHALL +VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS 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. + +Copyright 2004 Felix Kuehling +All Rights Reserved. + +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, sub license, +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", W
xserver-xorg-video-savage: Changes to 'debian-experimental'
debian/README.source |2 +- debian/changelog | 22 ++ debian/control| 10 -- debian/rules | 14 +++--- debian/xsfbs/xsfbs.mk | 35 ++- 5 files changed, 56 insertions(+), 27 deletions(-) New commits: commit 00f9cccedd7fb764c47ceedab2dc062789d7d885 Author: Cyril Brulebois Date: Sat Oct 16 20:59:44 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 58c8dd6..707ad3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-savage (1:2.3.1-3) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.1-3) experimental; urgency=low * Build against Xserver 1.9.1 rc1. - -- Cyril Brulebois Sat, 16 Oct 2010 20:59:19 +0200 + -- Cyril Brulebois Sat, 16 Oct 2010 20:59:43 +0200 xserver-xorg-video-savage (1:2.3.1-2) unstable; urgency=low commit bb55076800d13810daf107b6b97fbbf354de6790 Author: Cyril Brulebois Date: Sat Oct 16 20:59:27 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index b3467da..58c8dd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.3.1-3) UNRELEASED; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Sat, 16 Oct 2010 20:59:19 +0200 + xserver-xorg-video-savage (1:2.3.1-2) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 5b3c71c..0cc51bd 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow , Brice Goglin = 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.7.6.901), + xserver-xorg-dev (>= 2:1.9.0.901), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, commit d404ae524cb59a89e72032c1d5944b675c5e7fb4 Author: Mikhail Gusarov Date: Fri May 7 18:58:58 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 5e83aa8..5b3c71c 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,5 @@ Description: X.Org X server -- Savage display driver . More information about X.Org can be found at: http://www.X.org> - http://xorg.freedesktop.org> - http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-video-savage driver module. commit bf54dba378b9d3bcec47b5660b1189dd915f3bbc Author: Cyril Brulebois Date: Tue May 4 00:12:25 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index afcaa05..b3467da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-savage (1:2.3.1-2) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.1-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-savage (1:2.3.1-2) UNRELEASED; urgency=low * Add myself to Uploaders. * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). - -- Julien Cristau Sat, 23 Jan 2010 02:28:29 +0100 + -- Cyril Brulebois Tue, 04 May 2010 00:12:21 +0200 xserver-xorg-video-savage (1:2.3.1-1) experimental; urgency=low commit 6bf0c9154258e5aaef1a090a9dfa44e70eccfcdb Author: Cyril Brulebois Date: Tue May 4 00:12:07 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 de2e6e1..afcaa05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-savage (1:2.3.1-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 Sat, 23 Jan 2010 02:28:29 +0100 diff --git a/debian/control b/debian/control index 10f8630..5e83aa8 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git commit b6cbf1dcceca5cbeafc7a18ac0c6b536ae296abb Author: Cyril Brulebois Date: Tue May 4 00:11:29 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index af319da..de2e6e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-video-savage (1:2.3.1-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 Sat, 23 Jan 2010 02:28:29 +0100 diff --git a/debian/control b/debian/control index 37225fb..10f8630 100644 --- a/d
xserver-xorg-video-savage: Changes to 'debian-experimental'
ChangeLog| 189 ++ README | 20 + configure.ac | 10 debian/README.source | 73 +++ debian/changelog | 35 +++ debian/control |4 debian/patches/01_gen_pci_ids.diff | 39 --- debian/patches/series|1 debian/xserver-xorg-video-savage.install |1 debian/xsfbs/xsfbs.mk| 21 -- debian/xsfbs/xsfbs.sh| 311 --- man/savage.man | 35 +++ src/savage_accel.c | 26 ++ src/savage_dri.c | 42 src/savage_driver.c | 238 +++ src/savage_driver.h |6 src/savage_exa.c | 128 +--- src/savage_hwmc.c|1 src/savage_video.c | 196 +++ 19 files changed, 715 insertions(+), 661 deletions(-) New commits: commit e0e5e50e205e057ef1c3e2974836ac6f9c4df1c3 Author: Cyril Brulebois Date: Sun Dec 6 01:54:22 2009 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 1c55dce..3371c33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.3.1-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:10 +0200 + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 01:54:17 +0100 xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low commit 8ad8c98bab6031973f4d04dd0fb1c8620bd46c58 Author: Timo Aaltonen Date: Sat Dec 5 02:09:30 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index 8c8d8f7..1c55dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-video-savage (1:2.3.1-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 10:12:09 +0200 + -- Timo Aaltonen Sat, 05 Dec 2009 01:49:10 +0200 xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8d5e0ab..e87ccba 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow , Julien Cristau = 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.5.99.901), + xserver-xorg-dev (>= 2:1.7), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, commit de9a3b3e267d045736fd941eed8831d8f4fbca84 Author: Timo Aaltonen Date: Tue Dec 1 10:13:01 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index bbd0ad1..8c8d8f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-savage (1:2.3.1-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen Tue, 01 Dec 2009 10:12:09 +0200 diff --git a/debian/control b/debian/control index 37edece..8d5e0ab 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: automake, libtool, xutils-dev -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git commit c630a872cb929e498f5f831cff15f2b1c8a590c4 Author: Timo Aaltonen Date: Tue Dec 1 10:12:35 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 76d0280..3d9bfcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +commit 36ab23a95fd8d46a1206a941278df8845d5765ba +Author: Dave Airlie +Date: Thu Jul 30 12:04:29 2009 +1000 + +savage: bump for release 2.3.1 + +commit ad0b7ba4618c09c1a9d5a6da6b12f42980b7450c +Author: Dave Airlie +Date: Tue Jul 28 18:40:18 2009 +1000 + +savage: move abi check down for RAC + +commit 21f6bf3e492d328b8c7003ffb0c9deec0113fb05 +Author: Dave Airlie +Date: Tue Jul 28 15:22:41 2009 +1000 + +savage: change to using ABI version check + +commit 3c0b164ffe9e1f582cee43f89a94fc0a2899bed8 +Author: Dave Airlie +Date: Tue Jul 28 13:32:36 2009 +1000 + +savage: update for resources/RAC API removal + +commit 96d19b654e934fc3f85f9b45f1dee224cb40b389 +Author: Peter Hutterer +Date: Thu Jul 16 11:54:48 2009 +1000 + +Update to xextproto 7.1 support. + +DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers +need to include dpmsconst.h if xextproto 7.1 is available. + +Signed-off-by: Peter Hutterer + commit 75ce40850ea2ce2e
xserver-xorg-video-savage: Changes to 'debian-experimental'
Makefile.in| 675 - aclocal.m4 | 8256 - config.guess | 1526 --- config.h.in| 72 config.sub | 1658 --- configure |23271 - debian/changelog |9 debian/control | 20 debian/rules | 25 debian/xsfbs/repack.sh | 32 depcomp| 589 - install-sh | 519 - ltmain.sh | 6964 -- man/Makefile.in| 428 missing| 367 mkinstalldirs | 161 src/Makefile.in| 574 - 17 files changed, 76 insertions(+), 45070 deletions(-) New commits: commit 5bc38f7431e3ca420593bd72ee19efa1bf6eaf07 Author: Brice Goglin Date: Tue Feb 3 23:07:47 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index d81b8ee..c7cc9a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xserver-xorg-video-savage (1:2.2.1-4) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.2.1-4) experimental; urgency=low * Build against xserver 1.6 rc1. * Allow parallel builds. * Run autoreconf on build; add build-deps on automake, libtool and xutils-dev. - -- Brice Goglin Tue, 03 Feb 2009 23:06:45 +0100 + -- Brice Goglin Tue, 03 Feb 2009 23:07:21 +0100 xserver-xorg-video-savage (1:2.2.1-3) experimental; urgency=low commit bb9981a0df378a116c7ee6217383154c325fc686 Author: Brice Goglin Date: Tue Feb 3 23:06:22 2009 +0100 Build against Xserver 1.6rc1 diff --git a/debian/changelog b/debian/changelog index 6f9fc3f..d81b8ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ xserver-xorg-video-savage (1:2.2.1-4) UNRELEASED; urgency=low + * Build against xserver 1.6 rc1. * Allow parallel builds. * Run autoreconf on build; add build-deps on automake, libtool and xutils-dev. - -- Brice Goglin Tue, 03 Feb 2009 23:04:47 +0100 + -- Brice Goglin Tue, 03 Feb 2009 23:06:45 +0100 xserver-xorg-video-savage (1:2.2.1-3) experimental; urgency=low diff --git a/debian/control b/debian/control index 0021c9f..7edc777 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow , Julien Cristau = 5.0.0), pkg-config, - xserver-xorg-dev (>= 2:1.5), + xserver-xorg-dev (>= 2:1.5.99.901), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, commit 0ba828949201839b40da25350b66329556a511db Author: Brice Goglin Date: Tue Feb 3 23:05:55 2009 +0100 Delete generated files diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 86587c6..000 --- a/Makefile.in +++ /dev/null @@ -1,675 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -...@set_make@ - -# 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"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL -# 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. -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PR
xserver-xorg-video-savage: Changes to 'debian-experimental'
ChangeLog | 51 +++ aclocal.m4 |2 configure | 20 - configure.ac |2 debian/changelog | 34 +- debian/control |2 debian/patches/03_request_16bit_depth.diff |8 debian/rules |2 debian/xsfbs/xsfbs-autoreconf.mk | 150 --- debian/xsfbs/xsfbs.mk | 51 +-- debian/xsfbs/xsfbs.sh | 387 +++-- ltmain.sh |2 src/savage_driver.c| 38 ++ src/savage_exa.c | 21 - src/savage_vbe.c | 10 15 files changed, 366 insertions(+), 414 deletions(-) New commits: commit 2c68e2881a19f63ae64e9d2b5498663fe58450b4 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Sep 8 19:32:17 2008 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 9eb649f..a1b329e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-video-savage (1:2.2.1-3) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.2.1-3) experimental; urgency=low * Drop patch 02_temporary_revert_pciaccess. * Build against xserver 1.5. - -- Julien Cristau <[EMAIL PROTECTED]> Mon, 08 Sep 2008 19:07:47 +0100 + -- Julien Cristau <[EMAIL PROTECTED]> Mon, 08 Sep 2008 19:32:12 +0100 xserver-xorg-video-savage (1:2.2.1-2) unstable; urgency=low commit 8fab2a38f13e8c172da184e146820d04e6fb177b Author: Julien Cristau <[EMAIL PROTECTED]> Date: Mon Sep 8 19:32:01 2008 +0100 autoreconf diff --git a/configure b/configure index b24977f..9d43b77 100755 --- a/configure +++ b/configure @@ -883,6 +883,10 @@ DRI_TRUE DRI_FALSE DRI_CFLAGS DRI_LIBS +PCIACCESS_CFLAGS +PCIACCESS_LIBS +XSERVER_LIBPCIACCESS_TRUE +XSERVER_LIBPCIACCESS_FALSE moduledir DRIVER_NAME APP_MAN_SUFFIX @@ -919,7 +923,9 @@ PKG_CONFIG XORG_CFLAGS XORG_LIBS DRI_CFLAGS -DRI_LIBS' +DRI_LIBS +PCIACCESS_CFLAGS +PCIACCESS_LIBS' # Initialize some variables set by options. @@ -1542,6 +1548,10 @@ Some influential environment variables: XORG_LIBS linker flags for XORG, overriding pkg-config DRI_CFLAGS C compiler flags for DRI, overriding pkg-config DRI_LIBSlinker flags for DRI, overriding pkg-config + PCIACCESS_CFLAGS + C compiler flags for PCIACCESS, overriding pkg-config + PCIACCESS_LIBS + linker flags for PCIACCESS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4385,7 +4395,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4388 "configure"' > conftest.$ac_ext + echo '#line 4398 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7442,11 +7452,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7445: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7455: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7449: \$? = $ac_status" >&5 + echo "$as_me:7459: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7732,11 +7742,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7735: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7745: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7739: \$? = $ac_status" >&5 + echo "$as_me:7749: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7836,11 +7846,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7839: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7849: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7843: \$? = $ac_status" >&5 + echo "$as_me:7853: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -102
xserver-xorg-video-savage: Changes to 'debian-experimental'
.cvsignore | 19 ChangeLog | 199 + Makefile.in| 31 aclocal.m4 | 265 +-- config.guess | 36 - config.sub | 52 + configure | 978 +++-- configure.ac | 14 debian/changelog | 40 + debian/control | 10 debian/patches/03_request_16bit_depth.diff | 11 debian/patches/series |1 debian/xsfbs/xsfbs.mk | 76 -- debian/xsfbs/xsfbs.sh |7 depcomp| 33 install-sh | 228 +++--- ltmain.sh | 58 + man/.cvsignore |2 man/Makefile.am|1 man/Makefile.in|9 src/.cvsignore |6 src/Makefile.in| 31 src/savage_accel.c |1 src/savage_bci.h |1 src/savage_dga.c |3 src/savage_dri.c | 49 - src/savage_driver.c| 429 +--- src/savage_driver.h| 34 - src/savage_hwmc.c |2 src/savage_i2c.c |1 src/savage_regs.h |1 src/savage_shadow.c|1 src/savage_vbe.c |1 src/savage_vbe.h |1 src/savage_video.c | 55 + 35 files changed, 1922 insertions(+), 764 deletions(-) New commits: commit 1e575af099e9bc24daf9c9a83a1f371241f916c0 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Mar 20 02:06:39 2008 +0100 debian/control updates * 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 7a5d187..f4f90da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ xserver-xorg-video-savage (1:2.2.0-1) UNRELEASED; urgency=low [ Julien Cristau ] * New upstream release. * Drop patch 02_temporary_revert_pciaccess. + * Build against xserver 1.5 rc1. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. -- David Nusinow <[EMAIL PROTECTED]> Thu, 22 Nov 2007 00:06:24 -0500 diff --git a/debian/control b/debian/control index 0be9597..aac2240 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,10 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt -Standards-Version: 3.7.2.0 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git +Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt, libpciaccess-dev +Standards-Version: 3.7.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git Package: xserver-xorg-video-savage Architecture: any commit 99a39f18521b6f60f959a0c2bbe8e3b5f3db4616 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Mar 20 02:05:13 2008 +0100 autoreconf diff --git a/Makefile.in b/Makefile.in index 340f363..86587c6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 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. @@ -118,6 +118,7 @@ DRIVE
xserver-xorg-video-savage: Changes to 'debian-experimental'
debian/changelog |6 ++ debian/copyright |3 +++ 2 files changed, 9 insertions(+) New commits: commit 38c86bd51e49ffa8d7dc147605ca3ec33e3fdcf4 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Sat Sep 15 02:15:19 2007 +0200 Add upstream URL to debian/copyright diff --git a/debian/changelog b/debian/changelog index 235fd18..b854a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.1.3-3) UNRELEASED; urgency=low + + * Add upstream URL to debian/copyright. + + -- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 02:15:05 +0200 + xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low [ Brice Goglin ] diff --git a/debian/copyright b/debian/copyright index 5bd8fdb..e17bb32 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,6 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-savage: Changes to 'debian-experimental'
ChangeLog | 1073 - Makefile.in| 127 - aclocal.m4 | 676 +++-- config.guess | 32 config.sub | 16 configure | 1147 ++ configure.ac |2 debian/changelog | 57 debian/control | 13 debian/patches/01_gen_pci_ids.diff | 39 debian/patches/01_savage_driver_disable_randr_on_rotation.diff | 58 debian/patches/02_fix_respawn_crash_regression.diff| 23 debian/patches/series |3 debian/rules |4 debian/xserver-xorg-video-savage.install |1 debian/xsfbs/xsfbs.mk | 36 depcomp| 64 install-sh | 348 ++- ltmain.sh | 233 +- man/Makefile.in| 94 man/savage.man | 19 missing| 61 mkinstalldirs |5 src/Makefile.in| 151 - src/savage_bci.h |6 src/savage_driver.c| 101 src/savage_driver.h|8 src/savage_exa.c | 142 - src/savage_image.c | 204 - 29 files changed, 3237 insertions(+), 1506 deletions(-) New commits: commit c3e06ad850cf7f857b2c44903522922b216176b7 Author: David Nusinow <[EMAIL PROTECTED]> Date: Thu Sep 13 20:41:36 2007 -0400 * Build against X server 1.4 and build-dep on it as well diff --git a/debian/changelog b/debian/changelog index d5c0bb9..235fd18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,12 +5,12 @@ xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low thanks Tormod Volden, closes: #438975. [ David Nusinow ] - * Build against X server 1.3.99.0 and build-dep on it as well + * Build against X server 1.4 and build-dep on it as well * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this driver supports so that the server can automatically load it * Exclude savage_drv.la from dh_install - -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:09:56 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Thu, 13 Sep 2007 20:40:23 -0400 xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a0264c9..7114062 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, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt +Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt Standards-Version: 3.7.2.0 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git commit 23e26098563ab2c9090dd765ef51eb8c92edd19a Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Aug 31 18:11:42 2007 -0400 Exclude savage_drv.la from dh_install diff --git a/debian/changelog b/debian/changelog index 97abd67..d5c0bb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low * Build against X server 1.3.99.0 and build-dep on it as well * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this driver supports so that the server can automatically load it + * Exclude savage_drv.la from dh_install - -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:04:25 -0400 + --
xserver-xorg-video-savage: Changes to 'debian-experimental'
debian/control|2 +- debian/xsfbs/xsfbs.mk |5 - 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 9a026801e7b742dd6445025e1ec50100b99985d3 Author: David Nusinow <[EMAIL PROTECTED]> Date: Wed Feb 21 22:08:05 2007 -0500 Generate Provides line automatically diff --git a/debian/control b/debian/control index 2330685..8767bf2 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Standards-Version: 3.7.2.0 Package: xserver-xorg-video-savage 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 -- Savage display driver This package provides the driver for the S3/VIA Savage/ProSavage/Twister family 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-savage: 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 cfb8d020869459271dec1a141c3c4af5a9fe852f Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 20 22:28:44 2007 -0500 Generate server dependencies automatically from the ABI diff --git a/debian/changelog b/debian/changelog index 1f45a23..ff00c00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ xserver-xorg-video-savage (1:2.1.2-4) UNRELEASED; urgency=low - * Bump xserver ABI metadata to 1.1 for use with server 1.2 * Pull fixes from upstream + * Generate server dependencies automatically from the ABI - -- David Nusinow <[EMAIL PROTECTED]> Tue, 13 Feb 2007 22:52:30 -0500 + -- David Nusinow <[EMAIL PROTECTED]> Tue, 20 Feb 2007 22:24:02 -0500 xserver-xorg-video-savage (1:2.1.2-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 8b47bf6..2330685 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2.0 Package: xserver-xorg-video-savage 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 -- Savage display driver diff --git a/debian/rules b/debian/rules index 8fac289..3693853 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-savage: Changes to 'debian-experimental'
New branch 'debian-experimental' available with the following commits: commit 11302e88a8d076faf921a0761422beb46468ae42 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sat Feb 10 21:25:09 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]