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

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



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

New commits:
commit 9e0a245c0debb11b1a5662cbc88b990b0b76cb60
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Sat Dec 5 10:01:50 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 2c30526..47b45cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xserver-xorg-video-rendition (1:4.2.3-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:10 +0200
 
diff --git a/debian/patches/03_gen_pci_ids.diff b/debian/patches/03_gen_pci_ids.diff
deleted file mode 100644
index ff6e66c..0000000
--- a/debian/patches/03_gen_pci_ids.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: xserver-xorg-video-rendition/src/rendition.ids
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xserver-xorg-video-rendition/src/rendition.ids	2007-08-31 18:43:19.000000000 -0400
-@@ -0,0 +1,2 @@
-+11630001
-+11632000
-Index: xserver-xorg-video-rendition/src/Makefile.am
-===================================================================
---- xserver-xorg-video-rendition.orig/src/Makefile.am	2007-08-31 18:43:26.000000000 -0400
-+++ xserver-xorg-video-rendition/src/Makefile.am	2007-08-31 18:43:58.000000000 -0400
-@@ -66,3 +66,5 @@
- 	vgafont-vrx.data \
- 	vgapalette.data
-                         
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = rendition.ids
diff --git a/debian/patches/series b/debian/patches/series
index f70e62d..751e375 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_debian_remove_code_ref_to_object_code_files.diff
 02_debian_prune_nonfree.diff
-03_gen_pci_ids.diff


Reply to: