debian/changelog | 8 ++++++++ debian/patches/01_gen_pci_ids.diff | 28 ---------------------------- debian/patches/01_no_nonfree.diff | 12 ++++++++++++ debian/patches/03_no_nonfree.diff | 12 ------------ debian/patches/series | 3 +-- 5 files changed, 21 insertions(+), 42 deletions(-)
New commits: commit ef701ceb48e6deb639a067cf2d84f5009e541b36 Author: David Nusinow <dnusi...@debian.org> Date: Mon May 4 22:17:19 2009 -0400 Renumber 03_no_nonfree.diff to 01. diff --git a/debian/changelog b/debian/changelog index 4827a35..801fa8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-video-mga (1:1.4.10.dfsg-2) UNRELEASED; urgency=low * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. + * Renumber 03_no_nonfree.diff to 01. - -- David Nusinow <dnusi...@debian.org> Mon, 04 May 2009 22:15:22 -0400 + -- David Nusinow <dnusi...@debian.org> Mon, 04 May 2009 22:16:16 -0400 xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low diff --git a/debian/patches/01_no_nonfree.diff b/debian/patches/01_no_nonfree.diff new file mode 100644 index 0000000..83e4da4 --- /dev/null +++ b/debian/patches/01_no_nonfree.diff @@ -0,0 +1,12 @@ +Index: xserver-xorg-video-mga/src/Makefile.am +=================================================================== +--- xserver-xorg-video-mga.orig/src/Makefile.am 2006-10-26 22:48:24.000000000 -0400 ++++ xserver-xorg-video-mga/src/Makefile.am 2006-11-06 23:40:03.000000000 -0500 +@@ -54,7 +54,6 @@ + mga_reg.h \ + mga_sarea.h \ + mga_shadow.c \ +- mga_ucode.h \ + mga_vga.c \ + mga_video.c + diff --git a/debian/patches/03_no_nonfree.diff b/debian/patches/03_no_nonfree.diff deleted file mode 100644 index 83e4da4..0000000 --- a/debian/patches/03_no_nonfree.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: xserver-xorg-video-mga/src/Makefile.am -=================================================================== ---- xserver-xorg-video-mga.orig/src/Makefile.am 2006-10-26 22:48:24.000000000 -0400 -+++ xserver-xorg-video-mga/src/Makefile.am 2006-11-06 23:40:03.000000000 -0500 -@@ -54,7 +54,6 @@ - mga_reg.h \ - mga_sarea.h \ - mga_shadow.c \ -- mga_ucode.h \ - mga_vga.c \ - mga_video.c - diff --git a/debian/patches/series b/debian/patches/series index 4ae2caf..b7e34e9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -03_no_nonfree.diff +01_no_nonfree.diff commit c8315bd45bf246630ce0fc0021e5471ad8c24a84 Author: David Nusinow <dnusi...@debian.org> Date: Mon May 4 22:16:01 2009 -0400 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 5b79ba4..4827a35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-mga (1:1.4.10.dfsg-2) UNRELEASED; urgency=low + + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + -- David Nusinow <dnusi...@debian.org> Mon, 04 May 2009 22:15:22 -0400 + xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff deleted file mode 100644 index 55a6770..0000000 --- a/debian/patches/01_gen_pci_ids.diff +++ /dev/null @@ -1,28 +0,0 @@ -Index: xserver-xorg-video-mga/src/Makefile.am -=================================================================== ---- xserver-xorg-video-mga.orig/src/Makefile.am 2007-09-13 22:12:21.000000000 -0400 -+++ xserver-xorg-video-mga/src/Makefile.am 2007-09-13 22:13:12.000000000 -0400 -@@ -74,3 +74,6 @@ - mga_drv_la_SOURCES += \ - mga_storm.c - endif -+ -+pcidatadir = $(datadir)/xserver-xorg/pci -+pcidata_DATA = mga.ids -Index: xserver-xorg-video-mga/src/mga.ids -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver-xorg-video-mga/src/mga.ids 2007-09-13 22:12:13.000000000 -0400 -@@ -0,0 +1,12 @@ -+102B0519 -+102B051A -+102B051B -+102B051F -+102B0520 -+102B0521 -+102B0525 -+102B2527 -+102B1000 -+102B1001 -+102B0522 -+102B0524 diff --git a/debian/patches/series b/debian/patches/series index f6a23fd..4ae2caf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -01_gen_pci_ids.diff 03_no_nonfree.diff -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org