[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-tdfx: Changes to 'debian-unstable'



 debian/changelog                   |    2 ++
 debian/patches/04_gen_pci_ids.diff |   19 -------------------
 debian/patches/series              |    1 -
 3 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 31ecdcf408de19cfa769cbabba197d8c779e0f31
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Sat Dec 5 10:06:31 2009 +0200

    Remove 04_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 0b0a77d..a24811f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xserver-xorg-video-tdfx (1:1.4.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
+  * Remove 04_gen_pci_ids.diff. The X server now uses an internal table to
+    choose a driver during autoconfiguration.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Sat, 05 Dec 2009 01:49:13 +0200
 
diff --git a/debian/patches/04_gen_pci_ids.diff b/debian/patches/04_gen_pci_ids.diff
deleted file mode 100644
index 93226be..0000000
--- a/debian/patches/04_gen_pci_ids.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: xserver-xorg-video-tdfx/src/tdfx.ids
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver-xorg-video-tdfx/src/tdfx.ids	2007-08-22 20:50:06.000000000 -0400
-@@ -0,0 +1,3 @@
-+121A0003
-+121A0005
-+121A0009
-Index: xserver-xorg-video-tdfx/src/Makefile.am
-===================================================================
---- xserver-xorg-video-tdfx.orig/src/Makefile.am	2007-08-22 20:50:13.000000000 -0400
-+++ xserver-xorg-video-tdfx/src/Makefile.am	2007-08-22 20:50:43.000000000 -0400
-@@ -47,3 +47,6 @@
-          tdfx_dri.h \
-          tdfx_dripriv.h
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = tdfx.ids
diff --git a/debian/patches/series b/debian/patches/series
index 93c65dc..5064323 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_tdfx_disable_dri_on_16mb_with_highres.diff
 02_tdfx_improve_mode_rejection_diagnostics.diff
-04_gen_pci_ids.diff
 05_request_16bpp_depth.diff


Reply to: