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

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



 debian/changelog                   |    2 ++
 debian/patches/01_gen_pci_ids.diff |   35 -----------------------------------
 debian/patches/series              |    1 -
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit fb9fe0815ee34de7f4b6697104691faf52fded46
Author: Timo Aaltonen <tjaalton@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 <tjaalton@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..0000000
--- 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
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01_gen_pci_ids.diff


Reply to: