xserver-xorg-video-trident: Changes to 'debian-experimental'
debian/changelog |6 ++ 1 file changed, 6 insertions(+) New commits: commit 41f282f5b186c0f66454c10853332e469e99f2ba Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Wed Sep 25 13:02:42 2013 +0200 Release to unstable. diff --git a/debian/changelog b/debian/changelog index 7441804..55ba1dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-trident (1:1.3.6-2) unstable; urgency=low + + * Release to unstable. + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Wed, 25 Sep 2013 12:58:07 +0200 + xserver-xorg-video-trident (1:1.3.6-1) experimental; urgency=low * New upstream release. -- 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/e1vomtd-0004yk...@vasks.debian.org
xserver-xorg-video-trident: Changes to 'debian-experimental'
ChangeLog| 14 ++
debian/changelog |3 ++-
src/trident_dga.c|4 ++--
src/trident_driver.c |2 --
4 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 4c5611423118e8e3426b9bd1030fe332dfe86ec6
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Sep 24 14:37:36 2013 +0200
Add changelog entries.
diff --git a/ChangeLog b/ChangeLog
index 27c8bf1..c1583fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+commit 48c15909691e28ad2c188a2978b1c8ef3d9d8760
+Author: Timo Aaltonen tjaal...@ubuntu.com
+Date: Wed Sep 26 11:01:26 2012 +0300
+
+Fix loading the driver without XAA
+
+commit 30787294c837aefa8820b6f76f00fe30d4e54181
+Author: Adam Jackson a...@redhat.com
+Date: Tue Sep 25 08:55:01 2012 -0400
+
+Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
commit 3098fe7193cbfe4a885a60b93e71796b70e4fa2a
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 17 16:05:09 2012 +1000
commit 7b29e1f76aab503560b9929ae6a918e2b02393af
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Sep 24 14:21:48 2013 +0200
Release to experimental.
diff --git a/debian/changelog b/debian/changelog
index f68529a..7441804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xserver-xorg-video-trident (1:1.3.6-1) UNRELEASED; urgency=low
+xserver-xorg-video-trident (1:1.3.6-1) experimental; urgency=low
* New upstream release.
+ * Grab some patches to fix building from git.
-- Maarten Lankhorst maarten.lankho...@canonical.com Thu, 19 Jul 2012
13:21:51 +0200
commit 48c15909691e28ad2c188a2978b1c8ef3d9d8760
Author: Timo Aaltonen tjaal...@ubuntu.com
Date: Wed Sep 26 11:01:26 2012 +0300
Fix loading the driver without XAA
diff --git a/src/trident_dga.c b/src/trident_dga.c
index 0263aa7..c4b5b9a 100644
--- a/src/trident_dga.c
+++ b/src/trident_dga.c
@@ -37,10 +37,10 @@
static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
int *, int *, int *);
static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
-static void TRIDENT_Sync(ScrnInfoPtr);
static int TRIDENT_GetViewport(ScrnInfoPtr);
static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
#ifdef HAVE_XAA_H
+static void TRIDENT_Sync(ScrnInfoPtr);
static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
#if 0
@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = {
TRIDENT_SetMode,
TRIDENT_SetViewport,
TRIDENT_GetViewport,
- TRIDENT_Sync,
#ifdef HAVE_XAA_H
+ TRIDENT_Sync,
TRIDENT_FillRect,
TRIDENT_BlitRect,
#if 0
commit 30787294c837aefa8820b6f76f00fe30d4e54181
Author: Adam Jackson a...@redhat.com
Date: Tue Sep 25 08:55:01 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/trident_driver.c b/src/trident_driver.c
index dc12b76..408c870 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -56,7 +56,6 @@
#include mipointer.h
-#include mibstore.h
#include shadow.h
#include trident.h
#include trident_regs.h
@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
TridentAccelInit(pScreen);
}
-miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* Initialise cursor functions */
--
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/e1vorsa-0004el...@vasks.debian.org
xserver-xorg-video-trident: Changes to 'debian-experimental'
ChangeLog | 924 + configure.ac | 59 +-- debian/README.source | 24 - debian/changelog | 29 + debian/compat |2 debian/control | 22 - debian/patches/series |1 debian/rules | 100 - debian/watch |1 debian/xsfbs/repack.sh | 32 - debian/xsfbs/xsfbs.mk | 285 --- debian/xsfbs/xsfbs.sh | 622 man/Makefile.am| 22 - man/trident.man|1 src/Makefile.am|1 src/blade_accel.c | 11 src/blade_accel_exa.c | 21 - src/compat-api.h | 99 + src/image_accel.c | 12 src/trident.h | 18 src/trident_accel.c| 11 src/trident_bank.c | 15 src/trident_dac.c |5 src/trident_dga.c | 27 - src/trident_driver.c | 178 + src/trident_i2c.c |3 src/trident_shadow.c | 11 src/trident_video.c| 42 +- src/tridenthelper.c|1 src/tvga_dac.c |1 src/xp4_accel.c| 11 src/xp4_accel_exa.c| 13 src/xp_accel.c | 12 33 files changed, 1344 insertions(+), 1272 deletions(-) New commits: commit 267ae3ea7588fbea4c01c95f7c504479a2f771bd Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Thu Jul 19 13:22:07 2012 +0200 New upstream release. diff --git a/ChangeLog b/ChangeLog index b4b9ee5..27c8bf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,47 @@ +commit 3098fe7193cbfe4a885a60b93e71796b70e4fa2a +Author: Dave Airlie airl...@redhat.com +Date: Tue Jul 17 16:05:09 2012 +1000 + +xf86-video-trident: bump to version 1.3.6 + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit f02709607cb353db1e89a909ff01a6941f535ab4 +Author: Dave Airlie airl...@redhat.com +Date: Mon Jul 16 03:17:51 2012 +0100 + +trident: add support for building without XAA + +fix build for removal of XAA from server. + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 177c93486647e71c088ac42697e34c47664eb666 +Author: Dave Airlie airl...@redhat.com +Date: Wed Jun 6 11:49:16 2012 +0100 + +trident: convert to new compat API. + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit 2301879bc334fd9f44cc7f23be613b5b4533568a +Author: Dave Airlie airl...@redhat.com +Date: Wed Jun 6 11:40:26 2012 +0100 + +trident: drop lots of xf86PciInfo.h includes + +Signed-off-by: Dave Airlie airl...@redhat.com + +commit f481290e6dbd73b484cad3e8583031c6e2ccb555 +Author: Adam Jackson a...@redhat.com +Date: Wed Apr 18 10:48:07 2012 -0400 + +Use DamageRegion for shadow damage + +The 'damage' member is an ancient compatibility hack I want to destroy. + +Signed-off-by: Adam Jackson a...@redhat.com + commit 16816e99bacbd8dfc51a2deba541a72fb27f156a Author: Alan Coopersmith alan.coopersm...@oracle.com Date: Fri Mar 23 20:02:50 2012 -0700 diff --git a/debian/changelog b/debian/changelog index 4f06e20..f68529a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-trident (1:1.3.6-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Maarten Lankhorst maarten.lankho...@canonical.com Thu, 19 Jul 2012 13:21:51 +0200 + xserver-xorg-video-trident (1:1.3.5-1) unstable; urgency=low * New upstream release: diff --git a/debian/control b/debian/control index 9623194..97a15c2 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git diff --git a/debian/patches/series b/debian/patches/series index e69de29..fdffa2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +# placeholder commit 3098fe7193cbfe4a885a60b93e71796b70e4fa2a Author: Dave Airlie airl...@redhat.com Date: Tue Jul 17 16:05:09 2012 +1000 xf86-video-trident: bump to version 1.3.6 Signed-off-by: Dave Airlie airl...@redhat.com diff --git a/configure.ac b/configure.ac index 31bc459..eeb895e 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-trident], -[1.3.5], +[1.3.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-trident]) AC_CONFIG_SRCDIR([Makefile.am]) commit f02709607cb353db1e89a909ff01a6941f535ab4 Author: Dave Airlie airl...@redhat.com Date: Mon Jul 16 03:17:51 2012 +0100 trident: add support for building without XAA fix build for removal of XAA from server. Signed-off-by: Dave Airlie airl...@redhat.com diff --git a/configure.ac b/configure.ac index cab1fb7..31bc459 100644 --- a/configure.ac +++
xserver-xorg-video-trident: Changes to 'debian-experimental'
debian/changelog |8 ++-- debian/control |2 +- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit db17ec6aee3d816996943c4ce35920f62f8acae5 Author: Cyril Brulebois k...@debian.org Date: Sat Oct 16 21:26:41 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index c62f25e..3499dcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-trident (1:1.3.4-1) UNRELEASED; urgency=low +xserver-xorg-video-trident (1:1.3.4-1) experimental; urgency=low [ Christopher James Halse Rogers ] * New upstream version @@ -8,7 +8,7 @@ xserver-xorg-video-trident (1:1.3.4-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * Build against Xserver 1.9.1 rc1. - -- Christopher James Halse Rogers r...@ubuntu.com Wed, 04 Aug 2010 12:02:36 +1000 + -- Cyril Brulebois k...@debian.org Sat, 16 Oct 2010 21:26:40 +0200 xserver-xorg-video-trident (1:1.3.3-2) unstable; urgency=low commit 05fc1b4abd50ff714e0b52d42d575189b4fd3362 Author: Cyril Brulebois k...@debian.org Date: Sat Oct 16 21:26:31 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index a3a5ad7..c62f25e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ xserver-xorg-video-trident (1:1.3.4-1) UNRELEASED; urgency=low + [ Christopher James Halse Rogers ] * New upstream version - Fixes build against Xserver 1.9, which dropped ISA support and mibank.h * Bump Standards-Version to 3.9.1 (no changes needed) + [ Cyril Brulebois ] + * Build against Xserver 1.9.1 rc1. + -- Christopher James Halse Rogers r...@ubuntu.com Wed, 04 Aug 2010 12:02:36 +1000 xserver-xorg-video-trident (1:1.3.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 3d3a298..cef733f 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: automake, libtool, xutils-dev, - xserver-xorg-dev (= 2:1.7.6.901), + xserver-xorg-dev (= 2:1.9.0.901), x11proto-video-dev, x11proto-xext-dev, x11proto-xf86dga-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/e1p7cra-0007ga...@alioth.debian.org
xserver-xorg-video-trident: Changes to 'debian-experimental'
.gitignore| 70 +
COPYING | 67 +
ChangeLog | 585 --
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/trident.h |7
src/trident_dac.c |2
src/trident_driver.c | 17 -
src/tridentramdac.c | 70 -
src/tvga_dac.c|2
18 files changed, 236 insertions(+), 740 deletions(-)
New commits:
commit 81422b280b256e7d3e9e247360a7805ea1024c80
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date: Wed Aug 4 12:13:11 2010 +1000
Add changelog entry for 1.3.4-1
diff --git a/debian/changelog b/debian/changelog
index 0f84fe2..a3a5ad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-trident (1:1.3.4-1) UNRELEASED; urgency=low
+
+ * New upstream version
+- Fixes build against Xserver 1.9, which dropped ISA support and mibank.h
+ * Bump Standards-Version to 3.9.1 (no changes needed)
+
+ -- Christopher James Halse Rogers r...@ubuntu.com Wed, 04 Aug 2010
12:02:36 +1000
+
xserver-xorg-video-trident (1:1.3.3-2) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 08b344e..3d3a298 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,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-trident
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git
commit d38c91c0cd2bb3d503784899a05a09d063c6d9b0
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date: Wed Aug 4 12:12:34 2010 +1000
Remove stale tridentramdac.c file.
It's not in the tarball, it's not in upstream git, it's not used in the
build. Remove it from our tree, too
diff --git a/src/tridentramdac.c b/src/tridentramdac.c
deleted file mode 100644
index 299e782..000
--- a/src/tridentramdac.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 1992-2003 by Alan Hourihane, North Wales, UK.
- *
- * 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 name of Alan Hourihane not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Alan Hourihane makes no representations
- * about the suitability of this software for any purpose. It is provided
- * as is without express or implied warranty.
- *
- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ALAN HOURIHANE 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.
- *
- * Authors: Alan Hourihane, al...@fairlite.demon.co.uk
- *
- * TridentOutIndReg() and TridentInIndReg() are used to access
- * the indirect Trident RAMDAC registers only.
- */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridentramdac.c,v
1.4 2000/12/07 16:48:06 alanh Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include config.h
-#endif
-
-#include xf86.h
-#include xf86_OSproc.h
-
-#include xf86PciInfo.h
-#include xf86Pci.h
-
-#include trident_regs.h
-#include trident.h
-
-void
-TridentWriteAddress(ScrnInfoPtr pScrn, CARD32 index)
-{
-TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-MMIO_OUTB(0x3C6, 0xFF);
-MMIO_OUTB(0x3C8, index);
-}
-
-void
-TridentWriteData(ScrnInfoPtr pScrn, unsigned char data)
-{
-TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-MMIO_OUTB(0x3C9, data);
-}
-
-void
-TridentReadAddress(ScrnInfoPtr pScrn, CARD32 index)
-{
-TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-MMIO_OUTB(0x3C6, 0xFF);
-MMIO_OUTB(0x3C7, index);
-}
-
-unsigned char
-TridentReadData(ScrnInfoPtr pScrn)
-{
-TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-return(MMIO_INB(0x3C9));
-}
commit b5d17329ae1746bc95ac211c1325df86982e0eb1
Author: Dave Airlie airl...@redhat.com
Date: Mon Jul 5 14:32:39 2010 +1000
trident 1.3.4
diff --git a/configure.ac b/configure.ac
index ebff147..be54427 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
xserver-xorg-video-trident: Changes to 'debian-experimental'
ChangeLog | 107 Makefile.in | 673 README| 20 aclocal.m4| 8256 -- config.guess | 1526 - config.h.in | 66 config.sub| 1658 -- configure |23077 -- configure.ac | 14 debian/README.source | 73 debian/changelog | 23 debian/control| 19 debian/patches/01_gen_pci_ids.diff| 35 debian/patches/series |1 debian/rules | 20 debian/xserver-xorg-video-trident.install |2 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/trident.man |2 missing | 367 mkinstalldirs | 161 src/Makefile.am |1 src/Makefile.in | 581 src/trident.h |6 src/trident_dac.c |1 src/trident_driver.c | 128 src/trident_shadow.c |1 src/trident_video.c |1 src/tridenthelper.c |1 src/tvga_dac.c|1 35 files changed, 332 insertions(+), 45351 deletions(-) New commits: commit 5c929e7bbb7a8ef927b2ca75192515cecfcb7184 Author: Cyril Brulebois k...@debian.org Date: Sun Dec 6 01:12:27 2009 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 0028817..c663a79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,16 @@ -xserver-xorg-video-trident (1:1.3.3-1) UNRELEASED; urgency=low +xserver-xorg-video-trident (1:1.3.3-1) experimental; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. - -- Timo Aaltonen tjaal...@ubuntu.com Sat, 05 Dec 2009 01:49:13 +0200 + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois k...@debian.org Sun, 06 Dec 2009 01:12:19 +0100 xserver-xorg-video-trident (1:1.3.1-1) unstable; urgency=low commit 7736ba4ed7a571bc9c8451a1eb00056e68c54020 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Sat Dec 5 14:44:22 2009 +0200 Don't try to install the pci-ids. diff --git a/debian/xserver-xorg-video-trident.install b/debian/xserver-xorg-video-trident.install index 8a9f4ba..8f244ec 100644 --- a/debian/xserver-xorg-video-trident.install +++ b/debian/xserver-xorg-video-trident.install @@ -1,3 +1,3 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* -usr/share/xserver-xorg/pci/* + commit fb9fe0815ee34de7f4b6697104691faf52fded46 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Sat Dec 5 10:07:27 2009 +0200 Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. diff --git a/debian/changelog b/debian/changelog index 5f44302..0028817 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ xserver-xorg-video-trident (1:1.3.3-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to +choose a driver during autoconfiguration. -- Timo Aaltonen tjaal...@ubuntu.com Sat, 05 Dec 2009 01:49:13 +0200 diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index aae808e..000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,35 +0,0 @@ /dev/null -+++ xserver-xorg-video-trident/src/trident.ids -@@ -0,0 +1,23 @@ -+10232100 -+10232201 -+10238400 -+10238420 -+10238500 -+10238520 -+10238600 -+10238620 -+10238820 -+10239320 -+10239388 -+10239397 -+1023939A -+10239420 -+10239440 -+10239520 -+10239525 -+10239540 -+10239660 -+10239750 -+10239850 -+10239880 -+10239910 xserver-xorg-video-trident.orig/src/Makefile.am -+++ xserver-xorg-video-trident/src/Makefile.am -@@ -49,3 +49,6 @@ - xp_accel.c \ -xp4_accel.c \ -xp4_accel_exa.c -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = trident.ids diff --git a/debian/patches/series b/debian/patches/series index b55d79f..e69de29 100644 ---
xserver-xorg-video-trident: Changes to 'debian-experimental'
debian/changelog | 15 +
debian/control |2
debian/rules |2
debian/xsfbs/xsfbs-autoreconf.mk | 150 ---
debian/xsfbs/xsfbs.mk| 49 +---
debian/xsfbs/xsfbs.sh| 387 +--
6 files changed, 238 insertions(+), 367 deletions(-)
New commits:
commit 320b8c41831fe3e270c22dfb3d7fb8d7a98e10f3
Author: Julien Cristau [EMAIL PROTECTED]
Date: Wed Sep 10 12:45:46 2008 +0100
Build against xserver 1.5.
diff --git a/debian/changelog b/debian/changelog
index 5f910f8..d068fd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-trident (1:1.3.0-2) experimental; urgency=low
+
+ * Build against xserver 1.5.
+
+ -- Julien Cristau [EMAIL PROTECTED] Wed, 10 Sep 2008 12:45:40 +0100
+
xserver-xorg-video-trident (1:1.3.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 84a0adb..6865313 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force debian-x@lists.debian.org
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-video-dev, 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-video-dev, 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-trident
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.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
21; 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 21; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-#
xserver-xorg-video-trident: Changes to 'debian-experimental'
ChangeLog | 60 ++ Makefile.in| 31 - aclocal.m4 | 265 ++ config.guess | 60 +- config.sub | 66 ++ configure | 979 + configure.ac | 15 debian/changelog | 23 debian/control | 10 debian/patches/01_gen_pci_ids.diff | 14 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/blade_accel.c |1 src/image_accel.c |1 src/trident.h |3 src/trident_accel.c|1 src/trident_bank.c |1 src/trident_dac.c |1 src/trident_dga.c |1 src/trident_driver.c | 77 ++ src/trident_i2c.c |1 src/trident_regs.h |1 src/trident_shadow.c |1 src/trident_tv.c |1 src/trident_video.c| 12 src/tridenthelper.c|1 src/tridentpcirename.h | 122 src/tvga_dac.c |1 src/xp4_accel.c|1 src/xp_accel.c |1 39 files changed, 2073 insertions(+), 783 deletions(-) New commits: commit 6a96e71f5a92bc580cd3b9385df7e6e47c75d70e Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 21 13:47:10 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. diff --git a/debian/changelog b/debian/changelog index 2034ad2..b0380c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ xserver-xorg-video-trident (1:1.3.0-1) UNRELEASED; urgency=low * 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. -- Julien Cristau [EMAIL PROTECTED] Fri, 21 Mar 2008 13:44:17 +0100 diff --git a/debian/control b/debian/control index 495471b..bffef0b 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: xserver-xorg-video-trident Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org -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-video-dev, x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev -Standards-Version: 3.7.2.2 +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-video-dev, 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-trident Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git commit 73271ee4658df838aecdc3432fbb7fe98e5402b0 Author: Julien Cristau [EMAIL PROTECTED] Date: Fri Mar 21 13:45:13 2008 +0100 Update changelogs and refresh patch diff --git a/ChangeLog b/ChangeLog index a21321e..cd877b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,63 @@ +commit ac4bce50754528efbf55daa87dd4992ac70c4af2 +Author: Adam Jackson [EMAIL PROTECTED] +Date: Wed Mar 19 15:42:53 2008 -0400 + +trident 1.3.0 + +commit 012794d5aa4cf862f7d5b83d744acc2d5a13bf52 +Author: Adam Jackson [EMAIL PROTECTED] +Date: Wed Mar 19 15:41:46 2008 -0400 + +Fix distcheck + +commit 6e64c2a2d8bfc9cf3daf5f0df430ede5a5d0d7fb +Author: Adam Jackson [EMAIL PROTECTED] +Date: Wed Mar 19 15:40:11 2008 -0400 + +Death to RCS tags. + +commit 8419334ee64c977870194a651e2c5f05b6e89fa4 +Author: Matthieu Herrb [EMAIL PROTECTED] +Date: Sun Mar 9 00:01:45 2008 +0100 + +Makefile.am: nuke RCS Id + +commit a34c4ca7e1e8f2734aa443c0d597840f970e0eef +Author: Dave Airlie [EMAIL PROTECTED] +Date: Mon Feb 18 16:51:10 2008 +1000 + +initial trident pciaccess support + +commit 707a7c779c6859761c1b895b397239a36abef4c6 +Author: Alan Hourihane [EMAIL PROTECTED] +Date: Sun
xserver-xorg-video-trident: Changes to 'debian-experimental'
debian/changelog |6 ++ debian/copyright |3 +++ 2 files changed, 9 insertions(+) New commits: commit e20c01516c108b947d76de2ff106eee8128fcccf Author: Brice Goglin [EMAIL PROTECTED] Date: Sat Sep 15 02:23:22 2007 +0200 Add upstream URL to debian/copyright diff --git a/debian/changelog b/debian/changelog index 24894bc..de59b10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-trident (1:1.2.3-6) UNRELEASED; urgency=low + + * Add upstream URL to debian/copyright. + + -- Brice Goglin [EMAIL PROTECTED] Sat, 15 Sep 2007 02:22:59 +0200 + xserver-xorg-video-trident (1:1.2.3-5) experimental; urgency=low * Build against and build-dep on xserver 1.4 diff --git a/debian/copyright b/debian/copyright index dabddbf..95ee309 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,6 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + Copyright 1997-2003 by Alan Hourihane, North Wales, UK. 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-trident: Changes to 'debian-experimental'
debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit 5c474cba435364d3afe21d60f177d878b9d54fce Author: David Nusinow [EMAIL PROTECTED] Date: Sun Sep 9 23:00:43 2007 -0400 * Build against and build-dep on xserver 1.4 diff --git a/debian/changelog b/debian/changelog index ec79caf..24894bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-trident (1:1.2.3-5) experimental; urgency=low + + * Build against and build-dep on xserver 1.4 + + -- David Nusinow [EMAIL PROTECTED] Sun, 09 Sep 2007 22:58:40 -0400 + xserver-xorg-video-trident (1:1.2.3-4) experimental; urgency=low * Build against xserver 1.3.99.0. Build-dep on it as well. diff --git a/debian/control b/debian/control index 539c585..624bf5f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org 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-video-dev, 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-video-dev, x11proto-xext-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev Standards-Version: 3.7.2.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-trident: Changes to 'debian-experimental'
ChangeLog | 573 +++
Makefile.in | 125 +--
aclocal.m4| 676 --
configure | 1119 ++
debian/changelog | 26
debian/control| 13
debian/patches/01_gen_pci_ids.diff| 39 +
debian/patches/series |1
debian/rules |6
debian/xserver-xorg-video-trident.install |1
debian/xsfbs/xsfbs.mk |9
man/Makefile.in | 92 +-
src/Makefile.in | 150 ++--
13 files changed, 1859 insertions(+), 971 deletions(-)
New commits:
commit ce087db59d5d258747cb6733cd320e00ae480b88
Author: David Nusinow [EMAIL PROTECTED]
Date: Mon Aug 20 22:15:22 2007 -0400
Add 01_gen_pci_ids.diff.
This patch provides a list of the pci id's that the driver supports so
that the server can automatically load it under the right circumstances.
+ Enable our patch system and add quilt to build-depends
+ Autoreconf to deal with it
diff --git a/Makefile.in b/Makefile.in
index 21f61f8..3c7fb95 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 = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive\
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -130,6 +127,7 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -143,11 +141,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR =
xserver-xorg-video-trident: Changes to 'debian-experimental'
debian/changelog |6 +++---
debian/control|2 +-
debian/rules |2 +-
debian/xsfbs/xsfbs.mk | 15 +++
4 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 7e96240c87f403f21286e72fdb5bc4b91420e9cf
Author: David Nusinow [EMAIL PROTECTED]
Date: Tue Feb 20 22:28:57 2007 -0500
Generate server dependencies automatically from the ABI
diff --git a/debian/changelog b/debian/changelog
index f50f35f..c8b24ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-trident (1:1.2.3-2) UNRELEASED; urgency=low
+xserver-xorg-video-trident (1:1.2.3-2) unstable; urgency=low
- * 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:52 -0500
+ -- David Nusinow [EMAIL PROTECTED] Tue, 20 Feb 2007 22:26:23 -0500
xserver-xorg-video-trident (1:1.2.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 59310c6..7ef13dc 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2.2
Package: xserver-xorg-video-trident
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 -- Trident display driver
diff --git a/debian/rules b/debian/rules
index fd61bf5..0b1a107 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-trident: Changes to 'debian-experimental'
New branch 'debian-experimental' available with the following commits: commit d29f5f532480d08bd324ba4c64d106ea3a57889e Author: David Nusinow [EMAIL PROTECTED] Date: Sat Feb 10 21:25:15 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]
