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

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



 debian/changelog                   |    2 ++
 debian/patches/03_gen_pci_ids.diff |   30 ------------------------------
 debian/patches/series              |    1 -
 3 files changed, 2 insertions(+), 31 deletions(-)

New commits:
commit 86ff2847ac02dfa5042c4a9fd6a4041c8de6aa03
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Sat Dec 5 10:04:43 2009 +0200

    Remove 03_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 61b0b7d..a8bea2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xserver-xorg-video-sis (1:0.10.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
+  * Remove 03_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:11 +0200
 
diff --git a/debian/patches/03_gen_pci_ids.diff b/debian/patches/03_gen_pci_ids.diff
deleted file mode 100644
index 4a80cc8..0000000
--- a/debian/patches/03_gen_pci_ids.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: xserver-xorg-video-sis/src/sis.ids
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver-xorg-video-sis/src/sis.ids	2007-08-22 21:35:38.000000000 -0400
-@@ -0,0 +1,14 @@
-+10390200
-+10396306
-+10396326
-+10390300
-+10396300
-+10395300
-+10395315 
-+10390310
-+10390325
-+10396325 
-+10390330
-+10390340
-+01039315
-+10396330
-Index: xserver-xorg-video-sis/src/Makefile.am
-===================================================================
---- xserver-xorg-video-sis.orig/src/Makefile.am	2007-08-22 21:35:49.000000000 -0400
-+++ xserver-xorg-video-sis/src/Makefile.am	2007-08-22 21:36:07.000000000 -0400
-@@ -76,3 +76,6 @@
-          sis_dri.c \
-          sis_dri.h 
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = sis.ids
diff --git a/debian/patches/series b/debian/patches/series
index ca04166..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-03_gen_pci_ids.diff


Reply to: